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

src/views/vent/home/configurable/README.md

@@ -67,3 +67,15 @@
 4、测试修改并提交。
 
 如果是子模块，那么参考 ModuleEnhanced.vue 即可。
+
+## 相关项目配置
+
+1、配置可配置首页配置页面，组件名：vent/deviceManager/configurationTable/index，参考菜单：/configurable/table，参考页面位置：设置-首页管理。
+
+2、配置可配置首页依赖的字典，进入字典配置页面，添加 configurable_homepage 字典项，参考名称：可配置首页。
+
+3、在 2 中添加的字典里添加子项，添加的子项具体名称需要和相关同事确认，参考字典：vent(通风首页)、gas(瓦斯首页)、dust(粉尘首页)、vent_realtime(通风首页-实时数据版)等。
+
+4、配置可配置首页，组件名：vent/home/configurable/xxx(需要和开发同事确认)，参考菜单：将需要替换的首页菜单配给可配置首页。
+
+5、进入可配置首页配置页面，点击导入，将开发同事给的配置导入即可，后续调整可以点击帮助按钮查看配置细则，更为复杂的配置建议交与开发同事。

src/views/vent/home/configurable/components/detail/CustomChart.vue

@@ -386,7 +386,7 @@
             type: 'category',
             axisLabel: {
               interval: 0,
-              width: baseDataZoom.length ? undefined : 800 / get(baseSeries, '[0].data.length', 1),
+              width: baseDataZoom.length ? 100 : 800 / get(baseSeries, '[0].data.length', 1),
               overflow: 'break',
             },
           };

src/views/vent/home/configurable/components/detail/MiniBoard.vue

@@ -127,7 +127,7 @@
     background-image: var(--image-vent-param-bg);
   }
   .mini-board_D {
-    width: 105px;
+    // width: 105px;
     height: 58px;
     background-image: var(--image-mini-board-1);
     background-position: center bottom;

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

@@ -649,18 +649,13 @@ export const testConfigSY: Config[] = [
         },
       },
       background: {
-        show: false,
-        type: 'image',
-        link: '',
+        show: true,
+        type: 'video',
+        link: '/video/gate.mp4',
       },
       layout: {
         direction: 'row',
-        items: [
-          {
-            name: 'device_alarm',
-            basis: '100%',
-          },
-        ],
+        items: [],
       },
       board: [],
       list: [],
@@ -669,11 +664,7 @@ export const testConfigSY: Config[] = [
       gallery: [],
       complex_list: [],
       gallery_list: [],
-      preset: [
-        {
-          readFrom: 'device',
-        },
-      ],
+      preset: [],
       to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=gate_xinJianFuXieJin',
     },
     showStyle: {

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

@@ -142,6 +142,11 @@
     clearInterval(interval);
   });
 </script>
+<style>
+  #__qiankun_microapp_wrapper_for_micro_vent_3_d_modal__ #app {
+    background-color: transparent;
+  }
+</style>
 <style lang="less" scoped>
   @import '/@/design/theme.less';
 

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.three.bk.ts

@@ -166,7 +166,13 @@ export const addText = (selectData) => {
     },
     {
       text: `${
-        selectData.fchimenylength ? selectData.fchimenylength : selectData.airSupplyDistence_merge ? selectData.airSupplyDistence_merge : '-'
+        selectData.airSupplyDistence_merge
+          ? selectData.airSupplyDistence_merge
+          : selectData.fchimenylength
+          ? selectData.fchimenylength
+          : selectData.airSupplyDistence_merge
+          ? selectData.airSupplyDistence_merge
+          : '-'
       }`,
       font: 'normal 30px Arial',
       color: '#009900',

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.base.ts

@@ -338,7 +338,13 @@ class ModelContext {
       },
       {
         text: `${
-          selectData.fchimenylength ? selectData.fchimenylength : selectData.airSupplyDistence_merge ? selectData.airSupplyDistence_merge : '-'
+          selectData.airSupplyDistence_merge
+            ? selectData.airSupplyDistence_merge
+            : selectData.fchimenylength
+            ? selectData.fchimenylength
+            : selectData.airSupplyDistence_merge
+            ? selectData.airSupplyDistence_merge
+            : '-'
         }`,
         font: 'normal 30px Arial',
         color: '#009900',

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

@@ -166,7 +166,13 @@ export const addText = (selectData) => {
     },
     {
       text: `${
-        selectData.fchimenylength ? selectData.fchimenylength : selectData.airSupplyDistence_merge ? selectData.airSupplyDistence_merge : '-'
+        selectData.airSupplyDistence_merge
+          ? selectData.airSupplyDistence_merge
+          : selectData.fchimenylength
+          ? selectData.fchimenylength
+          : selectData.airSupplyDistence_merge
+          ? selectData.airSupplyDistence_merge
+          : '-'
       }`,
       font: 'normal 30px Arial',
       color: '#009900',