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

src/design/themify/default.less

@@ -47,8 +47,8 @@ html {
   --vent-configurable-home-light-border: #3df6ff;
 
   --vent-gas-list-item-bg-img: linear-gradient(to right, #39a3ff55, #3977e500);
-  --vent-gas-tab-bg: #10427a;
-  --vent-gas-tab-bg-avtived: #166ab5;
+  --vent-gas-tab-bg: #0f3656;
+  --vent-gas-tab-bg-avtived: #1e7890;
   --vent-gas-tab-border: #5590d8;
   --vent-gas-primary-text: #00c8d9;
   --vent-gas-primary-bg: #1673bf;
@@ -63,7 +63,6 @@ html {
   --vent-warn-tab-border: #166ab5;
   --vent-warn-tab-bg-actived: #209dfc;
 
-  --vent-balancePress-fan-bg-default: linear-gradient( to right, #071D3C22, #035EA266);
-  --vent-balancePress-fan-bg-select: linear-gradient(to right, #21A6CE99, #052d3d99);
-
+  --vent-balancePress-fan-bg-default: linear-gradient(to right, #071d3c22, #035ea266);
+  --vent-balancePress-fan-bg-select: linear-gradient(to right, #21a6ce99, #052d3d99);
 }

src/layouts/default/header/components/weatherBroadcast.vue

@@ -145,15 +145,15 @@ export default defineComponent({
     });
 
     const iconMap = {
-      晴: new URL('../../../../assets/icons/sun.svg', import.meta.url).href,
-      雨: new URL('../../../../assets/icons/rain.svg', import.meta.url).href,
-      雪: new URL('../../../../assets/icons/snow.svg', import.meta.url).href,
-      多云: new URL('../../../../assets/icons/cloud.svg', import.meta.url).href,
-      风: new URL('../../../../assets/icons/wind.svg', import.meta.url).href,
+      晴: new URL('/src/assets/icons/sun.svg', import.meta.url).href,
+      雨: new URL('/src/assets/icons/rain.svg', import.meta.url).href,
+      雪: new URL('/src/assets/icons/snow.svg', import.meta.url).href,
+      多云: new URL('/src/assets/icons/clound.svg', import.meta.url).href,
+      风: new URL('/src/assets/icons/wind.svg', import.meta.url).href,
     };
 
     function parseWeatherData(res) {
-      return iconMap[res] || new URL('../../../../assets/icons/sun.svg', import.meta.url).href;
+      return iconMap[res] || new URL('/src/assets/icons/sun.svg', import.meta.url).href;
     }
     function showWarningBroad() {
       isShowWeatherBroad.value = !isShowWeatherBroad.value;

src/views/vent/gas/components/tab/baseTab.vue

@@ -3,7 +3,7 @@
     <div
       v-for="tab in tabs"
       :key="tab.id"
-      class="flex-1 cursor-pointer pt-5px pb-5px"
+      class="flex-1 cursor-pointer pt-1px pb-1px"
       :class="{ tabs_pane_actived: id === tab.id }"
       @click="clickHandler(tab.id)"
     >

src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -72,14 +72,15 @@ export function getMonitorComponent() {
     case 'sdmtjtyjlmk': //榆家梁
     case 'sdmtjtcctmk': //榆家梁
     case 'sdmtjtswmk': //上湾
+    case 'zmhjhzmy': // 韩咀
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
       break;
-      case 'sdmtjtwlmlmk': //乌兰木伦
+    case 'sdmtjtwlmlmk': //乌兰木伦
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
       break;
     default:
-      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
-    // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
+      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.cct.vue'));
@@ -92,7 +93,7 @@ export function getMonitorComponent() {
   const GaspatrolModal = defineAsyncComponent(() => import('./modal/gaspatrol.modal.vue'));
   const WisdomBallModal = defineAsyncComponent(() => import('./modal/wisdomball.modal.vue'));
 
-  return {FiremonModal, FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal, WisdomBallModal };
+  return { FiremonModal, FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal, WisdomBallModal };
 }
 
 export const chartsColumnList = [

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

@@ -173,24 +173,21 @@ export const destroy = () => {
 
 // 为了兼容性而添加的方法导出
 export function addText(d, e) {
-  if (modelContextList[0]) {
-    // @ts-ignore
-    modelContextList[0].context?.addText(d);
-    modelContextList[1].context?.addText(e);
-    modelContextList[2].context?.addText(e);
-  }
+  if (modelContextList[0]) modelContextList[0].context?.addText(d);
+  if (modelContextList[1]) modelContextList[1].context?.addText(e);
+  if (modelContextList[2]) modelContextList[2].context?.addText(d);
 }
 export function addCssText() {
-  if (modelContextList[0]) {
-    // @ts-ignore
-    modelContextList[0].context?.addCssText();
-    modelContextList[2].context?.addCssText();
-  }
+  if (modelContextList[0] && modelContextList[0].context && modelContextList[0].context['addCssText']) modelContextList[0].context['addCssText']();
+  if (modelContextList[2] && modelContextList[2].context && modelContextList[2].context['addCssText']) modelContextList[2].context['addCssText']();
 }
 export function playSmoke(d) {
   if (modelContextList[0]) {
     // @ts-ignore
     modelContextList[0].context?.playSmoke(d);
+  }
+  if (modelContextList[2]) {
+    // @ts-ignore
     modelContextList[2].context?.playSmoke(d);
   }
 }