Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_vue into zdsz3.0

src/components/EngineePipe/index.vue

@@ -23,18 +23,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="节点类型" prop="zEngineeringNodeBoType">
-                <el-select v-model="queryParams.zEngineeringNodeBo.type" placeholder="请选择节点类型">
-                  <el-option
-                    v-for="e in dict.type.pipe_jack"
-                    :key="e.value"
-                    :label="e.label"
-                    :value="e.value"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="节点类型" prop="zEngineeringNodeBoType">-->
+<!--                <el-select v-model="queryParams.zEngineeringNodeBo.type" placeholder="请选择节点类型">-->
+<!--                  <el-option-->
+<!--                    v-for="e in dict.type.pipe_jack"-->
+<!--                    :key="e.value"-->
+<!--                    :label="e.label"-->
+<!--                    :value="e.value"-->
+<!--                  ></el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
@@ -250,7 +250,7 @@ export default {
         this.keyWork = '编辑节点信息'
       }
       this.queryParams = newData
-      this.zEngineeringInfoBo = newData.zEngineeringNodeBo.zEngineeringInfoBo
+      this.zEngineeringInfoBo = newData.zEngineeringNodeBoList
       this.open = true
     },
     closeToSucceed() {
@@ -277,7 +277,6 @@ export default {
         this.nodeList.forEach(e => {
           e.name = e.value
         })
-        console.log('顶管节点',this.nodeList)
         if (this.currentType == 'put') {
           this.queryParams.files = this.$refs.obsFileUpload.fileList
           this.$refs.childNode.open(this.queryParams, 15,this.nodeList)

src/components/ObsImageUpload/index.vue

@@ -47,8 +47,6 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import {picDel} from "@/api/zdsz/obs";
-import request from "@/utils/request";
 
 export default {
   props: {

src/components/ObsImageUpload/indexFile.vue

@@ -41,9 +41,6 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import {picDel} from "@/api/zdsz/obs";
-import request from "@/utils/request";
-import {delOss} from "@/api/system/oss";
 
 export default {
   props: {

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -254,6 +254,7 @@
         detailEngineeringPipeJacking,              // 历史
         getDictList
       } from "@/api/zdsz/enginee"
+      import {getDicts} from "@/api/system/dict/data";
 
       export default {
         name: "openrepair",
@@ -447,9 +448,11 @@
         },
         methods: {
           // 查看历史
-          viewSource(e){
+          async viewSource(e){
+            const res = await getDicts('pipe_jack');
+            const r = res.data!=null?res.data.map(o=>{return {label:o.dictLabel,value:o.dictValue}}):[];
             this.currentId = e.id
-            this.$refs.ConstructionDetails.open(this.dict.type.engin_type)
+            this.$refs.ConstructionDetails.open(r)
           },
           viewNodeSource(e){
             console.log(e)
@@ -458,7 +461,7 @@
               type:e
             }).then(res => {
               try {
-                this.currentCollapses = res.data.zengineeringNodeBoList[0].zEngineeringInfoBoList
+                this.currentCollapses = res.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList
               } catch (error) {
                 this.currentCollapses = [];
               }