forked from integrated_whb/integrated_whb_vue
bug:14355、14342、14333
parent
0167dfcd75
commit
cfd0f1ae63
|
@ -141,4 +141,12 @@ onBeforeUnmount(() => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:deep {
|
||||||
|
div#menu {
|
||||||
|
button {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -12,9 +12,11 @@ function echarts2(id, data) {
|
||||||
myChart5 = echarts.init(document.querySelector(`#${id}`));
|
myChart5 = echarts.init(document.querySelector(`#${id}`));
|
||||||
const option = {
|
const option = {
|
||||||
backgroundColor: "",
|
backgroundColor: "",
|
||||||
tooltip: {},
|
tooltip: {
|
||||||
|
trigger: "axis",
|
||||||
|
},
|
||||||
grid: {
|
grid: {
|
||||||
top: "5%",
|
top: "15%",
|
||||||
left: "1%",
|
left: "1%",
|
||||||
right: "1%",
|
right: "1%",
|
||||||
bottom: "0%",
|
bottom: "0%",
|
||||||
|
@ -24,7 +26,7 @@ function echarts2(id, data) {
|
||||||
icon: "circle",
|
icon: "circle",
|
||||||
data: ["累计工作", "本月工作"],
|
data: ["累计工作", "本月工作"],
|
||||||
textStyle: {
|
textStyle: {
|
||||||
color: "#999999",
|
color: "#fff",
|
||||||
borderColor: "#fff",
|
borderColor: "#fff",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -88,9 +90,6 @@ function echarts2(id, data) {
|
||||||
color: "#28ffb3",
|
color: "#28ffb3",
|
||||||
borderColor: "#fff",
|
borderColor: "#fff",
|
||||||
},
|
},
|
||||||
tooltip: {
|
|
||||||
show: true,
|
|
||||||
},
|
|
||||||
areaStyle: {
|
areaStyle: {
|
||||||
// 区域填充样式
|
// 区域填充样式
|
||||||
// 线性渐变,前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’,则该四个值是绝对像素位置。
|
// 线性渐变,前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’,则该四个值是绝对像素位置。
|
||||||
|
@ -120,9 +119,6 @@ function echarts2(id, data) {
|
||||||
name: "本月工作",
|
name: "本月工作",
|
||||||
type: "bar",
|
type: "bar",
|
||||||
barWidth: 20,
|
barWidth: 20,
|
||||||
tooltip: {
|
|
||||||
show: true,
|
|
||||||
},
|
|
||||||
itemStyle: {
|
itemStyle: {
|
||||||
color: "#1492FF",
|
color: "#1492FF",
|
||||||
},
|
},
|
||||||
|
|
|
@ -199,8 +199,8 @@ const fnAddOrEdit = async (id, type) => {
|
||||||
await nextTick();
|
await nextTick();
|
||||||
if (type === "edit") {
|
if (type === "edit") {
|
||||||
const resData = await getOtherAlarmConfigurationsView({ id });
|
const resData = await getOtherAlarmConfigurationsView({ id });
|
||||||
resData.data.regId = resData.data.regId.map(Number);
|
resData.data.regId = resData.data.regId?.map(Number);
|
||||||
resData.data.regGatherId = resData.data.regGatherId.map(Number);
|
resData.data.regGatherId = resData.data.regGatherId?.map(Number);
|
||||||
data.addOrEditDialog.form = resData.data;
|
data.addOrEditDialog.form = resData.data;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<template #button>
|
<template #button>
|
||||||
<el-button type="primary" @click="fnAddOrEdit('', 'add')">
|
<el-button type="primary" @click="fnAddOrEdit({}, 'add')">
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="danger" @click="fnBatchDelete">批量删除</el-button>
|
<el-button type="danger" @click="fnBatchDelete">批量删除</el-button>
|
||||||
|
@ -103,7 +103,11 @@ const { list, searchForm, tableRef, pagination, fnGetData, fnResetPagination } =
|
||||||
const data = reactive({
|
const data = reactive({
|
||||||
addOrEditDialog: {
|
addOrEditDialog: {
|
||||||
visible: false,
|
visible: false,
|
||||||
form: {},
|
form: {
|
||||||
|
layName: "",
|
||||||
|
layGroup: "",
|
||||||
|
floor: "",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
editLayerInfoDialog: {
|
editLayerInfoDialog: {
|
||||||
visible: false,
|
visible: false,
|
||||||
|
@ -140,10 +144,11 @@ const fnBatchDelete = debounce(
|
||||||
},
|
},
|
||||||
{ atBegin: true }
|
{ atBegin: true }
|
||||||
);
|
);
|
||||||
const fnAddOrEdit = (row, type) => {
|
const fnAddOrEdit = async (row, type) => {
|
||||||
|
data.addOrEditDialog.visible = true;
|
||||||
|
await nextTick();
|
||||||
data.addOrEditDialog.form = row;
|
data.addOrEditDialog.form = row;
|
||||||
data.addOrEditDialog.type = type;
|
data.addOrEditDialog.type = type;
|
||||||
data.addOrEditDialog.visible = true;
|
|
||||||
};
|
};
|
||||||
const fnEditLayerInfo = async (layId) => {
|
const fnEditLayerInfo = async (layId) => {
|
||||||
data.editLayerInfoDialog.visible = true;
|
data.editLayerInfoDialog.visible = true;
|
||||||
|
|
Loading…
Reference in New Issue