Merge remote-tracking branch 'origin/main'

src/api/screen/engineering.js

@@ -17,4 +17,43 @@ export function monitor(appOrg) {
   })
 }
 
+export function getProjectNumX() {
+  return request({
+    url: 'large/three/getIssueListLastWeek',
+    method: 'get'
+  })
+}
+export function getIssueList() {
+  return request({
+    url: '/large/three/getProjectNumThisWeek',
+    method: 'get'
+  })
+}
 
+export function geterProjectList() {
+  return request({
+    url: '/large/three/planCheckList',
+    method: 'get'
+  })
+}
+
+export function getProjectThisWeek() {
+  return request({
+    url: '/large/three/planDoneList',
+    method: 'get'
+  })
+}
+
+export function getProjectLastWeek() {
+  return request({
+    url:'/large/three/getIssueNum',
+    method: 'get'
+  })
+}
+
+export function getProjectNumThisWeek() {
+  return request({
+    url: '/large/three/getOverIssueNum',
+    method: 'get'
+  })
+}

src/views/screen/engineering/currentArea.vue

@@ -20,7 +20,7 @@
               <div>本周检查项目数量</div>
             </div>
             <div >
-              <div class="num">56 <span class="unit">个</span></div>
+              <div class="num">{{ issues }}<span class="unit">个</span></div>
             </div>
           </div>
           <div class="data-asgeh">
@@ -30,7 +30,7 @@
               </div>
               <div>问题数量</div>
             </div>
-            <div class="num">56 <span class="unit">个</span></div>
+            <div class="num">{{ lastweek }} <span class="unit">个</span></div>
           </div>
           <div class="data-asgeh">
             <div class="asdakda">
@@ -39,7 +39,7 @@
               </div>
               <div>已整改数量</div>
             </div>
-            <div class="num">56 <span class="unit">个</span></div>
+            <div class="num">{{ getprojectnum }} <span class="unit">个</span></div>
           </div>
         </div>
       </div>
@@ -58,44 +58,13 @@
           </div>
           <div class="table-roll" @click="choose">
             <div class="table-bot">
-              <div class="table-list">
+              <div class="table-list"  v-for="(item, index) in getProList" :key="index">
                 <div class="said"></div>
-                <div class="fir">2024/12/28</div>
-                <div class="snd">施工整改问题1</div>
+                <div class="fir">{{ item.name }}</div>
+                <div class="snd">{{ item.num }}</div>
                 <div class="smail"></div>
-                <div class="thd">处理中</div></div>
-            </div>
-            <div class="table-bot">
-              <div class="table-list">
-                <div class="said"></div>
-                <div class="fir">2024/12/28</div>
-                <div class="snd">施工整改问题1</div>
-                <div class="smail"></div>
-                <div class="thd">处理中</div></div>
-            </div>
-            <div class="table-bot">
-              <div class="table-list">
-                <div class="said"></div>
-                <div class="fir">2024/12/28</div>
-                <div class="snd">施工整改问题1</div>
-                <div class="smail"></div>
-                <div class="thd">处理中</div></div>
-            </div>
-            <div class="table-bot">
-              <div class="table-list">
-                <div class="said"></div>
-                <div class="fir">2024/12/28</div>
-                <div class="snd">施工整改问题1</div>
-                <div class="smail"></div>
-                <div class="thd">处理中</div></div>
-            </div>
-            <div class="table-bot">
-              <div class="table-list">
-                <div class="said"></div>
-                <div class="fir">2024/12/28</div>
-                <div class="snd">施工整改问题1</div>
-                <div class="smail"></div>
-                <div class="thd">处理中</div></div>
+                <div class="thd">处理中</div>
+              </div>
             </div>
           </div>
         </div>
@@ -117,62 +86,12 @@
           <div class="table-roll">
             <div class="table-bot">
              <div class="table-roll">
-               <div class="table-list">
-                 <div class="said"></div>
-                 <div class="fir">2024/12/17</div>
-                 <div class="snd">山西电网</div>
-                 <div class="thd">监控接入情况</div>
-                 <div class="fir">张三</div>
-               </div>
-               <div class="table-list">
-                 <div class="said"></div>
-                 <div class="fir">2024/12/17</div>
-                 <div class="snd">山西电网</div>
-                 <div class="thd">监控接入情况</div>
-                 <div class="fir">张三</div>
-               </div>
-               <div class="table-list">
-                 <div class="said"></div>
-                 <div class="fir">2024/12/17</div>
-                 <div class="snd">山西电网</div>
-                 <div class="thd">监控接入情况</div>
-                 <div class="fir">张三</div>
-               </div>
-               <div class="table-list">
-                 <div class="said"></div>
-                 <div class="fir">2024/12/17</div>
-                 <div class="snd">山西电网</div>
-                 <div class="thd">监控接入情况</div>
-                 <div class="fir">张三</div>
-               </div>
-               <div class="table-list">
-                 <div class="said"></div>
-                 <div class="fir">2024/12/17</div>
-                 <div class="snd">山西电网</div>
-                 <div class="thd">监控接入情况</div>
-                 <div class="fir">张三</div>
-               </div>
-               <div class="table-list">
+               <div class="table-list" v-for="(item, index) in getProjecList" :key="index" @click="co">
                  <div class="said"></div>
-                 <div class="fir">2024/12/17</div>
-                 <div class="snd">山西电网</div>
-                 <div class="thd">监控接入情况</div>
-                 <div class="fir">张三</div>
-               </div>
-
-               <div class="table-list">
-                 <div class="said"></div>
-                 <div class="fir">2024/12/17</div>
-                 <div class="snd">山西电网</div>
-                 <div class="thd">监控接入情况</div>
-                 <div class="fir">张三</div>
-               </div>
-               <div class="table-list">
-                 <div class="said"></div>
-                 <div class="fir">2024/12/17</div>
-                 <div class="snd">山西电网</div>
-                 <div class="thd">监控接入情况</div>
-                 <div class="fir">张三</div>
+                 <div class="fir">{{item.head}}</div>
+                 <div class="snd">{{item.startTime}}</div>
+                 <div class="thd">{{item.content}}</div>
+                 <div class="fir">{{item.projectName}}</div>
                </div>
              </div>
             </div>
@@ -198,40 +117,12 @@
             </div>
             <div class="table-bot">
               <div class="table-roll">
-                <div class="table-list">
-                  <div class="fir">山西电网</div>
-                  <div class="snd">楼宇施工</div>
-                  <div class="thd">2024/12/27</div>
-                  <div class="fir">2025/12/27</div>
-                  <div class="fiv">张三</div>
-                </div>
-                <div class="table-list">
-                  <div class="fir">山西电网</div>
-                  <div class="snd">楼宇施工</div>
-                  <div class="thd">2024/12/27</div>
-                  <div class="fir">2025/12/27</div>
-                  <div class="fiv">张三</div>
-                </div>
-                <div class="table-list">
-                  <div class="fir">山西电网</div>
-                  <div class="snd">楼宇施工</div>
-                  <div class="thd">2024/12/27</div>
-                  <div class="fir">2025/12/27</div>
-                  <div class="fiv">张三</div>
-                </div>
-                <div class="table-list">
-                  <div class="fir">山西电网</div>
-                  <div class="snd">楼宇施工</div>
-                  <div class="thd">2024/12/27</div>
-                  <div class="fir">2025/12/27</div>
-                  <div class="fiv">张三</div>
-                </div>
-                <div class="table-list">
-                  <div class="fir">山西电网</div>
-                  <div class="snd">楼宇施工</div>
-                  <div class="thd">2024/12/27</div>
-                  <div class="fir">2025/12/27</div>
-                  <div class="fiv">张三</div>
+                <div class="table-list" v-for="(item, index) in thisweek" :key="index">
+                  <div class="fir">{{ item.head }}</div>
+                  <div class="snd">{{ item.content }}</div>
+                  <div class="thd">{{ item.startTime }}</div>
+                  <div class="fir">{{ item.endTime }}</div>
+                  <div class="fiv">{{ item.projectName }}</div>
                 </div>
               </div>
             </div>
@@ -249,6 +140,8 @@ import LineChart from "@/components/Echarts/LineChart.vue";
 import echarts from "echarts";
 import {getCanteenData, getCanteenNameList, 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 {
   name: "Canteen",
@@ -265,15 +158,79 @@ export default {
   },
   data() {
     return{
-
+      getProList:[],
+      getProjecList:[],
+      thisweek:[],
+      issues:[],
+      issueCount: 0,
+      lastweek:[],
+      getprojectnum:[]
     }
   },
   created() {
+    this.getProjectNumX()
+    this.getIssueList()
+    this.geterProjectList()
+    this.getProjectThisWeek()
+    this.getProjectLastWeek()
+    this.getProjectNumThisWeek()
   },
   destroyed() {},
   beforeDestroy() {},
   mounted() {},
   methods: {
+    co(){
+      console.log(this.getProjecList)
+    },
+    getProjectNumX(){
+      getProjectNumX(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.getProList = res.data;
+          this.getProList.forEach((item, index) => {
+            item.name = item.createTime;
+            item.num = item.description;
+
+          });
+        }
+      });
+    },
+    getProjectThisWeek(){
+      getProjectThisWeek(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.thisweek = res.data;
+        }
+      });
+    },
+    geterProjectList(){
+      geterProjectList(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.getProjecList = res.data;
+        }
+      });
+    },
+    getIssueList(){
+      getIssueList(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.issues=res.data;
+          this.issueCount = res.data.length;
+
+        }
+      });
+    },
+    getProjectLastWeek(){
+      getProjectLastWeek(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.lastweek = res.data;
+        }
+      });
+    },
+    getProjectNumThisWeek(){
+      getProjectNumThisWeek(this.$props.appOrg).then((res) => {
+        if (Number(res.code) === 200) {
+          this.getprojectnum = res.data;
+        }
+      });
+    },
     choose(){
       this.$emit('choose')
     }
@@ -383,7 +340,7 @@ export default {
       color: #00FFFF;
       font-weight: 500;
       position: relative;
-      right:4px
+      right:0px
     }
 
 
@@ -435,7 +392,6 @@ export default {
       overflow: auto;
     }
     .table-top{
-
       height: 26px;
       background: url("../../../assets/images/building_guarantee/img_11.png") no-repeat;
       background-size: 100% 100%;