Bläddra i källkod

引入icon。

jiaxiaoqiang 3 månader sedan
förälder
incheckning
34aa376f6b

+ 11 - 0
src/api/project/excute.ts

@@ -0,0 +1,11 @@
+import request from "@/utils/request";
+import { AxiosPromise } from "axios";
+
+// 查询测试类型
+export function searhTestType(data: object): AxiosPromise {
+  return request({
+    url: "/api/v1/test/engrExecute/selectTestType",
+    method: "post",
+    data: {},
+  });
+}

+ 5 - 0
src/assets/icons/addHao.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" d="M4.5 4a.5.5 0 0 0-.5.5v15a.5.5 0 0 0 .5.5h15a.5.5 0 0 0 .5-.5v-15a.5.5 0 0 0-.5-.5h-15ZM2 4.5A2.5 2.5 0 0 1 4.5 2h15A2.5 2.5 0 0 1 22 4.5v15a2.5 2.5 0 0 1-2.5 2.5h-15A2.5 2.5 0 0 1 2 19.5v-15Z" clip-rule="evenodd"/>
+  <path fill-rule="evenodd" d="M12 7a1 1 0 0 1 1 1v8a1 1 0 1 1-2 0V8a1 1 0 0 1 1-1Z" clip-rule="evenodd"/>
+  <path fill-rule="evenodd" d="M7 12a1 1 0 0 1 1-1h8a1 1 0 1 1 0 2H8a1 1 0 0 1-1-1Z" clip-rule="evenodd"/>
+</svg>

+ 4 - 0
src/assets/icons/jianHao.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
+  <path fill-rule="evenodd" d="M4.5 4a.5.5 0 0 0-.5.5v15a.5.5 0 0 0 .5.5h15a.5.5 0 0 0 .5-.5v-15a.5.5 0 0 0-.5-.5h-15ZM2 4.5A2.5 2.5 0 0 1 4.5 2h15A2.5 2.5 0 0 1 22 4.5v15a2.5 2.5 0 0 1-2.5 2.5h-15A2.5 2.5 0 0 1 2 19.5v-15Z" clip-rule="evenodd"/>
+  <path fill-rule="evenodd" d="M7 12a1 1 0 0 1 1-1h8a1 1 0 1 1 0 2H8a1 1 0 0 1-1-1Z" clip-rule="evenodd"/>
+</svg>

+ 1 - 1
src/views/modules/global-config/global-config.vue

@@ -267,7 +267,7 @@ const globalHandledel = (index: number, row: any) => {
       </el-tab-pane>
       <el-tab-pane label="执行终端" name="执行终端"
         >跟仪器配置一样只是 instrumentProperty 仪器属性(1工程仪器 2执行仪器)
-        仪器类型是字典要选择</el-tab-pane
+        仪器类型接口 在仪器配置接口API里面</el-tab-pane
       >
     </el-tabs>
 

+ 12 - 8
src/views/modules/project-config/com/project-message.vue

@@ -52,9 +52,9 @@ const clickTestProjectItem = (item) => {
     <div class="project-msg-item">
       <span class="text-l">产品:</span>
       <span class="text-r">{{ currentProject?.engineeringProductName }}</span>
-      <span class="edit">
-        <svg-icon icon-class="homeIcon2" />
-      </span>
+      <!--      <span class="edit">-->
+      <!--        <svg-icon icon-class="homeIcon2" />-->
+      <!--      </span>-->
     </div>
     <div class="project-msg-item">
       <span class="text-l">工程类型:</span
@@ -77,8 +77,12 @@ const clickTestProjectItem = (item) => {
     <div class="project-test-btn">
       <div class="name">测试项目</div>
       <div class="btn">
-        <span>-</span>
-        <span>+</span>
+        <span class="edit">
+          <svg-icon icon-class="jianHao" />
+        </span>
+        <span class="edit">
+          <svg-icon icon-class="addHao" />
+        </span>
         <span class="edit">
           <svg-icon icon-class="homeIcon2" />
         </span>
@@ -165,12 +169,12 @@ const clickTestProjectItem = (item) => {
       span {
         cursor: pointer;
         display: inline-block;
-        width: 18px;
-        height: 18px;
+        //width: 18px;
+        //height: 18px;
         text-align: center;
         line-height: 16px;
         border-radius: 0px 0px 0px 0px;
-        border: 1px solid #ffffff;
+        //border: 1px solid #ffffff;
         color: var(--hj-white-1);
         //&:nth-of-type(2) {
         margin-left: 8px;

+ 2 - 0
src/views/modules/project-config/project-config.vue

@@ -92,6 +92,8 @@ onMounted(async () => {
 });
 
 const getFlowData = () => {
+  nodes.value = [];
+  edges.value = [];
   getTestProjectInfo(currentTestItemId.value).then((result) => {
     if (result.data.routeData) {
       let data = JSON.parse(result.data.routeData);