修改看板

master
夜笙歌 11 months ago
parent 5f050b0f32
commit 241da15d0b

@ -29,7 +29,8 @@
</el-col>
<el-col :span="19" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px">
<el-form-item label="计量设备状态" prop="monitorStatus">
<el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
<el-option
@ -75,7 +76,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['base:monitorWorkUnit:add']"
>新增</el-button>
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -86,7 +88,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['base:monitorWorkUnit:edit']"
>修改</el-button>
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -97,7 +100,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['base:monitorWorkUnit:remove']"
>删除</el-button>
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -107,7 +111,8 @@
size="mini"
@click="handleExport"
v-hasPermi="['base:monitorWorkUnit:export']"
>导出</el-button>
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
@ -159,14 +164,16 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:monitorWorkUnit:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:monitorWorkUnit:remove']"
>删除</el-button>
>删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -184,10 +191,12 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="计量设备名称" prop="monitorCode">
<treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer" placeholder="请选择计量设备" />
<treeselect v-model="form.monitorCode" :options="monitorInfoOptions" :normalizer="normalizer"
placeholder="请选择计量设备"/>
</el-form-item>
<el-form-item label="统计单元编号" prop="workUnitCode">
<treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer" placeholder="请选择父级编号" />
<treeselect v-model="form.workUnitCode" :options="workUnitOptions" :normalizer="workUnitOptionsNormalizer"
placeholder="请选择父级编号"/>
</el-form-item>
<!-- <el-form-item label="计量设备编号" prop="monitorCode">-->
<!-- <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />-->
@ -201,7 +210,8 @@
v-for="dict in dict.type.monitor_type"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="计算方式" prop="formulaMode">
@ -210,7 +220,8 @@
v-for="dict in dict.type.formula_mode"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="比率" prop="proportion">
@ -225,7 +236,8 @@
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="启用标识" prop="isFlag">
@ -234,7 +246,8 @@
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
@ -247,7 +260,13 @@
</template>
<script>
import { listMonitorWorkUnit, getMonitorWorkUnit, delMonitorWorkUnit, addMonitorWorkUnit, updateMonitorWorkUnit } from "@/api/base/monitorWorkUnit";
import {
listMonitorWorkUnit,
getMonitorWorkUnit,
delMonitorWorkUnit,
addMonitorWorkUnit,
updateMonitorWorkUnit
} from "@/api/base/monitorWorkUnit";
import {getWorkUnitTrees} from '@/api/base/workUnit'
import {listMonitorInfo} from '@/api/base/monitorInfo'
import Treeselect from "@riophae/vue-treeselect";
@ -347,9 +366,11 @@ export default {
getTreeselect() {
listMonitorInfo().then(response => {
this.monitorInfoOptions = [];
const data = { objId: 0, monitorName: '顶级节点', children: [] };
data.children = this.handleTree(response.data, "objId", "parentId");
this.monitorInfoOptions.push(data);
// const data = { objId: 0, monitorName: '', children: [] };
this.monitorInfoOptions = this.handleTree(response.data, "objId", "parentId");
// data.children = this.handleTree(response.data, "objId", "parentId");
console.log('data', data)
// this.monitorInfoOptions = data;
});
},
/** 转换计量设备信息数据结构 */
@ -365,6 +386,7 @@ export default {
},
/** 转换统计单元信息数据结构 */
workUnitOptionsNormalizer(node) {
console.log('node', node)
if (node.children && !node.children.length) {
delete node.children;
}
@ -378,8 +400,9 @@ export default {
/** 查询计量设备下拉树结构 */
getDeptTrees() {
getWorkUnitTrees().then(response => {
this.workUnitOptions = response.data;
console.log(this.workUnitOptions)
this.workUnitOptions = [];
this.workUnitOptions = JSON.parse(JSON.stringify(response.data).replaceAll('id','id2').replaceAll('code','id'));
console.log('this.workUnitOptions',this.workUnitOptions)
});
},
//
@ -464,7 +487,6 @@ export default {
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
console.log(this.form.monitorCode)
if (valid) {
if (this.form.objId != null) {
updateMonitorWorkUnit(this.form).then(response => {
@ -490,7 +512,8 @@ export default {
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {

Loading…
Cancel
Save