Selaa lähdekoodia

测试执行页面,位置替换,log开关,数据项目修改。

jxq 1 kuukausi sitten
vanhempi
commit
acee5d63bc
1 muutettua tiedostoa jossa 35 lisäystä ja 78 poistoa
  1. 35 78
      src/views/modules/runTest/run-test.vue

+ 35 - 78
src/views/modules/runTest/run-test.vue

@@ -237,6 +237,7 @@ const getSattisticData = () => {
 
 // ===== websocket ====
 const logList = ref<any[]>([]); //日志数据
+const isShowLog = ref(false); //是否展示日志
 const testingWSData = ref();
 const tableHeaderData = ref<any[]>([]);
 const setTestingData = () => {
@@ -252,70 +253,13 @@ const setTestingData = () => {
   //   电源测试: [
   //     {
   //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //   ],
-  //   wanger: [
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //   ],
-  //   aaaaaa: [
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
-  //     },
-  //     {
-  //       dataItem: "测试值0嘟嘟嘟嘟嘟嘟",
-  //       dataContent: "dddddafvdafgvjf多发点顺丰水电费阿道夫爸的阿凡达深V啊",
+  //       setData: "ddd",
+  //       testData: "aaa",
   //     },
   //   ],
   // };
+
+  // logList.value = ["dddd"];
 };
 watch(topProSelectedList, () => {
   setTestingData();
@@ -646,15 +590,6 @@ const cancelMsgType5 = () => {
           </div>
         </el-scrollbar>
       </div>
-
-      <div class="content-B-3">
-        <titHeader icon-class="zxgcrz" tit="执行过程日志" />
-        <el-scrollbar class="content-B-height-3">
-          <div class="content-log">
-            <div v-for="(item, index) in logList" :key="index">{{ item }}</div>
-          </div>
-        </el-scrollbar>
-      </div>
       <div class="content-B-4">
         <!--        <el-button class="test-min-btn" type="primary">-->
         <!--          <svg-icon icon-class="refresh1" />-->
@@ -667,8 +602,9 @@ const cancelMsgType5 = () => {
         <!--        </div>-->
         <el-table :data="tableHeaderData" class="header-only-table">
           <el-table-column type="index" width="55" label="序号" />
-          <el-table-column property="dataItem" width="160" label="数据项" />
-          <el-table-column property="dataContent" label="数据内容" />
+          <el-table-column property="dataItem" width="200" label="数据项" />
+          <el-table-column property="setData" label="设置值" />
+          <el-table-column property="testData" label="测量值" />
         </el-table>
         <el-scrollbar class="content-B-height-4" v-if="testingWSData">
           <div v-for="(proName, index) in Object.keys(testingWSData)">
@@ -679,12 +615,26 @@ const cancelMsgType5 = () => {
               :show-header="false"
             >
               <el-table-column type="index" width="55" />
-              <el-table-column property="dataItem" width="160" />
-              <el-table-column property="dataContent" />
+              <el-table-column property="dataItem" width="200" />
+              <el-table-column property="setData" />
+              <el-table-column property="testData" />
             </el-table>
           </div>
         </el-scrollbar>
       </div>
+      <div class="content-B-3">
+        <titHeader icon-class="zxgcrz" tit="执行过程日志" />
+        <el-switch
+          class="show-switch"
+          v-model="isShowLog"
+          active-color="#13ce66"
+        ></el-switch>
+        <el-scrollbar class="content-B-height-3" v-show="isShowLog">
+          <div class="content-log">
+            <div v-for="(item, index) in logList" :key="index">{{ item }}</div>
+          </div>
+        </el-scrollbar>
+      </div>
     </div>
 
     <div class="content-C">
@@ -980,10 +930,10 @@ $color-progress: #3cbaff;
     }
 
     .content-B-1 {
-      flex: 0 0 19%;
+      flex: 0 0 17%;
     }
     .content-B-2 {
-      flex: 0 0 22%;
+      flex: 0 0 18%;
       .select-div {
         display: flex;
         width: 100%;
@@ -1016,16 +966,23 @@ $color-progress: #3cbaff;
       }
     }
     .content-B-3 {
-      flex: 0 0 19%;
+      flex: 0 0 20%;
+      position: relative;
       .content-log {
         font-weight: 400;
         font-size: var(--hj-fs-12);
         color: var(--fc-color-5);
         line-height: 18px;
       }
+
+      .show-switch {
+        position: absolute;
+        top: -3px;
+        right: 10px;
+      }
     }
     .content-B-4 {
-      flex: 0 0 40%;
+      flex: 0 0 45%;
       position: relative;
       .test-min-btn {
         position: absolute;