From bf8023aad8385cbb9d3a946901a8bc1904295cff Mon Sep 17 00:00:00 2001
From: yjl <1490736767@qq.com>
Date: Fri, 10 Feb 2023 09:38:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=88=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2bug?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fourEngin/quality/centerTop.vue           | 33 +++++++++++++++++--
 .../projectFront/quality/acceptanceMoudle.vue |  7 ++--
 .../projectFront/quality/acceptanceReport.vue |  7 ++--
 .../projectFront/quality/actualMeasured.vue   |  6 ++--
 .../quality/qualityHighlights.vue             | 29 ++++++++++++----
 .../projectFront/safeManage/addSafeRecord.vue |  8 ++++-
 6 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/src/views/projectAdmin/fourEngin/quality/centerTop.vue b/src/views/projectAdmin/fourEngin/quality/centerTop.vue
index a5bb1b8e..55a021c2 100644
--- a/src/views/projectAdmin/fourEngin/quality/centerTop.vue
+++ b/src/views/projectAdmin/fourEngin/quality/centerTop.vue
@@ -1,13 +1,17 @@
 <template>
   <Card title="质量亮点">
-
     <div class="list">
       <vue-scroll style="width: 100%; height: 550px">
         <div class="list-item" v-for="(item, index) in showList" :key="index">
           <p>{{ item.title }}</p>
-          <img :src="$store.state.FILEURL + item.imageUrl" alt="" />
+          <img
+            :preview="item.imageUrl[0] ? item.imageUrl[0].url : []"
+            :src="item.imageUrl[0] ? item.imageUrl[0].url : []"
+            alt=""
+            width="50px"
+          />
+          <!-- <img :src="$store.state.FILEURL + item.imageUrl" alt="" /> -->
         </div>
-        
       </vue-scroll>
     </div>
     <div class="tbody" v-if="showList == 0">
@@ -52,6 +56,29 @@ export default {
         if (res.code == 200) {
           console.log("数据", res);
           this.showList = res.result;
+          res.result.map((item) => {
+            if (item.imageUrl.includes("[")) {
+              item.imageUrl = JSON.parse(item.imageUrl);
+              console.log("亮点展示 ====");
+              if (
+                item.imageUrl.length !== 0 &&
+                !item.imageUrl[0].url.includes(this.$store.state.FILEURL)
+              ) {
+                item.imageUrl[0].url =
+                  this.$store.state.FILEURL + item.imageUrl[0].url;
+              }
+            } else {
+              let url = item.imageUrl;
+
+              if (
+                url.length !== 0 &&
+                !url.includes(this.$store.state.FILEURL)
+              ) {
+                item.imageUrl = [{}];
+                item.imageUrl[0].url = this.$store.state.FILEURL + url;
+              }
+            }
+          });
         }
       });
     },
diff --git a/src/views/projectFront/quality/acceptanceMoudle.vue b/src/views/projectFront/quality/acceptanceMoudle.vue
index cdb07bfe..d8313585 100644
--- a/src/views/projectFront/quality/acceptanceMoudle.vue
+++ b/src/views/projectFront/quality/acceptanceMoudle.vue
@@ -292,6 +292,8 @@ export default {
     getData() {
       getSubdivisionAcceptanceApi({
         projectSn: this.$store.state.projectSn,
+        size:this.size,
+        current:this.current
       }).then((res) => {
         res.result.records.map((item) => {
           item.imageUrl = JSON.parse(item.imageUrl);
@@ -434,11 +436,12 @@ export default {
       this.fileList = fileList;
     },
     handleSizeChange(value) {
-      this.current = value;
+      this.size = value;
+      
       this.getData();
     },
     handleCurrentChange(value) {
-      this.size = value;
+      this.current = value;
       this.getData();
     },
   },
diff --git a/src/views/projectFront/quality/acceptanceReport.vue b/src/views/projectFront/quality/acceptanceReport.vue
index 48decc34..3b62614f 100644
--- a/src/views/projectFront/quality/acceptanceReport.vue
+++ b/src/views/projectFront/quality/acceptanceReport.vue
@@ -145,6 +145,8 @@ export default {
     getData() {
       getMaterialDetectionReportApi({
         projectSn: this.$store.state.projectSn,
+        size:this.size,
+        current:this.current
       }).then((res) => {
         console.log("材料检验报告", res);
         this.tableData=res.result.records
@@ -213,11 +215,12 @@ export default {
       });
     },
     handleSizeChange(value) {
-      this.current = value;
+      this.size = value;
+      
       this.getData();
     },
     handleCurrentChange(value) {
-      this.size = value;
+      this.current = value;
       this.getData();
     },
   },
diff --git a/src/views/projectFront/quality/actualMeasured.vue b/src/views/projectFront/quality/actualMeasured.vue
index ea76b50d..f3e59a0c 100644
--- a/src/views/projectFront/quality/actualMeasured.vue
+++ b/src/views/projectFront/quality/actualMeasured.vue
@@ -241,6 +241,8 @@ export default {
     getData() {
       getMeasuredRealQuantityApi({
         projectSn: this.$store.state.projectSn,
+        size:this.size,
+        current:this.current
       }).then((res) => {
         res.result.records.map((item) => {
           item.imageUrl = JSON.parse(item.imageUrl);
@@ -378,11 +380,11 @@ export default {
       this.fileList = fileList;
     },
     handleSizeChange(value) {
-      this.current = value;
+      this.size = value;
       this.getData();
     },
     handleCurrentChange(value) {
-      this.size = value;
+      this.current = value;
       this.getData();
     },
   },
diff --git a/src/views/projectFront/quality/qualityHighlights.vue b/src/views/projectFront/quality/qualityHighlights.vue
index ce08901e..775febb9 100644
--- a/src/views/projectFront/quality/qualityHighlights.vue
+++ b/src/views/projectFront/quality/qualityHighlights.vue
@@ -179,18 +179,33 @@ export default {
     getData() {
       getWindowDisplayApi({
         projectSn: this.$store.state.projectSn,
+        size:this.size,
+        current:this.current
       }).then((res) => {
-        console.log("亮点展示", res);
-        this.tableData = res.result.records;
-        this.total = res.result.total;
         res.result.records.map((item) => {
-          item.imageUrl = JSON.parse(item.imageUrl);
+
+          if(item.imageUrl.includes("[")){
+            item.imageUrl = JSON.parse(item.imageUrl);
+            console.log("亮点展示 ====");
           if (item.imageUrl.length !== 0 && !item.imageUrl[0].url.includes(this.$store.state.FILEURL)) {
             item.imageUrl[0].url =
               this.$store.state.FILEURL + item.imageUrl[0].url;
           }
+          }else{
+            let url = item.imageUrl
+           
+            if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) {
+              item.imageUrl = [{}]
+            item.imageUrl[0].url =
+              this.$store.state.FILEURL + url;
+          }
+          }
+          
+         
         });
-       
+        console.log("亮点展示", res);
+        this.tableData = res.result.records;
+        this.total = res.result.total;
       });
     },
     //新增
@@ -286,11 +301,11 @@ export default {
       this.fileList = fileList;
     },
     handleSizeChange(value) {
-      this.current = value;
+      this.size = value;
       this.getData();
     },
     handleCurrentChange(value) {
-      this.size = value;
+      this.current = value;
       this.getData();
     },
   },
diff --git a/src/views/projectFront/safeManage/addSafeRecord.vue b/src/views/projectFront/safeManage/addSafeRecord.vue
index 293ad462..7629a547 100644
--- a/src/views/projectFront/safeManage/addSafeRecord.vue
+++ b/src/views/projectFront/safeManage/addSafeRecord.vue
@@ -70,7 +70,7 @@
             v-model="form.checkTime"
             type="datetime"
             :placeholder="$t('message.safeMangeCheck.chooseDateAndTime')" 
-            value-format="yyyy-MM-dd" style="width:100%">
+            style="width:100%">
           </el-date-picker>
           </el-form-item>
           <el-form-item
@@ -169,6 +169,8 @@ import {
   getCrewListDataApi,
   addSecurityChecksApi
 } from "@/assets/js/api/safeManage";
+import moment from "moment";
+
 export default {
   data() {
     return {
@@ -328,6 +330,10 @@ export default {
       this.form.notifier = this.informCrew.length>0? this.informCrew.join(','):'';
       this.$refs.form.validate((valid)=>{
         if(valid){
+          let time = moment(this.form.checkTime).format(
+            "YYYY-MM-DD HH:mm:ss"
+          );
+          this.form.checkTime=time
           let data = JSON.parse(JSON.stringify(this.form));
           data.projectSn = this.projectSn;
           data.inspector = this.$store.state.userInfo.userId;