[Mod 0000] 修改模型电子屏底部文字

public/js/config.js

@@ -14,7 +14,7 @@ const VENT_PARAM = {
   simulatedPassword: '',
   showReport: false,
   isoOpenSso: 'false',
-  modalText: '', //国家能源集团沙吉海煤矿 //三维模型电子屏底部文字配置
+  modalText: '煤科通安（北京）智控科技有限公司研制', //国家能源集团沙吉海煤矿 //三维模型电子屏底部文字配置
   productionCrlPlatformUrl: '', // 神东要求主扇的控制功能改回跳转至生产管控平台,这里填写上生产管控地址后（例如填写："https://www.baidu.com/"），就可以跳转了
   safetyCrlPlatformUrl: '', // 神东要求安全监控跳转至安全监控管控平台,这里填写上生产管控地址后（例如填写："https://www.baidu.com/"），就可以跳转了
   gasControlMock: true, // 项目关于瓦斯自主调控，是否模拟演示， true: 真实调控； false 模拟调控

src/router/helper/menuHelper.ts

@@ -103,12 +103,6 @@ export async function addBrowseLog(
   from: AppRouteRecordRaw | RouteLocationNormalized,
   ignorePaths: string[]
 ): Promise<void> {
-  const currentPort = window.location.port;
-
-  if (currentPort === '8062') {
-    return Promise.resolve();
-  }
-
   // 在尝试添加浏览器记录时，应该先发出一个结束上次记录的请求（如有）再发出一个开发此次记录的请求
   const url = '/sys/log/addBrowseLog';
 

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

@@ -1206,7 +1206,7 @@
           // } else {
           //   leftColumns1.value[2].value = '-';
           // }
-          console.log(data.airLeakageRatePerHundredX, data.airLeakageRatePerHundred_merge, '漏风率数据');
+          // console.log(data.airLeakageRatePerHundredX, data.airLeakageRatePerHundred_merge, '漏风率数据');
           leftColumns1.value[2].value =
             data.airLeakageRatePerHundredX > 0 ? (data.airLeakageRatePerHundred_merge <= data.airLeakageRatePerHundredX ? '正常' : '不满足') : '-';
         });

src/views/vent/monitorManager/gateMonitor/gate.threejs.three.hsw.ts

@@ -172,7 +172,7 @@ class FmHsw3 {
         const planeMesh = new THREE.Mesh(planeGeometry, textMaterial);
         planeMesh.name = 'monitorText';
         planeMesh.scale.set(0.002, 0.002, 0.002);
-        planeMesh.position.set(4.205, 0.09, -0.39);
+        planeMesh.position.set(3.205, 0.09, -0.39);
         this.group.add(planeMesh);
       }
     });

src/views/vent/monitorManager/gateMonitor/gate.threejs.three.ts

@@ -85,7 +85,7 @@ class Fm2 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 11) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程控制自动风门`,
@@ -172,7 +172,7 @@ class Fm2 {
         const planeMesh = new THREE.Mesh(planeGeometry, textMaterial);
         planeMesh.name = 'monitorText';
         planeMesh.scale.set(0.002, 0.002, 0.002);
-        planeMesh.position.set(4.205, 0.09, -0.39);
+        planeMesh.position.set(4.105, 0.09, -0.39);
         this.group.add(planeMesh);
       }
     });

src/views/vent/monitorManager/gateMonitor/gate.threejs.window.hjg.ts

@@ -74,7 +74,7 @@ class FmDcHJG {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 7;
 
     const textArr = [
       {

src/views/vent/monitorManager/gateMonitor/gate.threejs.window.ts

@@ -74,7 +74,7 @@ class FmDc {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 7;
 
     const textArr = [
       {

src/views/vent/monitorManager/gateMonitor/gate.threejs.window.zhq.ts

@@ -74,7 +74,7 @@ class FmDcZHQ {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 7;
 
     const textArr = [
       {

src/views/vent/monitorManager/gateMonitor/gate.threejs.xc.ts

@@ -105,7 +105,7 @@ class FmXR {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 9;
     const textArr = [
       {
         text: `远程控制自动风门`,

src/views/vent/monitorManager/gateMonitor/gate.threejs.xr.ts

@@ -77,7 +77,7 @@ class FmXR {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 9;
     const textArr = [
       {
         text: `远程控制自动风门`,

src/views/vent/monitorManager/gateMonitor/gate.threejs.yj.ts

@@ -104,7 +104,7 @@ class FmYj {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 9;
     const textArr = [
       {
         text: `远程控制自动风门`,

src/views/vent/monitorManager/gateMonitor/gate.threejs.yy.ts

@@ -79,7 +79,7 @@ class Fm1 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 11) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 11) * 9;
     const textArr = [
       {
         text: `远程控制自动风门`,

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

@@ -66,7 +66,7 @@ class ddFc_5 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 120 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -58,7 +58,7 @@ class ddFc_4 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 90 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -60,7 +60,7 @@ class ddFc_2 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 90 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -62,7 +62,7 @@ class ddFc_7 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 90 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -59,7 +59,7 @@ class singleWindowBet {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 90 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -59,7 +59,7 @@ class ddFc_6 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 90 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -58,7 +58,7 @@ class ddFc_lt {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 90 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -119,11 +119,11 @@ class singleWindowXk {
         y: 250,
       },
       {
-        text: History_Type['type'] == 'remote' ? `国能神东煤炭集团监制` : '煤炭科学技术研究院有限公司研制',
+        text: History_Type['type'] == 'remote' ? `国能神东煤炭集团监制` : '煤科通安（北京）智控科技有限公司研制',
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',
-        x: History_Type['type'] == 'remote' ? 90 : 30,
+        x: History_Type['type'] == 'remote' ? 90 : 20,
         y: 300,
       },
     ];

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

@@ -43,7 +43,7 @@ class ddFc_1 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 90 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -61,7 +61,7 @@ class threeFc_8 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 120 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 90 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -62,7 +62,7 @@ class sdFc_1 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 120 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `${sysOrgCode == 'zlnxnywwek' ? selectData.strinstallpos : '远程控制自动风窗'}`, //王洼二矿需要特殊处理

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

@@ -43,7 +43,7 @@ class sdFc_3 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 125 - (screenDownText.length - 10) * 10;
+    const screenDownTextX = 125 - (screenDownText.length - 10) * 11;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -45,7 +45,7 @@ class sdFc_4 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 125 - (screenDownText.length - 10) * 10;
+    const screenDownTextX = 125 - (screenDownText.length - 10) * 11;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -65,7 +65,7 @@ class sdFc_2 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 120 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 120 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -45,7 +45,7 @@ class ddFc_2 {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 120 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 120 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `远程定量调节自动风窗`,

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

@@ -72,7 +72,7 @@ class SdFcZhq {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 80 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 80 - (screenDownText.length - 10) * 7;
 
     const textArr = [
       {

src/views/vent/monitorManager/windrectMonitor/dantou.threejs.ts

@@ -56,7 +56,7 @@ class ddWindRect {
       ? `国能神东煤炭集团监制`
       : '煤炭科学技术研究院有限公司研制';
 
-    const screenDownTextX = 110 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 100 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `测风实时数据`,

src/views/vent/monitorManager/windrectMonitor/duishe.threejs.ts

@@ -144,7 +144,7 @@ class dsWindRect {
         y: 247,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: `煤科通安（北京）智控科技有限公司研制`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',

src/views/vent/monitorManager/windrectMonitor/duisheFixed.threejs.ts

@@ -55,9 +55,9 @@ class fixedWindRect {
       ? VENT_PARAM['modalText']
       : History_Type['type'] == 'remote'
       ? `国能神东煤炭集团监制`
-      : '煤炭科学技术研究院有限公司研制';
+      : '煤科通安（北京）智控科技有限公司研制';
 
-    const screenDownTextX = 110 - (screenDownText.length - 10) * 6;
+    const screenDownTextX = 100 - (screenDownText.length - 10) * 7;
     const textArr = [
       {
         text: `测风实时数据`,
@@ -141,7 +141,7 @@ class fixedWindRect {
         const planeMesh = new THREE.Mesh(planeGeometry, textMaterial);
         planeMesh.name = 'monitorText';
         planeMesh.scale.set(0.23, 0.23, 0.23);
-        planeMesh.position.set(-2.38, 0.068, -0.4);
+        planeMesh.position.set(-2.44, 0.068, -0.4);
         this.group?.add(planeMesh);
       }
     });

src/views/vent/monitorManager/windrectMonitor/longmen.threejs.ts

@@ -170,7 +170,7 @@ class lmWindRect {
         y: 245,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: `煤科通安（北京）智控科技有限公司研制`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',

src/views/vent/monitorManager/windrectMonitor/longmenSide.threejs.ts

@@ -123,7 +123,7 @@ class lmWindRectSide {
         y: 245,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: `煤科通安（北京）智控科技有限公司研制`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',

src/views/vent/monitorManager/windrectMonitor/zhedie.threejs.ts

@@ -164,7 +164,7 @@ class zdWindRect {
         y: 252,
       },
       {
-        text: `煤炭科学技术研究院有限公司研制`,
+        text: `煤科通安（北京）智控科技有限公司研制`,
         font: 'normal 28px Arial',
         color: '#009900',
         strokeStyle: '#002200',