Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/api/zdsz/enginee.js

@@ -193,6 +193,21 @@ export function engineeringCivilReview(data) {
     })
 }
 
+/**
+ * 民用审核
+ * @param data
+ * @returns {*}
+ * @constructor
+ */
+export function CivilReview(data) {
+  return request({
+    url: '/zdsz/engineeringCivil/CivilReview',
+    method: 'post',
+    data
+  })
+}
+
+
 // 民用批量审核
 export function engineeringCivilAllReview(data) {
     return request({

src/views/zdsz/enginee/material/progres_statistics/progres_statistics.vue

@@ -80,16 +80,16 @@
             </el-table-column>
             <el-table-column
             prop="notstart"
-            label="未开工（户）"
+            label="未施工（户）"
             >
             </el-table-column>
             <el-table-column
             prop="willDone"
-            label="施工（户）">
+            label="施工中（户）">
             </el-table-column>
             <el-table-column
             prop="done"
-            label="完工（户）">
+            label="竣工（户）">
             </el-table-column>
 
         </el-table>
@@ -122,62 +122,10 @@ export default {
           queryParams:{pageNum:1,pageSize:10, areaId:undefined,enginCycle:"0"},
             currentMenu:1,   // 0:用料管理 1:进度统计 2:可视化进度
             typeOptions:[
-                {
-                    value: '0',
-                    label: '市政工程'
-                },
-                {
-                    value: '1',
-                    label: '工业工程'
-                },
-                {
-                    value: '2',
-                    label: '民用工程'
-                },
-                {
-                    value: '3',
-                    label: '危险作业'
-                },
-                {
-                    value: '4',
-                    label: '顶管工程'
-                },
-                {
-                    value: '5',
-                    label: '基建工程'
-                }
+
             ],
             tableData: [
-                {
-                    name: '兰亭湖畔',
-                    doing: '30',
-                    willDone:'19',
-                    done:'20'
-                },
-                {
-                    name: '清华园',
-                    doing: '30',
-                    willDone:'19',
-                    done:'20'
-                },
-                {
-                    name: '领秀世家',
-                    doing: '30',
-                    willDone:'19',
-                    done:'20'
-                },
-                {
-                    name: '上东府里',
-                    doing: '30',
-                    willDone:'19',
-                    done:'20'
-                },
-                {
-                    name: '龙腾香格里',
-                    doing: '30',
-                    willDone:'19',
-                    done:'20'
-                },
+
             ],
             currentType:'管'
         }

src/views/zdsz/engineeringCivil/index.vue

@@ -513,7 +513,12 @@ import {
   putEngineeringCivil,                       // 民用工程修改
   viewEngineeringCivil,                      // 民用工程查看详情
   deleteEngineeringCivil,                    // 删除民用工程
-  getDictList, viewEngineeringInfrastructureSource, viewEngineeringCivilSource,engineeringCivilReview,engineeringCivilAllReview
+  getDictList,
+  viewEngineeringInfrastructureSource,
+  viewEngineeringCivilSource,
+
+  engineeringCivilAllReview,
+  CivilReview
 } from "@/api/zdsz/enginee"
 import {getAreaList} from "@/api/zdsz/area";
 import {getBuildingList} from "@/api/zdsz/building";
@@ -961,7 +966,7 @@ export default {
       engineeringCivilAllReview(this.checkingForm).then(res => {
         if(res.code == 200){
           this.$message({
-            message: '提交成功',
+            message: '批量审核请求以提交后台，5-10分钟后均可成功。',
             type: 'success'
           });
           this.checkingsVisible = false
@@ -984,7 +989,7 @@ export default {
     checkWorking(checkingInfo){
       let params = checkingInfo
       params.createTime = this.createTime
-      engineeringCivilReview(params).then(res => {
+      CivilReview(params).then(res => {
         if(res.code == 200){
           this.$message({
             message: '审核成功',