Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/deviceManager/configurationTable/types.ts

@@ -93,7 +93,7 @@ export interface ModuleData {
   complex_list?: ModuleDataComplexList[];
   /** 如果目前没有数据可以对接，可使用模拟数据先行展示 */
   mock?: any;
-  /** 如果模块需要跳转，可以在这里配置，不支持 formatter 格式 */
+  /** 如果模块需要跳转，可以在这里配置，部分类型的模块（保德）不支持 formatter 格式 */
   to?: string;
 }
 

src/views/vent/home/configurable/components/ModuleCommon.vue

@@ -20,6 +20,7 @@
   import { computed, ref } from 'vue';
   import ventBox1 from '/@/components/vent/ventBox1.vue';
   import { openWindow } from '/@/utils';
+  import { getFormattedText } from '../hooks/helper';
   // import { ModuleProps } from '../types';
 
   const props = defineProps<{
@@ -57,7 +58,7 @@
   function redirectTo() {
     const { to } = props.moduleData;
     if (!to) return;
-    openWindow(to);
+    openWindow(getFormattedText(selectedData.value, to));
   }
 </script>
 <style lang="less" scoped>

src/views/vent/home/configurable/components/ModuleEnhanced.vue

@@ -23,6 +23,7 @@
   import ModuleBottom from './enhanced/moduleBottom.vue';
   import { computed, ref } from 'vue';
   import { openWindow } from '/@/utils';
+  import { getFormattedText } from '../hooks/helper';
   // import { ModuleProps } from '../types';
 
   const props = defineProps<{
@@ -66,6 +67,6 @@
   function redirectTo() {
     const { to } = props.moduleData;
     if (!to) return;
-    openWindow(to);
+    openWindow(getFormattedText(selectedData.value, to));
   }
 </script>

src/views/vent/home/configurable/components/ModuleOriginal.vue

@@ -22,6 +22,7 @@
   import ModuleBottom from './original/moduleBottom.vue';
   import { computed, ref } from 'vue';
   import { openWindow } from '/@/utils';
+  import { getFormattedText } from '../hooks/helper';
   // import { ModuleProps } from '../types';
 
   const props = defineProps<{
@@ -61,9 +62,10 @@
     }
     return ModuleBottom;
   }
+
   function redirectTo() {
     const { to } = props.moduleData;
     if (!to) return;
-    openWindow(to);
+    openWindow(getFormattedText(selectedData.value, to));
   }
 </script>

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

@@ -62,7 +62,7 @@ export const list = (params) => {
     });
     res.sys_majorpath.forEach((e) => {
       const { drag_1, drag_2, drag_3, drag_total } = e.majorpath;
-      const { retM3_merge } = e.readData;
+      const { retM3_merge = { value: '1' } } = e.readData;
       const m3_merge = parseInt(retM3_merge.value);
       e.piechart = [
         { val: drag_1, valMock: floor((drag_1 / drag_total) * m3_merge), label: '进风区' },

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

@@ -71,6 +71,7 @@ export const testConfigVent: Config[] = [
           fan2Prop: ['flow_merge', 'fy_merge'],
         },
       ],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=fanmain',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -130,6 +131,7 @@ export const testConfigVent: Config[] = [
       complex_list: [],
       gallery_list: [],
       preset: [],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=fanlocal',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -342,6 +344,7 @@ export const testConfigVent: Config[] = [
       ],
       gallery_list: [],
       preset: [],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_majorpath&deviceid=${deviceID}',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -424,6 +427,7 @@ export const testConfigVent: Config[] = [
       ],
       gallery_list: [],
       complex_list: [],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_surface_caimei',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -507,6 +511,7 @@ export const testConfigVent: Config[] = [
       chart: [],
       gallery_list: [],
       complex_list: [],
+      to: '/monitorChannel/monitor-alarm-home',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -1495,6 +1500,7 @@ export const testConfigVentRealtime: Config[] = [
           fan2Prop: ['readData.Fan2_FanFlow', 'readData.Fan2FanPre'],
         },
       ],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=fanmain',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -1557,6 +1563,7 @@ export const testConfigVentRealtime: Config[] = [
       complex_list: [],
       gallery_list: [],
       preset: [],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=fanlocal',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -1769,6 +1776,7 @@ export const testConfigVentRealtime: Config[] = [
       ],
       gallery_list: [],
       preset: [],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_majorpath',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -1851,6 +1859,7 @@ export const testConfigVentRealtime: Config[] = [
       ],
       gallery_list: [],
       complex_list: [],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_surface_caimei',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -1934,6 +1943,7 @@ export const testConfigVentRealtime: Config[] = [
       chart: [],
       gallery_list: [],
       complex_list: [],
+      to: '/monitorChannel/monitor-alarm-home',
     },
     showStyle: {
       size: 'width:450px;height:280px;',

src/views/vent/home/configurable/hooks/helper.ts

@@ -2,6 +2,8 @@ import { get, isNil } from 'lodash-es';
 
 /** 根据配置中的 formatter 将文本格式并返回 */
 export function getFormattedText(data: any, formatter: string, trans?: Record<string, string>, defaultValue?: any): string {
+  if (!data) return formatter;
+
   // e.g. 'pre${prop[0].name}suf' => ['pre${prop[0].name}suf', 'prop[0].name']
   const exp = /\$\{([\w|\.|\[|\]]*)\}/g;
   const res = exp.exec(formatter);

src/views/vent/home/configurable/vent_v5.vue

@@ -17,7 +17,6 @@
     <template v-if="route.query.deviceType">
       <div style="width: 100%; height: 100%; position: absolute; left: 0; top: 0">
         <VentModal />
-        <div class="switch-button icon-goto right-5px" @click="goMicroApp(true)"></div>
       </div>
     </template>
     <template v-else>
@@ -123,19 +122,15 @@
     }, 60000);
   }
 
-  function goMicroApp(test = false) {
-    if (test) {
-      router.push({ path: route.path });
-    } else {
-      router.push({
-        path: route.path,
-        query: {
-          ...route.query,
-          type: 'model3D',
-          deviceType: 'model3D',
-        },
-      });
-    }
+  function goMicroApp() {
+    router.push({
+      path: route.path,
+      query: {
+        ...route.query,
+        type: 'model3D',
+        deviceType: 'model3D',
+      },
+    });
   }
 
   watch(