1。亚美大宁风门添加风窗控制

2. 亚美大宁局部分机页面调整

src/views/vent/home/clique/components/mine-wind.vue

@@ -6,12 +6,14 @@
         <div class="label-t" v-for="(ite, ind) in labelList" :key="ind">{{ ite.name }}</div>
       </div>
       <div class="content-text">
-        <div class="text" v-for="(item, index) in mineData" :key="index">
-          <span>{{ item.deviceName }}</span>
-          <span>{{ filterBadValue(item.jf) }}</span>
-          <span>{{ filterBadValue(item.hf) }}</span>
-          <span>{{ filterBadValue(item.xf) }}</span>
-        </div>
+        <template v-for="(item, index) in mineData" :key="index">
+          <div class="text" :style="{ color: item['isWarning'] ? '#f00' : '#fff' }">
+            <span>{{ item.deviceName }}</span>
+            <span>{{ filterBadValue(item.jf) }}</span>
+            <span>{{ filterBadValue(item.hf) }}</span>
+            <span>{{ filterBadValue(item.xf) }}</span>
+          </div>
+        </template>
       </div>
     </div>
   </div>

src/views/vent/home/clique/index.vue

@@ -126,6 +126,7 @@
           jf: el.sys_data.zongjinfeng,
           xf: el.sys_data.xufengliang,
           hf: el.sys_data.zonghuifeng,
+          isWarning: el.sys_data.zongjinfeng < el.sys_data.xufengliang,
         });
 
         //临时添加，前端判断，后期后端加上预警再处理

src/views/vent/home/configurable/configurable.data.ts

@@ -1960,8 +1960,8 @@ export const testConfigBDFire: Config[] = [
         link: '',
       },
       slice: {
-        direction: 'column',
-        basis: ['20%', '80%'],
+        direction: 'row',
+        basis: ['100%', '100%'],
       },
       layout: ['gallery', 'complex_list'],
       board: [],

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -774,7 +774,7 @@ function goDetail(record?) {
       const newPage = router.resolve({ path: '/monitorChannel/monitor-fanmain', query: { id: activeID.value, deviceType: deviceType.value } });
       window.open(newPage.href, '_blank');
     } else if (deviceType.value.indexOf('fanlocal') != -1 && glob.sysOrgCode !== 'ymdnymdn') {
-      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal1', query: { id: activeID.value, deviceType: deviceType.value } });
+      const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal', query: { id: activeID.value, deviceType: deviceType.value } });
       window.open(newPage.href, '_blank');
     } else if (deviceType.value.indexOf('fanlocal') != -1 && glob.sysOrgCode == 'ymdnymdn') {
       const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal1', query: { id: activeID.value, deviceType: record.deviceType } });

src/views/vent/monitorManager/fanLocalMonitor1/components/fanlocal-history.vue

@@ -1,59 +1,60 @@
 <template>
-    <div class="alarm-history">
-        <template v-if="globalConfig.History_Type == 'remote'">
-                <HistoryTable
-                  :columns-type="`${selectDatas.deviceType}`"
-                  :device-type="`${devicekide}`"
-                  designScope="fanlocal-history"
-                  :scroll="scroll"
-                />
-              </template>
-              <template v-else>
-                <HistoryTable1 class="w-100% h-100%" :device-code="`${devicekide}`" :scroll="scroll" dict-code="fanlocal_dict" />
-              </template>
-    </div>
+  <div class="alarm-history">
+    <!-- <template v-if="globalConfig.History_Type == 'remote'">
+      <HistoryTable :columns-type="`${selectDatas.deviceType}`" :device-type="`${devicekide}`" designScope="fanlocal-history" :scroll="scroll" />
+    </template>
+    <template v-else>
+      <HistoryTable1 class="w-100% h-100%" :device-code="`${devicekide}`" :scroll="scroll" dict-code="fanlocal_dict" />
+    </template> -->
+    <HistoryTable :columns-type="`${selectDatas.deviceType}`" :device-type="`${devicekide}`" designScope="fanlocal-history" :scroll="scroll" />
+  </div>
 </template>
 <script setup lang="ts">
-import { onBeforeMount, ref, watch, onMounted, nextTick, defineAsyncComponent, reactive, onUnmounted, inject, unref } from 'vue';
-import HistoryTable from '../../comment/HistoryTable.vue'
-import HistoryTable1 from '../../../../vent/comment/history/HistoryTable.vue'
+  import { onBeforeMount, ref, watch, onMounted, nextTick, defineAsyncComponent, reactive, onUnmounted, inject, unref } from 'vue';
+  import HistoryTable from '../../comment/HistoryTable.vue';
+  import HistoryTable1 from '../../../../vent/comment/history/HistoryTable.vue';
 
-const props = defineProps({
+  const props = defineProps({
     selectData: {
-        type: Object,
-        default: () => {
-            return {}
-        }
+      type: Object,
+      default: () => {
+        return {};
+      },
     },
-    devicekide:{
-        type:String,
-        default:'',
+    devicekide: {
+      type: String,
+      default: '',
     },
-    globalConfig:{
-        type:Object,
-        default:()=>{
-            return {}
-        },
-    }
-});
+    globalConfig: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  });
 
-let selectDatas = reactive({})
-let scroll = reactive({
-  y: 700,
-});
+  let selectDatas = reactive({});
+  let scroll = reactive({
+    y: 700,
+  });
 
-watch(() => props.selectData, (newS, oldS) => {
-    selectDatas = Object.assign({}, newS)
-}, {
-    immediate: true,
-    deep: true
-})
+  watch(
+    () => props.selectData,
+    (newS, oldS) => {
+      selectDatas = Object.assign({}, newS);
+    },
+    {
+      immediate: true,
+      deep: true,
+    }
+  );
 </script>
 <style lang="less" scoped>
-.alarm-history {
+  .alarm-history {
     width: 100%;
-    height: 730px;
+    height: 700px;
     position: fixed;
     top: 100px;
-}
-</style>
+    overflow-y: auto;
+  }
+</style>

src/views/vent/monitorManager/fanLocalMonitor1/components/fanlocal-operate-history.vue

@@ -1,36 +1,35 @@
 <template>
-    <div class="alarm-history">
-        <HandlerHistoryTable
-                columns-type="operator_history"
-                :device-type="`${devicekide}`"
-                :device-list-api="baseList"
-                designScope="alarm-history"
-                :scroll="scroll"
-              />
-    </div>
+  <div class="alarm-history">
+    <HandlerHistoryTable
+      columns-type="operator_history"
+      :device-type="`${devicekide}`"
+      :device-list-api="baseList"
+      designScope="alarm-history"
+      :scroll="scroll"
+    />
+  </div>
 </template>
 <script setup lang="ts">
-import { onBeforeMount, ref, watch, onMounted, nextTick, defineAsyncComponent, reactive, onUnmounted, inject, unref } from 'vue';
-import HandlerHistoryTable from '../../comment/HandlerHistoryTable.vue';
-import { list as baseList } from '../../../deviceManager/fanTabel/fan.api';
+  import { onBeforeMount, ref, watch, onMounted, nextTick, defineAsyncComponent, reactive, onUnmounted, inject, unref } from 'vue';
+  import HandlerHistoryTable from '../../comment/HandlerHistoryTable.vue';
+  import { list as baseList } from '../../../deviceManager/fanTabel/fan.api';
 
-const props = defineProps({
-    devicekide:{
-        type:String,
-        default:'',
+  const props = defineProps({
+    devicekide: {
+      type: String,
+      default: '',
     },
-});
-let scroll = reactive({
-  y: 700,
-});
-
-
+  });
+  let scroll = reactive({
+    y: 700,
+  });
 </script>
 <style lang="less" scoped>
-.alarm-history {
+  .alarm-history {
     width: 100%;
-    height: 730px;
+    height: 700px;
     position: fixed;
     top: 100px;
-}
-</style>
+    overflow-y: auto;
+  }
+</style>

src/views/vent/monitorManager/fanLocalMonitor1/components/fanlocal-warn-history.vue

@@ -1,29 +1,28 @@
 <template>
-    <div class="alarm-history">
-        <AlarmHistoryTable columns-type="alarm" :device-type="`${devicekide}`" designScope="alarm-history" :scroll="scroll" />
-    </div>
+  <div class="alarm-history">
+    <AlarmHistoryTable columns-type="alarm" :device-type="`${devicekide}`" designScope="alarm-history" :scroll="scroll" />
+  </div>
 </template>
 <script setup lang="ts">
-import { onBeforeMount, ref, watch, onMounted, nextTick, defineAsyncComponent, reactive, onUnmounted, inject, unref } from 'vue';
-import AlarmHistoryTable from '../../comment/AlarmHistoryTable.vue';
+  import { onBeforeMount, ref, watch, onMounted, nextTick, defineAsyncComponent, reactive, onUnmounted, inject, unref } from 'vue';
+  import AlarmHistoryTable from '../../comment/AlarmHistoryTable.vue';
 
-const props = defineProps({
-    devicekide:{
-        type:String,
-        default:'',
+  const props = defineProps({
+    devicekide: {
+      type: String,
+      default: '',
     },
-});
-let scroll = reactive({
-  y: 700,
-});
-
-
+  });
+  let scroll = reactive({
+    y: 700,
+  });
 </script>
 <style lang="less" scoped>
-.alarm-history {
+  .alarm-history {
     width: 100%;
-    height: 730px;
+    height: 700px;
     position: fixed;
     top: 100px;
-}
-</style>
+    overflow-y: auto;
+  }
+</style>

src/views/vent/monitorManager/fanLocalMonitor1/fanLocal.three.ts

@@ -618,6 +618,11 @@ export const mountedThree = (playerVal1) => {
         Fengtongbu01.material = textMaterial;
         Fengtongbu01.renderOrder = 300;
       }
+      // 隐藏风机文字
+      const planeTextFan1 = group?.getObjectByName('Plane12125') as THREE.Mesh;
+      const planeTextFan2 = group?.getObjectByName('Plane12128') as THREE.Mesh;
+      planeTextFan1.visible = false;
+      planeTextFan2.visible = false;
 
       model?.scene?.add(group);
       setModalPosition();

src/views/vent/monitorManager/fanLocalMonitor1/index.vue

@@ -154,10 +154,10 @@
         <div class="item-container">
           <div class="tab">
             <div class="tab-item" :class="{ 'tab-item-active-r': warningMonitorRowIndex === 0 }" @click="selectDevice('warningMonitorRowIndex', 0)"
-              >主机</div
+              >1#风机</div
             >
             <div class="tab-item" :class="{ 'tab-item-active-r': warningMonitorRowIndex === 1 }" @click="selectDevice('warningMonitorRowIndex', 1)"
-              >备机</div
+              >2#风机</div
             >
           </div>
           <div class="container-group">
@@ -191,10 +191,10 @@
           <div class="item-container">
             <div class="tab">
               <div class="tab-item" :class="{ 'tab-item-active-r': dataMonitorRowIndex == 0 }" @click="selectDevice('dataMonitorRowIndex', 0)"
-                >主机</div
+                >1#风机</div
               >
               <div class="tab-item" :class="{ 'tab-item-active-r': dataMonitorRowIndex == 1 }" @click="selectDevice('dataMonitorRowIndex', 1)"
-                >备机</div
+                >2#风机</div
               >
             </div>
             <div class="container-group container-group-l">
@@ -322,14 +322,14 @@
       <div class="" v-if="controlType == 'startSmoke'">
         <!-- 互斥控制 -->
         <div class="startSmoke-select">
-          <div class="label">主机：</div>
+          <div class="label">1#风机</div>
           <a-radio-group v-model:value="mainWindIsShow1" @change="changeMotor" name="localWind1">
             <a-radio value="open">开启</a-radio>
             <a-radio value="stop">停止</a-radio>
           </a-radio-group>
         </div>
         <div class="startSmoke-select">
-          <div class="label">备机：</div>
+          <div class="label">2#风机</div>
           <a-radio-group v-model:value="mainWindIsShow2" @change="changeMotor" name="localWind2">
             <a-radio value="open">开启</a-radio>
             <a-radio value="stop">停止</a-radio>
@@ -339,13 +339,13 @@
       <div class="" v-if="controlType == 'startFan'">
         <!-- 不互斥控制 -->
         <div class="startSmoke-select">
-          <div class="label">主机：</div>
+          <div class="label">1#风机：</div>
           <div :class="{ 'button-box': true, 'button-disable': false }" @click="handleOk('Fan1Open')">开启</div>
           <div :class="{ 'button-box': true, 'button-disable': false }" @click="handleOk('Fan1Stop')">停止</div>
           <div :class="{ 'button-box': true, 'button-disable': false }" @click="handleOk('Fan1Reset')">复位</div>
         </div>
         <div class="startSmoke-select">
-          <div class="label">备机：</div>
+          <div class="label">1#风机：</div>
           <div :class="{ 'button-box': true, 'button-disable': false }" @click="handleOk('Fan2Open')">开启</div>
           <div :class="{ 'button-box': true, 'button-disable': false }" @click="handleOk('Fan2Stop')">停止</div>
           <div :class="{ 'button-box': true, 'button-disable': false }" @click="handleOk('Fan2Reset')">复位</div>
@@ -353,11 +353,11 @@
       </div>
       <!-- 调频 -->
       <div class="vent-flex-row input-box" v-if="controlType == 'Fan1Frequency'">
-        <div class="label">主风机运行频率（Hz）：</div>
+        <div class="label">1#机运行频率（Hz）：</div>
         <a-input-number size="small" v-model:value="fan1FrequencyVal" :min="20" :max="50" :step="0.1" />
       </div>
       <div class="vent-flex-row input-box" v-if="controlType == 'Fan2Frequency'">
-        <div class="label">备风机运行频率（Hz）：</div>
+        <div class="label">2#机运行频率（Hz）：</div>
         <a-input-number size="small" v-model:value="fan2FrequencyVal" :min="20" :max="50" :step="0.1" />
       </div>
       <div class="vent-flex-row input-box" v-if="controlType == 'FanFrequency'">
@@ -495,22 +495,22 @@
       },
       {
         key: 'fan1ToFan2',
-        value: '主机倒备机',
+        value: '1#倒2#',
         permission: 'btn:ctrlFan1ToFan2',
       },
       {
         key: 'fan2ToFan1',
-        value: '备机倒主机',
+        value: '2#倒1#',
         permission: 'btn:ctrlFan2ToFan1',
       },
       {
         key: 'Fan1Frequency',
-        value: '主机调频',
+        value: '1#调频',
         permission: 'btn:frequency',
       },
       {
         key: 'Fan2Frequency',
-        value: '备机调频',
+        value: '2#调频',
         permission: 'btn:frequency',
       },
       {
@@ -676,13 +676,15 @@
   const leftColumns = ref<BasicColumn[]>([]);
   const devicekide = ref('');
   const deviceType = ref(selectData.deviceType);
+  const deviceId = ref('');
   const headElHeight = ref(0);
   let btnClick = ref(true); // 判断按钮是否可点
 
   //报表导出
   // let editID = ref<any>('');
   // let fileType = ref('');
-
+  // https获取监测数据
+  let timer: null | NodeJS.Timeout | undefined = null;
   const { getCamera, removeCamera } = useCamera();
 
   watch(deviceType, (type) => {
@@ -702,8 +704,15 @@
   };
 
   const activeBtn = ref('fanLocal-ssjc');
-  function changeActive(activeValue) {
+  async function changeActive(activeValue) {
     activeBtn.value = activeValue;
+    if (activeBtn.value !== 'fanLocal-ssjc') {
+      timer = undefined;
+      clearTimeout(timer);
+    } else {
+      timer = null;
+      await getMonitor(true);
+    }
   }
 
   const selectDevice = (key, val) => {
@@ -725,12 +734,16 @@
   //
   async function getDataSource() {
     if (devicekide.value) {
-      const res = await list({ devicetype: devicekide.value, pagetype: 'normal' });
+      const res = await list({ devicetype: devicekide.value, systemID: deviceId.value || null, pagetype: 'normal' });
       // const res = await list({ devicetype: 'fanlocal', pagetype: 'normal' });
       if (res.msgTxt && res.msgTxt[0] && res.msgTxt[0].datalist && res.msgTxt[0].datalist.length > 0) {
         const dataArr = res.msgTxt[0].datalist || [];
         dataSource.value = [];
-        dataArr.forEach((data) => {
+        selectRowIndex.value = dataArr.findIndex((item) => item.deviceID === deviceId.value);
+        debugger;
+        if (selectRowIndex.value > -1) {
+          if (!deviceType.value) deviceType.value = dataArr[selectRowIndex.value]['deviceType'];
+          let data = dataArr[selectRowIndex.value];
           const readData = data.readData;
           data = Object.assign(data, readData);
           if (data['Fan1StartStatus'] && data['Fan1StartStatus'] === '1.0') data['Fan1StartStatus'] = '1';
@@ -749,7 +762,7 @@
           //   if (data['m3']) data['ductOutletAirVolume_merge'] = data['m3'];
           //   if (data['m3']) data['inletAirVolume_merge'] = (Number(data['m3']) * 1.08).toFixed(2);
           // }
-          dataSource.value.push(data);
+          Object.assign(selectData, data);
           if (selectRowIndex.value > -1) {
             let echartsData = dataArr[selectRowIndex.value]['history'] || [];
             echartsData = echartsData.filter((item) => {
@@ -766,7 +779,7 @@
             });
             historyList.value = echartsData;
           }
-        });
+        }
       } else {
         return (dataSource.value = []);
       }
@@ -775,25 +788,25 @@
     }
   }
 
-  // https获取监测数据
-  let timer: null | NodeJS.Timeout = null;
   async function getMonitor(flag?) {
     if (Object.prototype.toString.call(timer) === '[object Null]') {
       timer = await setTimeout(
         async () => {
           // debugger;
+          // for (const key in selectData) {
+          //   selectData[key] = '';
+          // }
           await getDataSource();
-          for (const key in selectData) {
-            selectData[key] = '';
-          }
-          if (dataSource.value.length > 0 && dataSource.value[selectRowIndex.value]) {
-            deviceType.value = dataSource.value[selectRowIndex.value]['deviceType'];
-            if (dataSource.value.length > 0 && dataSource.value[selectRowIndex.value]) {
-              Object.assign(selectData, dataSource.value[selectRowIndex.value]);
-            }
-            playSmoke(selectData);
-            addText(selectData);
-          }
+
+          // if (dataSource.value.length > 0 && dataSource.value[selectRowIndex.value]) {
+          //   deviceType.value = dataSource.value[selectRowIndex.value]['deviceType'];
+          //   if (dataSource.value.length > 0 && dataSource.value[selectRowIndex.value]) {
+          //     Object.assign(selectData, dataSource.value[selectRowIndex.value]);
+          //   }
+
+          // }
+          playSmoke(selectData);
+          addText(selectData);
           // historySource.value = selectData.history;
           if (timer) {
             timer = null;
@@ -1175,9 +1188,13 @@
     getDeviceBaseList();
   });
 
-  onMounted(() => {
+  onMounted(async () => {
     const { query } = unref(currentRoute);
-    if (query['deviceType']) devicekide.value = query['deviceType'] as string;
+    if (query['deviceType']) {
+      devicekide.value = query['deviceType'] as string;
+      deviceId.value = query['id'] as string;
+    }
+
     mountedThree(player1.value).then(async () => {
       await getMonitor(true);
       nextTick(async () => {
@@ -1185,7 +1202,7 @@
         addCssText();
       });
     });
-
+    await getCamera(deviceId.value, playerRef.value);
     document.body.addEventListener('mousedown', addPlayVideo, false);
   });
 

src/views/vent/monitorManager/fanlocalPage/index.vue

@@ -73,7 +73,8 @@
   //获取列表数据
   async function getList() {
     let res = await device({ devicetype: 'fanlocal', pagetype: 'normal' });
-    let data = res.msgTxt[0].datalist;
+    let res1 = await device({ devicetype: 'fanlocaldp', pagetype: 'normal' });
+    let data = [...res.msgTxt[0].datalist, res1.msgTxt[0] ? res1.msgTxt[0].datalist : []];
     cardList.length = 0;
     if (data.length != 0) {
       data.forEach((el) => {
@@ -83,13 +84,25 @@
           label: el.strinstallpos,
           txVal: el.netStatus == 1 ? '连接' : '未连接',
           txLable: '通讯状态',
-          warnVal: el.warnLevel_str,
+          warnVal: el.warnLevel_str ? el.warnLevel_str : '-',
           warnLabel: '是否报警',
           listData: [
-            { label: '运行风机', value: el.readData.Fan1StartStatus == '1' ? '主机' : el.readData.Fan2StartStatus == '1' ? '备机' : '--', dw: '' },
-            { label: '风量', value: el.readData.window_fWindowM3, dw: 'm³/min' },
-            { label: '迎头风速', value: el.readData.windSpeed1, dw: 'm/s' },
-            { label: '迎头瓦斯', value: el.readData.gas1, dw: 'm/s' },
+            {
+              label: '运行风机',
+              value: el.readData.Fan1StartStatus == '1' ? '1#风机' : el.readData.Fan2StartStatus == '1' ? '2#风机' : '--',
+              dw: '',
+            },
+            {
+              label: '风量',
+              value: el.readData.windQuantity1 ? el.readData.windQuantity1 : el.readData.windQuantity2 ? el.readData.windQuantity2 : '-',
+              dw: 'm³/min',
+            },
+            {
+              label: '迎头风速',
+              value: el.readData.windSpeed1 ? el.readData.windSpeed1 : el.readData.windSpeed2 ? el.readData.windSpeed2 : '-',
+              dw: 'm/s',
+            },
+            { label: '迎头瓦斯', value: el.readData.gas1 ? el.readData.gas1 : '-', dw: 'm/s' },
             { label: '时间', value: el.readTime, dw: '' },
           ],
         });

src/views/vent/monitorManager/gateMonitor/index.vue

@@ -31,9 +31,10 @@
         <div v-if="hasPermission('btn:control')" class="button-box" @click="playAnimation(4)">关闭后门</div>
         <div v-if="hasPermission('btn:control') && selectData.deviceType != 'gate_ss'" class="button-box" @click="playAnimation(5)">同时打开</div>
         <div v-if="hasPermission('btn:control') && selectData.deviceType != 'gate_ss'" class="button-box" @click="playAnimation(6)">同时关闭</div>
+        <div v-if="hasPermission('btn:controlWindow')" class="button-box" @click="playAnimation(10)">风窗控制</div>
       </div>
       <!-- 控制模式 -->
-      <div class="top-right row">
+      <div class="top-right row" v-if="hasPermission('btn:remote')">
         <div class="vent-flex-m row" v-if="selectData.contrlMod == 'loopCtrl'">
           <div class="control-title">控制模式：</div>
           <a-radio-group v-model:value="selectData.autoRoManual">
@@ -621,6 +622,11 @@
         modalType.value = '7';
         modalIsShow.value = true;
         break;
+      case 10: // 风窗控制
+        modalTitle.value = '风窗控制';
+        modalType.value = '10';
+        modalIsShow.value = true;
+        break;
     }
 
     if (globalConfig?.simulatedPassword) {
@@ -763,6 +769,7 @@
           data.value = contrlValue;
           selectData.autoRoManual = null;
         }
+        break;
     }
 
     if (data.paramcode) {
@@ -900,7 +907,6 @@
     modalIsShow.value = false;
     modalTitle.value = '';
     modalType.value = '';
-    selectData.autoRoManual = null;
   }
 
   // // 远程、就地切换

src/views/vent/monitorManager/gateMonitor/modal.vue

@@ -5,6 +5,16 @@
         <ExclamationCircleFilled style="color: #ffb700; font-size: 30px" />
         <div class="warning-text">您是否要进行{{ title }}操作？</div>
       </div>
+      <div v-if="type == '10'">
+        <div class="vent-flex-row input-box">
+          <div class="label">前窗开启角度：</div>
+          <a-input-number size="small" placeholder="0" :min="0" :max="90" v-model:value="frontA" />
+        </div>
+        <div class="vent-flex-row input-box">
+          <div class="label">后窗开启角度：</div>
+          <a-input-number size="small" placeholder="0" :min="0" :max="90" v-model:value="rearA" />
+        </div>
+      </div>
       <div class="vent-flex-row input-box">
         <div class="label">操作密码：</div>
         <a-input size="small" type="password" v-model:value="passWord" />
@@ -37,6 +47,8 @@
   const title = ref<String>('');
   const type = ref<String>('');
   const passWord = ref('');
+  const frontA = ref(0);
+  const rearA = ref(0);
 
   watch([() => props.modalIsShow, () => props.modalTitle, () => props.modalType], ([newVal, newModalTitle, newModalType]) => {
     visible.value = newVal;
@@ -47,7 +59,11 @@
 
   function handleOk() {
     //
-    emit('handleOk', passWord.value, type.value);
+    if (type.value == '10') {
+      emit('handleOk', passWord.value, type.value, frontA, rearA);
+    } else {
+      emit('handleOk', passWord.value, type.value);
+    }
   }
   function handleCancel() {
     //
@@ -58,9 +74,12 @@
   @ventSpace: zxm;
 
   .label {
-    width: 80px;
+    width: 120px;
   }
   .@{ventSpace}-input {
     width: 150px;
   }
+  .@{ventSpace}-input-number {
+    width: 150px;
+  }
 </style>