zxh 1 рік тому
батько
коміт
a71178f401
43 змінених файлів з 25 додано та 25 видалено
  1. 0 0
      src/api/yizhuan/scada.js
  2. 0 0
      src/assets/yizhuan/point.png
  3. 0 0
      src/assets/yizhuan/point1.png
  4. 0 0
      src/assets/yizhuan/point2.png
  5. 0 0
      src/assets/yizhuan/point3.png
  6. 1 1
      src/layout/components/loadComps.js
  7. 7 7
      src/router/_import.js
  8. 4 4
      src/views/components/olMap/index.vue
  9. 1 1
      src/views/currentSystem/regionalMetering/statisticalReport/minuteWaterReport.vue
  10. 1 1
      src/views/shiYuan/common/MonitorCurve/index.vue
  11. 0 0
      src/views/yizhuan/components/ExportBtn.vue
  12. 0 0
      src/views/yizhuan/components/VolatileDetail.vue
  13. 0 0
      src/views/yizhuan/components/WaterAmountAnalyse.vue
  14. 0 0
      src/views/yizhuan/configManage/deviceManage/WaterDetail.vue
  15. 3 3
      src/views/shiYuan/configManage/deviceManage/widget.vue
  16. 1 1
      src/views/shiYuan/configManage/indicatorsManage/WaterDetail.vue
  17. 1 1
      src/views/shiYuan/configManage/indicatorsManage/widget.vue
  18. 0 0
      src/views/yizhuan/configManage/waringTypeManage/WaterDetail.vue
  19. 1 1
      src/views/shiYuan/configManage/waringTypeManage/widget.vue
  20. 0 0
      src/views/yizhuan/monitoringCenter/dayilyReport/images/statistic.png
  21. 0 0
      src/views/yizhuan/monitoringCenter/dayilyReport/reportTable.vue
  22. 0 0
      src/views/yizhuan/monitoringCenter/dayilyReport/widget.vue
  23. 2 2
      src/views/shiYuan/monitoringCenter/monitorPopup/index.vue
  24. 0 0
      src/views/yizhuan/monitoringCenter/partitionManage/components/dmaSettingDialog/index.vue
  25. 0 0
      src/views/yizhuan/monitoringCenter/partitionManage/widget.vue
  26. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/craftConfig.js
  27. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/createSiteCraft.js
  28. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/2D74E7.png
  29. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/999999.png
  30. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/Craft.png
  31. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/F65252.png
  32. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/S.jpg
  33. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/line.png
  34. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/power.png
  35. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/site1.png
  36. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/site2.png
  37. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/site3.png
  38. 0 0
      src/views/yizhuan/monitoringCenter/scadaMonitor/images/site4.png
  39. 2 2
      src/views/shiYuan/monitoringCenter/scadaMonitor/widget.vue
  40. 0 0
      src/views/yizhuan/statisticalAnalysis/leakageRate/widget.vue
  41. 0 0
      src/views/yizhuan/statisticalAnalysis/minStroomAnalyse/widget.vue
  42. 0 0
      src/views/yizhuan/statisticalAnalysis/waterSupplyReport/widget.vue
  43. 1 1
      src/views/zhpt/index.vue

src/api/shiYuan/scada.js → src/api/yizhuan/scada.js


src/assets/shiyuan/point.png → src/assets/yizhuan/point.png


src/assets/shiyuan/point1.png → src/assets/yizhuan/point1.png


src/assets/shiyuan/point2.png → src/assets/yizhuan/point2.png


src/assets/shiyuan/point3.png → src/assets/yizhuan/point3.png


+ 1 - 1
src/layout/components/loadComps.js

@@ -10,7 +10,7 @@ requireComponent.keys().forEach(fileName => {
   // resultComps[files[files.length - 2]] = comp.default
   const comp = requireComponent(fileName)
   const files = fileName.replace(/^\.\/(.*)\.\w+$/, '$1').split('/')
-  if (['shiYuan','mapView', 'components'].includes(files[0])) {
+  if (['yizhuan','mapView', 'components'].includes(files[0])) {
     const names = [...files]
     names.pop()
     resultComps[`/${names.join('/')}`] = comp.default

+ 7 - 7
src/router/_import.js

@@ -32,27 +32,27 @@ const map = {
   zoningManage: () =>
     import("@/views/currentSystem/regionalMetering/DMAManage"), // DMA分区
 
-  //DMA分区子系统 /shiYuan//leakageRate
+  //DMA分区子系统 /yizhuan//leakageRate
   DMAHomePage: () =>
     import("@/views/currentSystem/regionalMetering/DMAHomePage"), // DMA分区首页
   sheetsForObserve: () =>
     import("@/views/currentSystem/regionalMetering/zone/sheetsForObserve"), // 区域视察表
   minStroomAnalyse: () =>
-    import("@/views/shiYuan/statisticalAnalysis/minStroomAnalyse/widget"), // 夜间最小流量
+    import("@/views/yizhuan/statisticalAnalysis/minStroomAnalyse/widget"), // 夜间最小流量
   minuteWaterReport: () =>
     import(
       "@/views/currentSystem/regionalMetering/statisticalReport/minuteWaterReport"
     ), // 统计报表-分时用水统计
   waterSupplyReport: () =>
-    import("@/views/shiYuan/statisticalAnalysis/waterSupplyReport/widget"), // 供水量报表
+    import("@/views/yizhuan/statisticalAnalysis/waterSupplyReport/widget"), // 供水量报表
   leakageRate: () =>
-    import("@/views/shiYuan/statisticalAnalysis/leakageRate/widget"), // 统计分析-漏损率指标分析
+    import("@/views/yizhuan/statisticalAnalysis/leakageRate/widget"), // 统计分析-漏损率指标分析
   dayilyReport: () =>
-    import("@/views/shiYuan/monitoringCenter/dayilyReport/widget"), // 监测日报
+    import("@/views/yizhuan/monitoringCenter/dayilyReport/widget"), // 监测日报
 
   //配置管理
   indicatorsManage: () =>
-    import("@/views/shiYuan/configManage/indicatorsManage/widget"), // 指标类型管理
+    import("@/views/yizhuan/configManage/indicatorsManage/widget"), // 指标类型管理
   waringTypeManage: () =>
-    import("@/views/shiYuan/configManage/waringTypeManage/widget"), // 报警类型管理
+    import("@/views/yizhuan/configManage/waringTypeManage/widget"), // 报警类型管理
 };

+ 4 - 4
src/views/components/olMap/index.vue

@@ -41,9 +41,9 @@ import { mapConfig } from "@/views/components/olMap/mapConfig";
 import elementResizeDetectorMaker from "element-resize-detector";
 import measureTool from "@/views/components/measureTool/index.vue";
 import layerControl from "@/views/components/layerControl/widget.vue";
-import monitorPopup from "@/views/shiYuan/monitoringCenter/monitorPopup/index.vue";
+import monitorPopup from "@/views/yizhuan/monitoringCenter/monitorPopup/index.vue";
 // api
-import { queryScadaData } from "@/api/shiYuan/scada";
+import { queryScadaData } from "@/api/yizhuan/scada";
 export default {
   components: {
     measureTool,
@@ -252,7 +252,7 @@ export default {
           feature.setStyle(
             new Style({
               image: new Icon({
-                src: require(`@/assets/shiyuan/point.png`),
+                src: require(`@/assets/yizhuan/point.png`),
               }),
             })
           );
@@ -357,7 +357,7 @@ export default {
     createFeatureStyle(text) {
       return new Style({
         image: new Icon({
-          src: require("@/assets/shiyuan/point1.png"),
+          src: require("@/assets/yizhuan/point1.png"),
         }),
         text: new Text({
           offsetY: 40,

+ 1 - 1
src/views/currentSystem/regionalMetering/statisticalReport/minuteWaterReport.vue

@@ -118,7 +118,7 @@ import TableItem from '@/components/TableAuto'
 import comMixins from '@/views/mixins/comMixins'
 import { getSysCommonCode } from "@/api/dataCenter";
 import { getWaterTimeTotal, getWaterTimeFlowDetail } from '@/api/DMA/workbench'
-import { queryDevice, queryAlarmManageList } from "@/api/shiYuan/scada";
+import { queryDevice, queryAlarmManageList } from "@/api/yizhuan/scada";
 import { getDmaLevel, getYearReportForm, exportReportForm } from '@/api/DMA/zoningManage'
 
 const elementResizeDetectorMaker = require('element-resize-detector')

+ 1 - 1
src/views/shiYuan/common/MonitorCurve/index.vue

@@ -231,7 +231,7 @@
 
 <script>
 // api
-import { queryScadaData, getScadaInfo,exportScadaInfo } from "@/api/shiYuan/scada";
+import { queryScadaData, getScadaInfo,exportScadaInfo } from "@/api/yizhuan/scada";
 
 import elementResizeDetectorMaker from "element-resize-detector";
 

src/views/shiYuan/components/ExportBtn.vue → src/views/yizhuan/components/ExportBtn.vue


src/views/shiYuan/components/VolatileDetail.vue → src/views/yizhuan/components/VolatileDetail.vue


src/views/shiYuan/components/WaterAmountAnalyse.vue → src/views/yizhuan/components/WaterAmountAnalyse.vue


src/views/shiYuan/configManage/deviceManage/WaterDetail.vue → src/views/yizhuan/configManage/deviceManage/WaterDetail.vue


+ 3 - 3
src/views/shiYuan/configManage/deviceManage/widget.vue

@@ -150,7 +150,7 @@ import {
   editDevice,
   deleteDevice,
   queryDevice,
-} from "@/api/shiYuan/scada";
+} from "@/api/yizhuan/scada";
 
 export default {
   name: "DeviceManage",
@@ -340,7 +340,7 @@ export default {
         source: new VectorSource(),
         style: new Style({
           image: new Icon({
-            src: require("@/assets/shiyuan/point1.png"),
+            src: require("@/assets/yizhuan/point1.png"),
           }),
         }),
       });
@@ -366,7 +366,7 @@ export default {
       feature.setStyle(
         new Style({
           image: new Icon({
-            src: require("@/assets/shiyuan/point.png"),
+            src: require("@/assets/yizhuan/point.png"),
           }),
         })
       );

+ 1 - 1
src/views/shiYuan/configManage/indicatorsManage/WaterDetail.vue

@@ -98,7 +98,7 @@
 </template>
 <script>
 // import { queryDevice, queryAlarmManageList } from "@/api/scadaApi";
-import { queryDevice, queryAlarmManageList } from "@/api/shiYuan/scada";
+import { queryDevice, queryAlarmManageList } from "@/api/yizhuan/scada";
 import { getSysCommonCode } from "@/api/dataCenter";
 export default {
   name: "WaterDetail",

+ 1 - 1
src/views/shiYuan/configManage/indicatorsManage/widget.vue

@@ -63,7 +63,7 @@ import {
   editIndexConfiguration,
   deleteIndexConfiguration,
   queryIndexConfiguration
-} from "@/api/shiYuan/scada";
+} from "@/api/yizhuan/scada";
 
 export default {
   name: "IndexConfigurationManage",

src/views/shiYuan/configManage/waringTypeManage/WaterDetail.vue → src/views/yizhuan/configManage/waringTypeManage/WaterDetail.vue


+ 1 - 1
src/views/shiYuan/configManage/waringTypeManage/widget.vue

@@ -52,7 +52,7 @@ import {
   updateAlarmManageList,
   deleteAlarmManageList,
   queryAlarmManageList
-} from "@/api/shiYuan/scada";
+} from "@/api/yizhuan/scada";
 export default {
   name: "WaringTypeManage",
   components: { TableItem, WaterDetail },

src/views/shiYuan/monitoringCenter/dayilyReport/images/statistic.png → src/views/yizhuan/monitoringCenter/dayilyReport/images/statistic.png


src/views/shiYuan/monitoringCenter/dayilyReport/reportTable.vue → src/views/yizhuan/monitoringCenter/dayilyReport/reportTable.vue


src/views/shiYuan/monitoringCenter/dayilyReport/widget.vue → src/views/yizhuan/monitoringCenter/dayilyReport/widget.vue


+ 2 - 2
src/views/shiYuan/monitoringCenter/monitorPopup/index.vue

@@ -36,10 +36,10 @@ import Overlay from "ol/Overlay";
 
 import * as echarts from "echarts";
 
-import monitorCurve from "@/views/shiYuan/common/MonitorCurve/index.vue";
+import monitorCurve from "@/views/yizhuan/common/MonitorCurve/index.vue";
 
 // api
-import { getScadaInfo, getMonitorInfo } from "@/api/shiYuan/scada";
+import { getScadaInfo, getMonitorInfo } from "@/api/yizhuan/scada";
 
 export default {
   props: ["parent"],

src/views/shiYuan/monitoringCenter/partitionManage/components/dmaSettingDialog/index.vue → src/views/yizhuan/monitoringCenter/partitionManage/components/dmaSettingDialog/index.vue


src/views/shiYuan/monitoringCenter/partitionManage/widget.vue → src/views/yizhuan/monitoringCenter/partitionManage/widget.vue


src/views/shiYuan/monitoringCenter/scadaMonitor/craftConfig.js → src/views/yizhuan/monitoringCenter/scadaMonitor/craftConfig.js


src/views/shiYuan/monitoringCenter/scadaMonitor/createSiteCraft.js → src/views/yizhuan/monitoringCenter/scadaMonitor/createSiteCraft.js


src/views/shiYuan/monitoringCenter/scadaMonitor/images/2D74E7.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/2D74E7.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/999999.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/999999.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/Craft.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/Craft.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/F65252.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/F65252.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/S.jpg → src/views/yizhuan/monitoringCenter/scadaMonitor/images/S.jpg


src/views/shiYuan/monitoringCenter/scadaMonitor/images/line.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/line.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/power.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/power.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/site1.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/site1.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/site2.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/site2.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/site3.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/site3.png


src/views/shiYuan/monitoringCenter/scadaMonitor/images/site4.png → src/views/yizhuan/monitoringCenter/scadaMonitor/images/site4.png


+ 2 - 2
src/views/shiYuan/monitoringCenter/scadaMonitor/widget.vue

@@ -211,9 +211,9 @@ import tfLegend from "@/views/zhpt/common/Legend";
 import TableItem from "@/components/Table";
 import request from "@/utils/request";
 import Echarts from "echarts";
-import monitorCurve from "@/views/shiYuan/common/MonitorCurve/index.vue";
+import monitorCurve from "@/views/yizhuan/common/MonitorCurve/index.vue";
 import { getSysCommonCode } from "@/api/dataCenter";
-import { queryScadaData } from "@/api/shiYuan/scada";
+import { queryScadaData } from "@/api/yizhuan/scada";
 export default {
   name: "ScadaMonitor",
   components: { TableItem, tfLegend, Echarts,monitorCurve },

src/views/shiYuan/statisticalAnalysis/leakageRate/widget.vue → src/views/yizhuan/statisticalAnalysis/leakageRate/widget.vue


src/views/shiYuan/statisticalAnalysis/minStroomAnalyse/widget.vue → src/views/yizhuan/statisticalAnalysis/minStroomAnalyse/widget.vue


src/views/shiYuan/statisticalAnalysis/waterSupplyReport/widget.vue → src/views/yizhuan/statisticalAnalysis/waterSupplyReport/widget.vue


+ 1 - 1
src/views/zhpt/index.vue

@@ -114,7 +114,7 @@ import {
 import tfDialog from "./common/Dialog";
 
 import olMap from "@/views/components/olMap/index.vue";
-import onlineMonitor from "@/views/shiYuan/monitoringCenter/scadaMonitor/widget.vue";
+import onlineMonitor from "@/views/yizhuan/monitoringCenter/scadaMonitor/widget.vue";
 export default {
   components: {
     HalfPanels,