绿色版本修改-提交

src/views/vent/home/colliery/components/wind-monitor.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="windMonitor">
-    <div class="title-top" @click="getDetail">风量监测111</div>
+    <div class="title-top" @click="getDetail">风量监测</div>
     <div class="wind-contents">
       <div class="wind-bar" ref="windBar"></div>
     </div>
@@ -259,7 +259,7 @@ watch(
         echartData.xdata.push(el.strinstallpos);
         echartData.ydata.push(el.readData.m3);
       } else {
-        echartData.xdata.push('0');
+        echartData.xdata.push(el.strinstallpos);
         echartData.ydata.push('0');
       }
     });

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

@@ -346,9 +346,9 @@ export const testConfigVent: Config[] = [
       to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=windrect',
     },
     showStyle: {
-      size: 'width:460px;height:260px;',
+      size: 'width:505px;height:260px;',
       version: '原版',
-      position: 'bottom:0px;left:15px;',
+      position: 'bottom:15px;left:420px;',
     },
   },
   {
@@ -428,7 +428,7 @@ export const testConfigVent: Config[] = [
     showStyle: {
       size: 'width:460px;height:260px;',
       version: '原版',
-      position: 'bottom:0px;left:495px;',
+      position: 'bottom:15px;left:940px;',
     },
   },
   {
@@ -511,96 +511,10 @@ export const testConfigVent: Config[] = [
     showStyle: {
       size: 'width:460px;height:260px;',
       version: '原版',
-      position: 'bottom:0px;left:975px;',
+      position: 'bottom:15px;right:15px;',
     },
   },
-  //  {
-  //     // deviceType: 'warn',
-  //     // moduleName: '预警监测',
-  //     deviceType: '',
-  //     moduleName: '智能通风Deepseek',
-  //     pageType: 'vent',
-  //     moduleData: {
-  //       header: {
-  //         show: true,
-  //         readFrom: '',
-  //         selector: {
-  //           show: false,
-  //           value: '',
-  //         },
-  //         slot: {
-  //           show: true,
-  //           value: '网络异常：${warn[0].netstatus.val}',
-  //         },
-  //       },
-  //       background: {
-  //         show: false,
-  //         type: 'video',
-  //         link: '',
-  //       },
-  //       layout: {
-  //         direction: 'row',
-  //         items: [
-  //           {
-  //             // name: 'list',
-  //             name: 'ai_chat',
-  //             basis: '100%',
-  //           },
-  //         ],
-  //       },
-  //       board: [],
-  //       list: [
-  //         {
-  //           type: 'timeline',
-  //           readFrom: 'warn[0]',
-  //           items: [
-  //             {
-  //               label: '报警',
-  //               value: '${alarm.val}',
-  //               info: '',
-  //               color: 'red',
-  //             },
-  //             {
-  //               label: '重大风险预警',
-  //               value: '${red.val}',
-  //               info: '',
-  //               color: 'red',
-  //             },
-  //             {
-  //               label: '较大风险预警',
-  //               value: '${orange.val}',
-  //               info: '',
-  //               color: 'orange',
-  //             },
-  //             {
-  //               label: '一般风险预警',
-  //               value: '${yellow.val}',
-  //               info: '',
-  //               color: 'yellow',
-  //             },
-  //             {
-  //               label: '低风险预警',
-  //               value: '${blue.val}',
-  //               info: '',
-  //               color: 'blue',
-  //             },
-  //           ],
-  //         },
-  //       ],
-  //       preset: [{ readFrom: '' }],
-  //       table: [],
-  //       gallery: [],
-  //       chart: [],
-  //       gallery_list: [],
-  //       complex_list: [],
-  //       to: '/monitorChannel/monitor-alarm-home',
-  //     },
-  //     showStyle: {
-  //       size: 'width:390px;height:260px;',
-  //       version: '原版',
-  //       position: 'top:855px;left:15px',
-  //     },
-  //   },
+
 ];
 
 export const testConfigDust: Config[] = [
@@ -1088,7 +1002,7 @@ export const testConfigDustGreen: Config[] = [
       // mock: BDdustMock,
     },
     showStyle: {
-      size: 'width:420px;height:780px;',
+      size: 'width:420px;height:815px;',
       version: '新版',
       position: 'top:0px;left:15px',
     },
@@ -2048,7 +1962,7 @@ export const testConfigFireGreen: Config[] = [
       // mock: BDfireMock,
     },
     showStyle: {
-      size: 'width:420px;height:350px;',
+      size: 'width:420px;height:400px;',
       version: '原版',
       position: 'top:415px;left:15px;',
     },
@@ -2966,7 +2880,7 @@ export const testConfigFusionGreen: Config[] = [
           readFrom: 'deviceWarn',
           listOption: {
             fanmain: {
-              url: getThemifyImagesURL(),
+              url: getThemifyImagesURL('vent/alarm-icons/zfj.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -2976,7 +2890,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'fanmain_close',
             },
             fanlocal: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/jbfj.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -2986,7 +2900,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'fanlocal_close',
             },
             bundletube: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/sgjc.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -2996,7 +2910,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'bundletube_close',
             },
             fanlocaldp: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/jbfj-db.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3006,7 +2920,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'fanlocaldp_close',
             },
             gate: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/fm-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3016,7 +2930,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'gate_close',
             },
             window: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/fc-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3026,7 +2940,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'window_close',
             },
             windrect: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/dscf-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3036,7 +2950,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'windrect_close',
             },
             forcFan: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/yf-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3046,7 +2960,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'forcFan_close',
             },
             spray: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/pl-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3056,7 +2970,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'spray_close',
             },
             dustdev: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/pf-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3066,7 +2980,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'dustdev_close',
             },
             nitrogen: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/zd-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3076,7 +2990,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'nitrogen_close',
             },
             pulping: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/zj-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3086,7 +3000,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'pulping_close',
             },
             atomizing: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/pw-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3096,7 +3010,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'atomizing_close',
             },
             dustsensor: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/cgq-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3106,7 +3020,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'dustsensor_close',
             },
             gas: {
-              url: getThemifyImagesURL(''),
+              url: getThemifyImagesURL('vent/alarm-icons/ccb-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3116,7 +3030,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'gas_close',
             },
             pump: {
-              url: getThemifyImagesURL('vent/alarm-icons/wasibeng.png'),
+              url: getThemifyImagesURL('vent/alarm-icons/ccb-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3126,7 +3040,7 @@ export const testConfigFusionGreen: Config[] = [
               closeCount: 'pump_close',
             },
             modelsensor: {
-              url: getThemifyImagesURL('vent/alarm-icons/cf.png'),
+              url: getThemifyImagesURL('vent/alarm-icons/cf-green.png'),
               text: '',
               allText: '总数',
               warnText: '报警数',
@@ -3141,7 +3055,7 @@ export const testConfigFusionGreen: Config[] = [
       // mock: BDfireMock,
     },
     showStyle: {
-      size: 'width:420px;height:350px;',
+      size: 'width:420px;height:400px;',
       version: '原版',
       position: 'top:415px;left:15px',
     },
@@ -3319,7 +3233,7 @@ export const testConfigFusionGreen: Config[] = [
       // mock: BDfireMock,
     },
     showStyle: {
-      size: 'width:420px;height:350px;',
+      size: 'width:420px;height:400px;',
       version: '原版',
       position: 'top:415px;right:15px',
     },

src/views/vent/home/configurable/green/common-green.vue

@@ -3,18 +3,10 @@
     <!-- 如果是有 deviceType、type 等 query，认为是详情页，不需要展示普通模块，只需要模型 -->
     <template v-if="!route.query.deviceType">
       <div class="main-container">
-        <div class="left-area">
-          <!-- 采用定位方式以避免出现各个模块隐藏时其他模块下移的问题 -->
-          <ModuleOriginal v-for="cfg in configsLeft" :key="cfg.deviceType" :show-style="cfg.showStyle"
-            :module-data="cfg.moduleData" :module-name="cfg.moduleName" :device-type="cfg.deviceType" :data="data"
-            :visible="true" />
-        </div>
-        <div class="bottom-area">
-          <!-- 采用定位方式以避免出现各个模块隐藏时其他模块下移的问题 -->
-          <ModuleOriginal v-for="cfg in configsBottom" :key="cfg.deviceType" :show-style="cfg.showStyle"
-            :module-data="cfg.moduleData" :module-name="cfg.moduleName" :device-type="cfg.deviceType" :data="data"
-            :visible="true" />
-        </div>
+        <!-- 采用定位方式以避免出现各个模块隐藏时其他模块下移的问题 -->
+        <ModuleOriginal v-for="cfg in configs" :key="cfg.deviceType" :show-style="cfg.showStyle"
+          :module-data="cfg.moduleData" :module-name="cfg.moduleName" :device-type="cfg.deviceType" :data="data"
+          :visible="true" />
         <div class="right-area">
           <greenRightTag />
         </div>
@@ -45,14 +37,6 @@ const route = useRoute();
 
 let interval: number | undefined;
 let configs = ref<any[]>([]);
-
-let configsLeft = computed(() => {
-  return configs.value.filter((v) => v.showStyle.position.includes('top'));
-});
-let configsBottom = computed(() => {
-  return configs.value.filter((v) => v.showStyle.position.includes('bottom'));
-});
-
 function refresh() {
   fetchConfigs('vent').then(() => {
     configs.value = testConfigVent;
@@ -155,78 +139,6 @@ onUnmounted(() => {
   .main-container {
     width: 100%;
     height: 100%;
-
-    .left-area {
-      position: absolute;
-      left: 0;
-      top: 0;
-      width: 420px;
-      height: 100%;
-      padding: 15px;
-      background: url('../../../../assets/images/home-green/green-bd-left.png') no-repeat;
-      background-size: 100% 100%;
-      box-sizing: border-box;
-      overflow-y: auto;
-    }
-
-    .bottom-area {
-      position: absolute;
-      left: 435px;
-      bottom: 0;
-      width: calc(100% - 435px);
-      height: 290px;
-      padding: 15px;
-      background: url('../../../../assets/images/home-green/green-bd-bottom.png') no-repeat;
-      background-size: 100% 100%;
-      box-sizing: border-box;
-    }
-
-    .right-area {
-      position: absolute;
-      right: 0px;
-      top: 0px;
-      width: 120px;
-      height: calc(100% - 305px);
-    }
-  }
-
-  .module-dropdown {
-    padding: 5px;
-    background-image: @vent-configurable-dropdown;
-    border-bottom: 2px solid @vent-configurable-home-light-border;
-    color: @vent-font-color;
-    position: absolute;
-    top: 60px;
-    right: 480px;
-  }
-
-  .module-dropdown-original {
-    padding: 10px;
-    background-image: @vent-configurable-dropdown;
-    border-bottom: 2px solid @vent-configurable-home-light-border;
-    color: @vent-font-color;
-    position: absolute;
-    top: 70px;
-    right: 460px;
-  }
-
-  .module-trigger-button {
-    color: @vent-font-color;
-    background-image: @vent-configurable-dropdown;
-    border: none;
-    border-bottom: 2px solid @vent-configurable-home-light-border;
-  }
-
-  .realtime-mode {
-    background-image: var(--image-monitor-realtime);
-  }
-
-  .module-monitor-bar {
-    position: absolute;
-    top: 100px;
-    width: 1000px;
-    height: 200px;
-    left: calc(50% - 500px);
   }
 }
 

src/views/vent/home/configurable/green/components/CustomTable-green.vue

@@ -73,7 +73,7 @@
     padding: 5px 0;
 
     .table__content_label {
-      width: 390px;
+      width: 375px;
       height: 32px;
       display: flex;
       justify-content: space-around;
@@ -112,7 +112,7 @@
 
     .table__content_list {
       height: calc(100% - 32px);
-      width: 390px;
+      width: 375px;
       display: flex;
       flex-direction: column;
       padding: 5px 0;

src/views/vent/home/configurable/green/components/center-area-green.vue

@@ -145,8 +145,8 @@ let paramDatas = reactive<any>({})
 const { sysOrgCode, sysDataType } = useGlobSetting();
 
 watch(() => props.paramData, (newV, oldV) => {
-    paramDatas =newV
-}, { immediate: true,deep:true })
+    paramDatas = newV
+}, { immediate: true, deep: true })
 </script>
 
 <style lang="less" scoped>
@@ -185,18 +185,20 @@ watch(() => props.paramData, (newV, oldV) => {
     .container {
         position: relative;
         width: 100%;
-        height: calc(100% - 25px);
-        margin-top: 25px;
+        height: calc(100% - 30px);
+        margin-top: 30px;
         background: var(--image-model_container_img) no-repeat center;
         background-size: 100% 100%;
     }
-.risk-echartbox{
-       position: absolute;
-    left: 18px;
-    top: -52px;
-    width: 220px;
-    height: 170px;
-}
+
+    .risk-echartbox {
+        position: absolute;
+        left: 18px;
+        top: -52px;
+        width: 220px;
+        height: 170px;
+    }
+
     .risk-score {
         position: absolute;
         left: 50%;
@@ -314,18 +316,16 @@ watch(() => props.paramData, (newV, oldV) => {
 
     .ite-label {
         text-align: center;
-        margin-bottom: 8px;
+        margin-bottom: 10px;
         padding-top: 4px;
         font-size: 12px;
     }
 
     .ite-val {
         width: 100%;
-        position: absolute;
         text-align: center;
         font-family: 'douyuFont';
         font-size: 12px;
-        bottom: 2px;
     }
 
     .ite-content {

src/views/vent/home/configurable/green/components/dz-list.vue

@@ -3,7 +3,7 @@
         <div class="icons-box" @mouseleave="resetScroll">
             <template v-for="(item, key) in listOption" :key="key">
                 <div class="icon-item">
-                    <!-- <img :src="item.url" :alt="item.text" /> -->
+                    <img :src="item.url" :alt="item.text" />
                     <div class="level-text">
                         <div class="all-count">
                             <span>{{ `${item.allText}&nbsp:&nbsp` }}</span>
@@ -12,13 +12,13 @@
                         <div class="warn-count">
                             <span>{{ `${item.warnText}&nbsp:&nbsp` }}</span>
                             <span :class="item.warnCount ? 'num-count1' : 'num-count'">{{ listData[item.warnCount] || 0
-                            }}</span>
+                                }}</span>
                         </div>
                         <div class="close-count">
                             <span> {{ `${item.closeText}&nbsp:&nbsp` }}</span>
                             <span :class="item.closeCount ? 'num-count1' : 'num-count'">{{ listData[item.closeCount] ||
                                 0
-                            }}</span>
+                                }}</span>
                         </div>
                     </div>
                 </div>
@@ -125,8 +125,11 @@ watch(() => props.listData, (newV, oldV) => {
             }
 
             img {
-                width: 100%;
-                height: 60px;
+                width: 50px;
+                height: 50px;
+                position: absolute;
+                left: 16px;
+                top: -18px;
             }
         }
     }

src/views/vent/home/configurable/green/components/header-green.vue

@@ -81,7 +81,8 @@
   .costume-header {
     height: 30px;
     /* background-image: linear-gradient(90deg, var(--vent-base-light-bg-opcity), transparent 20%, transparent 80%, var(--vent-base-light-bg-opcity)); */
-    background:url('../../../../../assets/images/home-green/green-select-bg.png') no-repeat;
+    /* background:url('../../../../../assets/images/home-green/green-select-bg.png') no-repeat; */
+    background:url('@/assets/images/home-green/green-select-bg.png') no-repeat;
     background-size:100% 100%;
   }
   .costume-header_left {

src/views/vent/home/configurable/green/vent-Green.vue

@@ -76,7 +76,8 @@ onUnmounted(() => { });
   --image-monitor-goto: url('/@/assets/images/company/monitor-goto.png');
 
   width: 100%;
-  height: calc(100% - 52px);
+  // height: calc(100% - 52px);
+  height: 100%;
   color: @white;
   position: relative;
   background: #181b24;