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

src/components/ConstructionDetails/index.vue

@@ -1202,19 +1202,6 @@ export default {
       if(dicts && dicts[0]){
         this.node = dicts[0].value
       }
-      // alert(kind)
-      // alert(enginType)
-      console.log(1)
-      console.log('dicts=',dicts)
-      console.log('type=',type)
-      console.log('currentStatus=',currentStatus)
-      console.log('kind=',kind)
-      console.log('node=',this.node)
-      console.log('enginType=',enginType)
-      console.log(2)
-      // if (kind=='民用'||kind=='基建'){
-      // alert(enginType)
-      //   this.enginType=enginType
         this.engineType=enginType
         this.enginSort=enginSort
         this.enginClassification=enginClassification

src/components/EnginNodeInfo/index.vue

@@ -545,6 +545,7 @@ export default {
           this.nodeInfoBo.zEngineeringInfoBo.lightning=this.nodeInfo.lightning
           this.nodeInfoBo.zEngineeringInfoBo.bottomLeg=this.nodeInfo.bottomLeg
           this.nodeInfoBo.zEngineeringInfoBo.groundHardening=this.nodeInfo.groundHardening
+          this.nodeInfoBo.zEngineeringInfoBo.remark=this.nodeInfo.remark
           delete this.nodeInfo.zEngiineeringPhotoBoList
           console.log('即将返回的节点Info',this.nodeInfoBo)
           result = this.nodeInfoBo

src/views/zdsz/engineeringCivil/index.vue

@@ -278,7 +278,7 @@
               trigger="hover"
               :content="item.Type">
 
-              <span slot="reference" v-if="(item.state == '1' && item.Type != '开栓')"
+              <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 == '0' && item.Type != '开栓'"
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
@@ -286,6 +286,7 @@
                     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>
@@ -525,20 +526,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <EnginNodeInfoTYG
-          v-if="title=='添加用料'"
-          v-for="(e,idx) in currentCheckList"
-          :key="idx"
-          :name="e"
-          :ref="'EnginNodeInfo'+idx"
-          :flag="'gy_tyg'"
-          :types="currentCheckList"
-          :currentContain="currentCheckList"
-          :enginType="'工业工程'"
-          :enginSort="queryParams.enginType"
-        />
         <EnginNodeInfo
-          v-else
           v-for="(e,idx) in currentCheckList"
           :key="idx"
           :name="e"
@@ -671,7 +659,6 @@
       ref="checkingAllForm"
       title="节点开关"
       :visible.sync="batchVisible"
-
       @close="checkingAllFormClosed"
     >
       <el-form :model="batchForm" :rules="batchFormRules" ref="batchFormAll" label-width="auto" label-position="right">
@@ -1207,17 +1194,39 @@ export default {
         ///////////////////////////////////////////////底腿//////////////////////////////////////////
         ///////////////////////////////////////////////调压柜安装//////////////////////////////////////////
         {
-          name: '调压柜安装',
+          name: '调压箱铭牌',
           components: [
-            [
-              'specificConstruction'//具体施工位置
-            ],
-            'constructTime',
-            'boxBrand',
-            'Lightning',
-            'BottomLeg',
-            'GroundHardening',
-            'stonePowder',                // 照片
+            'constructTime',                           // 施工时间
+            'zEngiineeringPhotoBoList',                // 照片
+            'remark',
+          ]
+        },{
+          name: '底腿连接',
+          components: [
+            'constructTime',                           // 施工时间
+            'zEngiineeringPhotoBoList',                // 照片
+            'remark',
+          ]
+        },{
+          name: '石粉回填',
+          components: [
+            'constructTime',                           // 施工时间
+            'zEngiineeringPhotoBoList',                // 照片
+            'remark',
+          ]
+        },{
+          name: '防雷接地',
+          components: [
+            'constructTime',                           // 施工时间
+            'zEngiineeringPhotoBoList',                // 照片
+            'remark',
+          ]
+        },{
+          name: '地面硬化',
+          components: [
+            'constructTime',                           // 施工时间
+            'zEngiineeringPhotoBoList',                // 照片
+            'remark',
           ]
         }
         ///////////////////////////////////////////////调压柜安装//////////////////////////////////////////
@@ -1592,9 +1601,6 @@ export default {
       this.status = 'put'
       let title = e.areaName + "-" + e.buildingName + "-" + e.unitName + "-" + e.houseName + " [" + (e.enginType == 'new_built' ? "新建" : '旧改') + "-" + e.enginClassificationName + "]"
       let val = e.enginType + "_" + e.enginClassification
-      if (e.enginClassification=='pressure_regulating'){
-        val = 'gy_tyg'
-      }
       getDicts(val).then(res => {
         let dict = []
         for (let i = 0; i < res.data.length; i++) {
@@ -1637,9 +1643,6 @@ export default {
       console.log("viewSource(e, type = null)", title)
       this.enginId = e.id
       let val = e.enginType + "_" + e.enginClassification
-      if (e.enginClassification=='pressure_regulating'){
-        val = 'gy_tyg'
-      }
       getDicts(val).then(res => {
         let dict = []
         for (let i = 0; i < res.data.length; i++) {
@@ -1698,9 +1701,6 @@ export default {
         this.enginTypeHasChanged(newData.enginType)
         let val = newData.enginType + "_" + newData.enginClassification
         this.currentCheckList = []
-        if (newData.enginClassification=='pressure_regulating'){
-          val = 'gy_tyg'
-        }
         getDicts(val).then(res => {
           this.checkList = res.data
           console.log(this.checkList)
@@ -1724,9 +1724,6 @@ export default {
       )
         return
       let val = this.queryParams.enginType + "_" + this.queryParams.enginClassification
-      if (this.queryParams.enginClassification=='pressure_regulating'){
-        val = 'gy_tyg';
-      }
       getDicts(val).then(res => {
         this.checkList = res.data
       })
@@ -1738,9 +1735,6 @@ export default {
       )
         return
       let val = this.checkingForm.enginType + "_" + this.checkingForm.enginClassification
-      if (this.checkingForm.enginClassification=='pressure_regulating'){
-        val = 'gy_tyg';
-      }
       getDicts(val).then(res => {
         this.checkingAllList = res.data
       })
@@ -1752,9 +1746,6 @@ export default {
       )
         return
       let val = this.batchForm.enginType + "_" + this.batchForm.enginClassification
-      if (this.batchForm.enginClassification=='pressure_regulating'){
-        val = 'gy_tyg';
-      }
       getDicts(val).then(res => {
         this.checkingAllList = res.data
       })
@@ -1815,9 +1806,6 @@ export default {
       this.queryParams1.type = ''
       this.currentEnginTypeChangeOptions2 = []
       let params = enginType && enginClassification || this.queryParams1.enginType + '_' + this.queryParams1.enginClassification
-      if (this.queryParams1.enginClassification=='pressure_regulating'){
-        params = 'gy_tyg'
-      }
       getDicts(params).then(res => {
         this.currentEnginTypeChangeOptions2 = res.data
       })

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -1214,8 +1214,8 @@ export default {
         console.log(res)
         let newData = res.data
         let zEngineeringNodeBo = {
-            type:res.data.zEngineeringNodeBoList[0].type || null,
-            zEngineeringInfoBo:res.data.zEngineeringNodeBoList[0].zEngineeringInfoBo
+            type:res.data.zEngineeringNodeBoList.length >0 && res.data.zEngineeringNodeBoList[0].type || null,
+            zEngineeringInfoBo:res.data.zEngineeringNodeBoList.length >0 && res.data.zEngineeringNodeBoList[0].zEngineeringInfoBo || null,
         }
         newData.zEngineeringNodeBo = zEngineeringNodeBo
         this.currentType = 'put'