大屏 界面修改

src/views/pad/engineering/main.vue

@@ -194,36 +194,30 @@
 import IssueSubDia from './issueSubDia.vue'
 import IssueDealDia from './issueDealDia.vue'
 import CameraScreen from './cameraScreen.vue'
-import IssueListDia from "./issueListDia.vue"
-import ProjectCameraDia from "./projectCameraDia.vue";
-import UnitProjectDia from "./unitProjectDia.vue";
-import Province from "../map/province.vue";
-import Map from "../map/map.vue";
-import UnitAccess from "./unitAccess.vue";
-import UnitAccessTo from "./unitAccessto.vue";
-import CameraOnline from "./cameraOnline.vue";
-import CurrentArea from "./currentArea.vue";
-import Monitoring from "./monitoring.vue";
-import VideoList from "./videoList.vue";
-import MonitoringStatus from "./monitoringStatus.vue";
-import MonitoringVideo from "./monitoringVideo.vue";
-import MonitorLive from "./monitorLive.vue";
-import MonitorLiveList from "./monitorLiveList.vue";
-import company from "../data/company.json";
-import TerminalDataDialog from "@/views/pad/official/terminalDataDialog.vue";
-import CarWarningDialog from "@/views/pad/official/carWarningDialog.vue";
-import CarStockDialog from "@/views/pad/logistics/car/carStockDialog.vue";
-import unitAccessDialog from "@/views/pad/engineering/unitAccessDialog.vue";
-import CarCost from "@/views/pad/official/carCost.vue";
-import ResourceList from "@/views/pad/official/resourceList.vue";
-import CarHealth from "@/views/pad/official/carHealth.vue";
-import {
-  getProjectNum,
-  getProjectNumThisWeek,
-  getProjectNumX,
-  getProjectNumY,
-  getProjectNumZ
-} from '@/api/screen/service'
+import IssueListDia from './issueListDia.vue'
+import ProjectCameraDia from './projectCameraDia.vue'
+import UnitProjectDia from './unitProjectDia.vue'
+import Province from '../map/province.vue'
+import Map from '../map/map.vue'
+import UnitAccess from './unitAccess.vue'
+import UnitAccessTo from './unitAccessto.vue'
+import CameraOnline from './cameraOnline.vue'
+import CurrentArea from './currentArea.vue'
+import Monitoring from './monitoring.vue'
+import VideoList from './videoList.vue'
+import MonitoringStatus from './monitoringStatus.vue'
+import MonitoringVideo from './monitoringVideo.vue'
+import MonitorLive from './monitorLive.vue'
+import MonitorLiveList from './monitorLiveList.vue'
+import TerminalDataDialog from '@/views/screen/official/terminalDataDialog.vue'
+import CarWarningDialog from '@/views/screen/official/carWarningDialog.vue'
+import CarStockDialog from '@/views/screen/logistics/car/carStockDialog.vue'
+import unitAccessDialog from '@/views/screen/engineering/unitAccessDialog.vue'
+import CarCost from '@/views/screen/official/carCost.vue'
+import ResourceList from '@/views/screen/official/resourceList.vue'
+import CarHealth from '@/views/screen/official/carHealth.vue'
+import { getProjectNum, getProjectNumX, getProjectNumY, getProjectNumZ } from '@/api/screen/service'
+
 export default {
   name: "EngineeringMain",
   components: {
@@ -252,6 +246,8 @@ export default {
   props: {},
   data() {
     return {
+      supervisionUnit: null,
+      constructionUnit: null,
       menuFlag: true,
       appOrg: "0000",
       num: 0,
@@ -498,7 +494,9 @@ export default {
     },
 
     onChooseProject(e){
-      this.curCompanMonth = e;
+      this.curCompanMonth = e.id;
+      this.constructionUnit = e.constructionUnit
+      this.supervisionUnit = e.supervisionUnit
       this.showC = false
       this.showCenter = true;
       this.showType = 2;

src/views/pad/map/map.vue

@@ -11,8 +11,18 @@
       v-if="showBack"
       @click="beBack(sign)"
       src="@/assets/images/main/back.png"
-      style="width: 34px;height: 30px;cursor: pointer;position: absolute;right: 50px;bottom: 80px;"
+      style="width: 34px;height: 30px;cursor: pointer;position: absolute;right: 50px;bottom: 50px;"
     />
+    <div style="position: absolute;right: 20px;bottom: 200px;color: white;user-select: none" v-if="!showBack">
+      <div style="display: flex;align-items: center;justify-content: center;flex-wrap: wrap;width: 46px;margin-bottom: 20px">
+        <img src="@/assets/zhang/myMap/blue.png">
+        <div>在建</div>
+      </div>
+      <div style="display: flex;align-items: center;justify-content: center;flex-wrap: wrap;width: 46px">
+        <img src="@/assets/zhang/myMap/orange.png">
+        <div>施工</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -358,6 +368,8 @@ export default {
       }
       else {
         this.showSign = false
+        this.showBack = true
+        this.sign = 1
         getProjectByAppOrg(appOrg).then((res) => {
           if (Number(res.code) === 200) {
             for (let it of res.data){
@@ -583,6 +595,8 @@ export default {
         else if(params.componentIndex === 3){
           this.getProject('10001')
           this.$emit('changeCurCompany')
+          this.showBack = true
+          this.sign = 1
         }
       });
     },
@@ -803,11 +817,14 @@ export default {
       if (sign === 1){
         this.sign = 0
         this.projectList = []
-        this.childCharts.dispose();
-        this.initCharts()
+        if (this.childCharts){
+          this.childCharts.dispose();
+          this.initCharts()
+        }
         this.showBack = false
         this.appOrg = "0000"
         this.$emit('transmit', this.appOrg)
+        this.getProject(null)
       }
       else {
         this.projectList = []

src/views/pad/map/mapTwo.vue

@@ -11,7 +11,7 @@
       v-if="showBack"
       @click="beBack"
       src="@/assets/images/main/back.png"
-      style="width: 34px;height: 30px;cursor: pointer;position: absolute;right: 50px;bottom: 80px;"
+      style="width: 34px;height: 30px;cursor: pointer;position: absolute;right: 50px;bottom: 50px;"
     />
   </div>
 </template>
@@ -227,6 +227,7 @@ export default {
           });
         }else if(params.componentIndex === 2){
           this.$emit('changeCurCompany')
+          this.showBack = true
         }
       });
     },
@@ -301,7 +302,7 @@ export default {
     beBack(){
       this.initCharts()
       this.showBack = false
-      this.appOrg = "10001"
+      this.appOrg = "0000"
       this.$emit('transmit', this.appOrg)
     }
   },

src/views/pad/map/shanxi.json

@@ -498,7 +498,7 @@
       "properties": {
         "adcode": 140300,
         "name": "阳泉市",
-        "cp": [114.083285, 37.861188],
+        "cp": [113.7030285, 37.861188],
         "center": [113.583285, 37.861188],
         "centroid": [113.505474, 38.064652],
         "childrenNum": 5,

src/views/pad/official/main.vue

@@ -157,7 +157,7 @@
 </template>
 
 <script>
-import ResourceList from '@/views/pad/official/resourceList.vue'
+import ResourceList from '@/views/screen/official/resourceList.vue'
 import Province from "../map/province.vue";
 import TerminalData from "./terminalData.vue";
 import TerminalDataDialog from "./terminalDataDialog.vue";
@@ -166,11 +166,11 @@ import CarWarning from "./carWarning.vue";
 import CarWarningDialog from "./carWarningDialog.vue";
 import CarStock from "../logistics/car/carStock.vue";
 import CarTerminal from "../logistics/car/carTerminal.vue";
-import company from "@/views/pad/data/company.json";
-import CarCost from '@/views/pad/official/carCost.vue'
-import CarHealth from '@/views/pad/official/carHealth.vue'
-import CarStockDialog from "@/views/pad/logistics/car/carStockDialog.vue";
-import MapTwo from '@/views/pad/map/mapTwo.vue'
+import company from "@/views/screen/data/company.json";
+import CarCost from '@/views/screen/official/carCost.vue'
+import CarHealth from '@/views/screen/official/carHealth.vue'
+import CarStockDialog from "@/views/screen/logistics/car/carStockDialog.vue";
+import MapTwo from '@/views/screen/map/mapTwo.vue'
 import {
   getCarDetail,
   getMonitor,
@@ -282,8 +282,10 @@ export default {
       console.log(this.curCompany)
       if (!e[1]){
         this.transmit('0000')
+        this.$refs.map.showBack = false
         return
       }
+      this.$refs.map.showBack = true
       this.transmit(e[1])
     },
 
@@ -324,6 +326,9 @@ export default {
 
     transmit(appOrg){
       this.appOrg = appOrg
+      if (appOrg === '0000'){
+        this.curCompany = []
+      }
       this.resource();
       this.monitor();
       this.operationManageTopHalf();

src/views/screen/engineering/main.vue

@@ -197,36 +197,30 @@
 import IssueSubDia from './issueSubDia.vue'
 import IssueDealDia from './issueDealDia.vue'
 import CameraScreen from './cameraScreen.vue'
-import IssueListDia from "./issueListDia.vue"
-import ProjectCameraDia from "./projectCameraDia.vue";
-import UnitProjectDia from "./unitProjectDia.vue";
-import Province from "../map/province.vue";
-import Map from "../map/map.vue";
-import UnitAccess from "./unitAccess.vue";
-import UnitAccessTo from "./unitAccessto.vue";
-import CameraOnline from "./cameraOnline.vue";
-import CurrentArea from "./currentArea.vue";
-import Monitoring from "./monitoring.vue";
-import VideoList from "./videoList.vue";
-import MonitoringStatus from "./monitoringStatus.vue";
-import MonitoringVideo from "./monitoringVideo.vue";
-import MonitorLive from "./monitorLive.vue";
-import MonitorLiveList from "./monitorLiveList.vue";
-import company from "../data/company.json";
-import TerminalDataDialog from "@/views/screen/official/terminalDataDialog.vue";
-import CarWarningDialog from "@/views/screen/official/carWarningDialog.vue";
-import CarStockDialog from "@/views/screen/logistics/car/carStockDialog.vue";
-import unitAccessDialog from "@/views/screen/engineering/unitAccessDialog.vue";
-import CarCost from "@/views/screen/official/carCost.vue";
-import ResourceList from "@/views/screen/official/resourceList.vue";
-import CarHealth from "@/views/screen/official/carHealth.vue";
-import {
-  getProjectNum,
-  getProjectNumThisWeek,
-  getProjectNumX,
-  getProjectNumY,
-  getProjectNumZ
-} from '@/api/screen/service'
+import IssueListDia from './issueListDia.vue'
+import ProjectCameraDia from './projectCameraDia.vue'
+import UnitProjectDia from './unitProjectDia.vue'
+import Province from '../map/province.vue'
+import Map from '../map/map.vue'
+import UnitAccess from './unitAccess.vue'
+import UnitAccessTo from './unitAccessto.vue'
+import CameraOnline from './cameraOnline.vue'
+import CurrentArea from './currentArea.vue'
+import Monitoring from './monitoring.vue'
+import VideoList from './videoList.vue'
+import MonitoringStatus from './monitoringStatus.vue'
+import MonitoringVideo from './monitoringVideo.vue'
+import MonitorLive from './monitorLive.vue'
+import MonitorLiveList from './monitorLiveList.vue'
+import TerminalDataDialog from '@/views/screen/official/terminalDataDialog.vue'
+import CarWarningDialog from '@/views/screen/official/carWarningDialog.vue'
+import CarStockDialog from '@/views/screen/logistics/car/carStockDialog.vue'
+import unitAccessDialog from '@/views/screen/engineering/unitAccessDialog.vue'
+import CarCost from '@/views/screen/official/carCost.vue'
+import ResourceList from '@/views/screen/official/resourceList.vue'
+import CarHealth from '@/views/screen/official/carHealth.vue'
+import { getProjectNum, getProjectNumX, getProjectNumY, getProjectNumZ } from '@/api/screen/service'
+
 export default {
   name: "EngineeringMain",
   components: {

src/views/screen/map/mapTwo.vue

@@ -227,6 +227,7 @@ export default {
           });
         }else if(params.componentIndex === 2){
           this.$emit('changeCurCompany')
+          this.showBack = true
         }
       });
     },
@@ -301,7 +302,7 @@ export default {
     beBack(){
       this.initCharts()
       this.showBack = false
-      this.appOrg = "10001"
+      this.appOrg = "0000"
       this.$emit('transmit', this.appOrg)
     }
   },

src/views/screen/map/shanxi.json

@@ -498,7 +498,7 @@
       "properties": {
         "adcode": 140300,
         "name": "阳泉市",
-        "cp": [114.083285, 37.861188],
+        "cp": [113.7030285, 37.861188],
         "center": [113.583285, 37.861188],
         "centroid": [113.505474, 38.064652],
         "childrenNum": 5,

src/views/screen/official/main.vue

@@ -282,8 +282,10 @@ export default {
       console.log(this.curCompany)
       if (!e[1]){
         this.transmit('0000')
+        this.$refs.map.showBack = false
         return
       }
+      this.$refs.map.showBack = true
       this.transmit(e[1])
     },
 
@@ -324,6 +326,9 @@ export default {
 
     transmit(appOrg){
       this.appOrg = appOrg
+      if (appOrg === '0000'){
+        this.curCompany = []
+      }
       this.resource();
       this.monitor();
       this.operationManageTopHalf();