设备集控-更新

src/views/vent/monitorManager/airDoor/airdoor.api.ts

@@ -4,18 +4,20 @@ import { loginCipher } from '/@/settings/encryptionSetting';
 
 
 enum Api {
-  getDevice = '/monitor/device',
-  getCameraUrl = '/monitor/camera/queryByCameraCode',
-  devicecontrol = '/safety/ventanalyMonitorData/devicecontrol_ssl',
-  //insertSyncRule = '/ventanaly-device/synccontrol/upcoming/saveOrUpdateRule',
-  insertSyncRule = '/ventanaly-device/monitor/timeSync/insertSyncRule',
-  upcoming = '/ventanaly-device/synccontrol/upcoming',
-  GetSyncRule='/ventanaly-device/synccontrol/upcoming/GetSyncRule',
-  GetSyncRuleOperationLog='/ventanaly-device/synccontrol/upcoming/GetSyncRuleOperationLog',
-  GetSyncRuleExecLog='/ventanaly-device/synccontrol/upcoming/GetSyncRuleExecLog',
-  list='/safety/ventanalyDeviceInfo/list',
-  edit='/ventanaly-device/safety/ventanalyDeviceInfo/batchEdit',
-  manualTimeSync='/ventanaly-device/monitor/timeSync/manualTimeSync'
+getDevice = '/monitor/device',
+getCameraUrl = '/monitor/camera/queryByCameraCode',
+devicecontrol = '/safety/ventanalyMonitorData/devicecontrol_ssl',
+//insertSyncRule = '/ventanaly-device/synccontrol/upcoming/saveOrUpdateRule',
+insertSyncRule = '/ventanaly-device/monitor/timeSync/insertSyncRuleClock',
+upcoming = '/ventanaly-device/synccontrol/upcoming',
+GetSyncRule='/ventanaly-device/synccontrol/upcoming/GetSyncRule',
+GetSyncRuleOperationLog='/ventanaly-device/synccontrol/upcoming/GetSyncRuleOperationLog',
+GetSyncRuleExecLog='/ventanaly-device/synccontrol/upcoming/GetSyncRuleExecLog',
+list='/safety/ventanalyDeviceInfo/list',
+edit='/ventanaly-device/safety/ventanalyDeviceInfo/batchEdit',
+manualTimeSync='/ventanaly-device/monitor/timeSync/manualTimeSync',
+isPasswordCurrect='/ventanaly-device/monitor/timeSync/isPasswordCurrect'
+
 }
 
 
@@ -33,10 +35,10 @@ export const cameraAddr = (params) => defHttp.get({ url: Api.getCameraUrl, param
 * @param params
 */
 export const devicecontrol = (params) => {
-  // 加密password
-  const encryption = new AesEncryption({ key: loginCipher.key, iv: loginCipher.iv });
-  params.password = encryption.encryptByAES(params.password);
-  return defHttp.put({ url: Api.devicecontrol, params });
+// 加密password
+const encryption = new AesEncryption({ key: loginCipher.key, iv: loginCipher.iv });
+params.password = encryption.encryptByAES(params.password);
+return defHttp.put({ url: Api.devicecontrol, params });
 };
 
 /**
@@ -49,7 +51,7 @@ export const GetSyncRule = (params) => defHttp.post({ url: Api.GetSyncRule, para
 * @param params
 */
 export const insertSyncRule = (params) => {
-  return defHttp.post({ url: Api.insertSyncRule, params });
+return defHttp.post({ url: Api.insertSyncRule, params });
 };
 
 //读取未来30秒内的预告
@@ -66,3 +68,5 @@ export const controlList = (params) => defHttp.get({ url: Api.list, params });
 export const confirmChoice = (params) => defHttp.put({ url: Api.edit, params });
 //同步PLC时钟
 export const manualTimeSync = () => defHttp.post({ url: Api.manualTimeSync });
+//设备集控选择密码设置
+export const isPasswordCurrect = (params) => defHttp.post({ url: Api.isPasswordCurrect,params });

src/views/vent/monitorManager/airDoor/components/door-content-r.vue

@@ -30,7 +30,8 @@
             `20${item.readData.PLCyear}-${item.readData.PLCmonth}-${item.readData.PLCday}
             ${item.readData.PLChour}:${item.readData.PLCminute}:${item.readData.PLCsecond}` : '' }}</div>
           <!-- 二三维信息 -->
-          <gateSVG v-if="item.gateStyle == 'fmSp1' || item.gateStyle=='fm_fc_ssl'" :ref="(el) => setChildRef(el, index)" :identify="index">
+          <gateSVG v-if="item.gateStyle == 'fmSp1' || item.gateStyle == 'fm_fc_ssl'"
+            :ref="(el) => setChildRef(el, index)" :identify="index">
           </gateSVG>
           <gateDualSVG v-else :ref="(el) => setChildRef(el, index)" :identify="index">
           </gateDualSVG>
@@ -90,7 +91,7 @@ import gateSVG from './gateSVG.ssl.vue'
 import operationModal from './operationModal.vue'
 import DeviceControl from './deviceControl.vue'
 import { useRouter } from 'vue-router';
-import { devicecontrol, insertSyncRule, GetSyncRule, controlList, confirmChoice, manualTimeSync } from '../airdoor.api'
+import { devicecontrol, insertSyncRule, GetSyncRule, controlList, confirmChoice, manualTimeSync, isPasswordCurrect } from '../airdoor.api'
 import { doorStatus } from '../airdoor.data'
 // import { getModelComponent } from '../airdoor.data'
 import { useMessage } from '/@/hooks/web/useMessage';
@@ -120,7 +121,7 @@ let Ids = ref('')
 //摄像头-控制显示与隐藏
 let modalVisible = ref(false);
 
-let deviceId=ref('')
+let deviceId = ref('')
 //操作日志弹窗显示/关闭
 let visibleOperation = ref(false)
 const childRefs = ref<any[]>([])
@@ -157,10 +158,14 @@ async function handleOk(param) {
       }, 60000 * 5)
     }
   } else {
-    visible.value = param.visib
-    visibleDeviceControl.value = true
+    let res = await isPasswordCurrect({ password: param.pass })
+    if (res) {
+      visible.value = param.visib
+      visibleDeviceControl.value = true
+    } else {
+      visible.value = param.visib
+    }
   }
-
 }
 //取消
 function handleCancel(param) {
@@ -199,7 +204,7 @@ function handlerDetail(id) {
 //摄像头切换
 function handlerCamera(item, index) {
   modalVisible.value = true;
-   deviceId.value = item.deviceID
+  deviceId.value = item.deviceID
 }
 //摄像头弹窗关闭
 function handleCancelCamera(param) {