bug修复

src/api/select.js

@@ -48,7 +48,13 @@ export function getGtList(query) {
         params: query
     })
 }
-
+export function getProListTwo(query) {
+    return request({
+        url: '/bracelet/sideband/getProList',
+        method: 'get',
+        params: query
+    })
+}
 
 
 

src/views/construction/sideband/index.vue

@@ -123,7 +123,7 @@
       />
       
       <!-- 杆塔弹窗 -->
-      <el-dialog :title="title" :visible.sync="showGt" width="1000px" height="1000px" append-to-body>
+      <el-dialog :title="titleGt" :visible.sync="showGt" width="1000px" height="1000px" append-to-body @close="cancelGtTwo">
           <el-form :model="queryKeyword" ref="queryFormOne" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item  prop="keyword">
           <el-input
@@ -191,7 +191,7 @@
       </el-dialog>
 
       <!-- 选择设备弹窗 -->
-      <el-dialog :title="title" :visible.sync="showDevice" width="1000px" height="1000px" append-to-body>
+      <el-dialog :title="title" :visible.sync="showDevice" width="1000px" height="1000px" append-to-body @close="cancelBindTwo">
           <el-form :model="queryKeywordTemp" ref="queryFormTwo" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item  prop="keyword">
           <el-input
@@ -250,7 +250,7 @@
 
                 <el-col :span="12">
                     <el-form-item label="边带编码" prop="sidebandCode">
-                        <el-input v-model="form.sidebandCode" placeholder="请选择边带编码" maxlength="20"/>
+                        <el-input v-model="form.sidebandCode" placeholder="请输入边带编码" maxlength="20"/>
                     </el-form-item>
                 </el-col>
           </el-row>
@@ -260,9 +260,9 @@
                         <el-select v-model="form.projectName" placeholder="请选择所属工程" clearable style="width: 100%;">
                             <el-option
                             v-for="dict in proList"
-                            :key="dict.id"
+                            :key="dict.id+''"
-                            :label="dict.name"
+                            :label="dict.projectName"
-                            :value="dict.id"
+                            :value="dict.id+''"
                             />
                         </el-select>
                     </el-form-item>
@@ -297,7 +297,7 @@
   
   <script>
   import { listSideband, addSideband, editSideband, getSidebandInfo, delSideband,listDevice,delDevice,listDeviceNoBind,bindDevice, exportPerson} from "@/api/construction/sideband";
-  import { getProList } from "@/api/select";
+  import { getProListTwo } from "@/api/select";
   import { getGtList } from "@/api/select";
   import { downloadFile } from '@/utils/download'
   import { getToken } from '@/utils/auth'
@@ -339,6 +339,7 @@
         bindNoList: [],
         // 弹出层标题
         title: "",
+        titleGt: "",
         // 是否显示弹出层
         open: false,
         //所属工程
@@ -427,15 +428,29 @@
         },
     },
     created() {
-      this.getProList();
+      this.getProListTwo();
       this.getGtList();
       this.getList();
     },
     methods: {
+
+      cancelBindTwo() {
+            this.showDevice = false;
+            this.resetForm("queryFormTwo");
+            this.handleQueryDevice();
+        },
+
+      cancelGtTwo() {
+            this.showGt = false;
+            this.resetForm("queryFormOne");
+            this.handleQueryTemp();
+        },
+
        //获取所属工程
-        getProList(){
+        getProListTwo(){
-            getProList().then(response => {
+            getProListTwo().then(response => {
                this.proList = response.data;
+               console.log(this.proList);
             });
         },
 
@@ -651,7 +666,7 @@
                 });
               return;
             }
-            this.$modal.confirm('是否确认删除边带名称为"' + row.sidebandId + '"的数据项？').then(function() {
+            this.$modal.confirm('是否确认删除边带名称为"' + row.sidebandName + '"的数据项？').then(function() {
               return delSideband(param);
             }).then(() => {
               this.getList();
@@ -675,7 +690,7 @@
         //打开杆塔页面
         openGt(row){
           this.sidebandId = row.sidebandId;
-          this.title = "杆塔"
+          this.titleGt = "杆塔"
           this.showGt = true;
           this.getListTemp();
         },