emm...

src/api/screen/service.js

@@ -555,7 +555,7 @@ export function openCamera(code) {
 // 项目数量(在建)
 export function getProjectNum(appOrg) {
   return request({
-    url: '/large/production/getProjectNum',
+    url: '/large/production/getProjectNum/' + appOrg,
     method: 'get'
   })
 }
@@ -563,7 +563,7 @@ export function getProjectNum(appOrg) {
 // 项目数量(审批)
 export function getProjectNumX(appOrg) {
   return request({
-    url: '/large/production/getProjectNumX',
+    url: '/large/production/getProjectNumX/' + appOrg,
     method: 'get'
   })
 }
@@ -571,7 +571,7 @@ export function getProjectNumX(appOrg) {
 // 项目数量(施工)
 export function getProjectNumY(appOrg) {
   return request({
-    url: '/large/production/getProjectNumY',
+    url: '/large/production/getProjectNumY/' + appOrg,
     method: 'get'
   })
 }
@@ -579,23 +579,23 @@ export function getProjectNumY(appOrg) {
 // 各单位已接入项目数量和已接入摄像头数量
 export function getProjectCameraNumList(appOrg) {
   return request({
-    url: '/large/monitor/getProjectCameraNumList',
+    url: '/large/monitor/getProjectCameraNumList/' + appOrg,
     method: 'get'
   })
 }
 
 // 近一周问题列表
-export function getIssueListLastWeek() {
+export function getIssueListLastWeek(appOrg) {
   return request({
-    url: 'large/check/getIssueListLastWeek',
+    url: 'large/check/getIssueListLastWeek/' + appOrg,
     method: 'get'
   })
 }
 
 // 本周检查项目数量
-export function getProjectNumThisWeek() {
+export function getProjectNumThisWeek(appOrg) {
   return request({
-    url: '/large/check/getProjectNumThisWeek',
+    url: '/large/check/getProjectNumThisWeek/' + appOrg,
     method: 'get'
   })
 }
@@ -617,17 +617,17 @@ export function planDoneList() {
 }
 
 // 问题数量
-export function getIssueNum() {
+export function getIssueNum(appOrg) {
   return request({
-    url:'/large/check/getIssueNum',
+    url:'/large/check/getIssueNum/' + appOrg,
     method: 'get'
   })
 }
 
 // 已整改问题数量
-export function getOverIssueNum() {
+export function getOverIssueNum(appOrg) {
   return request({
-    url: '/large/check/getOverIssueNum',
+    url: '/large/check/getOverIssueNum/' + appOrg,
     method: 'get'
   })
 }

src/views/screen/engineering/currentArea.vue

@@ -156,7 +156,7 @@ export default {
   props: {
     appOrg: {
       type: String,
-      default: "0000",
+      default: "10001",
     },
   },
   watch:{

src/views/screen/engineering/main.vue

@@ -14,7 +14,9 @@
             <div class="cont-title">生产辅助基建项目情况</div>
           </div>
           <div class="components-item bg2">
-            <unit-access :key="appOrg"></unit-access>
+            <unit-access :parest = "parest"
+                         :num = "num"
+                         :key="appOrg"></unit-access>
           </div>
           <!-- <monitoring v-if="menu === 1"></monitoring>
           <monitoring-video v-if="menu === 2"></monitoring-video> -->
@@ -29,7 +31,7 @@
             <div class="cont-title">现场监控接入情况</div>
           </div>
           <div class="components-item">
-            <unit-access-to @chooseUnit="onChooseUnit" :key="appOrg"></unit-access-to>
+            <unit-access-to @chooseUnit="onChooseUnit" :app-org="appOrg"></unit-access-to>
           </div>
           <!-- <monitoring v-if="menu === 1"></monitoring>
           <monitoring-video v-if="menu === 2"></monitoring-video> -->
@@ -55,7 +57,7 @@
         height="850px"
         @mapClick="onMapClick"
       ></province>-->
-      <Map v-if="showMap"></Map>
+      <Map @transmit="transmit" v-if="showMap"></Map>
       <div
         v-if="showLocal"
         class="img-area flex-row align-items-center flex-center"
@@ -147,7 +149,7 @@
             <div class="cont-title">现场远程检查情况</div>
           </div>
           <div class="components-item">
-            <current-area @chooseMonitor="onChooseMonitor" @choose="onChooseIssueList" :monitorName="monitorName" :key="appOrg"></current-area>
+            <current-area @chooseMonitor="onChooseMonitor" @choose="onChooseIssueList" :monitorName="monitorName" :app-org="appOrg"></current-area>
           </div>
         </div>
       </div>
@@ -211,6 +213,9 @@
     >
       <unit-access-dialog
         v-if="dialogType === 1"
+        :parest = "parest"
+        :num = "num"
+        :parest1 = "parest1"
         @choose="chooseRes"
         @chooseH="chooseHealth"
         @closeDialog="closeDialog"
@@ -245,6 +250,7 @@ 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 } from '@/api/screen/service'
 export default {
   name: "EngineeringMain",
   components: {
@@ -272,6 +278,19 @@ export default {
   props: {},
   data() {
     return {
+      appOrg: "10001",
+      num: 0,
+      parest:[
+        {name:"可研评审",num:0},{name:"初设评审",num:0},
+        {name:"政府立项备案",num:0},{name:"土地手续",num:0},
+        {name:"用地规划",num:0},{name:"工程规划",num:0},
+        {name:"设计招标",num:0},{name:"施工招标",num:0},
+        {name:"监理招标",num:0},{name:"施工许可",num:0},
+      ],
+      parest1:[
+        {name:"基础施工",num:0},{name:"主体工程",num:0},
+        {name:"室内外装修",num:0},{name:"室外工程",num:0},
+      ],
       showRes:0,
       showC:false,
       showIssue:0,
@@ -292,7 +311,6 @@ export default {
       showBack: false,
       showMap: true,
       showLocal: false,
-      appOrg: "0000",
       dataList: [
         {
           name: "接入单位数量",
@@ -326,11 +344,47 @@ export default {
       company: company,
     };
   },
-  created() {},
+  created() {
+    this.getProjectNum();
+    this.getProjectNumX();
+  },
   destroyed() {},
   beforeDestroy() {},
   mounted() {},
   methods: {
+    transmit(appOrg){
+      this.appOrg = appOrg
+    },
+    //前期审批数量
+    getProjectNum() {
+      getProjectNum(this.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.num = res.data;
+        }
+      });
+    },
+    getProjectNumX() {
+      getProjectNumX(this.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          const fetchedData = res.data;
+          for (let i = 0; i < fetchedData.length; i++) {
+            this.parest[fetchedData[i].subdivision-1].num= fetchedData[i].num;
+          }
+        }
+      });
+    },
+    getProjectNumY() {
+      getProjectNumY(this.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          const fetchedData = res.data;
+          for (let i = 0; i < fetchedData.length; i++) {
+            this.parest1[fetchedData[i].subdivision-11].num= fetchedData[i].num;
+          }
+          this.leftShow = false;
+          this.rightShow = true;
+        }
+      });
+    },
     chooseRes(){
       this.closeDialog()
       this.showC = true
@@ -419,9 +473,8 @@ export default {
 
 
     showDialog(type) {
-      if (type < 4) {
-        this.leftShow = false;
-        this.rightShow = true;
+      if (type === 1) {
+        this.getProjectNumY();
       } else {
         this.rightShow = false;
         this.leftShow = true;

src/views/screen/engineering/unitAccess.vue

@@ -60,6 +60,8 @@ export default {
     BarChart
   },
   props: {
+    parest: Array,
+    num: Number,
     appOrg: {
       type: String,
       default: "0000",
@@ -76,14 +78,6 @@ export default {
 
       pieData: [],
       dataList: [],
-      num: 0,
-      parest:[
-        {name:"可研评审",num:0},{name:"初设评审",num:0},
-        {name:"政府立项备案",num:0},{name:"土地手续",num:0},
-        {name:"用地规划",num:0},{name:"工程规划",num:0},
-        {name:"设计招标",num:0},{name:"施工招标",num:0},
-        {name:"监理招标",num:0},{name:"施工许可",num:0},
-      ],
       parest1:[
         {name:"基础施工",num:0},{name:"主体工程",num:0},
         {name:"室内外装修",num:0},{name:"室外工程",num:0},
@@ -376,36 +370,6 @@ export default {
   beforeDestroy() {},
   mounted() {},
   methods: {
-    //前期审批数量
-    getProjectNum() {
-      getProjectNum(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          this.num = res.data;
-        }
-      });
-    },
-    getProjectNumX() {
-      getProjectNumX(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          const fetchedData = res.data;
-          for (let i = 0; i < fetchedData.length; i++) {
-            this.parest[fetchedData[i].subdivision-1].num= fetchedData[i].num;
-          }
-        }
-      });
-    },
-    // examine() {
-    //   examine(this.$props.appOrg).then((res) => {
-    //     if (Number(res.code) === 200) {
-    //       const fetchedData = res.data;
-    //       for (let i = 0; i < fetchedData.length; i++) {
-    //         this.parest[fetchedData[i].subdivision-1].num= fetchedData[i].num;
-    //
-    //       }
-    //     }
-    //   });
-    // },
-
     //初始化
     resetData(){
       this.show = false;

src/views/screen/engineering/unitAccessDialog.vue

@@ -82,23 +82,14 @@ export default {
     PieChart,
     LineChart,
   },
-  props: {},
+  props: {
+    parest: Array,
+    parest1: Array,
+    num: Number
+  },
   data() {
     return {
-      //在线数
-      num: 0,
       pieData: [],
-      parest:[
-        {name:"可研评审",num:0},{name:"初设评审",num:0},
-        {name:"政府立项备案",num:0},{name:"土地手续",num:0},
-        {name:"用地规划",num:0},{name:"工程规划",num:0},
-        {name:"设计招标",num:0},{name:"施工招标",num:0},
-        {name:"监理招标",num:0},{name:"施工许可",num:0},
-      ],
-      parest1:[
-        {name:"基础施工",num:0},{name:"主体工程",num:0},
-        {name:"室内外装修",num:0},{name:"室外工程",num:0},
-      ],
       catePieData: [
         { value: 40, name: "新能源汽车" },
         { value: 20, name: "燃油汽车" },
@@ -380,41 +371,11 @@ export default {
   created() {
     this.handlePie();
     this.handleBar();
-    this.getProjectNum();
-    this.getProjectNumX();
-    this.getProjectNumY();
   },
   destroyed() {},
   beforeDestroy() {},
   mounted() {},
   methods: {
-    getProjectNum() {
-      getProjectNum(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          this.num = res.data;
-        }
-      });
-    },
-    getProjectNumX() {
-      getProjectNumX(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          const fetchedData = res.data;
-          for (let i = 0; i < fetchedData.length; i++) {
-            this.parest[fetchedData[i].subdivision-1].num= fetchedData[i].num;
-          }
-        }
-      });
-    },
-    getProjectNumY() {
-      getProjectNumY(this.$props.appOrg).then((res) => {
-        if (Number(res.code) === 200) {
-          const fetchedData = res.data;
-          for (let i = 0; i < fetchedData.length; i++) {
-            this.parest1[fetchedData[i].subdivision-11].num= fetchedData[i].num;
-          }
-        }
-      });
-    },
     choose(){
       this.$emit('choose')
     },

src/views/screen/engineering/unitAccessto.vue

@@ -42,7 +42,7 @@ export default {
   props:{
     appOrg: {
       type: String,
-      default: "0000",
+      default: "10001",
     },
   },
   watch:{

src/views/screen/map/map.vue

@@ -35,6 +35,7 @@ let imgElement
 export default {
   data(){
     return{
+      appOrg: "10001",
       showBack: false,
       dataSource: {
         大同市: 大同市,
@@ -181,6 +182,8 @@ export default {
         } else if (params.componentType === "series") {
           // 点击的是自定义图标（scatter）
           console.log("Clicked scatter point: ", params.name, params.data.appOrg);
+          this.appOrg = params.data.appOrg
+          this.$emit('transmit', this.appOrg)
           // 销毁当前图表实例
           charts.dispose();
           // 重新初始化并设置新的配置项
@@ -262,6 +265,8 @@ export default {
     beBack(){
       this.initCharts()
       this.showBack = false
+      this.appOrg = "10001"
+      this.$emit('transmit', this.appOrg)
     }
   },
 };