From 11fff9dd37e1711cec2debb5fc704911719a87b8 Mon Sep 17 00:00:00 2001
From: yjl <1490736767@qq.com>
Date: Fri, 10 Feb 2023 15:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BB=BA=E5=9B=9B?=
 =?UTF-8?q?=E5=B1=80=EF=BC=88=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=EF=BC=89=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fourEngin/progress/topRight.vue           |  17 ++-
 .../fourEngin/quality/centerBottom.vue        |   6 +-
 .../fourEngin/quality/rightBottom.vue         | 123 +++++++++++-------
 .../fourEngin/quality/rightTop.vue            |   4 +-
 .../fourEngin/sourse/leftBottom.vue           |  98 +++++++++++++-
 .../fourEngin/sourse/rightBottom.vue          |   5 +-
 .../projectFront/aiAnalysis/overview.vue      |  29 +++--
 .../projectFront/quality/acceptanceReport.vue |   4 +-
 8 files changed, 214 insertions(+), 72 deletions(-)

diff --git a/src/views/projectAdmin/fourEngin/progress/topRight.vue b/src/views/projectAdmin/fourEngin/progress/topRight.vue
index ceab4ff6..412a31fd 100644
--- a/src/views/projectAdmin/fourEngin/progress/topRight.vue
+++ b/src/views/projectAdmin/fourEngin/progress/topRight.vue
@@ -89,9 +89,15 @@
           </div>
           <div class="endTime">
             <span class="grey">状态：</span>
-            <span style="color:orange" v-if="item.status==1">{{ item.status == 1 ? "提前" : item.status == 2 ? "正常" : "延迟"  }}</span>
-            <span style="color:green" v-if="item.status==2">{{ item.status == 1 ? "提前" : item.status == 2 ? "正常" : "延迟"  }}</span>
-            <span style="color:red" v-if="item.status==3">{{ item.status == 1 ? "提前" : item.status == 2 ? "正常" : "延迟"  }}</span>
+            <span style="color: orange" v-if="item.status == 1">{{
+              item.status == 1 ? "提前" : item.status == 2 ? "正常" : "延迟"
+            }}</span>
+            <span style="color: green" v-if="item.status == 2">{{
+              item.status == 1 ? "提前" : item.status == 2 ? "正常" : "延迟"
+            }}</span>
+            <span style="color: red" v-if="item.status == 3">{{
+              item.status == 1 ? "提前" : item.status == 2 ? "正常" : "延迟"
+            }}</span>
           </div>
         </div>
       </vue-scroll>
@@ -147,7 +153,6 @@ export default {
     ...mapState(["projectSn"]),
   },
   methods: {
-   
     getData() {
       //查询实际进度
       getProgressTApi({ projectSn: this.$store.state.projectSn }).then(
@@ -322,7 +327,11 @@ export default {
     background-size: 88% 100%;
     font-size: 16px;
     .todo {
+      width: 330px;
       font-size: 24px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
     &:not(:last-child) {
       margin-bottom: 20px;
diff --git a/src/views/projectAdmin/fourEngin/quality/centerBottom.vue b/src/views/projectAdmin/fourEngin/quality/centerBottom.vue
index 1c6555c2..9c264e63 100644
--- a/src/views/projectAdmin/fourEngin/quality/centerBottom.vue
+++ b/src/views/projectAdmin/fourEngin/quality/centerBottom.vue
@@ -1,5 +1,5 @@
 <template>
-  <Card title="分部(子分部)验收">
+  <Card title="现场验收">
     <div class="list">
       <el-date-picker
         @change="credad"
@@ -14,7 +14,7 @@
       <div class="thead">
         <div class="row">
           <div class="td">序号</div>
-          <div class="td">分部(子分部)工程</div>
+          <div class="td">验收内容</div>
           <div class="td">计划验收时间</div>
           <div class="td">实际验收时间</div>
           <div class="td">结论</div>
@@ -22,7 +22,7 @@
 
         </div>
       </div>
-      <div class="thead">
+      <div class="thead" style="color:#fff">
         <vue-scroll style="width: 95%;height:200px">
         <div class="row" v-for="(item, index) in list" :key="index">
           <div class="td">{{ index + 1 }}</div>
diff --git a/src/views/projectAdmin/fourEngin/quality/rightBottom.vue b/src/views/projectAdmin/fourEngin/quality/rightBottom.vue
index a5e11cab..d21d7f77 100644
--- a/src/views/projectAdmin/fourEngin/quality/rightBottom.vue
+++ b/src/views/projectAdmin/fourEngin/quality/rightBottom.vue
@@ -2,7 +2,6 @@
   <Card title="实测实量">
     <div class="DataTime">
       <el-date-picker
-      
         v-model="time1"
         type="daterange"
         range-separator="-"
@@ -12,38 +11,48 @@
         size="mini"
       ></el-date-picker>
     </div>
-      <div class="list" >
-        <vue-scroll style="width: 100%;height:250px">
-        <div class="list-item" v-for="(item,index) in listData" :key="index">
+    <div class="list">
+      <vue-scroll style="width: 100%; height: 250px">
+        <div class="list-item" v-for="(item, index) in listData" :key="index">
           <div class="imgDiv">
-            <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>
           <div class="textDiv">
-            <p style=" margin: -70px 0 0 120px;;font-size:16px">{{ item.title }}</p>
-            <p style="margin-top:10px;font-size:10px">{{item.measuredRealQuantityNumber}}/{{item.qualifiedNumber}}次</p>
-            <el-progress :percentage="item.qualifiedRatio" style="width:260px;margin-left:120px"></el-progress>
+            <p style="margin: -70px 0 0 120px; font-size: 16px">
+              {{ item.title }}
+            </p>
+            <p style="margin-top: 10px; font-size: 10px;margin-left:120px">
+              {{ item.measuredRealQuantityNumber }}/{{ item.qualifiedNumber }}次
+            </p>
+            <el-progress
+              :percentage="item.qualifiedRatio"
+              style="width: 260px; margin-left: 120px"
+            ></el-progress>
           </div>
-          <div class="dateDiv" >
+          <div class="dateDiv">
             {{ item.surveyingDate }}
           </div>
         </div>
       </vue-scroll>
+    </div>
+    <div class="tbody" v-if="listData.length == 0">
+      <div class="dataImg">
+        <img src="@/assets/images/noData3.png" alt srcset />
+        <p>{{ $t("message.dataBoard.nodata") }}</p>
       </div>
-      <div class="tbody" v-if="listData.length==0">
-        <div class="dataImg">
-          <img src="@/assets/images/noData3.png" alt srcset />
-          <p>{{ $t("message.dataBoard.nodata") }}</p>
-        </div>
-      </div>
-    
-    
+    </div>
   </Card>
 </template>
 
 <script>
 import Card from "../components/Card.vue";
-import { getLimitOrderBySurveyingDateApi
- } from "@/assets/js/api/zhongjianFourth";
+import { getLimitOrderBySurveyingDateApi } from "@/assets/js/api/zhongjianFourth";
 
 export default {
   data() {
@@ -121,26 +130,45 @@ export default {
       //   //   date:' 2022-12-20'
       //   // },
       // ],
-      sn:'',
-      listData:[],
-      time1:'',
+      sn: "",
+      listData: [],
+      time1: "",
     };
   },
-  created(){
-    this.sn=this.$store.state.projectSn
-    this.getData()
+  created() {
+    this.sn = this.$store.state.projectSn;
+    this.getData();
   },
-  methods:{
+  methods: {
     //查询实测实量数据
-getData(){
-  getLimitOrderBySurveyingDateApi({
-    projectSn:this.sn
-  }).then(res=>{
-   console.log('实测实量',res);
-   this.listData=res.result
-  })
- 
-},
+    getData() {
+      getLimitOrderBySurveyingDateApi({
+        projectSn: this.sn,
+      }).then((res) => {
+        console.log("实测实量", res);
+        this.listData = 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;
+            }
+          }
+        });
+      });
+    },
   },
   components: {
     Card,
@@ -151,11 +179,11 @@ getData(){
 <style lang="less" scoped>
 .list {
   // width: 1000px;
-    height: 525px;
-    // display: flex;
-    // flex-wrap: wrap;
-    // margin-left: -290%;
-    margin-top: 20px;
+  height: 525px;
+  // display: flex;
+  // flex-wrap: wrap;
+  // margin-left: -290%;
+  margin-top: 20px;
   .list-item {
     width: 375px;
     height: 100px;
@@ -164,10 +192,10 @@ getData(){
     background-size: 100% 100%;
     // margin-right: 18px;
     margin-top: 10px;
-    .dateDiv{
+    .dateDiv {
       margin-left: 300px;
-    margin-top: -68px;
-    font-size: 10px;
+      margin-top: -80px;
+      font-size: 10px;
     }
     .imgDiv {
       img {
@@ -188,7 +216,7 @@ getData(){
 .dataImg {
   width: 100%;
   height: 100%;
-  margin: -120% 0px 0px 40%;;
+  margin: -120% 0px 0px 40%;
   p {
     margin: 6px 0 0 13px;
   }
@@ -228,9 +256,9 @@ getData(){
 }
 ::v-deep .el-progress-bar {
   width: 100%;
-  ::v-deep .el-progress-bar__outer{
-  height: 10px !important;
-}
+  ::v-deep .el-progress-bar__outer {
+    height: 10px !important;
+  }
 }
 ::v-deep .el-progress__text {
   color: #fff;
@@ -238,5 +266,4 @@ getData(){
 ::v-deep .el-progress-bar__inner {
   background-color: #5ce2f6;
 }
-
 </style>
\ No newline at end of file
diff --git a/src/views/projectAdmin/fourEngin/quality/rightTop.vue b/src/views/projectAdmin/fourEngin/quality/rightTop.vue
index e44baeea..66201ce5 100644
--- a/src/views/projectAdmin/fourEngin/quality/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/quality/rightTop.vue
@@ -19,7 +19,7 @@
           <div class="row">
             <div class="td">事件类型</div>
             <div class="td" style="margin-left: 5px">检测时间</div>
-            <div class="td">检测结果</div>
+            <div class="td"  style="margin-left: 20px">检测结果</div>
           </div>
         </div>
         <div class="tbody">
@@ -141,7 +141,7 @@ getLimitList(){
         overflow: hidden;
 
         white-space: nowrap;
-        margin: 20px 0 0 0;
+        margin: 20px 0 0 7px;
       }
 
       img {
diff --git a/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue b/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue
index 30024e2e..7df91416 100644
--- a/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue
@@ -114,6 +114,46 @@ export default {
         },
       ],
       tableData: [
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-02-07",
+          mobilization: 10.262,
+        },
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-02-07",
+          mobilization: 22.774,
+        },
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-02-07",
+          mobilization: 12.862,
+        },
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-02-07",
+          mobilization: 10.31,
+        },
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-02-07",
+          mobilization: 10.604,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-02-07",
+          mobilization: 32.78,
+        },
+        {
+          nameType: "西林 HRB400E 螺纹钢",
+          dateTime: "2023-02-03",
+          mobilization: 31.21,
+        },
+        {
+          nameType: "韶钢 HRB400E 螺纹钢",
+          dateTime: "2023-02-03",
+          mobilization: 32.958,
+        },
         {
           nameType: "韶钢 HRB400E 螺纹钢",
           dateTime: "2023-01-10",
@@ -224,6 +264,62 @@ export default {
       isShow:false,
       tableDataTest: {},
       tableDataShow:[
+        {
+          showTime:'2023-02-07',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:10.262,
+          showLicensePlate:'粤F07667',
+        },
+        {
+          showTime:'2023-02-07',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:22.774,
+          showLicensePlate:'粤F07667',
+        },
+        {
+          showTime:'2023-02-07',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:12.862,
+          showLicensePlate:'粤F20148',
+        },
+        {
+          showTime:'2023-02-07',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:10.31,
+          showLicensePlate:'粤F20148',
+        },
+        {
+          showTime:'2023-02-07',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:10.604,
+          showLicensePlate:'粤F20148',
+        },
+        {
+          showTime:'2023-02-07',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:32.78,
+          showLicensePlate:'粤ADY795',
+        },
+        {
+          showTime:'2023-02-03',
+          showType:'西林 HRB400E 螺纹钢',
+          showManufactor:'建龙西林钢铁有限公司',
+          showVolume:31.21,
+          showLicensePlate:'粤ACQ953',
+        },
+        {
+          showTime:'2023-02-03',
+          showType:'韶钢 HRB400E 螺纹钢',
+          showManufactor:'广东韶钢松山股份有限公司',
+          showVolume:32.958,
+          showLicensePlate:'粤F69281',
+        },
         {
           showTime:'2023-01-10',
           showType:'韶钢 HRB400E 螺纹钢',
@@ -429,7 +525,7 @@ export default {
   // margin-top: -4%;
   height: 108%;
   color: #fff;
-  margin-left: 15px;
+  margin-left: 35px;
   margin-top: 20px;
   .thead {
     color: #6ae3eb;
diff --git a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
index 64238c4d..e1f1a935 100644
--- a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
@@ -4,7 +4,7 @@
       <div v-for="(item, index) in list" :key="index">
         <div :style="'background-image:url(' + item.url + ')'" class="item">
           <div>{{ item.name }}</div>
-          <div>{{ item.consumeValue }}</div>
+          <div class="consumeStyle">{{ item.consumeValue }}</div>
         </div>
       </div>
     </div>
@@ -116,6 +116,9 @@ export default {
   flex-wrap: wrap;
   justify-content: space-evenly;
 }
+.consumeStyle:nth-child(2){
+  margin-left: 20px;
+}
 .item {
   width: 280px;
   height: 85px;
diff --git a/src/views/projectFront/aiAnalysis/overview.vue b/src/views/projectFront/aiAnalysis/overview.vue
index c3d51d92..83b2437c 100644
--- a/src/views/projectFront/aiAnalysis/overview.vue
+++ b/src/views/projectFront/aiAnalysis/overview.vue
@@ -2,7 +2,8 @@
   <div class="aiAnlysis">
     <closePage></closePage>
     <div class="title_wrap flex3">
-      <div class="title_l">{{time}}</div>
+      <span>{{ date }}</span>
+      <span class="styleText">{{time}}</span>
       <div class="title_c">{{$store.state.currentProDetail.projectName}} - {{$t('message.aiAnalysis.analyze')}}</div>
       <div class="flex3 title_r">
         <div style="text-align: center;">
@@ -290,6 +291,7 @@ export default {
       projectDetail:{},
       weatherInfo:{},
       time:'',
+      date:'',
     };
   },
   mounted() {
@@ -298,15 +300,15 @@ export default {
    this.getTime()
   },
   methods: {
-    getTime(){
+    getTime() {
       var myDate = new Date(); //实例一个时间对象；
-      this.time=myDate.getFullYear();   //获取系统的年；
-      this.time+='-'+myDate.getMonth()+1;   //获取系统月份，由于月份是从0开始计算，所以要加1
-      this.time+='-'+myDate.getDate(); // 获取系统日，
-      this.time+=' '+myDate.getHours(); //获取系统时，
-      this.time+=':'+myDate.getMinutes(); //分
-      this.time+=':'+myDate.getSeconds(); //秒
-      
+      this.date = myDate.getFullYear();   //获取系统的年；
+      this.date += '-' + (myDate.getMonth() + 1);   //获取系统月份，由于月份是从0开始计算，所以要加1
+      this.date += '-' + myDate.getDate(); // 获取系统日，
+      this.time = ' ' + myDate.getHours(); //获取系统时，
+      this.time += ':' + myDate.getMinutes(); //分
+      this.time += ':' + myDate.getSeconds(); //秒
+
       setTimeout(() => {
         this.getTime()
       }, 1000);
@@ -488,8 +490,8 @@ export default {
     .title_c {
       font-size: 28px;
       font-weight: 600;
-      // margin-right: -7.5%;
-      margin-bottom: -10px;
+      margin-bottom: -30px;
+      margin-left: 285px;
     }
     .title_r{
       width: 20%;
@@ -668,6 +670,7 @@ export default {
       }
     }
 
+    
     // .showBg {
     //   background: #0c1f3f;
     // }
@@ -757,6 +760,10 @@ export default {
       }
     }
   }
+  .styleText{
+      position: absolute;
+    margin-left: 80px;
+    }
   /deep/ .el-carousel__container {
     height: 100%;
   }
diff --git a/src/views/projectFront/quality/acceptanceReport.vue b/src/views/projectFront/quality/acceptanceReport.vue
index 3b62614f..a1d01c37 100644
--- a/src/views/projectFront/quality/acceptanceReport.vue
+++ b/src/views/projectFront/quality/acceptanceReport.vue
@@ -85,9 +85,9 @@
             <el-form-item label="检测时间" prop="detectionDate">
               <el-date-picker
                 v-model="dialogdata.detectionDate"
-                type="datetime"
+                type="date"
                 placeholder="选择日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
               >
               </el-date-picker>
             </el-form-item>