检测首页、主页、数据展示界面样式修改

frontend/src/views/plan/autoTest/components/ShowDataPopup.vue

@@ -1,10 +1,8 @@
 <template>
-        <el-dialog class='table-box'
+        <el-dialog
         title="数据查询"
                v-model='dialogVisible'
-               v-bind="dialogSmall" 
-               width="1200"
-               height="600"
+               v-bind="dialogBig" 
                draggable
 >
     <div class='table-box'>
@@ -16,6 +14,7 @@
         ref='proTable1'
         :columns='columns1'
         :data="testResultDatas"
+        :toolButton="false"
       >
          
       </ProTable>
@@ -29,6 +28,7 @@
         ref='proTable2'
         :columns='columns2'
         :data="testDatas"
+        :toolButton="false"
       >
       </ProTable>
       </div>
@@ -48,7 +48,7 @@
   import permissionUnit from './components/permissionUnit.vue'
   import ImportExcel from '@/components/ImportExcel/index.vue'
   import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
-  import {dialogSmall} from '@/utils/elementBind'
+  import {dialogBig,dialogMiddle,dialogSmall} from '@/utils/elementBind'
   import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
   import { useDictStore } from '@/stores/modules/dict'
   import {

frontend/src/views/plan/autoTest/components/tree.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="plan_tree">
-    <div class="search_view">
+    <!-- <div class="search_view">
       <el-input
         placeholder="请输入计划名称"
         v-model="searchForm.planName"
       ></el-input>
-    </div>
+    </div> -->
     <div class="tree_container">
       <el-tree
         :data="data"
@@ -19,12 +19,14 @@
         @node-click="handleNodeClick"
         @check-change="changeSelect"
       >
+      <!-- scriptIdx -->
         <template #default="{ node, data }">
           <span
             class="custom-tree-node"
             style="display: flex; align-items: center"
           >
-            <!-- <Platform v-if="!data.pid" style="width:18px;height: 18px;margin-right:8px;" :style="{color:node.label=='未检测'?'#F56C6C':node.label=='检测中'?'#E6A23C':'#67C23A'}"/> -->
+            <CircleCheck v-if="data.isChildNode && data.scriptIdx < currentIndex" style="width:18px;height: 18px;margin-right:8px;color:#67C23A;"/>
+            <Loading v-if="data.isChildNode && data.scriptIdx === currentIndex" style="width:18px;height: 18px;margin-right:8px;color:#E6A23C;"/>
             <span>{{ node.label }}</span>
           </span>
         </template>
@@ -34,7 +36,7 @@
 </template>
 <script lang="ts" setup>
 import { ref, onMounted, defineExpose, watch } from "vue";
-import { Menu, Platform } from "@element-plus/icons-vue";
+import { Menu, Platform, CircleCheck,Loading } from "@element-plus/icons-vue";
 const emit = defineEmits(["jump"]);
 const data: any = ref([]);
 const defaultProps = {
@@ -55,6 +57,17 @@ const getTreeData = (val: any) => {
 };
 const filterText = ref("");
 const treeRef = ref();
+const currentIndex = ref(0);
+
+const timer = setInterval(() => {
+  currentIndex.value++;
+      if (currentIndex.value > 14) 
+      currentIndex.value = 0;
+    console.log(currentIndex.value);
+    
+    }, 2000);
+
+
 watch(
   () => searchForm.value.planName,
   (val) => {

frontend/src/views/plan/autoTest/index.vue

@@ -4,18 +4,18 @@
         <!-- 顶部筛选条件&返回按钮 -->
     <!-- {{ printText }} -->
     <div class="test_top">
+      <!-- style="pointer-events: none" -->
       <el-checkbox
         v-for="(item, index) in detectionOptions"
-        :model-value="item.id"
-        :true-value="item.id"
+        v-model="item.selected"
         :key="index"
-        style="pointer-events: none"
-        >{{ item.name }}</el-checkbox
+        :label="item.name"
+        ></el-checkbox
       >
-      <el-button type="primary" @click="handlePreTest">启动预检测</el-button>
-      <el-button type="primary" @click="handleAutoTest">进入检测流程</el-button>
+      <el-button type="primary" @click="handlePreTest">预检测</el-button>
+      <el-button type="primary" @click="handleAutoTest">正式检测</el-button>
       <el-button type="primary" @click="handleBackDeviceList"
-        >返回检测首页</el-button
+        >返回首页</el-button
       >
     </div>
     <div class="test_bot">
@@ -42,6 +42,23 @@
           />
           <div class="test_button">
             <el-button
+              type="primary"
+              v-if="!isPause"
+              :icon="VideoPause"
+              @click="handlePauseTest"
+              >暂停检测</el-button
+            >
+            <el-button
+              type="warning"
+              v-if="isPause"
+              :icon="Refresh"
+              @click="handlePauseTest"
+              >继续检测</el-button
+            >
+            <el-button type="danger" :icon="Close" @click="handleFinishTest"
+              >停止检测</el-button
+            >
+            <!-- <el-button
               type="danger"
               v-if="!isPause"
               :icon="Close"
@@ -57,7 +74,7 @@
             >
             <el-button type="primary" :icon="Check" @click="handleFinishTest"
               >完成检测</el-button
-            >
+            > -->
           </div>
         </template>
         <!-- <el-descriptions-item width="0px" label="上送数据总数">
@@ -74,7 +91,7 @@
       <div class="right_table">
         <!-- 模拟列表样式 -->
         <!-- 表头设备 -->
-        <div class="table_left">
+        <div class="table_left" v-if="false">
           <p>测试项目</p>
           <div v-for="(item, index) in deviceTestList" :key="index">
             {{ item.name }}
@@ -125,7 +142,8 @@
       </div>
       <!-- 右侧状态加载 -->
       <div class="right_status" ref="statusRef">
-        <p v-for="(item, index) in statusList" :key="index">
+        <!-- ,fontSize:index%5===0?'16px':'14px' -->
+        <p v-for="(item, index) in statusList" :key="index" :style="{color:index%5===0?'#F56C6C':'var(--el-text-color-regular)'}">
           输入：{{ item.remark }} -{{
             item.status == 0 ? "输出完毕" : "输入中，请稍后！"
           }}<br />
@@ -159,30 +177,53 @@ import {
   Refresh,
   Search,
   Close,
+  VideoPause,
 } from "@element-plus/icons-vue";
 const treeRef = ref<any>();
 const PopupVisible = ref(false)
 const showDataPopup = ref()
 
 //定义与预检测配置数组
-const detectionOptions = [
+const detectionOptions = ref([
   {
     id: 0,
-    name: "标准源通讯检测",
+    name: "标准源通讯检测",//判断源通讯是否正常
+    selected: true,
   },
   {
     id: 1,
-    name: "设备通讯检测",
+    name: "设备通讯检测",//判断设备的IP、Port、识别码、秘钥是否正常
+    selected: true,
   },
   {
     id: 2,
-    name: "协议校验",
+    name: "协议校验",//ICD报告触发测试
+    selected: true,
   },
   {
     id: 3,
-    name: "数据校对",
+    name: "相序校验",//判断装置的接线是否正确
+    selected: true,
   },
-];
+  {
+    id: 4,
+    name: "守时校验",//判断装置24小时内的守时误差是否小于1s
+    selected: true,
+  },
+  {
+    id: 5,
+    name: "通道系数校准",//通过私有协议与装置进行通讯，校准三相电压电流的通道系数
+    selected: true,
+  },
+  // {
+  //   id: 6,
+  //   name: "实时数据比对",
+  // },
+  // {
+  //   id: 7,
+  //   name: "录波数据比对",
+  // },
+]);
 
 const leftDeviceData = ref<any>([
   // {

frontend/src/views/plan/planList/index.vue

@@ -25,8 +25,6 @@
          <el-button type='primary' link :icon='Tools' @click="showtestSourceOpen(scope.row)">检测源绑定</el-button>
        </template>
    </ProTable>
-
-   <temp></temp>
       <!-- 向计划导入/导出设备对话框 -->
       <planPopup     
       :visible="dialogFormVisible"