1. 项目配置新增矿井数据来源

.env.development

@@ -6,6 +6,7 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
 #VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
+#VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://182.92.126.35:9999/upload"],["/documents", "http://182.92.126.35:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://182.92.126.35:8051"]]
 VITE_PROXY = [["/jeecgsystem","http://192.168.183.88:9999"],["/upload","http://192.168.183.88:9999/upload"],["/documents", "http://192.168.183.88:9050"],["/modelreq", "http://192.168.183.88:9999"],["/webRtc", "http://192.168.183.88:8051"]]
 # VITE_PROXY = [["/jeecgsystem","http://10.10.150.72:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
 #VITE_PROXY = [["/jeecgsystem","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
@@ -28,6 +29,7 @@ VITE_GLOB_API_URL_PREFIX=
 
 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 #VITE_APP_SUB_APP = [["micro-need-air", "//10.10.150.72:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
-VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
+#VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.88:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
+VITE_APP_SUB_APP = [["micro-vent-3dModal", "//192.168.183.154:8091/", "micro-vent-3dModal"], ["micro-need-air", "//192.168.183.88:8093/", "micro-need-air"], ["micro-fire-front", "//localhost:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/", "micro-vent-3dModal"], ["micro-need-air", "//182.92.126.35:8099/", "micro-need-air"], ["micro-fire-front", "//182.92.126.35:8097/", "fire-Micro"]]
 # VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]

src/design/themify/default.less

@@ -21,7 +21,7 @@ html {
   --vent-modal-box-shadow: #2b87ff;
   --vent-modal-bg2: linear-gradient(#2cd1ff55, #1eb0ff55);
 
-  --vent-tabs-bg: linear-gradient(#0091aa33, #2081ff11);
+  --vent-tabs-bg: linear-gradient(#0030497d, #2081ff11);
   --vent-tabs-table-thead: #3d9dd433;
   --vent-tabs-action-link: #28f3f3;
 

src/hooks/setting/index.ts

@@ -7,7 +7,8 @@ let domainUrl = '',
   logoUrl = '',
   homePath = '',
   sysOrgCode = '',
-  title = '';
+  title = '',
+  sysDataType = 'monitor';
 
 const getUrl = () => {
   return new Promise((resolve, reject) => {
@@ -22,9 +23,10 @@ const getUrl = () => {
         .then((response) => response.json())
         .then((data) => {
           if (data.result) {
-            title = data.result['systemTitle'] ? data.result['systemTitle'] : '';
-            logoUrl = data.result['logoIcon'] ? data.result['logoIcon'] : '';
-            sysOrgCode = data.result['sysOrgCode'] ? data.result['sysOrgCode'] : '';
+            if (data.result['systemTitle']) title = data.result['systemTitle'];
+            if (data.result['logoIcon']) logoUrl = data.result['logoIcon'];
+            if (data.result['sysOrgCode']) sysOrgCode = data.result['sysOrgCode'];
+            if (data.result['sysDataType']) sysDataType = data.result['sysDataType'];
             // getHomePath是以前的代码，留下做兼容，获取到一个默认的首页路径
             // 然后正常按配置走，默认使用上面的首页路径
             const homePathKey = data.result['defaultTheme'] ? data.result['defaultTheme'] : '';
@@ -99,6 +101,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     modalUrlArr: VITE_3D_MODAL_ARR,
     homePath: homePath,
     sysOrgCode: sysOrgCode,
+    sysDataType: sysDataType,
   };
   return glob as Readonly<GlobConfig>;
 };

src/router/guard/index.ts

@@ -31,13 +31,13 @@ export function setupRouterGuard(router: Router) {
   createStateGuard(router);
 }
 const glob = useGlobSetting();
+
 RootRoute.redirect = glob.homePath || PageEnum.BASE_HOME;
 /**
  * Hooks for handling page state
  */
 function createPageGuard(router: Router) {
   const loadedPageMap = new Map<string, boolean>();
-  // debugger;
   router.beforeEach(async (to, from) => {
     if (from.path.startsWith('/micro-') && !to.path.startsWith('/micro-')) {
       unmountMicroApps(['/' + from.path.split('/')[1]]);

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

@@ -68,18 +68,18 @@
     const selectData = fanList.find((item) => item['deviceID'] == val);
     if (selectData) {
       fjStatus.value =
-        selectData.readData.Fan1StartStatus && selectData.readData.Fan1StartStatus == '1'
+        selectData.readData.Fan1StartStatus && selectData.readData.Fan1StartStatus == 1
           ? sysOrgCode !== 'ymdnymdn'
             ? '主机'
             : '1#风机'
-          : selectData.readData.Fan2StartStatus && selectData.readData.Fan2StartStatus == '1'
+          : selectData.readData.Fan2StartStatus && selectData.readData.Fan2StartStatus == 1
           ? sysOrgCode !== 'ymdnymdn'
             ? '备机'
             : '2#风机'
           : selectData.readData.Fan1StartStatus &&
-            selectData.readData.Fan1StartStatus == '0' &&
+            selectData.readData.Fan1StartStatus == 0 &&
             selectData.readData.Fan2StartStatus &&
-            selectData.readData.Fan2StartStatus == '0'
+            selectData.readData.Fan2StartStatus == 0
           ? '断开'
           : '-';
       echartData.xdata = selectData.readData.windQuantity1 || selectData.readData.windQuantity1_merge;

src/views/vent/monitorManager/comment/DeviceEcharts.vue

@@ -3,7 +3,7 @@
     <a-select ref="select" v-model:value="chartsType" size="small" style="position: absolute; z-index: 99; top: 2px; left: 2px; width: 98px">
       <!-- <a-select-option value="listMonitor">实时监测</a-select-option> -->
       <a-select-option value="history">历史记录</a-select-option>
-      <a-select-option value="detail">详情监测</a-select-option>
+      <!-- <a-select-option value="detail">详情监测</a-select-option> -->
     </a-select>
 
     <!-- <div class="charts-box" v-if="chartsType === 'listMonitor'" style="position: absolute; top: 20px">

src/views/vent/monitorManager/windowMonitor/index.vue

@@ -31,6 +31,13 @@
           <!-- <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(3)">自主联动控制开启</div>
           <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(4)">自主联动控制停止</div> -->
         </div>
+
+        <div class="row" v-if="hasPermission('window:fourAreaControl')">
+          <div class="button-box" @click="setFourAngle('frontSetValue1', '窗1开度设置')">窗1开度</div>
+          <div class="button-box" @click="setFourAngle('frontSetValue2', '窗2开度设置')">窗2开度</div>
+          <div class="button-box" @click="setFourAngle('frontSetValue3', '窗3开度设置')">窗3开度</div>
+          <div class="button-box" @click="setFourAngle('frontSetValue4', '窗4开度设置')">窗4开度</div>
+        </div>
         <div class="row" v-if="Number(selectData.nwindownum) == 1">
           <div v-if="hasPermission('window:AreaControl')" class="button-box" @click="setArea(1)">设定风窗面积</div>
           <div v-if="hasPermission('window:showAngle')" class="button-box" @click="setAngle(1)">设定风窗角度</div>
@@ -404,6 +411,12 @@
     }
   };
 
+  const setFourAngle = (flag, title) => {
+    modalType.value = flag + '';
+    modalTitle.value = title;
+    modalIsShow.value = true;
+  };
+
   const handleOK = (passWord, handlerState, windowAngleNum) => {
     if (!passWord && !globalConfig?.simulatedPassword) {
       message.warning('请输入密码！');
@@ -460,8 +473,10 @@
       } else if (handlerState == 5 || handlerState == 6) {
         data.paramcode = 'frontSetValue';
         data.value = handlerState == 5 ? selectData.maxarea : 0;
+      } else if (handlerState.startsWith('frontSetValue')) {
+        data.paramcode = handlerState;
+        data.value = windowAngleNum;
       }
-
       deviceControlApi(handlerState == 3 ? params : data)
         .then((res) => {
           if (res.success) {

src/views/vent/monitorManager/windowMonitor/modal.vue

@@ -29,6 +29,12 @@
           <a-input-number size="small" placeholder="0" :min="0" v-model:value="ch4" />
         </div>
       </template>
+      <template v-if="type.startsWith('frontSetValue')">
+        <div class="vent-flex-row input-box">
+          <div class="label">风窗角度：</div>
+          <a-input-number size="small" placeholder="0" :min="0" v-model:value="area" />
+        </div>
+      </template>
       <div v-if="!globalConfig?.simulatedPassword" class="vent-flex-row input-box">
         <div class="label">操作密码：</div>
         <a-input size="small" type="password" v-model:value="passWord" />

src/views/vent/monitorManager/windowMonitor/window.threejs.ts

@@ -234,7 +234,7 @@ export const setModelType = (type) => {
 
 export const mountedThree = (playerDom) => {
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtbetmk';
+  // const sysOrgCode = 'sdmtjtbltmk';
   return new Promise(async (resolve) => {
     model = new UseThree('#window3D');
     if (!model || !model.renderer || !model.camera) return;

src/views/vent/sys/setting/setting.data.ts

@@ -99,6 +99,28 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
+    field: 'dataType',
+    label: '矿井数据来源',
+    component: 'RadioGroup',
+    defaultValue: 1,
+    componentProps: {
+      options: [
+        {
+          label: '报表',
+          value: 'report',
+        },
+        {
+          label: '监测值',
+          value: 'monitor',
+        },
+        {
+          label: '两种切换',
+          value: 'all',
+        },
+      ],
+    },
+  },
+  {
     field: 'loginBack',
     label: '登录背景图',
     component: 'JImageUpload',

types/config.d.ts

@@ -158,6 +158,7 @@ export interface GlobConfig {
   modalUrlArr: string;
   homePath: string;
   sysOrgCode: string;
+  sysDataType: string;
   // isSimulate: boolean
 }
 export interface GlobEnvConfig {