2 Incheckningar 84c73b2f4d ... d97d640143

Upphovsman SHA1 Meddelande Datum
  qinhouyu d97d640143 Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0 11 månader sedan
  qinhouyu 8b5127ee62 修改开栓 11 månader sedan

+ 7 - 0
src/api/zdsz/engineeringGasOpening.js

@@ -15,6 +15,13 @@ export function getEngineeGasOpeningList(data) {
     params:data
     params:data
   })
   })
 }
 }
+export function queryPageListAndGetByCivi(data) {
+  return request({
+    url: `/zdsz/engineeringGasOpening/queryPageListAndGetByCivi`,
+    method: 'get',
+    params:data
+  })
+}
 
 
 export function addEngineeEngineeGasOpening(data) {
 export function addEngineeEngineeGasOpening(data) {
   return request({
   return request({

+ 27 - 3
src/views/zdsz/engineeringCivil/index.vue

@@ -277,13 +277,14 @@
               placement="top-start"
               placement="top-start"
               trigger="hover"
               trigger="hover"
               :content="item.Type">
               :content="item.Type">
+
               <span slot="reference" v-if="(item.state == '1' && item.Type != '开栓')"
               <span slot="reference" v-if="(item.state == '1' && item.Type != '开栓')"
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
                     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 != '开栓'"
               <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>
                     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 == '0' || item.state == '2') && item.Type == '开栓'"
+              <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>
                     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 == '开栓'"
+              <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>
                     style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #6998e0;"></span>
             </el-popover>
             </el-popover>
           </div>
           </div>
@@ -811,6 +812,7 @@
     </el-dialog>
     </el-dialog>
     <!-- 顶管工程新增 -->
     <!-- 顶管工程新增 -->
     <EngineePipe ref="enginPipe"/>
     <EngineePipe ref="enginPipe"/>
+    <engineeringGasOpening ref="engineeringGasOpening" v-if="engineeringGasOpeningShow"/>
 
 
   </div>
   </div>
 </template>
 </template>
@@ -847,6 +849,12 @@ import EngineePipe from '@/components/EngineePipe'
 import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
 import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
 import ConstructionDetailsGY from "@/components/ConstructionDetails/indexGY.vue";
 import ConstructionDetailsGY from "@/components/ConstructionDetails/indexGY.vue";
 import {listAll} from "@/api/system/user";
 import {listAll} from "@/api/system/user";
+import {
+  getEngineeGasOpeningList,
+  putEngineeGasOpening,
+  queryPageListAndGetByCivi
+} from "@/api/zdsz/engineeringGasOpening";
+import engineeringGasOpening from '@/views/zdsz/engineeringGasOpening/indexCivi.vue';
 
 
 function formatDate(date) {
 function formatDate(date) {
   const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
   const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
@@ -869,6 +877,7 @@ export default {
     EnginNodeInfo,
     EnginNodeInfo,
     EnginNodeInfoTYG,
     EnginNodeInfoTYG,
     ConstructionDetailsGY,
     ConstructionDetailsGY,
+    engineeringGasOpening,
     EngineePipe
     EngineePipe
   },
   },
 
 
@@ -895,6 +904,7 @@ export default {
       currentCollapses: [],
       currentCollapses: [],
       enginId: undefined,
       enginId: undefined,
       checkingsVisible: false,
       checkingsVisible: false,
+      engineeringGasOpeningShow: false,
       batchVisible: false,
       batchVisible: false,
       updateOption: [],
       updateOption: [],
       batchFormRules: {
       batchFormRules: {
@@ -1434,7 +1444,6 @@ export default {
     };
     };
   },
   },
   created() {
   created() {
-    this.getList();
     this.getAreaList();
     this.getAreaList();
   },
   },
   mounted() {
   mounted() {
@@ -2078,6 +2087,21 @@ export default {
       this.open = true;
       this.open = true;
       this.title = "添加民用工程";
       this.title = "添加民用工程";
     },
     },
+    refresh(value){
+      this.engineeringGasOpeningShow=true
+    },
+    async gotoOpenGas(entity){
+      entity.pageNum = 1;
+      entity.pageSize = 10;
+      const { district, areaId, buildingId, unitId, houseId ,pageNum , pageSize} = entity;
+      const response = await queryPageListAndGetByCivi({ district, areaId, buildingId, unitId, houseId ,pageNum , pageSize});
+      if (response!=null){
+        this.engineeringGasOpeningShow=true
+        this.$nextTick(()=>{
+          this.$refs.engineeringGasOpening.handleview(response);
+        })
+      }
+    },
     /** 修改按钮操作 */
     /** 修改按钮操作 */
     handleUpdate(row) {
     handleUpdate(row) {
       let that = this
       let that = this

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1271 - 0
src/views/zdsz/engineeringGasOpening/indexCivi.vue