优化

src/components/ConstructionDetails/index.vue

@@ -6,17 +6,15 @@
 -->
 
 <template>
-  <div style="width: 100%;height: 100%;">
+  <div style="width: 100%;height: 100%;overflow-y: auto;">
     <el-dialog
       :visible.sync="dialogVisible && titleName.includes('旧改')"
       :title="titleName"
       width="79%"
       append-to-body
-      z-index="777"
-      :model="false"
       :before-close="closeVideo"
       custom-class="ConstructionDetailsDialog">
-      <div style="float:left;width:60%">
+      <div style="float:left;width:60%;height: 98%;">
         <el-tabs type="card" v-model="activeNames" @tab-click="viewSource" class="projectTabs" >
           <el-tab-pane
             :label="e.label"
@@ -37,11 +35,11 @@
                       <!--                  style="width: 15px;height: 15px;margin: auto 10px;border-radius: 73%;background-color: #a3d3ff;box-shadow: 1px 1px rgb(131 131 131 / 62%);">-->
                       <!--                </div>-->
                       <el-checkbox :label="e.id" @change="handleCheckedCitiesChange"
-                                   :disabled="currentDicts.some(item=>item.label==='底腿')&&(e.onTheDitch.length==0||e.beforeBottom.length==0||e.inferiorSulcus.length==0||e.legBackfilling.length==0)">
+                                   :disabled="(currentDicts.some(item=>item.label==='底腿')&&(e.onTheDitch.length==0||e.beforeBottom.length==0||e.inferiorSulcus.length==0||e.legBackfilling.length==0))||(e.state == '99')">
                         <h2 style="margin-left: 1%;font-weight: 700;">{{ e.updateInfoTime }}</h2>
                       </el-checkbox>
                       <h2 :style="'margin-left: 20%;font-weight: 700;'+ (e.state == '1'? 'color: #1ab394':'') ">
-                        {{ e.state == '0' ? "该施工信息审核未通过:" : e.state == '1' ? "该施工信息审核通过" : e.state == '3' ? "该施工信息照片一致":"" }}{{e.zEngineeringReviewBo.reviewContent}}</h2>
+                        {{ e.state == '0' ? "该施工信息审核未通过:" : e.state == '1' ? "该施工信息审核通过" : e.state == '3' ? "该施工信息照片不一致":"" }}{{(e.state != '1' && e.content!=null) ? e.content:''}}</h2>
                     </div>
                   </template>
                   <div class="personInfo">
@@ -938,7 +936,7 @@
                   </el-form>
                   <div style="display: flex;  justify-content: flex-end; width: 100%;height: 100%;">
                     <el-button type="primary" @click="singleReview(e)"
-                               v-show="currentStatus == 'check'  && isChecking">
+                               v-show="currentStatus == 'check'  && isChecking && e.state!='99'">
                       审 核
                     </el-button>
                     <el-button plain type="danger" @click=" handleDelete(e)"
@@ -960,16 +958,16 @@
         </el-tabs>
       </div>
       <el-divider direction="vertical"></el-divider>
-      <div style="float:right;width:35%">
-      <obs-image-upload-to-video
-        class="picDialog"
-        :class=" status == 'read-only' ? 'obsImageUploads' : '' "
-        ref="obsImageUpload"
-        :limit="99"
-        :fileType="['png', 'jpg', 'jpeg']"
-        :value="allPicUrl"
-        :disabled="status == 'read-only' "
-      ></obs-image-upload-to-video>
+      <div style="float:right;width:35%;overflow-y: auto;height: 100%;">
+        <obs-image-upload-to-video
+          class="picDialog"
+          :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+          ref="obsImageUpload"
+          :limit="99"
+          :fileType="['png', 'jpg', 'jpeg']"
+          :value="allPicUrl"
+          :disabled="status == 'read-only' "
+        ></obs-image-upload-to-video>
       </div>
     </el-dialog>
     <el-dialog
@@ -1003,7 +1001,7 @@
                         <h2 style="margin-left: 1%;font-weight: 700;">{{ e.updateInfoTime }}</h2>
                       </el-checkbox>
                       <h2 :style="'margin-left: 20%;font-weight: 700;'+ (e.state == '1'? 'color: #1ab394':'') ">
-                        {{ e.state == '0' ? "该施工信息审核未通过:" : e.state == '1' ? "该施工信息审核通过" : e.state == '3' ? "该施工信息照片一致":"" }}{{e.zEngineeringReviewBo.reviewContent}}</h2>
+                        {{ e.state == '0' ? "该施工信息审核未通过" : e.state == '1' ? "该施工信息审核通过" : e.state == '3' ? "该施工信息照片不一致":"" }}</h2>
                     </div>
                   </template>
                   <div class="personInfo">
@@ -1913,7 +1911,7 @@
             </el-checkbox-group>
           </el-tab-pane>
           <el-button class="check" plain type="danger" @click="checkWorking"
-                     v-show="currentStatus == 'check'  && isChecking " style="width: 80px;"
+                     v-show="currentStatus == 'check'  && isChecking " style="width: 80px;right: 21%;"
                      :disabled="currentCollapses.length == 0">审核
           </el-button>
           <el-button class="check" plain type="danger" @click="updateNodeOption" style="width: 94px;cursor: pointer;"
@@ -2016,7 +2014,7 @@ export default {
         },
         {
           value: '3',
-          label: '前后照片一致'
+          label: '前后照片不一致'
         }
       ],
       nodesource: '',// 审核状态option
@@ -2131,6 +2129,11 @@ export default {
   },
   methods: {
     singleReview(e){
+
+      if(this.checkingInfo.reviewStatus=='' || this.checkingInfo.reviewStatus==undefined || this.checkingInfo.reviewStatus==null){
+        this.$modal.alertWarning("请选择审核状态！");
+        return;
+      }
       if(this.checkingInfo.reviewStatus == '0'){
         if(this.checkingInfo.reviewContent=='' || this.checkingInfo.reviewContent==undefined || this.checkingInfo.reviewContent==null){
           this.$modal.alertWarning("请输入审核内容！");
@@ -2145,6 +2148,7 @@ export default {
       this.checkingInfo.infoIdList[0] = e;
       this.checkingInfo.engInfoId = e.engInfoId;
       this.checkingInfo.createTime = e.createTime;
+      this.checkingInfo.activeNames = this.activeNames;
       this.$emit('checkWorking', this.checkingInfo);
       this.handleChecking()
     },
@@ -2213,6 +2217,7 @@ export default {
               this.checkingInfo.delInfoIdList = this.delinfoidList
             }
             this.checkingInfo.infoIdList = this.infoIdList
+            this.checkingInfo.activeNames = this.activeNames
             console.log('checkWorking', this.checkingInfo)
             this.$emit('checkWorking', this.checkingInfo)
             this.checkList = []
@@ -2275,10 +2280,6 @@ export default {
       }
     },
     updateNodeOption() {
-      console.log('currentCollapses')
-      console.log(this.currentCollapses)
-      console.log('checkList')
-      console.log(this.checkList)
       if (this.checkList.length == 0) {
         this.$message.warning("请选择需要修改的施工信息")
         return

src/views/zdsz/engineeringCivil/index.vue

@@ -262,9 +262,9 @@
         <span
           style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>不通过
         <span
-          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #5d5050;"></span>底腿未完工
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #5d5050;"></span>暂存
         <span
-          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #500304;"></span>前后照片一致
+          style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #500304;"></span>前后照片不一致
         <el-button
           type="danger"
           plain
@@ -278,6 +278,110 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+
+    <el-table :data="zuijinList">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="主键" align="center" prop="id" v-if="false"/>
+      <el-table-column label="行政区" align="center" prop="district">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.district" :value="scope.row.district"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="小区名称" align="center" prop="areaName"/>
+      <el-table-column label="楼宇名称" align="center" prop="buildingName"/>
+      <el-table-column label="单元名称" align="center" prop="unitName"/>
+      <el-table-column label="房间名称" align="center" prop="houseName"/>
+      <el-table-column label="工程类型" align="center" prop="enginType">
+        <template slot-scope="scope">
+          {{ scope.row.enginType === 'old_renovation' ? "旧改工程" : "新建" }}
+        </template>
+      </el-table-column>
+      <el-table-column label="工程分类" align="center" prop="enginClassificationName"/>
+      <el-table-column label="审核状态" align="center" prop="nodeReViewStateList" width="250">
+        <template slot-scope="scope">
+          <div style="text-align:center">
+            <el-popover
+              v-for="item in scope.row.nodeReViewStateList"
+              placement="top-start"
+              trigger="hover"
+              :content="item.Type">
+
+              <span slot="reference" v-if="item.state == '-1' && item.content=='无数据' && item.Type != '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #c0c0c0;"></span>
+              <span slot="reference" v-if="item.state == '0' && item.content=='暂未审核' && item.Type != '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #e0c794;"></span>
+              <span slot="reference" v-if="(item.state == '1'||item.state == '2') && item.Type != '开栓' "
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
+              <span slot="reference" v-if="item.state == '99' && item.Type != '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #5d5050;"></span>
+              <span slot="reference" v-if="item.state == '0' && item.content!='暂未审核' && item.Type != '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
+              <span slot="reference" v-if="item.state == '3' && item.Type != '开栓'"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #500304;"></span>
+
+              <span slot="reference" v-if="(item.state == '0' || item.state == '2') && item.Type == '开栓'" @click="gotoOpenGas(scope.row)"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #ffff00;"></span>
+              <span slot="reference" v-if="item.state == '1' && item.Type == '开栓'" @click="gotoOpenGas(scope.row)"
+                    style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #6998e0;"></span>
+
+            </el-popover>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['zdsz:engineeringCivil:edit']"
+          >修改工程信息
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="addNodeInfo(scope.row)"
+            v-hasPermi="['zdsz:engineeringCivil:xgsg']"
+          >修改施工信息
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-circle-check"
+            @click="viewSource(scope.row,'check')"
+            v-hasPermi="['zdsz:engineeringCivil:review']"
+          >审核
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-time"
+            @click="viewSource(scope.row)"
+            v-hasPermi="['zdsz:engineeringCivil:lssg']"
+          >历史施工
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-hasPermi="['zdsz:engineeringPipeJacking:xzdggc']"
+            @click="addNewPipe(scope.row)"
+          >新增顶管工程
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-hasPermi="['zdsz:engineeringCivil:tjyl']"
+            @click="addMaterial(scope.row)"
+          >添加用料
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
     <el-table v-loading="loading" :data="engineeringCivilList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键" align="center" prop="id" v-if="false"/>
@@ -934,6 +1038,8 @@ export default {
     "engin_cycle"],
   data() {
     return {
+      zuijinList:[],
+      listone:null,
       nodeDetailType: null,
       enginClassification: null,
       currentCollapses: [],
@@ -1355,7 +1461,7 @@ export default {
           label: '未审核'
         },{
           value: '3',
-          label: '照片一致'
+          label: '照片不一致'
         },{
           value: '99',
           label: '无数据'
@@ -1667,16 +1773,31 @@ export default {
     // 节点单项审核
     checkWorking(checkingInfo) {
       let params = checkingInfo
-      params.createTime = this.createTime
+      let that = this;
+      params.createTime = that.createTime
       CivilReview(params).then(res => {
         if (res.code == 200) {
           this.$message({
             message: '审核成功',
             type: 'success'
           });
-          this.getList()
+          if(that.zuijinList.length > 2){
+            that.zuijinList.shift();
+          }
+          for (const i in that.zuijinList) {
+            if(that.zuijinList[i].id == that.listone.id){
+              that.zuijinList.splice(i, 1);
+            }
+          }
+          for (const i in that.listone.nodeReViewStateList) {
+            if(that.listone.nodeReViewStateList[i].Type == checkingInfo.activeNames){
+              that.listone.nodeReViewStateList[i].state = checkingInfo.reviewStatus
+            }
+          }
+          that.zuijinList.push(that.listone);
+          that.getList();
           setTimeout(() => {
-            this.viewNodeSource()
+            that.viewNodeSource()
           }, 1000)
         }
       })
@@ -1742,6 +1863,7 @@ export default {
     },
     // 查看历史
     viewSource(e, type = null) {
+      this.listone = e;
       this.enginClassification = e.enginClassification
       console.log("viewSource(e, type = null)", e)
       let title = e.areaName + "-" + e.buildingName + "-" + e.unitName + "-" + e.houseName + " [" + (e.enginType == 'new_built' ? "新建" : '旧改') + "-" + e.enginClassificationName + "]"
@@ -2267,8 +2389,9 @@ export default {
     },
     /** 导出按钮操作 */
     exportBottomLeg() {
-      if (this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '') {
-        this.$message.warning("请选择行政区")
+      if ((this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '')&&
+        (this.queryParams1.areaId == undefined || this.queryParams1.areaId == null || this.queryParams1.areaId == '')) {
+        this.$message.warning("请选择行政区或小区")
         return
       }
       this.download('zdsz/engineeringCivil/exportBottomLeg', {
@@ -2287,10 +2410,11 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      // if (this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '') {
-      //   this.$message.warning("请选择行政区")
-      //   return
-      // }
+      if ((this.queryParams1.district == undefined || this.queryParams1.district == null || this.queryParams1.district == '')&&
+        (this.queryParams1.areaId == undefined || this.queryParams1.areaId == null || this.queryParams1.areaId == '')) {
+        this.$message.warning("请选择行政区或小区")
+        return
+      }
       if (this.queryParams1.enginType == undefined || this.queryParams1.enginType == null || this.queryParams1.enginType == '') {
         this.$message.warning("请选择工程类型")
         return

src/views/zdsz/engineeringGY/index.vue

@@ -1364,7 +1364,7 @@ export default {
       putEngineeEngineeIndustry(id).then(response => {
         this.loading = false;
         this.form = response.data;
-        if (response.data.zEngineeringNodeBoList !== undefined && response.data.zEngineeringNodeBoList.length > 0) {
+        if (response.data.zEngineeringNodeBoList !== null && response.data.zEngineeringNodeBoList !== undefined && response.data.zEngineeringNodeBoList.length > 0) {
           this.zEngineeringNodeBo = response.data.zEngineeringNodeBoList[0]
           if (response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList !== undefined && response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList.length > 0) {
             this.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]

src/views/zdsz/engineeringIndustry/index.vue

@@ -1005,7 +1005,7 @@ export default {
       putEngineeEngineeIndustry(id).then(response => {
         this.loading = false;
         this.form = response.data;
-        if (response.data.zEngineeringNodeBoList !== undefined && response.data.zEngineeringNodeBoList.length > 0) {
+        if (response.data.zEngineeringNodeBoList !== null && response.data.zEngineeringNodeBoList !== undefined && response.data.zEngineeringNodeBoList.length > 0) {
           this.zEngineeringNodeBo = response.data.zEngineeringNodeBoList[0]
           if (response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList !== undefined && response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList.length > 0) {
             this.zEngineeringNodeBo.zEngineeringInfoBo = response.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -914,13 +914,13 @@ export default {
           this.zEngineeringNodeBo = e
           this.currentId = e.id
           this.status = 'read-only'
-          this.$refs.ConstructionDetails.open(params,_,type,'基建',null,this.zEngineeringNodeBo.enginClassification,this.zEngineeringNodeBo.enginType)
+          this.$refs.ConstructionDetails.open(params,_,type,'基建',e.enginName,this.zEngineeringNodeBo.enginClassification,this.zEngineeringNodeBo.enginType)
         })
       })
     } else{
       this.zEngineeringNodeBo = e
       this.currentId = e.id
-      this.$refs.ConstructionDetails.open(params,_,type,'基建',null,this.zEngineeringNodeBo.enginClassification,this.zEngineeringNodeBo.enginType)
+      this.$refs.ConstructionDetails.open(params,_,type,'基建',e.enginName,this.zEngineeringNodeBo.enginClassification,this.zEngineeringNodeBo.enginType)
       this.status = 'read-only'
     }
   },

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -701,7 +701,7 @@ export default {
       this.currentId = e.id
       this.status = 'read-only'
       console.log('__________', r)
-      this.$refs.ConstructionDetails.open(r, null, type, '顶管工程', e.name, null,null, "顶管工程")
+      this.$refs.ConstructionDetails.open(r, null, type, '顶管工程', e.enginName, null,null, "顶管工程")
     },
     viewNodeSource(e) {
       console.log('查看历史传值', e, this.currentId)

vue.config.js

@@ -36,9 +36,9 @@ module.exports = {
 
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://127.0.0.1:8080`,
-        // target: `http://127.0.0.1:8080`,
-				target: `http://192.168.4.88:8080`,
+        // target: `http://127.0.0.1:8081`,
+        target: `http://127.0.0.1:8080`,
+				// target: `http://192.168.4.88:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''