Ver Fonte

修改页面。

jxq há 1 mês atrás
pai
commit
94de32dcee
1 ficheiros alterados com 136 adições e 87 exclusões
  1. 136 87
      src/views/modules/runTest/run-test.vue

+ 136 - 87
src/views/modules/runTest/run-test.vue

@@ -216,6 +216,7 @@ const getSattisticData = () => {
 // ===== websocket ====
 const logList = ref<any[]>([]); //日志数据
 const testingWSData = ref();
+const tableHeaderData = ref<any[]>([]);
 const setTestingData = () => {
   let data = {};
   topProSelectedList.value.forEach((id) => {
@@ -225,52 +226,74 @@ const setTestingData = () => {
   });
   testingWSData.value = data;
 
-  // testingWSData.value = {
-  //   电源测试: [
-  //     {
-  //       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啊",
-  //     },
-  //   ],
-  // };
+  testingWSData.value = {
+    电源测试: [
+      {
+        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啊",
+      },
+    ],
+  };
 };
 watch(topProSelectedList, () => {
   setTestingData();
@@ -497,46 +520,49 @@ const cancelMsgType5 = () => {
     <div class="content-B">
       <div class="content-B-1">
         <titHeader icon-class="csgcxx" tit="测试工程信息" />
-        <el-form
-          label-position="top"
-          label-width="auto"
-          :model="formLabelAlign"
-          ref="ruleFormRef"
-        >
-          <el-form-item label="产品名称">
-            {{ engineeringObj?.engineeringProductName }}
-          </el-form-item>
-          <el-form-item label="工程类型">
-            {{ engineeringObj?.engineeringType }}
-          </el-form-item>
-          <el-form-item label="	工程版本" label-position="left">
-            {{ engineeringObj?.engineeringVersion }}
-          </el-form-item>
+        <el-scrollbar class="content-B-height-1">
+          <el-form
+            label-position="top"
+            label-width="auto"
+            :model="formLabelAlign"
+            ref="ruleFormRef"
+          >
+            <el-form-item label="产品名称">
+              {{ engineeringObj?.engineeringProductName }}
+            </el-form-item>
+            <el-form-item label="工程类型">
+              {{ engineeringObj?.engineeringType }}
+            </el-form-item>
+            <el-form-item label="	工程版本" label-position="left">
+              {{ engineeringObj?.engineeringVersion }}
+            </el-form-item>
 
-          <el-form-item label="产品编号" prop="productCode">
-            <el-input v-model="formLabelAlign.productCode" />
-          </el-form-item>
-          <el-form-item label="测试类型" prop="testType">
-            <el-select
-              v-model="formLabelAlign.testType"
-              placeholder="选择测试类型"
-            >
-              <el-option
-                v-for="item in allTestTypes"
-                :key="item.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="测试地点" prop="testLocation">
-            <el-input v-model="formLabelAlign.testLocation" />
-          </el-form-item>
-        </el-form>
+            <el-form-item label="产品编号" prop="productCode">
+              <el-input v-model="formLabelAlign.productCode" />
+            </el-form-item>
+            <el-form-item label="测试类型" prop="testType">
+              <el-select
+                v-model="formLabelAlign.testType"
+                placeholder="选择测试类型"
+              >
+                <el-option
+                  v-for="item in allTestTypes"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="测试地点" prop="testLocation">
+              <el-input v-model="formLabelAlign.testLocation" />
+            </el-form-item>
+          </el-form>
+        </el-scrollbar>
       </div>
 
       <div class="content-B-2">
         <titHeader icon-class="zxzd-yq" tit="执行终端/仪器" />
+
         <el-form
           label-position="top"
           label-width="auto"
@@ -564,6 +590,7 @@ const cancelMsgType5 = () => {
             </div>
           </el-form-item>
         </el-form>
+
         <div>
           <!--          <svg-icon icon-class="gougou" class="svg-success" />-->
           <span>{{ selectedExcutingMachine?.ip }}</span>
@@ -611,11 +638,16 @@ const cancelMsgType5 = () => {
         <!--          <svg-icon icon-class="refresh1" />-->
         <!--        </el-button>-->
         <titHeader icon-class="cssj" tit="测试数据" />
-        <div class="cssj-row-flex">
-          <span>序号</span>
-          <span>数据项</span>
-          <span>数据内容</span>
-        </div>
+        <!--        <div class="cssj-row-flex">-->
+        <!--          <span>序号</span>-->
+        <!--          <span>数据项</span>-->
+        <!--          <span>数据内容</span>-->
+        <!--        </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>
         <el-scrollbar class="content-B-height-4" v-if="testingWSData">
           <div v-for="(proName, index) in Object.keys(testingWSData)">
             <div class="cssj-tit">项目名称: {{ proName }}</div>
@@ -1090,8 +1122,12 @@ $color-progress: #3cbaff;
   margin-right: 20px;
 }
 
+.content-B-height-1 {
+  height: calc(100vh - $main-header-height - 300px - 64px - 90px);
+}
+
 .content-B-height-2 {
-  height: calc(100vh - $main-header-height - 300px - 64px - 228px);
+  height: calc(100vh - $main-header-height - 300px - 64px - 210px);
 }
 
 .content-B-height-3 {
@@ -1101,4 +1137,17 @@ $color-progress: #3cbaff;
 .content-B-height-4 {
   height: calc(100vh - $main-header-height - 300px - 64px - 120px);
 }
+
+.header-only-table {
+  :deep(.el-table__empty-block) {
+    display: none;
+  }
+  :deep(.el-table__body-wrapper) {
+    display: none;
+  }
+  :deep(.el-table__inner-wrapper::before) {
+    height: 2px;
+    background-color: #787171;
+  }
+}
 </style>