- 修改配置

package.json

@@ -73,10 +73,16 @@
   "devDependencies": {
     "@babel/core": "7.0.0",
     "@babel/register": "7.0.0",
+    "@types/node": "^18.11.9",
+    "@types/vue-moment": "^4.0.3",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
     "@vue/cli-plugin-babel": "3.6.0",
     "@vue/cli-plugin-eslint": "^3.9.1",
+    "@vue/cli-plugin-typescript": "^4.5.15",
     "@vue/cli-plugin-unit-jest": "3.6.3",
     "@vue/cli-service": "3.6.0",
+    "@vue/eslint-config-typescript": "^4.0.0",
     "@vue/test-utils": "1.0.0-beta.29",
     "autoprefixer": "^9.8.8",
     "babel-core": "7.0.0-bridge.0",
@@ -105,15 +111,10 @@
     "serve-static": "^1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.2",
+    "typescript": "~4.1.5",
     "vue-baidu-map": "^0.21.22",
-    "vue-template-compiler": "2.6.10",
     "vue-echarts": "^4.1.0",
-    "@types/vue-moment": "^4.0.3",
-    "@typescript-eslint/eslint-plugin": "^6.5.0",
-    "@typescript-eslint/parser": "^6.5.0",
-    "@vue/cli-plugin-typescript": "^4.5.15",
-    "@vue/eslint-config-typescript": "^4.0.0",
-    "typescript": "~4.1.5",
+    "vue-template-compiler": "2.6.10",
     "vue-tsx-support": "^3.2.0"
   },
   "engines": {

src/views/dataBoard/smartTech/config/craftConfig.js

@@ -6,51 +6,54 @@
  * @FilePath: \dcWaterService\src\views\zhpt\scada\scadaCraftMap\craftConfig.js
  * @Description: 小工艺图
  */
-import { allConfig as thirdCraftConfig } from './craftConfig/thirdCraftConfig'
-import { allConfig as ylCraftConfig } from './craftConfig/ylCraftConfig'
-import { allConfig as mlCraftConfig } from './craftConfig/mlCraftConfig'
-import { allConfig as firstCraftConfig } from './craftConfig/firstCraftConfig'
-import { config as testConfig } from './craftConfig/testConfig'
-import { config as testConfig2 } from './craftConfig/testConfig2'
+import { config as maliConfig } from './craftConfig/maliCraftConfig'
+import { config as cidaConfig } from './craftConfig/cidaCraftConfig'
+import { config as kuanyuConfig } from './craftConfig/kuanyuCraftConfig'
+import { config as reheConfig } from './craftConfig/reheCraftConfig'
+import { config as yonglangConfig } from './craftConfig/yonglangCraftConfig'
+import { config as wangsuoConfig } from './craftConfig/wangsuoCraftConfig'
 
 export const config = [
   {
-    name: '三水厂',
+    name: '麻栗污水处理站',
+    active: true,
+    id: 'graphContainer',
+    config: maliConfig,
+    title: true
+  },
+  {
+    name: '茨达污水处理站',
     active: false,
     id: 'graphContainer1',
-    config: thirdCraftConfig,
+    config: cidaConfig,
     title: false
-  }, {
-    name: '银鹿水厂',
+  },
+  {
+    name: '宽裕污水处理站',
     active: false,
     id: 'graphContainer2',
-    config: ylCraftConfig,
+    config: kuanyuConfig,
     title: false
-  }, {
-    name: '麻栗水厂',
+  },
+  {
+    name: '热河污水处理站',
     active: false,
     id: 'graphContainer3',
-    config: mlCraftConfig,
+    config: reheConfig,
     title: false
-  }, {
-    name: '一水厂',
+  },
+  {
+    name: '永郎污水处理站',
     active: false,
     id: 'graphContainer4',
-    config: firstCraftConfig,
+    config: yonglangConfig,
     title: false
-  }, 
-  {
-    name: '麻栗污水处理站',
-    active: true,
-    id: 'graphContainer5',
-    config: testConfig,
-    title: true
   },
   {
-    name: '茨达污水处理站',
+    name: '王所污水处理站',
     active: false,
-    id: 'graphContainer6',
-    config: testConfig2,
+    id: 'graphContainer5',
+    config: wangsuoConfig,
     title: false
-  }
+  },
 ]

src/views/dataBoard/smartTech/config/craftConfig/testConfig.js

@@ -1,54 +0,0 @@
-export const config = [
-  // 点
-  { 'type': 'point', 'id': 'm1p1', 'name': '基准点1', 'x': [0, 0], 'y': [0.5, 0] }, 
-  { 'type': 'point', 'id': 'm1p2', 'name': '基准点2', 'x': [0, 150], 'y': [0.5, 0] },
-  { 'type': 'point', 'id': 'm1p3', 'name': '基准点3', 'x': [0, 300], 'y': [0.5, 0] },
-  { 'type': 'point', 'id': 'm1p4', 'name': '基准点4', 'x': [0, 450], 'y': [0.5, 0] },
-  { 'type': 'point', 'id': 'm1p5', 'name': '基准点5', 'x': [0, 600], 'y': [0.5, 0] },
-  { 'type': 'point', 'id': 'm1p6', 'name': '基准点6', 'x': [0, 750], 'y': [0.5, 0] },
-  { 'type': 'point', 'id': 'm1p7', 'name': '基准点7', 'x': [0, 900], 'y': [0.5, 0] },
-  { 'type': 'point', 'id': 'm1p8', 'name': '基准点8', 'x': [0, 1040], 'y': [0.5, 0] },
-  { 'type': 'point', 'id': 'm1p9', 'name': '基准点9', 'x': [0, 1040], 'y': [0.2, 0] },
-  { 'type': 'point', 'id': 'm1p10', 'name': '基准点10', 'x': [0, 1040], 'y': [0.8, 0] },
-
-  { 'type': 'point', 'id': 'm1p11', 'name': '基准点11', 'x': [0, 1120], 'y': [0.2, 0] },
-  { 'type': 'point', 'id': 'm1p12', 'name': '基准点12', 'x': [0, 1120], 'y': [0.8, 0] },
-  // 虚线点
-  { 'type': 'point', 'id': 'm1p13', 'name': '基准点13', 'x': [0, 300], 'y': [0.2, 0] },
-
-  { 'type': 'point', 'id': 'm1p14', 'name': '基准点14', 'x': [0, 670], 'y': [0.5, 0] },
-  { 'type': 'point', 'id': 'm1p15', 'name': '基准点15', 'x': [0, 670], 'y': [0.8, 0] },
-  { 'type': 'point', 'id': 'm1p16', 'name': '基准点16', 'x': [0, 900], 'y': [0.8, 0] },
-  // 线
-  { 'type': 'arrow', 'id': 'a1', 'from': 'm1p1', 'to': 'm1p8', 'style': 'strokeColor=#33f3fe;', 'flow': true },
-  { 'type': 'arrow', 'id': 'a2', 'from': 'm1p8', 'to': 'm1p9', 'style': 'strokeColor=#33f3fe;', 'flow': true },
-  { 'type': 'arrow', 'id': 'a3', 'from': 'm1p8', 'to': 'm1p10', 'style': 'strokeColor=#33f3fe;', 'flow': true },
-  { 'type': 'arrow', 'id': 'a4', 'from': 'm1p9', 'to': 'm1p11', 'style': 'strokeColor=#33f3fe;', 'flow': true },
-  { 'type': 'arrow', 'id': 'a5', 'from': 'm1p10', 'to': 'm1p12', 'style': 'strokeColor=#33f3fe;', 'flow': true },
-  // 虚线
-  { 'type': 'linedash', 'id': 'ld1', 'from': 'm1p3', 'to': 'm1p13', isVer: true },
-  { 'type': 'linedash', 'id': 'ld2', 'from': 'm1p13', 'to': 'm1p9', isVer: false, arrow: 'right' },
-
-  { 'type': 'linedash', 'id': 'ld3', 'from': 'm1p7', 'to': 'm1p16', isVer: true },
-  { 'type': 'linedash', 'id': 'ld4', 'from': 'm1p16', 'to': 'm1p15', isVer: false },
-  { 'type': 'linedash', 'id': 'ld5', 'from': 'm1p15', 'to': 'm1p14', isVer: true, arrow: 'top' },
-  
-
-  // 图片
-  { 'type': 'image', 'id': 'm1i1', 'name': '格栅机', 'text': '格栅机', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p2', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 100, 'src': '格栅池.gif' },
-  { 'type': 'image', 'id': 'm1i2', 'name': '调节池', 'text': '调节池', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p3', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 100, 'src': '调节池.gif' },
-  { 'type': 'image', 'id': 'm1i3', 'name': '缺氧池', 'text': '缺氧池', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p4', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 100, 'src': '缺氧池.gif' },
-  { 'type': 'image', 'id': 'm1i4', 'name': '好氧池', 'text': '好氧池', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p5', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 100, 'src': '好氧池.gif' },
-  { 'type': 'image', 'id': 'm1i5', 'name': '缺氧池', 'text': '缺氧池', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p6', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 100, 'src': '缺氧池.gif' },
-  { 'type': 'image', 'id': 'm1i6', 'name': '好氧池', 'text': '好氧池', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p7', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 100, 'src': '好氧池.gif' },
-  { 'type': 'image', 'id': 'm1i7', 'name': '二沉池', 'text': '二沉池', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p8', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 100, 'src': '二沉池.gif' },
-  { 'type': 'image', 'id': 'm1i8', 'name': '污泥池', 'text': '污泥池', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p9', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 120, 'src': '储泥池.gif' },
-  { 'type': 'image', 'id': 'm1i9', 'name': '高负荷地下渗透田', 'text': '高负荷地下渗透田', 'class': 'onWhiteText', 'titleStyle': 'font-size:14px;', 'point': [0, 0.9], 'from': 'm1p10', 'margin': { 'x': [0, -50], 'y': [0, 30] }, 'width': 100, 'height': 100, 'src': '高效沉淀池.gif' },
-  
-  // 文字
-  { 'type': 'text', 'id': 'm1t1', 'text': '生活污水', 'from': 'm1p1', 'point': [0, 0.5], 'margin': { 'x': [0, 0], 'y': [0, -20] }},
-  { 'type': 'text', 'id': 'm1t2', 'text': '泥渣', 'from': 'm1p13', 'point': [0, 0.5], 'margin': { 'x': [0.3, 30], 'y': [0, -20] }},
-  { 'type': 'text', 'id': 'm1t3', 'text': '污泥回流', 'from': 'm1p15', 'point': [1, 0.5], 'margin': { 'x': [0.1, 30], 'y': [0, -20] }},
-  { 'type': 'text', 'id': 'm1t4', 'text': '定期清运', 'from': 'm1p11', 'point': [0, 0.5], 'margin': { 'x': [0, 0], 'y': [0, -20] }},
-  { 'type': 'text', 'id': 'm1t5', 'text': '达标后消毒排放', 'from': 'm1p12', 'point': [0, 0.5], 'margin': { 'x': [0, 0], 'y': [0, 20] }},
-]

src/views/operationCenter/common/gis/GisUtil.ts

@@ -1,6 +1,6 @@
 
 import { appconfig, geoServerConfig } from 'staticPub/config'
-import Map from 'ol/Map']
+import Map from 'ol/Map'
 import { defaults as controls } from 'ol/control'
 import View from 'ol/View'
 

src/views/zhpt/basicInfoManage/waterloggingMng/widget.vue

@@ -117,7 +117,6 @@ import { getDicValueByKeys } from '@/api/base'
 import { getPointFloodPage, deletePointFlood } from '@/api/basicData/waterlogging.ts'
 import { appconfig } from 'staticPub/config'
 import { getMonitorsiteList, querySiteIndexById } from '@/api/basicData/videoManage.ts'
-
 export default {
   name: 'waterloggingMng',
   components: { FormDialog },

tsconfig.json

@@ -27,6 +27,6 @@
     "extensions": [".vue"]
   },
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue", "tests/**/*.ts", "tests/**/*.tsx"],
-  "exclude": ["node_modules", "src/views/zhpt", "src/views/currentSystem", "src/views/comprehensivePage"],
+  "exclude": ["node_modules", "src/views/zhpt", "src/views/currentSystem"],
   "strictFunctionTypes": false
 }