emm...

src/api/screen/engineering.js

@@ -1,59 +0,0 @@
-import request from '@/utils/request'
-
-//----------------------------------- 工程现场 -------------------------------
-
-export function examine(appOrg) {
-  return request({
-    url: '/large/production/getProjectNumX',
-    method: 'get'
-  })
-}
-
-
-export function monitor(appOrg) {
-  return request({
-    url: '/large/monitor/getProjectCameraNumList',
-    method: 'get'
-  })
-}
-
-export function getProjectNumX() {
-  return request({
-    url: 'large/check/getIssueListLastWeek',
-    method: 'get'
-  })
-}
-export function getIssueList() {
-  return request({
-    url: '/large/check/getProjectNumThisWeek',
-    method: 'get'
-  })
-}
-
-export function geterProjectList() {
-  return request({
-    url: '/large/check/planCheckList',
-    method: 'get'
-  })
-}
-
-export function getProjectThisWeek() {
-  return request({
-    url: '/large/check/planDoneList',
-    method: 'get'
-  })
-}
-
-export function getProjectLastWeek() {
-  return request({
-    url:'/large/check/getIssueNum',
-    method: 'get'
-  })
-}
-
-export function getProjectNumThisWeek() {
-  return request({
-    url: '/large/check/getOverIssueNum',
-    method: 'get'
-  })
-}

src/api/screen/service.js

@@ -542,3 +542,85 @@ export function openCamera(code) {
     method: 'get'
   })
 }
+
+/*--------------- 工程现场 ------------------*/
+
+// 项目数量(在建)
+export function getProjectNum(appOrg) {
+  return request({
+    url: '/large/production/getProjectNum',
+    method: 'get'
+  })
+}
+
+// 项目数量(审批)
+export function getProjectNumX(appOrg) {
+  return request({
+    url: '/large/production/getProjectNumX',
+    method: 'get'
+  })
+}
+
+// 项目数量(施工)
+export function getProjectNumY(appOrg) {
+  return request({
+    url: '/large/production/getProjectNumY',
+    method: 'get'
+  })
+}
+
+// 各单位已接入项目数量和已接入摄像头数量
+export function getProjectCameraNumList(appOrg) {
+  return request({
+    url: '/large/monitor/getProjectCameraNumList',
+    method: 'get'
+  })
+}
+
+// 近一周问题列表
+export function getIssueListLastWeek() {
+  return request({
+    url: 'large/check/getIssueListLastWeek',
+    method: 'get'
+  })
+}
+
+// 本周检查项目数量
+export function getProjectNumThisWeek() {
+  return request({
+    url: '/large/check/getProjectNumThisWeek',
+    method: 'get'
+  })
+}
+
+// 本周检查计划
+export function planCheckList() {
+  return request({
+    url: '/large/check/planCheckList',
+    method: 'get'
+  })
+}
+
+// 本周施工计划
+export function planDoneList() {
+  return request({
+    url: '/large/check/planDoneList',
+    method: 'get'
+  })
+}
+
+// 问题数量
+export function getIssueNum() {
+  return request({
+    url:'/large/check/getIssueNum',
+    method: 'get'
+  })
+}
+
+// 已整改问题数量
+export function getOverIssueNum() {
+  return request({
+    url: '/large/check/getOverIssueNum',
+    method: 'get'
+  })
+}

src/views/screen/engineering/currentArea.vue

@@ -138,9 +138,14 @@
 <script>
 import LineChart from "@/components/Echarts/LineChart.vue";
 import echarts from "echarts";
-import {getCanteenData, getCanteenNameList, videoList} from "@/api/screen/service";
+import {
+  getCanteenData,
+  getCanteenNameList,
+  getIssueListLastWeek, getIssueNum, getOverIssueNum,
+  getProjectNumThisWeek, planCheckList, planDoneList,
+  videoList
+} from '@/api/screen/service'
 import BarChart from "@/components/Echarts/BarChart.vue";
-import {getIssueList,getProjectNumX,geterProjectList,getProjectThisWeek,getProjectLastWeek,getProjectNumThisWeek} from "@/api/screen/engineering";
 
 
 export default {
@@ -161,19 +166,19 @@ export default {
       getProList:[],
       getProjecList:[],
       thisweek:[],
-      issues:[],
+      issues:0,
       issueCount: 0,
-      lastweek:[],
+      lastweek:0,
       getprojectnum:[]
     }
   },
   created() {
-    this.getProjectNumX()
-    this.getIssueList()
-    this.geterProjectList()
-    this.getProjectThisWeek()
-    this.getProjectLastWeek()
     this.getProjectNumThisWeek()
+    this.getIssueNum()
+    this.getOverIssueNum()
+    this.getIssueListLastWeek()
+    this.planCheckList()
+    this.planDoneList()
   },
   destroyed() {},
   beforeDestroy() {},
@@ -182,8 +187,8 @@ export default {
     co(){
       console.log(this.getProjecList)
     },
-    getProjectNumX(){
-      getProjectNumX(this.$props.appOrg).then((res) => {
+    getIssueListLastWeek(){
+      getIssueListLastWeek(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.getProList = res.data;
           this.getProList.forEach((item, index) => {
@@ -194,22 +199,22 @@ export default {
         }
       });
     },
-    getProjectThisWeek(){
-      getProjectThisWeek(this.$props.appOrg).then((res) => {
+    planCheckList(){
+      planCheckList(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.thisweek = res.data;
         }
       });
     },
-    geterProjectList(){
-      geterProjectList(this.$props.appOrg).then((res) => {
+    planDoneList(){
+      planDoneList(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.getProjecList = res.data;
         }
       });
     },
-    getIssueList(){
-      getIssueList(this.$props.appOrg).then((res) => {
+    getProjectNumThisWeek(){
+      getProjectNumThisWeek(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.issues=res.data;
           this.issueCount = res.data.length;
@@ -217,15 +222,15 @@ export default {
         }
       });
     },
-    getProjectLastWeek(){
-      getProjectLastWeek(this.$props.appOrg).then((res) => {
+    getIssueNum(){
+      getIssueNum(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.lastweek = res.data;
         }
       });
     },
-    getProjectNumThisWeek(){
-      getProjectNumThisWeek(this.$props.appOrg).then((res) => {
+    getOverIssueNum(){
+      getOverIssueNum(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.getprojectnum = res.data;
         }

src/views/screen/engineering/unitAccess.vue

@@ -16,7 +16,7 @@
               <div style="position: absolute;left: 0;height: 100%;width: 10px;border: 1px solid #00FFFF;border-right: none; "></div>
               <div style="width: 294.15px;height: 52.5px;background-image: linear-gradient(270deg, #00ffff00 0%, #00ffff1a 100%);display: flex;justify-content: space-around;align-items: center">
                 <div style="width: 96px;font-family: DingTalk-JinBuTi;font-weight: JinBuTi;font-size: 24px;color: #00FFFF;letter-spacing: 0;line-height: 32.93px;">在建项目</div>
-                <div style="font-size: 24px;color: #00FFFF;">5656<span style="font-size: 12px">个</span></div>
+                <div style="font-size: 24px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
               </div>
 
 
@@ -49,7 +49,7 @@
 <script>
 import PieChart from "@/components/Echarts/PieChart";
 import BarChart from "@/components/Echarts/BarChart.vue";
-import {examine} from "@/api/screen/engineering";
+import { getProjectNum, getProjectNumX } from '@/api/screen/service'
 
 
 
@@ -76,6 +76,7 @@ export default {
 
       pieData: [],
       dataList: [],
+      num: undefined,
       parest:[
         {name:"可研评审",num:0},{name:"初设评审",num:0},
         {name:"政府立项备案",num:0},{name:"土地手续",num:0},
@@ -368,24 +369,42 @@ export default {
   created() {
     this.handlePie();
     this.handleBar();
-    this.examine();
+    this.getProjectNumX();
+    this.getProjectNum();
   },
   destroyed() {},
   beforeDestroy() {},
   mounted() {},
   methods: {
     //前期审批数量
-    examine() {
-      examine(this.$props.appOrg).then((res) => {
+    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(){

src/views/screen/engineering/unitAccessDialog.vue

@@ -24,7 +24,7 @@
               <div style="position: absolute;left: 0;height: 100%;width: 10px;border: 1px solid #00FFFF;border-right: none; "></div>
               <div style="width: 294.15px;height: 52.5px;background-image: linear-gradient(270deg, #00ffff00 0%, #00ffff1a 100%);display: flex;justify-content: space-around;align-items: center">
                 <div style="width: 96px;font-family: DingTalk-JinBuTi;font-weight: JinBuTi;font-size: 24px;color: #00FFFF;letter-spacing: 0;line-height: 32.93px;">在建项目</div>
-                <div style="font-size: 24px;color: #00FFFF;">5656<span style="font-size: 12px">个</span></div>
+                <div style="font-size: 24px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
               </div>
             </div>
 
@@ -72,7 +72,7 @@ import LineChart from "@/components/Echarts/LineChart";
 import PieChart from "@/components/Echarts/PieChart";
 import BarChart from "@/components/Echarts/BarChart.vue";
 import echarts from "echarts";
-import {examine} from "@/api/screen/engineering";
+import { getProjectNum, getProjectNumX, getProjectNumY } from '@/api/screen/service'
 
 export default {
   name: "BuildingSaveDialog",
@@ -85,6 +85,7 @@ export default {
   data() {
     return {
       //在线数
+      num: undefined,
       pieData: [],
       parest:[
         {name:"可研评审",num:0},{name:"初设评审",num:0},
@@ -378,20 +379,37 @@ export default {
   created() {
     this.handlePie();
     this.handleBar();
-    this.examine();
+    this.getProjectNum();
+    this.getProjectNumX();
+    this.getProjectNumY();
   },
   destroyed() {},
   beforeDestroy() {},
   mounted() {},
   methods: {
-    examine() {
-      this.dataList = [];
-      examine(this.$props.appOrg).then((res) => {
+    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;
           }
         }
       });

src/views/screen/engineering/unitAccessto.vue

@@ -30,7 +30,8 @@
 import BarChart from "@/components/Echarts/BarChart";
 import LineChart from "@/components/Echarts/LineChart.vue";
 import echarts from "echarts";
-import {monitor } from "@/api/screen/engineering"
+import { getProjectCameraNumList } from '@/api/screen/service'
+
 
 export default {
   name: "UnitAccessTo",
@@ -151,14 +152,14 @@ export default {
     this.handleUnitDataList();
     this.handleCurrentArea();
     this.handleOnlineData();
-    this.monitor()
+    this.getProjectCameraNumList()
   },
   destroyed() {},
   beforeDestroy() {},
   mounted() {},
   methods: {
-    monitor(){
-      monitor(this.$props.appOrg).then((res) => {
+    getProjectCameraNumList(){
+      getProjectCameraNumList(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.monitorList = res.data;
           this.monitorList.forEach((item, index) => {