新增场景切换

frontend/src/api/system/base/index.ts

@@ -1,3 +1,4 @@
+
 import http from '@/api'
 import {type Base} from '@/api/system/base/interface'
 
@@ -12,6 +13,10 @@ export const updateTestConfig = (params: Base.ResTestConfig) => {
     return http.post(`/sysTestConfig/update`, params)
 }
 
+//场景切换
+export const updateScene = (params: any) => {
+    return http.post(`/sysTestConfig/update`,params)
+}
 
 
 

frontend/src/api/system/base/interface/index.ts

@@ -9,6 +9,7 @@ export namespace Base {
         autoGenerate:number;//检测报告是否自动生成0 否；1是
         maxTime:number;//最大复检次数，默认3次
         state: number; //状态
+        scale:number;//小数位
         createBy?: string| null; //创建用户
         createTime?: string| null; //创建时间
         updateBy?: string| null; //更新用户

frontend/src/languages/modules/en.ts

@@ -27,6 +27,7 @@ export default {
     changeMode:"Change Mode",
     versionRegister:"Version Register",
     changeTheme: "Change Theme",
+    changeScene: "Change Scene",
     logout: "Logout"
   }
 };

frontend/src/languages/modules/zh.ts

@@ -27,6 +27,7 @@ export default {
     changeMode:"模式切换",
     versionRegister:"版本注册",
     changeTheme:"主题切换",
+    changeScene: "场景切换",
     logout: "退出登录"
   }
 };

frontend/src/layouts/components/Header/components/Avatar.vue

@@ -33,6 +33,27 @@
         <el-dropdown-item @click="openDialog('versionRegisterRef')">
           <el-icon><SetUp /></el-icon>{{ t("header.versionRegister") }}
         </el-dropdown-item>
+       <el-dropdown trigger="hover" placement="left-start" v-if="userStore.userInfo.loginName == 'root'">
+          <div class="custom-dropdown-trigger">
+            <el-icon><Tools /></el-icon>
+            <span>{{ t("header.changeScene") }}</span>
+          </div>
+          <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item
+                  v-for="item in dictStore.getDictData('app_scene')"
+                  :key="item.value"
+                  :class="{
+                    'custom-dropdown-item': true,
+                    active: item.value === appSceneStore.currentScene
+                  }"
+                  @click="changeScene(item.value?? '')"
+                >
+              {{ item.name }}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
       </el-dropdown-menu>
     </template>
   </el-dropdown>
@@ -62,7 +83,7 @@ import PasswordDialog from "./PasswordDialog.vue";
 import ThemeDialog from "./ThemeDialog.vue";
 import VersionDialog from "@/views/system/versionRegister/index.vue";
 import { computed } from "vue";
-import { Avatar, Delete, Document, Sunny, Switch } from "@element-plus/icons-vue";
+import { ArrowLeft, Avatar, Delete, Document, Sunny, Switch ,Tools} from "@element-plus/icons-vue";
 import AssemblySize from "./components/AssemblySize.vue";
 import Language from "./components/Language.vue";
 import SearchMenu from "./components/SearchMenu.vue";
@@ -75,12 +96,16 @@ import { useModeStore,useAppSceneStore } from "@/stores/modules/mode";
 const userStore = useUserStore();
 const dictStore = useDictStore();
 const username = computed(() => userStore.userInfo.name);
+
 const router = useRouter();
 const authStore = useAuthStore();
 const modeStore = useModeStore();
 const AppSceneStore = useAppSceneStore();
 import { useTheme } from "@/hooks/useTheme";
 import { useI18n } from "vue-i18n";
+import {updateScene} from '@/api/system/base/index'
+
+
 const { changePrimary} = useTheme();
 
 // 初始化 i18n
@@ -126,7 +151,14 @@ const openDialog = (ref: string) => {
 };
 
 
+const appSceneStore = useAppSceneStore();
 
+const changeScene = async (value: string) => {
+  appSceneStore.setCurrentMode(value);
+  await updateScene({scene :dictStore.getDictData('app_scene').find(item => item.value == value)?.id});
+  // 强制刷新页面
+  window.location.reload();
+};
 
 
 //模式切换
@@ -168,4 +200,18 @@ const changeMode = () => {
     // height: 100%;
   }
 }
+
+.custom-dropdown-trigger {
+  padding: 8px 15px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+:deep(.el-dropdown-menu__item.custom-dropdown-item.active),
+:deep(.el-dropdown-menu__item.custom-dropdown-item.active:hover) {
+  background-color: var(--el-color-primary-light-9) !important; 
+  color: var(--el-color-primary)
+}
 </style>

frontend/src/stores/interface/index.ts

@@ -30,7 +30,7 @@ export interface UserState {
     accessToken: string;
     refreshToken: string;
     isRefreshToken: boolean;
-    userInfo: { id: string, name: string };
+    userInfo: { id: string, name: string,loginName:string };
 }
 
 /* tabsMenuProps */

frontend/src/stores/modules/user.ts

@@ -10,7 +10,7 @@ export const useUserStore = defineStore({
     refreshToken: "",
     isRefreshToken:false,
     exp: Number(0),
-    userInfo: {id:"", name: "admin" },
+    userInfo: {id:"", name: "" ,loginName:""},
   }),
   getters: {},
   actions: {

frontend/src/views/authority/user/index.vue

@@ -64,8 +64,8 @@
   // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
   const getTableList = (params: any) => {
   let newParams = JSON.parse(JSON.stringify(params))
-  newParams.searchEndTime = endDate.value
+  // newParams.searchEndTime = endDate.value
-  newParams.searchBeginTime = startDate.value
+  // newParams.searchBeginTime = startDate.value
   return getUserList(newParams)
 }
 
@@ -112,19 +112,19 @@
       prop: 'loginTime',
       label: '最后一次登录时间',
       minWidth: 180,
-      search: {
+    //   search: {
-      render: () => {
+    //   render: () => {
-        return (
+    //     return (
-            <div class='flx-flex-start'>
+    //         <div class='flx-flex-start'>
-              <TimeControl
+    //           <TimeControl
-                  include={['日', '周', '月', '自定义']}
+    //               include={['日', '周', '月', '自定义']}
-                  default={'月'}
+    //               default={'月'}
-                  onUpdate-dates={handleDateChange}
+    //               onUpdate-dates={handleDateChange}
-              />
+    //           />
-            </div>
+    //         </div>
-        )
+    //     )
-      },
+    //   },
-    },
+    // },
     },
     {
       prop: 'state',

frontend/src/views/home/components/factorTest.vue

@@ -739,7 +739,7 @@ const handleSubmit = async () => {
 
   isButtonDisabled.value = true; // 禁用按钮
   tableLoading('big', '系数下装')
-  await getCoefficientCheck({
+/*  await getCoefficientCheck({
     userPageId: "cdf",
     devIds: devIdArray.value,
     planId: planId.value,
@@ -747,7 +747,7 @@ const handleSubmit = async () => {
     scriptId: select_Plan.value?.scriptId,
     operateType: '0', // '0'为预检测、‘1‘为正式检测
     userId:userStore.userInfo.id
-  })
+  })*/
   active.value++;  
 
   console.log('开始检测active.value', active.value)

frontend/src/views/home/components/table.vue

@@ -97,10 +97,10 @@
             <!-- <el-button type="primary" :icon="CirclePlus" @click="addDevice('设备新增')" v-if="form.activeTabs === 0"
               >设备新增</el-button> -->
 
-            <el-button type='primary' v-auth.role="'channelsTest'" :icon='Odometer' @click="handleTest('系数校准')"
+<!--            <el-button type='primary' v-auth.role="'channelsTest'" :icon='Odometer' @click="handleTest('系数校准')"-->
-                       v-if='form.activeTabs === 0 && appSceneStore.currentScene === "1" '
+<!--                       v-if='form.activeTabs === 0 && appSceneStore.currentScene === "1" '-->
-            >系数校准
+<!--            >系数校准-->
-            </el-button>
+<!--            </el-button>-->
           </el-form-item>
         </el-form>
       </template>
@@ -965,7 +965,8 @@ const handleTest = async (val: string) => {
               if(appSceneStore.currentScene === '0'){
                 writeTHPopupRef.value?.open()
               }else{
-                openTestDialog(true)
+                selectTestItemPopupRef.value?.open()
+                //openTestDialog(true)
               }
             })
             .catch((action: Action) => {
@@ -976,17 +977,17 @@ const handleTest = async (val: string) => {
                 if(appSceneStore.currentScene === '0'){
                   writeTHPopupRef.value?.open()
                 }else{
-                  openTestDialog(true)
+                  selectTestItemPopupRef.value?.open()
+                  //openTestDialog(true)
                 }
               }
             })
+
         checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true})
       } else {
-         
-        checkStore.setReCheckType(1)
         selectTestItemPopupRef.value?.open()
+        checkStore.setReCheckType(1)
       }
- 
     } else if (val === '系数校准') {
       // 检查 socketClient.Instance 是否存在
       if (!socketClient.Instance) {

frontend/src/views/home/components/test.vue

@@ -12,64 +12,6 @@
             style="width: 82%; margin-right: 3%;"
             :percentage="percentage"
             :color="customColors"/>
-
-        <!--        <div style="width: 15%">-->
-        <!--          <el-button type="primary" v-if="testStatus=='test_init'" disabled @click="handlePause()">-->
-        <!--            <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
-        <!--              <component :is="Refresh"/>-->
-        <!--            </el-icon>-->
-        <!--            初始化中-->
-        <!--          </el-button>-->
-
-        <!--          <el-button-->
-        <!--              type="primary"-->
-        <!--              v-if="testStatus=='process' && percentage < 100"-->
-        <!--              :icon="VideoPause"-->
-        <!--              @click="handlePause()">停止检测-->
-        <!--          </el-button>-->
-        <!--          <el-button type="warning" v-if="testStatus === 'paused_ing' && percentage < 100" disabled>-->
-        <!--            <el-icon class="loading-box" style="margin-right: 8px;">-->
-        <!--              <component :is="Refresh"/>-->
-        <!--            </el-icon>-->
-        <!--            暂停中-->
-        <!--          </el-button>-->
-        <!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
-        <!--          &lt;!&ndash;          type="primary"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          v-if="testStatus=='test_init'"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          :icon="VideoPause"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          disabled>初始化中&ndash;&gt;-->
-        <!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
-        <!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
-        <!--          &lt;!&ndash;          type="danger"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          v-if="testStatus=='test_init_fail'"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          :icon="Failed"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          disabled>初始化失败&ndash;&gt;-->
-        <!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
-        <!--          &lt;!&ndash;      <el-button&ndash;&gt;-->
-        <!--          &lt;!&ndash;          type="danger"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          v-if="testStatus=='connect_timeout'"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          :icon="Failed"&ndash;&gt;-->
-        <!--          &lt;!&ndash;          disabled>连接超时&ndash;&gt;-->
-        <!--          &lt;!&ndash;      </el-button>&ndash;&gt;-->
-        <!--          &lt;!&ndash;          <el-button&ndash;&gt;-->
-        <!--          &lt;!&ndash;              type="primary"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              :icon="RefreshLeft"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              v-if="testStatus === 'recheck'"&ndash;&gt;-->
-        <!--          &lt;!&ndash;              @click="emit('sendReCheck')">重新检测&ndash;&gt;-->
-        <!--          &lt;!&ndash;          </el-button>&ndash;&gt;-->
-
-
-        <!--          <el-button type="success" v-if="percentage >= 100" :icon="Check" disabled>检测完成</el-button>-->
-
-        <!--          <el-button-->
-        <!--              type="warning"-->
-        <!--              v-if="(testStatus=='paused' || testStatus === 'pause_timeout') && percentage < 100"-->
-        <!--              :icon="VideoPlay"-->
-        <!--              :disabled="testStatus === 'pause_timeout'"-->
-        <!--              @click="emit('sendResume')"-->
-        <!--          >继续检测-->
-        <!--          </el-button>-->
-        <!--        </div>-->
         <el-button style="width: 10%" type="text" :icon="InfoFilled" @click="showTestLog">检测项进度</el-button>
       </div>
 
@@ -335,19 +277,19 @@ const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(()
 
 watch(testStatus, function (newValue, oldValue) {
   if (newValue == 'start') {
-    ElMessage.success('初始化开始!')
+    if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest) {
+      ElMessage.success('初始化开始!')
+      emit('update:testStatus', 'test_init')
+      testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化开始！`})
+    } else {
+      emit('update:testStatus', 'process')
+    }
     startTimeCount()
 
     showTestLog()
-
-    // if (oldValue == 'recheck' || oldValue == 'error' || oldValue == 'test_init_fail' || oldValue == 'connect_timeout' || oldValue == 'pause_timeout' || oldValue == 'error_flow_end') {
-    //   handleReCheck()
-    // }
-    emit('update:testStatus', 'test_init')
     //startTimer() // todo 可移除
     startData.value = new Date();
     timeDifference.value = 0;
-    testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化开始！`})
   }
 
   if (newValue == 'recheck' || newValue == 'error' || newValue == 'test_init_fail' || newValue == 'connect_timeout' || newValue == 'pause_timeout' || oldValue == 'error_flow_end') {

frontend/src/views/home/components/testPopup.vue

@@ -4,8 +4,10 @@
     <div class="steps-container">
       <el-steps class="test-head-steps" simple :active="stepsActiveIndex" process-status="finish" finish-status="success">
         <el-step v-if="preTestSelected" title="预检测" :icon="stepsActive > 1 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Edit" @click="handleStepClick(1)"/>
-        <el-step v-if="timeTestSelected" title="守时检测" :icon="stepsActive > 2 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :UploadFilled" @click="handleStepClick(2)"/>
+        <el-step v-if="timeTestSelected" title="守时检测" :icon="stepsActive > 2 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :UploadFilled"
-        <el-step v-if="channelsTestSelected" title="系数校准" :icon="stepsActive > 3 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Odometer" @click="handleStepClick(3)"/>
+                 @click="handleStepClick(2)"/>
+        <el-step v-if="channelsTestSelected" title="系数校准" :icon="stepsActive > 3 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Odometer"
+                 @click="handleStepClick(3)"/>
         <el-step v-if="testSelected" title="正式检测" :icon="stepsActive > 4 || stepsActiveIndex > stepsTotalNum-1? SuccessFilled :Coin" @click="handleStepClick(4)"/>
         <el-step title="检测完成" :icon="stepsActiveIndex > stepsTotalNum-1 ? SuccessFilled :Key"/>
       </el-steps>
@@ -15,32 +17,16 @@
              :webMsgSend="webMsgSend"/>
     <timeTest v-if="showComponent&&timeTestSelected" v-show="timeTestSelected && stepsActiveView==2" v-model:testStatus="timeTestStatus"/>
     <!--     <channelsTest v-if="stepsActiveIndex === 3" v-model:testStatus="channelsTestStatus"></channelsTest>-->
-    <factorTest v-if="showComponent&&channelsTestSelected" v-show="channelsTestSelected && stepsActiveView==3" v-model:testStatus="channelsTestStatus" :webMsgSend="webMsgSend"/>
+    <factorTest v-if="showComponent&&channelsTestSelected" v-show="channelsTestSelected && stepsActiveView==3" v-model:testStatus="channelsTestStatus"
+                :webMsgSend="webMsgSend"/>
     <test v-if="showComponent&&testSelected" ref="testRef" v-show="testSelected && stepsActiveView==4" v-model:testStatus="TestStatus" :webMsgSend="webMsgSend"
-          @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck" @closeWebSocket="closeWebSocket" :stepsActive="stepsActive"/>
+          @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck" @closeWebSocket="closeWebSocket"
+          :stepsActive="stepsActive"/>
 
     <template #footer>
       <div>
-<!--        <el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < stepsTotalNum && ActiveStatue != 'success'" @click="nextStep">跳过</el-button>-->
+        <!--        <el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < stepsTotalNum && ActiveStatue != 'success'" @click="nextStep">跳过</el-button>-->
-        <el-button type="primary" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmit">开始检测</el-button>
+        <el-button type="primary" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmitFast">开始检测</el-button>
-<!--        <el-button type="primary"-->
-<!--                   v-if="(stepsActiveIndex <= stepsTotalNum - 1) && (ActiveStatue !== 'success' &&ActiveStatue !== 'test_init' && ActiveStatue !=='paused_ing' && ActiveStatue !=='paused' && ActiveStatue !== 'waiting' && ActiveStatue !== 'error' && ActiveStatue !== 'test_init_fail' && ActiveStatue !== 'connect_timeout' && ActiveStatue!=='pause_timeout')"-->
-<!--                   disabled>-->
-<!--          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
-<!--            <component :is="Refresh"/>-->
-<!--          </el-icon>-->
-<!--          检测中-->
-<!--        </el-button>-->
-
-
-        <!--        <el-button type="primary" v-if="ActiveStatue === 'process'" disabled>-->
-        <!--          <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">-->
-        <!--            <component :is="Refresh"/>-->
-        <!--          </el-icon>-->
-        <!--          检测中-->
-        <!--        </el-button>-->
-<!--        <el-button type="warning" :icon="VideoPlay" v-if="TestStatus === 'paused'" @click="handleSubmit">继续检测</el-button>-->
-        <!--        <el-button type="primary" :icon="RefreshLeft" v-if="ActiveStatue === 'recheck' || ActiveStatue ==='error' || ActiveStatue ==='test_init_fail' || ActiveStatue === 'pause_timeout' || ActiveStatue === 'connect_timeout'" @click="handleSubmit">重新检测</el-button>-->
         <el-button type="primary" v-if="TestStatus === 'test_init'" disabled>
           <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
             <component :is="Refresh"/>
@@ -85,7 +71,7 @@
 <script lang="tsx" setup name="testPopup">
 import {reactive, ref, watch} from 'vue';
 import {ElMessage, ElMessageBox} from 'element-plus'
-import {Coin, DArrowRight, Edit, Key, Odometer, Refresh, Right, SuccessFilled, UploadFilled, VideoPlay,VideoPause} from '@element-plus/icons-vue'
+import {Coin, Edit, Key, Odometer, Refresh, Right, SuccessFilled, UploadFilled, VideoPause, VideoPlay} from '@element-plus/icons-vue'
 import preTest from './preTest.vue'
 import timeTest from './timeTest.vue'
 import factorTest from './factorTest.vue'
@@ -94,7 +80,6 @@ import socketClient from '@/utils/webSocketClient';
 import {useCheckStore} from "@/stores/modules/check";
 import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
 import {useUserStore} from "@/stores/modules/user";
-import { Device } from '@/api/device/interface/device';
 
 const userStore = useUserStore()
 const checkStore = useCheckStore();
@@ -198,8 +183,7 @@ const open = (title: string) => {
   });
 }
 
-// let loading;
+const handleSubmitFast = () => {
-const handleSubmit = () => {
   let deviceIds = checkStore.devices.map((item) => item.deviceId)
   let planId = checkStore.plan.id
 
@@ -207,58 +191,84 @@ const handleSubmit = () => {
     ElMessage.error('webSocket连接中断！')
     return
   }
-  console.log("handleSubmit",stepsActive.value,TestStatus.value)
+  console.log("handleSubmit", stepsActive.value, TestStatus.value)
   switch (stepsActive.value) {
     case 1:
-      startPreTest({
+      if (preTestStatus.value == 'waiting') {
-        userPageId: "cdf",
+        if (checkStore.selectTestItems.preTest) {
-        devIds: deviceIds,
+          startPreTest({
-        planId: planId,
+            userPageId: "cdf",
-        operateType: '1', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+            devIds: deviceIds,
-        userId:userStore.userInfo.id,
+            planId: planId,
-        temperature:checkStore.temperature,
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
-        humidity:checkStore.humidity
+            userId: userStore.userInfo.id,
-      }).then(res => {
+            temperature: checkStore.temperature,
-        if (res.code === 'A001014') {
+            humidity: checkStore.humidity,
-          ElMessageBox.alert('装置配置异常', '检测失败', {
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
-            confirmButtonText: '确定',
+          }).then(res => {
-            type: 'error',
+            if (res.code === 'A001014') {
+              ElMessageBox.alert('装置配置异常', '检测失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              preTestStatus.value = 'error'
+            }
           })
-          preTestStatus.value = 'error'
+          preTestStatus.value = 'start'
         }
-      })
+      }
-      preTestStatus.value = 'start'
-      // setTimeout(() => {
-      //   preTestStatus.value = 'success'
-      // }, 5000)
       break;
     case 2:
       timeTestStatus.value = 'start'
       break;
     case 3:
-      // 调用系数校准组件的handleSubmit方法
+      if (channelsTestStatus.value == 'waiting') {
-      channelsTestStatus.value = 'start'
+        if (!checkStore.selectTestItems.preTest && checkStore.selectTestItems.channelsTest) {
+          startPreTest({
+            userPageId: "cdf",
+            devIds: deviceIds,
+            planId: planId,
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
+            userId: userStore.userInfo.id,
+            temperature: checkStore.temperature,
+            humidity: checkStore.humidity,
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
+          }).then(res => {
+            if (res.code === 'A001014') {
+              ElMessageBox.alert('装置配置异常', '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              channelsTestStatus.value = 'test_init_fail'
+            }
+          })
+          // 调用系数校准组件的handleSubmit方法
+        }
+        channelsTestStatus.value = 'start'
+      }
       break;
     case 4:
       if (TestStatus.value == "waiting") {
-        startPreTest({
+        if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) {
-          userPageId: "cdf",
+          startPreTest({
-          devIds: deviceIds,
+            userPageId: "cdf",
-          planId: planId,
+            devIds: deviceIds,
-          operateType: checkStore.reCheckType ==1 ?'2':'8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+            planId: planId,
-          userId:userStore.userInfo.id,
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
-          temperature:checkStore.temperature,
+            userId: userStore.userInfo.id,
-        humidity:checkStore.humidity
+            temperature: checkStore.temperature,
-        }).then(res => {
+            humidity: checkStore.humidity,
-          console.log(res)
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
-          if (res.code === 'A001014') {
+          }).then(res => {
-            ElMessageBox.alert('装置配置异常', '初始化失败', {
+            if (res.code === 'A001014') {
-              confirmButtonText: '确定',
+              ElMessageBox.alert('装置配置异常', '初始化失败', {
-              type: 'error',
+                confirmButtonText: '确定',
-            })
+                type: 'error',
-            TestStatus.value = 'test_init_fail'
+              })
-          }
+              TestStatus.value = 'test_init_fail'
-        })
+            }
+          })
+        }
         TestStatus.value = 'start'
       } else if (TestStatus.value == 'paused') {
         // 发送继续指令
@@ -275,7 +285,7 @@ const handleSubmit = () => {
     default:
       break;
   }
-};
+}
 
 
 const emit = defineEmits<{
@@ -327,22 +337,24 @@ watch(ActiveStatue, function (newValue, oldValue) {
   }
   if (newValue === 'success' && stepsActiveIndex.value < stepsTotalNum.value - 1) {
     nextStep() // 实现自动点击，进入下一个测试内容
-    handleSubmit()
+    //handleSubmit()
+    handleSubmitFast()
   }
 
 })
 
 const handleQuit = () => {
-  console.log('handleQuit',ActiveStatue.value)
+  console.log('handleQuit', ActiveStatue.value)
   if (ActiveStatue.value !== 'success' && ActiveStatue.value !== 'waiting' && ActiveStatue.value !== 'paused' && ActiveStatue.value !== 'test_init_fail' && ActiveStatue.value !== 'connect_timeout' && ActiveStatue.value !== 'pause_timeout') {
-    beforeClose(() => {})
+    beforeClose(() => {
+    })
   } else {
     handleClose()
   }
 }
 
 
-const handlePause=()=>{
+const handlePause = () => {
   sendPause()
   testRef.value?.handlePause()
 }
@@ -366,9 +378,9 @@ const sendResume = () => {
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
     operateType: '2', //  0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-    userId:userStore.userInfo.id,
+    userId: userStore.userInfo.id,
-    temperature:checkStore.temperature,
+    temperature: checkStore.temperature,
-        humidity:checkStore.humidity
+    humidity: checkStore.humidity
   })
   Object.assign(webMsgSend.value, {
     requestId: 'Resume_Success'
@@ -382,9 +394,10 @@ const sendReCheck = () => {
     devIds: checkStore.devices.map((item) => item.deviceId),
     planId: checkStore.plan.id,
     operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-    userId:userStore.userInfo.id,
+    userId: userStore.userInfo.id,
-   temperature:checkStore.temperature,
+    temperature: checkStore.temperature,
-        humidity:checkStore.humidity
+    humidity: checkStore.humidity,
+    testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
   }).then(res => {
     console.log(res)
     if (res.code === 'A001014') {
@@ -494,7 +507,8 @@ defineExpose({open})
     .el-step__head.is-success {
       color: #91cc75;
     }
-    .el-step__title.is-success{
+
+    .el-step__title.is-success {
       color: #91cc75;
     }
   }

frontend/src/views/home/tabs/model.vue

@@ -84,7 +84,6 @@ const modeList = [
 const handelOpen = async (item: any) => {
   modeStore.setCurrentMode(item.code); // 将模式code存入 store
   const {data:scene} = await getCurrentScene(); // 获取当前场景
-
   // AppSceneStore.setCurrentMode(scene+'');//0：省级平台，1：设备出厂，2：研发自测
   AppSceneStore.setCurrentMode(scene+'');//0：省级平台，1：设备出厂，2：研发自测
   await authStore.setShowMenu();

frontend/src/views/machine/device/index.vue

@@ -151,6 +151,11 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     minWidth: 130,
 
   },
+  {
+    prop: 'ip',
+    label: 'IP',
+    minWidth: 130,
+  },
   {
     prop: 'manufacturer',
     label: '设备厂家',

frontend/src/views/plan/planList/components/planPopup.vue

@@ -64,12 +64,12 @@
               <el-radio :value="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="关联报告模版" :label-width="100" prop='associateReport'>
+          <!-- <el-form-item label="关联报告模版" :label-width="100" prop='associateReport'>
             <el-radio-group v-model="formContent.associateReport">
               <el-radio :value="1">是</el-radio>
               <el-radio :value="0">否</el-radio>
             </el-radio-group>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="模版名称" prop="reportTemplateName" :label-width="100" v-if="formContent.associateReport === 1">
             <el-select v-model="formContent.reportTemplateName" placeholder="请选择报告模版" autocomplete="off"  >
               <el-option
@@ -119,6 +119,12 @@
   import { type ErrorSystem } from '@/api/device/interface/error';
   import { type Device } from '@/api/device/interface/device';
   import {getPqReportAllName,getPqReportAllVersion} from '@/api/device/report/index.ts'
+  import {useAppSceneStore} from "@/stores/modules/mode";
+import { fromPairs } from 'lodash';
+import { el } from 'element-plus/es/locale';
+
+
+  const AppSceneStore = useAppSceneStore()
   const dictStore = useDictStore()
   // 定义弹出组件元信息
   const dialogFormRef = ref()
@@ -348,22 +354,10 @@ const open = async (sign: string,
      mode.value = currentMode
      titleType.value = sign
      isSelectDisabled.value = false
-      if (data.id) {
-          if(data.testState === 0){
-            isSelectDisabled.value = false
-          }else{
-            isSelectDisabled.value = true
-          }
-          
-          Object.assign(formContent,{ ...data })
-      } else {
-        resetFormContent()
-      }
-      // 重置表单
-      dialogFormRef.value?.resetFields()
 
      if(sign == 'add')
       {
+        resetFormContent()
         const [pqSource_Result, PqScript_Result, PqErrSys_Result,pqDevList_Result,pqReportName_Result] = await Promise.all([
             getTestSourceList(data),
             getPqScriptList(data),
@@ -373,8 +367,6 @@ const open = async (sign: string,
            
         ]);
        
-
-       
         if (Array.isArray(pqReportName_Result.data)) {
           pqReportName.value = pqReportName_Result.data.map(item => ({ name: item }));
         } else {
@@ -390,14 +382,23 @@ const open = async (sign: string,
         boundPqDevList.value = [];
 
         //楼下场景新增下拉框需要默认
-        formContent.scriptId = pqScriptList.value[0].id;
+        formContent.scriptId = pqScriptList.value[0]?.id ?? '';
-        formContent.errorSysId = pqErrSysList.value[0].id;
+        formContent.errorSysId = pqErrSysList.value[0]?.id ?? '';
-        formContent.sourceIds = pqSourceList.value[0].id;
+        formContent.sourceIds = pqSourceList.value[0]?.id ?? '';
-        formContent.datasourceIds = dictStore.getDictData('Datasource')[0].code;
+        formContent.datasourceIds = dictStore.getDictData('Datasource')[0]?.code ?? '';
-        formContent.dataRule = dictStore.getDictData('Data_Rule')[0].id;
+        formContent.dataRule = dictStore.getDictData('Data_Rule')[0]?.id ?? '';
 
       }else{//编辑时先给表单赋值（这会没接收被检设备），需要手动再给被检设备复制后整体表单赋值
        
+
+        if(data.testState === 0){
+            isSelectDisabled.value = false
+        }else{
+            isSelectDisabled.value = true
+        }
+          
+        Object.assign(formContent,{ ...data })
+
         const [pqSource_Result, PqScript_Result, PqErrSys_Result,boundPqDevList_Result, unboundPqDevList_Result,pqReportName_Result] = await Promise.all([
             getTestSourceList(data),
             getPqScriptList(data),
@@ -444,6 +445,13 @@ const open = async (sign: string,
       }
 
       value.value = boundPqDevList.value.map((i: { id: { toString: () => any } }) => i.id.toString());
+      
+      if(AppSceneStore.currentScene == "1"){//楼下场景不用报告模版
+        formContent.associateReport = 0
+      }else{
+        formContent.associateReport = 1
+      }
+
        // 所有数据加载完成后显示对话框
        dialogVisible.value = true;
 }

frontend/src/views/system/base/index.vue

@@ -15,11 +15,16 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label='检测最大次数' prop='maxTime' :label-width="110">
+                <el-form-item label='检测最大次数' prop='maxTime' :label-width="140">
 <!--                  <el-input-number v-model='TestConfigForm.maxTime' :min='1' :max='999' onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>-->
                   <el-input number v-model.number='TestConfigForm.maxTime' placeholder="请输入检测最大次数" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label='误差保留小数位' prop='scale' :label-width="140">
+                  <el-input number v-model.number='TestConfigForm.scale' placeholder="请输入误差保留小数位" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"/>
+                </el-form-item>
+              </el-col>
 <!--              <el-col :span="8">-->
 <!--                <el-form-item label='数据处理原则' prop='dataRule' :label-width="140">-->
 <!--                  <el-select v-model="TestConfigForm.dataRule" clearable placeholder="请选择数据处理原则">-->
@@ -229,6 +234,7 @@ const TestConfigForm = ref<Base.ResTestConfig>({
   autoGenerate: 0,
   maxTime: 3,
   state: 1, //状态
+  scale:4,
 })
 
 const RegResForm = ref<VersionRegister.ResSys_Reg_Res>({
@@ -259,6 +265,10 @@ const rules = computed(() => {
       {required: true, trigger: 'blur', message: '检测最大次数必填!'},
       {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '检测最大次数为1~999的正整数', trigger: 'blur'}
     ],
+    scale: [
+      {required: true, trigger: 'blur', message: '误差保留小数位必填!'},
+      {pattern: /^[4-6]$/, message: '误差保留小数位为4~6的整数', trigger: 'blur'}
+    ],
     realTime: [
       {required: true, trigger: 'blur', message: '实时数据有效组数必填!'},
       {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '实时数据有效组数为1~999的正整数', trigger: 'blur'}
@@ -271,6 +281,7 @@ const rules = computed(() => {
       {required: true, trigger: 'blur', message: '闪变数据有效组数必填!'},
       {pattern: /^(?:[1-9]|[1-9][0-9]|[1-9][0-9]{2})$/, message: '闪变数据有效组数为1~999的正整数', trigger: 'blur'}
     ],
+
   });