lxh 5 kuukautta sitten
vanhempi
commit
f08aa2b11e

+ 9 - 3
src/views/vent/home/configurable/electroChamber.vue

@@ -46,7 +46,8 @@ import chamberAlarmHistory from '../../monitorManager/chamberMonitor/components/
 import { getElectroData } from './configurable.api';
 import { testConfigElectro } from './configurable.data';
 import { useRouter } from 'vue-router';
-import {jdDsMock} from './jdDsMock'
+import { jdDsMock } from './jdDsMock'
+import { useGlobSetting } from '/@/hooks/setting';
 
 const { currentRoute } = useRouter();
 const activeKey = ref('monitor');
@@ -64,8 +65,13 @@ onMounted(() => {
   if (currentRoute.value && currentRoute.value['query'] && currentRoute.value['query']['id']) optionValue.value = currentRoute.value['query']['id']
   fetchConfigs('electro-champer').then(() => {
     configs.value = testConfigElectro;
-    // getElectroData({devicetype:deviceType.value}).then(updateData);
-    Promise.resolve(jdDsMock).then(updateData);
+    const { sysOrgCode } = useGlobSetting();
+    if (sysOrgCode == 'A02A02') {
+      Promise.resolve(jdDsMock).then(updateData);
+    } else {
+      getElectroData({ devicetype: deviceType.value }).then(updateData);
+    }
+
   });
   // setInterval(() => {
   //   getElectroData({devicetype:deviceType.value}).then(updateData);

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

@@ -66,6 +66,7 @@ import { devicecontrol, insertSyncRule, GetSyncRule } from '../airdoor.api'
 // import { getModelComponent } from '../airdoor.data'
 import { useMessage } from '/@/hooks/web/useMessage';
 import { SvgIcon } from '/@/components/Icon';
+import { getDictItemsByCode } from '/@/utils/dict';
 
 let props = defineProps({
   infoData: {
@@ -170,7 +171,9 @@ function handleCancelOperation(param) {
 function monitorAnimation(selectData, index) {
   childRefs.value[index]?.animate?.(selectData.frontGateOpen == '1', selectData.midGateOpen == '1', selectData.rearGateOpen == '1');
 }
-function getInitSvg(){
+function getInitSvg() {
+  const dictCodes = getDictItemsByCode('gateStyle');
+  console.log(dictCodes, 'dictCodes---')
   
 }