中建四(质量管理):质量巡检模块接口对接

public/js/config.js

@@ -18,7 +18,7 @@ var PROJECT = {
 }
 
 
-var PROJECT_TYPE = PROJECT.local_test
+var PROJECT_TYPE = PROJECT.online_zjsj
 
 var headerShow = true; // 是否显示头部
 var tabsShow = true;  // 是否显示tabs

src/assets/js/api/zhongjianFourth.js

@@ -37,4 +37,9 @@ export const getWorkerNumApi = data => get('xmgl/workerInfo/getPersonnelNum',dat
 // 人员增长趋势
 export const getWorkerGrowthApi = data => get('xmgl/workerInfo/getPersonnelGrowth',data)
 // 员工申报年龄段
-export const getDeclareAgeApi = data => get('/xmgl/workerInfo/getDeclareAge',data)
+export const getDeclareAgeApi = data => get('/xmgl/workerInfo/getDeclareAge',data)
+
+
+/* --------------质量管理------------ */
+// 质量巡检
+export const getQualityAcceptanceApi = data => get('/xmgl/qualityInspectionRecord/getQualityAcceptanceAndRectificationNum',data)

src/store/index.js

@@ -45,8 +45,8 @@ export default new Vuex.Store({
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
-    // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
+    UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
-    // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+    FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
     /* 2022-05-16 */
     // tag: 部署河南项目时，需要打开这两行代码
     // UPLOADURL: 'http://124.71.178.44:100/upload/image',
@@ -56,8 +56,8 @@ export default new Vuex.Store({
     // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
     // FILEURL: 'http://182.90.224.237:7000/image/',
     // 邱平毅的
-    UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+    // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
-    FILEURL: 'http://192.168.34.216:6023/image/',
+    // FILEURL: 'http://192.168.34.216:6023/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式

src/views/home/login_v1.vue

@@ -162,7 +162,8 @@
             </el-form>
           </div>
           <div style="margin-top: 40px">
-            <el-button type="primary" class="logo_btn" :disabled="pass" @click="loginFn"
+            <!-- :disabled="pass" -->
+            <el-button type="primary" class="logo_btn"  @click="loginFn"
               >{{ $t("message.login.login") }}
             </el-button>
           </div>

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

@@ -4,9 +4,9 @@
       <div class="dllm">
         <div class="chart">
           <JRingChart
-            :title="{ text: '质量验收', subTitle: '2314件',fontSize: 14 }"
+            :title="{ text: '质量验收', subTitle: `${list.disposeTotal} 件`,fontSize: 14 }"
             :color="['#6EE4F0', '#E7622A']"
-            :data="[{ value: 2314, name: '已验收' }, { value: 987 ,name: '未验收'}]"
+            :data="[{ value: list.disposeNum, name: '已验收' }, { value: list.noDisposeNum ,name: '未验收'}]"
             :radius="['60%', '80%']"
             :legend="false"
           />
@@ -17,8 +17,8 @@
             <span>占比</span>
           </div>
           <div class="row">
-            <span>123456</span>
+            <span>{{list.disposeNum}}</span>
-            <span>20%</span>
+            <span>{{list.disposeNumRatio}}%</span>
           </div>
         </div>
         <div class="legend">
@@ -27,17 +27,17 @@
             <span>占比</span>
           </div>
           <div class="row">
-            <span>123456</span>
+            <span>{{list.noDisposeNum}}</span>
-            <span>20%</span>
+            <span>{{list.noDisposeNumRatio}}%</span>
           </div>
         </div>
       </div>
       <div class="dllm">
         <div class="chart">
           <JRingChart
-            :title="{ text: '质量整改', subTitle: '987件',fontSize: 14 }"
+            :title="{ text: '质量整改', subTitle: `${list.pollingTotal} 件`,fontSize: 14 }"
             :color="['#6EE4F0', '#E7622A']"
-            :data="[{ value: 2314,name: '已整改' }, { value: 987,name: '未整改' }]"
+            :data="[{ value: list.pollingNum,name: '已整改' }, { value: list.noPollingNum,name: '未整改' }]"
             :radius="['60%', '80%']"
             :legend="false"
           />
@@ -48,8 +48,8 @@
             <span>占比</span>
           </div>
           <div class="row">
-            <span>123456</span>
+            <span>{{list.pollingNum}}</span>
-            <span>20%</span>
+            <span>{{list.pollingNumRatio}}%</span>
           </div>
         </div>
         <div class="legend">
@@ -58,8 +58,8 @@
             <span>占比</span>
           </div>
           <div class="row">
-            <span>123456</span>
+            <span>{{list.noPollingNum}}</span>
-            <span>20%</span>
+            <span>{{list.noPollingNumRatio}}%</span>
           </div>
         </div>
       </div>
@@ -70,8 +70,36 @@
 <script>
 import Card from '../components/Card.vue'
 import JRingChart from '../../common/jChart/pie/JRingChart.vue'
+import {getQualityAcceptanceApi} from '@/assets/js/api/zhongjianFourth'
 export default {
-  components: { Card, JRingChart }
+  components: { Card, JRingChart },
+  data(){
+    return{
+      list:{
+        pollingNumRatio: 0,
+        disposeNum: 0,
+        noDisposeNum: 0,
+        disposeTotal: 0,
+        disposeNumRatio: 0,
+        pollingNum: 0,
+        noPollingNum: 0,
+        noPollingNumRatio: 0,
+        noDisposeNumRatio: 0,
+        pollingTotal: 0
+      }
+    }
+  },
+  mounted(){
+    this.getData()
+  },
+  methods:{
+    getData(){
+      getQualityAcceptanceApi({projectSn: this.$store.state.projectSn}).then((res)=>{
+        this.list = res.result
+        console.log('-----',this.list)
+      })
+    }
+  }
 }
 </script>
 

src/views/projectAdmin/zjsj/security/leftTop.vue

@@ -97,19 +97,19 @@ export default {
     return {
       // 安全隐患
       safetyPeril: {
-        rectificationNum: undefined,
+        rectificationNum: 0,
-        rectificationRatio: undefined,
+        rectificationRatio: 0,
-        noRectificationNum: undefined,
+        noRectificationNum: 0,
-        noRectificationRatio: undefined,
+        noRectificationRatio: 0,
-        totalNum: undefined,
+        totalNum: 0,
       },
       // 今日巡检
       todayInspection: {
-        rectificationNum: undefined,
+        rectificationNum: 0,
-        rectificationRatio: undefined,
+        rectificationRatio: 0,
-        noRectificationNum: undefined,
+        noRectificationNum: 0,
-        noRectificationRatio: undefined,
+        noRectificationRatio: 0,
-        totalNum: undefined,
+        totalNum: 0,
       },
       // 事件列表
       list: [