修改测试bug
This commit is contained in:
@@ -8,11 +8,11 @@
|
||||
<el-form-item label="编码">
|
||||
<el-input v-model="form.code" placeholder="请输入编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="类型">
|
||||
<!-- <el-form-item label="类型">
|
||||
<el-select v-model="form.type" placeholder="请选择类型">
|
||||
<el-option v-for="item in options" :key="item.value" :label="item.name" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
@@ -49,7 +49,7 @@ const form = reactive({
|
||||
name: '',
|
||||
code: '',
|
||||
remark: '',
|
||||
type: 2,
|
||||
// type: 2,
|
||||
sort: 100,
|
||||
pid: '',
|
||||
id: ''
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标"
|
||||
style="width: 1040px" @closed="close">
|
||||
style="width: 1200px" @closed="close">
|
||||
<el-scrollbar style="padding-right: 0">
|
||||
<div class="box">
|
||||
<div class="box-left">
|
||||
@@ -42,7 +42,14 @@
|
||||
}" :options="toData">
|
||||
<template #default="{ node, data }">
|
||||
<div style="display: flex; align-items: center">
|
||||
<div class="hide-txt">{{ data.label }}</div>
|
||||
|
||||
<el-tooltip placement="bottom" :hide-after="0">
|
||||
<template #content>
|
||||
<span>{{ data.label}}</span>
|
||||
</template>
|
||||
|
||||
<div class="hide-txt">{{ data.label }}</div>
|
||||
</el-tooltip>
|
||||
<template v-if="node.level === 1">
|
||||
<div class="ml5">({{ data.children.length }})</div>
|
||||
<div style="flex: 1"></div>
|
||||
@@ -337,7 +344,7 @@ const dicDeleteGroup = (data: any) => {
|
||||
|
||||
const newGroup = () => {
|
||||
|
||||
addRef.value.open('新增菜单', {
|
||||
addRef.value.open('新建分组', {
|
||||
sort: toData.value.length ? toData.value[toData.value.length - 1].sort + 1 : 1,
|
||||
code: '',
|
||||
pid: pid.value,
|
||||
@@ -348,7 +355,7 @@ const newGroup = () => {
|
||||
}
|
||||
const editGroup = (data: any) => {
|
||||
getDictTreeById(data.id).then(res => {
|
||||
addRef.value.open('修改菜单', {
|
||||
addRef.value.open('修改分组', {
|
||||
sort: res.data.sort || 100,
|
||||
code: res.data.code || '',
|
||||
pid: res.data.pid || '',
|
||||
@@ -411,7 +418,7 @@ defineExpose({ open })
|
||||
.statistical-type-binding {
|
||||
.box {
|
||||
display: flex;
|
||||
width: 1000px;
|
||||
width: 1160px;
|
||||
height: calc(60vh - 95px);
|
||||
margin: 0 auto;
|
||||
text-align: left;
|
||||
@@ -429,7 +436,8 @@ defineExpose({ open })
|
||||
.box-left {
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
flex: 1;
|
||||
// flex: 1;
|
||||
width: 450px;
|
||||
|
||||
.el-cascader-menu {
|
||||
padding-right: 0;
|
||||
@@ -440,16 +448,19 @@ defineExpose({ open })
|
||||
}
|
||||
|
||||
.el-cascader-panel {
|
||||
height: 100%;
|
||||
height: calc(60vh - 140px);
|
||||
|
||||
.el-cascader-menu__list {
|
||||
height: 100% !important;
|
||||
overflow-y: auto !important;
|
||||
padding-bottom: 50px !important;
|
||||
// padding-bottom: 50px !important;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
}
|
||||
}
|
||||
.box-right{
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.hide-txt {
|
||||
width: 150px;
|
||||
|
||||
@@ -1,11 +1,19 @@
|
||||
<template>
|
||||
<div class='default-main'>
|
||||
<TableHeader>
|
||||
<TableHeader :showReset='false'>
|
||||
<template v-slot:operation>
|
||||
<el-button :icon='Plus' type='primary' @click='addMenu'>新增</el-button>
|
||||
</template>
|
||||
</TableHeader>
|
||||
<Table ref='tableRef' />
|
||||
<el-tabs type="border-card">
|
||||
<el-tab-pane v-for="item in tabPane" :label="item.name">
|
||||
<Table ref='tableRef' />
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
|
||||
|
||||
|
||||
<PopupBinding ref='bindingRef'></PopupBinding>
|
||||
<PopupAdd ref='addRef' @over='init'></PopupAdd>
|
||||
</div>
|
||||
@@ -24,6 +32,7 @@ import { dicDelete } from '@/api/system-boot/dic'
|
||||
defineOptions({
|
||||
name: 'govern/setting/statisticalType'
|
||||
})
|
||||
const tabPane = [{ name: '在线监测' }, { name: '治理' }, { name: '测试' }]
|
||||
const tableRef = ref()
|
||||
const bindingRef = ref()
|
||||
const addRef = ref()
|
||||
@@ -39,10 +48,13 @@ const tableStore = new TableStore({
|
||||
url: '/system-boot/dictTree/query',
|
||||
method: 'POST',
|
||||
paramsPOST: true,
|
||||
publicHeight: 60,
|
||||
column: [
|
||||
{ title: '序号', width: 80,formatter: (row: any) => {
|
||||
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
|
||||
} },
|
||||
{
|
||||
title: '序号', width: 80, formatter: (row: any) => {
|
||||
return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
|
||||
}
|
||||
},
|
||||
{ title: '统计类型', field: 'name' },
|
||||
{
|
||||
title: '类型', field: 'type',
|
||||
|
||||
Reference in New Issue
Block a user