Merge branch 'master' of http://192.168.1.22:3000/ClientApps/pqs-9100_client

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

@@ -563,7 +563,8 @@ const handleErrorSysChange = async () => {
         errorSysId: formContent.errorSysId,
         deviceId: formContent.deviceId,
         code: checkStore.plan.code + '',
-        patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
+        patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? '',
+        chnNum: formContent.chnNum
     }).then(res => {
         if (res.code === ResultEnum.SUCCESS) {
             ElMessage.success('切换误差体系成功')
@@ -579,7 +580,8 @@ const handleReCalculate = async () => {
         errorSysId: formContent.errorSysId,
         deviceId: formContent.deviceId,
         code: checkStore.plan.code + '',
-        patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? ''
+        patternId: dictStore.getDictData('Pattern').find(item => item.name === modeStore.currentMode)?.id ?? '',
+        chnNum: formContent.chnNum
     }).then(res => {
         if (res.code === ResultEnum.SUCCESS) {
             ElMessage.success('重新计算成功！')

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

@@ -18,13 +18,15 @@
                     <img :src="item.img" />
                 </div>
                 <div class="test_button">
-                    <el-button size="large" type="primary" @click="handelOpen(item)" :disabled="!item.activated">
-                        进入检测
+                    <el-button size="large" type="primary" @click="handelOpen(item)">
+                        {{ item.activated ? '进入检测' : '待激活' }}
                     </el-button>
                 </div>
             </el-carousel-item>
         </el-carousel>
     </div>
+    <!-- versionRegisterDialog -->
+    <VersionDialog ref="versionRegisterRef"></VersionDialog>
 </template>
 <script lang="ts" setup>
 import { useAuthStore } from '@/stores/modules/auth'
@@ -32,6 +34,8 @@ import { useAppSceneStore, useModeStore } from '@/stores/modules/mode' // 引入
 import { getCurrentScene } from '@/api/user/login'
 import { initDynamicRouter } from '@/routers/modules/dynamicRouter'
 import { useTabsStore } from '@/stores/modules/tabs'
+import VersionDialog from '@/views/system/versionRegister/index.vue'
+import { ref, onMounted } from 'vue'
 
 const authStore = useAuthStore()
 const modeStore = useModeStore() // 使用模式 store
@@ -39,6 +43,7 @@ const AppSceneStore = useAppSceneStore()
 const activateInfo = authStore.activateInfo
 const isActivateOpen = import.meta.env.VITE_ACTIVATE_OPEN
 const tabsStore = useTabsStore()
+const versionRegisterRef = ref<InstanceType<typeof VersionDialog> | null>(null)
 const modeList = [
     {
         name: '模拟式模块',
@@ -64,7 +69,8 @@ const modeList = [
 ]
 const handelOpen = async (item: any) => {
     if (!item.activated) {
-        ElMessage.warning(`${item.name}未激活`)
+        // 打开版本激活弹窗
+        versionRegisterRef.value?.openDialog()
         return
     }
     modeStore.setCurrentMode(item.code) // 将模式code存入 store

frontend/src/views/login/components/LoginForm.vue

@@ -24,7 +24,7 @@
                 </template>
             </el-input>
         </el-form-item>
-        <el-form-item prop="checked">
+        <el-form-item prop="checked" v-show="false">
             <el-checkbox v-model="loginForm.checked">记住我</el-checkbox>
         </el-form-item>
     </el-form>