Merge branch 'dev-yjl' into 'shenzhen-dev'

中建四大屏-质量管理接口调整修改

See merge request !116

src/assets/js/api/zhongjianFourth.js

@@ -90,7 +90,7 @@ export const getPersonnelSituationApi = data => get('/xmgl/workerInfo/getPersonn
 
 /* --------------质量管理------------ */
 // 质量巡检
-export const getQualityAcceptanceApi = data => get('/xmgl/qualityInspectionRecord/getQualityAcceptanceAndRectificationNum',data)
+export const getQualityAcceptanceApi = data => get('xmgl/qualityInspectionRecord/getAllAndWeekData',data)
 export const getLimitListBySubdivisionApi = data => get('/xmgl/qualityInspectionRecord/limitListBySubdivision',data)
 export const getLimitOrderBySurveyingDateApi = data => get('/xmgl/measuredRealQuantity/limitOrderBySurveyingDate',data)
 export const getLimitOrderByAcceptanceDateApi = data => get('/xmgl/subdivisionAcceptance/limitOrderByAcceptanceDate',data)

src/assets/js/http.js

@@ -41,8 +41,8 @@ if (process.env.NODE_ENV == 'development') {
   
   // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
-  axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+  // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
@@ -74,7 +74,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发    huaxin    123456789
   // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
   // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上
-  // axios.defaults.baseURL = 'http://192.168.34.221:8200' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:8088' //郭圣雄本地
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'

src/views/projectAdmin/fourEngin/quality/leftTop.vue

@@ -11,8 +11,8 @@
             }"
             :color="['#6EE4F0', '#E7622A']"
             :data="[
-              { value: list.allClose, name: '已整改' },
+              { value: list.allClose, name: '已闭合' },
-              { value: list.allNoClose, name: '未整改' }
+              { value: list.allNoClose, name: '未闭合' }
             ]"
             :radius="['60%', '80%']"
             :legend="false"
@@ -20,7 +20,7 @@
         </div>
         <div class="legend">
           <div class="row">
-            <span>已整改</span>
+            <span>已闭合</span>
             <span>占比</span>
           </div>
           <div class="row">
@@ -30,7 +30,7 @@
         </div>
         <div class="legend">
           <div class="row">
-            <span>未整改</span>
+            <span>未闭合</span>
             <span>占比</span>
           </div>
           <div class="row">
@@ -58,18 +58,18 @@
           <JRingChart
             :title="{
               text: '本周巡检',
-              subTitle: `${list.todayTotal}条`,
+              subTitle: `${list.weekTotal}条`,
               fontSize: 18
             }"
             :color="['#6EE4F0', '#E7622A']"
             :data="[
               {
-                value: list.todayClose,
+                value: list.weekClose,
-                name: '已整改'
+                name: '已闭合'
               },
               {
-                value: list.todayNoClose,
+                value: list.weekNoClose,
-                name: '未整改'
+                name: '未闭合'
               }
             ]"
             :radius="['60%', '85%']"
@@ -78,22 +78,22 @@
         </div>
         <div class="legend">
           <div class="row">
-            <span>已整改</span>
+            <span>已闭合</span>
             <span>占比</span>
           </div>
           <div class="row">
-            <span>{{ list.todayClose }}</span>
+            <span>{{ list.weekClose }}</span>
-            <span>{{ list.todayCloseRatio }}%</span>
+            <span>{{ list.weekCloseRatio }}%</span>
           </div>
         </div>
         <div class="legend">
           <div class="row">
-            <span>未整改</span>
+            <span>未闭合</span>
             <span>占比</span>
           </div>
           <div class="row">
-            <span>{{ list.todayNoClose }}</span>
+            <span>{{ list.weekNoClose }}</span>
-            <span>{{ list.todayNoCloseRatio }}%</span>
+            <span>{{ list.weekNoCloseRatio }}%</span>
           </div>
         </div>
       </div>
@@ -105,6 +105,7 @@
             v-model="value"
             :options="listData"
             @change="checkSubListData"
+            :clearable="true"
           ></el-cascader>
         </div>
       </div>
@@ -198,7 +199,7 @@ export default {
       getQualityAcceptanceApi({ projectSn: this.$store.state.projectSn }).then(
         (res) => {
           this.list = res.result
-          console.log('质量巡检-----', this.list)
+          console.log('质量巡检===========================', this.list)
         }
       )
     },

src/views/projectFront/towerCrane/basicInfo.vue

@@ -2930,7 +2930,7 @@ export default {
 }
 
 .bgPack {
-  // width: 100%;
+  width: 100%;
   height: 100%;
   display: inline-block;
   background-repeat: no-repeat;