haozq
/
lj-zhgd-htweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
jjLv 2024-09-03 17:24:36 +08:00
parent d83172d88f
commit 5d83e98c12
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/img/bg.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

8
src/api/select.js
View File

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

39
src/views/construction/sideband/index.vue
View File

@ -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"
:label="dict.name"
:value="dict.id"
:key="dict.id+''"
:label="dict.projectName"
: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(){
getProList().then(response => {
getProListTwo(){
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();
},