Skip to content

D
DC-TOM
Commit c80f0375 authored by liuzhaoh's avatar liuzhaoh
Browse files
Options

Merge branch 'dev' of http://app.bmetech.com/liuzhaohui/dctomproject into dev

parents cecc15b7 d22e86b9
Hide whitespace changes
Inline Side-by-side
Showing with 404 additions and 124 deletions
src/layout/menuCom.vue
View file @ c80f0375
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
@open="handleOpen" @open="handleOpen"
@close="handleClose" @close="handleClose"
:collapse="sidebar" :collapse="sidebar"
:active-text-color="'#1890FF'"
:default-active="activeMenu"
:collapse-transition="false" :collapse-transition="false"
:router="true"
> >
<template v-for="(item, index) in routerList" :key="item.path"> <template v-for="(item, index) in routerList" :key="item.path">
<el-sub-menu <el-sub-menu
...@@ -15,25 +18,22 @@ ...@@ -15,25 +18,22 @@
class="submenu-box" class="submenu-box"
> >
<template #title> <template #title>
<el-icon><location /></el-icon> <!-- <el-icon><location /></el-icon> -->
<img class="menu-icon" :src="`/src/assets/menu/${item.meta.icon}.png`" alt="">
<span>{{getMenuTitle(item)}}</span> <span>{{getMenuTitle(item)}}</span>
</template> </template>
<el-menu-item v-for="(item_son, index_son) in item.children" <el-menu-item v-for="(item_son, index_son) in item.children"
:key="item_son.path" :key="item_son.path"
:index="index + '_' + index_son" :index="item_son.path"
@click="handleClick(item_son.path)" @click="handleClick(item_son.path)"
class="submenu-title-noDropdown" class="submenu-title-noDropdown"
> >
<span>{{getMenuTitle(item_son)}}</span> <span>{{getMenuTitle(item_son)}}</span>
</el-menu-item> </el-menu-item>
</el-sub-menu> </el-sub-menu>
<el-menu-item v-else :index="index + ''" <el-menu-item v-else :index="index + ''" class="submenu-box" @click="handleClick(item.path)">
class="submenu-box" <!-- <el-icon><setting /></el-icon> -->
@click="handleClick(item.path)" <img class="menu-icon" :src="`/src/assets/menu/${item.meta.icon}.png`" alt="">
>
<el-icon>
<setting />
</el-icon>
<span>{{getMenuTitle(item)}}</span> <span>{{getMenuTitle(item)}}</span>
</el-menu-item> </el-menu-item>
</template> </template>
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
</template> </template>
<script setup> <script setup>
import { computed } from 'vue';
import { import {
Document, Document,
Menu as IconMenu, Menu as IconMenu,
...@@ -50,9 +51,10 @@ import { ...@@ -50,9 +51,10 @@ import {
Setting, Setting,
} from "@element-plus/icons-vue"; } from "@element-plus/icons-vue";
import {routes} from "../router/index.js"; import {routes} from "../router/index.js";
import { useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router';
import { menuStore } from '@/pinia/menu.js'; import { menuStore } from '@/pinia/menu.js';
import { storeToRefs } from 'pinia'; import { storeToRefs } from 'pinia';
const route = useRoute();
const router = useRouter(); const router = useRouter();
const { sidebar } = storeToRefs(menuStore()); const { sidebar } = storeToRefs(menuStore());
const handleClick = (path) => { const handleClick = (path) => {
...@@ -65,6 +67,13 @@ const handleClick = (path) => { ...@@ -65,6 +67,13 @@ const handleClick = (path) => {
} }
const routerList = routes[0].children; const routerList = routes[0].children;
const activeMenu = computed(()=>{
console.log('123--', route.path);
return route.path;
});
const handleOpen = (key, keyPath) => { const handleOpen = (key, keyPath) => {
console.log(key, keyPath); console.log(key, keyPath);
}; };
...@@ -88,6 +97,11 @@ const getMenuTitle = (item) => { ...@@ -88,6 +97,11 @@ const getMenuTitle = (item) => {
span, a, i { span, a, i {
color: #fff !important; color: #fff !important;
} }
.menu-icon {
width: 16px;
// height: 18px;
margin-right: 5px;
}
} }
...@@ -98,6 +112,27 @@ const getMenuTitle = (item) => { ...@@ -98,6 +112,27 @@ const getMenuTitle = (item) => {
color: #fff !important; color: #fff !important;
} }
} }
.is-active {
.el-submenu__title {
color: #FFFFFFFF !important;
background: #03A1B3FF !important;
.el-icon-arrow-down {
color: #FFFFFFFF;
}
.svg-icon {
opacity: 1;
}
}
}
.ns-active {
background-color: #fff !important;
span {
color: #055f7c !important;
}
}
</style> </style>
<style lang="scss"> <style lang="scss">
...@@ -121,10 +156,22 @@ const getMenuTitle = (item) => { ...@@ -121,10 +156,22 @@ const getMenuTitle = (item) => {
// menu hover // menu hover
.submenu-title-noDropdown, .submenu-title-noDropdown,
.el-submenu__title { .el-submenu__title {
background: transparent; background: linear-gradient(225deg, rgba(128, 255, 178, .2), rgba(58, 120, 255, .1) 100%, #0049fa 0) !important;
color: #FFFFFF !important; color: #FFFFFF !important;
&:hover { &:hover {
background-color: #03a1b3 !important; background-color: #03a1b3 !important;
} }
} }
.el-menu-item {
background: #055F7CFF !important;
}
.submenu-box .is-active {
background-color: #fff !important;
span {
color: #055f7c !important;
}
}
</style> </style>
\ No newline at end of file
src/router/index.js
View file @ c80f0375
...@@ -24,16 +24,16 @@ const routes = [ ...@@ -24,16 +24,16 @@ const routes = [
{ {
path: '/dashboard', path: '/dashboard',
component: Dashboard, component: Dashboard,
meta: { title: '首页' }, meta: { title: '首页', icon: 'dashboard', },
}, },
{ {
path: '/dust-overview', path: '/dust-overview',
component: DustOverview, component: DustOverview,
meta: { title: '除尘器总览' }, meta: { title: '除尘器总览', icon: 'dustOverview' },
}, },
{ {
path: '/device-management', path: '/device-management',
meta: { title: '设备管理' }, meta: { title: '设备管理', icon: 'deviceManage' },
children: [ children: [
{ {
path: '/management/device-management', path: '/management/device-management',
...@@ -50,26 +50,26 @@ const routes = [ ...@@ -50,26 +50,26 @@ const routes = [
{ {
path: '/monitor', path: '/monitor',
component: dustMonitoring, component: dustMonitoring,
meta: { title: '除尘器监控' }, meta: { title: '除尘器监控', icon: 'monitor' },
}, },
{ {
path: '/collectorList', path: '/collectorList',
component: CollectorList, component: CollectorList,
meta: { title: '布袋周期' }, meta: { title: '布袋周期', icon: 'collectorList' },
}, },
{ {
path: '/bag-monitor', path: '/bag-monitor',
component: bagMonitoring, component: bagMonitoring,
meta: { title: 'BME布袋监测' }, meta: { title: 'BME布袋监测', icon: 'collectorList' },
}, },
{ {
path: '/alerts', path: '/alerts',
component: AboutView, component: AboutView,
meta: { title: '告警总览' }, meta: { title: '告警总览', icon: 'warnning' },
}, },
{ {
path: '/my-loop', path: '/my-loop',
meta: { title: '我的闭环' }, meta: { title: '我的闭环', icon: 'closeIcon' },
children: [ children: [
{ {
path: '/my-loop/myAgency', path: '/my-loop/myAgency',
......
src/views/closeManage/myAgency.vue
View file @ c80f0375
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
:data="tableData" :data="tableData"
:columns="tableColumns" :columns="tableColumns"
:default-page-size="20" :default-page-size="20"
:total="total"
@pagination-change="handlePaginationChange" @pagination-change="handlePaginationChange"
:pagination-texts="{ :pagination-texts="{
total: '共', total: '共',
...@@ -588,6 +589,37 @@ ...@@ -588,6 +589,37 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</common-dialog> </common-dialog>
<common-dialog
:show-dialog="bagDialog.show"
:title="bagDialog.title"
:btn-group="bagDialog.btnGroup"
:width="bagDialog.width"
@handleBtn="saveBag"
@close:showDialog="bagDialog.show = false"
>
<el-form>
<el-form-item label="第几行：">
<el-select v-model="bagRow" placeholder="请选择第几行" @change="getCol">
<el-option
v-for="item in rowList" :key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="第几列：">
<el-select v-model="bagCol" placeholder="请选择第几列">
<el-option
v-for="item in colList" :key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
</common-dialog>
</div> </div>
</template> </template>
...@@ -595,14 +627,16 @@ ...@@ -595,14 +627,16 @@
import { ref, reactive, onMounted, onBeforeUnmount,computed } from 'vue' import { ref, reactive, onMounted, onBeforeUnmount,computed } from 'vue'
import CommonTable from "@/components/commonTable/index.vue"; import CommonTable from "@/components/commonTable/index.vue";
import commonDialog from "./components/dialog.vue"; import commonDialog from "./components/dialog.vue";
import { getData, getDataFun, postDataJson, postDataJSON } from '@/request/method.js'; import { getData, getDataFun, postData, postDataJson, postDataJSON } from '@/request/method.js';
import moment from 'moment'; import moment from 'moment';
import { getToken } from '@/utils/auth.js'; import { getToken } from '@/utils/auth.js';
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
import { useUsersStore } from "@/pinia/user.js"; import { useUsersStore } from "@/pinia/user.js";
const { functionAuthority } = storeToRefs(useUsersStore()); const { functionAuthority } = storeToRefs(useUsersStore());
const total = ref(0);
const formInline = ref({ const formInline = ref({
eventName: '', eventName: '',
keyword: '', keyword: '',
...@@ -647,6 +681,80 @@ const assignDialog = ref({ ...@@ -647,6 +681,80 @@ const assignDialog = ref({
} }
] ]
}); });
const bagDialog = ref({
title: '更换布袋',
show: false,
width: '30%',
btnGroup: [
{
attrKey: 'save',
label: '保存'
}
]
});
const bagRow = ref('');
const bagCol = ref('');
const rowList = ref([]);
const colList = ref([]);
const saveBag = ()=>{
if (bagRow.value === '') {
ElMessage({
type: 'warning',
message: '请选择第几行'
});
return;
}
if (bagCol.value === '') {
ElMessage({
type: 'warning',
message: '请选择第几列'
});
return;
}
const params = {
workTicketNo: workTicketNo.value,
row: bagRow.value,
column: bagCol.value
};
postDataJSON('/transaction/doc/changeBag',params).then(res => {
if (res.code === 1) {
ElMessage({
type: 'success',
message: '更换布袋成功'
});
bagDialog.value.show = false;
}
});
}
const rowLineMap = ref(null);
const getBagRowLine = (no) => {
const url = '/bag/cycle/getCompartEnumList';
const params = {
deviceNo: no
}
getDataFun((url,params).then(res => {
if (res.code === 1) {
rowLineMap.value = res.data;
res.data.forEach(item => {
rowList.value.push(item.row);
});
}
})
)
}
const getCol = ()=>{
rowLineMap.value.forEach(item => {
if (item.row === bagRow.value) {
colList.value.push(item.column);
}
});
}
const personTag = ref([]); const personTag = ref([]);
const addPerson = ()=>{ const addPerson = ()=>{
...@@ -880,7 +988,9 @@ const getDetail = (workTicketNo) => { ...@@ -880,7 +988,9 @@ const getDetail = (workTicketNo) => {
} }
const changeBag = (data)=>{ const changeBag = (data)=>{
workTicketNo.value = data.workTicketNo;
getBagRowLine(data.deviceNo);
bagDialog.value.show = true;
} }
const tableData = ref([]); const tableData = ref([]);
...@@ -1018,6 +1128,7 @@ const getTableData = ()=> { ...@@ -1018,6 +1128,7 @@ const getTableData = ()=> {
getDataFun(url,params).then(res => { getDataFun(url,params).then(res => {
if (res && res.code === 1) { if (res && res.code === 1) {
const { list } = res.data; const { list } = res.data;
total.value = res.data.total;
disposeType(list); disposeType(list);
tableData.value = list; tableData.value = list;
} }
......
src/views/closeManage/myDone.vue
View file @ c80f0375
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
:data="tableData" :data="tableData"
:columns="tableColumns" :columns="tableColumns"
:default-page-size="20" :default-page-size="20"
:total="total"
@pagination-change="handlePaginationChange" @pagination-change="handlePaginationChange"
:pagination-texts="{ :pagination-texts="{
total: '共', total: '共',
...@@ -698,6 +699,37 @@ ...@@ -698,6 +699,37 @@
</el-row> </el-row>
</el-form> </el-form>
</common-dialog> </common-dialog>
<common-dialog
:show-dialog="bagDialog.show"
:title="bagDialog.title"
:btn-group="bagDialog.btnGroup"
:width="bagDialog.width"
@handleBtn="saveBag"
@close:showDialog="bagDialog.show = false"
>
<el-form>
<el-form-item label="第几行：">
<el-select v-model="bagRow" placeholder="请选择第几行" @change="getCol">
<el-option
v-for="item in rowList" :key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="第几列：">
<el-select v-model="bagCol" placeholder="请选择第几列">
<el-option
v-for="item in colList" :key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
</common-dialog>
</div> </div>
</template> </template>
...@@ -709,6 +741,7 @@ import { getData, getDataFun, postDataJSON } from '@/request/method.js'; ...@@ -709,6 +741,7 @@ import { getData, getDataFun, postDataJSON } from '@/request/method.js';
import moment from 'moment'; import moment from 'moment';
import { getToken } from '@/utils/auth.js'; import { getToken } from '@/utils/auth.js';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { router } from '@/router/index.js';
const formInline = ref({ const formInline = ref({
eventName: '', eventName: '',
keyword: '', keyword: '',
...@@ -731,6 +764,78 @@ const viewDialog = ref({ ...@@ -731,6 +764,78 @@ const viewDialog = ref({
width: '45%', width: '45%',
}); });
const bagDialog = ref({
title: '更换布袋',
show: false,
width: '30%',
btnGroup: [
{
attrKey: 'save',
label: '保存'
}
]
});
const bagRow = ref('');
const bagCol = ref('');
const rowList = ref([]);
const colList = ref([]);
const saveBag = ()=>{
if (bagRow.value === '') {
ElMessage({
type: 'warning',
message: '请选择第几行'
});
return;
}
if (bagCol.value === '') {
ElMessage({
type: 'warning',
message: '请选择第几列'
});
return;
}
const params = {
workTicketNo: workTicketNo.value,
row: bagRow.value,
column: bagCol.value
};
postDataJSON('/transaction/doc/changeBag',params).then(res => {
if (res.code === 1) {
ElMessage({
type: 'success',
message: '更换布袋成功'
});
bagDialog.value.show = false;
}
});
}
const rowLineMap = ref(null);
const getBagRowLine = (no) => {
const url = '/bag/cycle/getCompartEnumList';
const params = {
deviceNo: no
}
getDataFun((url,params).then(res => {
if (res.code === 1) {
rowLineMap.value = res.data;
res.data.forEach(item => {
rowList.value.push(item.row);
});
}
})
)
}
const getCol = ()=>{
rowLineMap.value.forEach(item => {
if (item.row === bagRow.value) {
colList.value.push(item.column);
}
});
}
const viewData = { const viewData = {
D: "在线监控(监测)仪器仪表故障", D: "在线监控(监测)仪器仪表故障",
B: "在线监控(监测)仪器仪表与数采通讯异常", B: "在线监控(监测)仪器仪表与数采通讯异常",
...@@ -898,7 +1003,8 @@ const saveReject = ()=>{ ...@@ -898,7 +1003,8 @@ const saveReject = ()=>{
const params = { const params = {
workTicketNo: workTicketNo.value, workTicketNo: workTicketNo.value,
rejectType: rejectType.value, rejectType: rejectType.value,
rejectReason: rejectReason.value rejectReason: rejectReason.value,
isDcTom: 1
} }
postDataJSON(url,params).then(res => { postDataJSON(url,params).then(res => {
workTicketNo.value = ''; workTicketNo.value = '';
...@@ -930,7 +1036,9 @@ const getDetail = (workTicketNo) => { ...@@ -930,7 +1036,9 @@ const getDetail = (workTicketNo) => {
} }
const changeBag = (data)=>{ const changeBag = (data)=>{
workTicketNo.value = data.workTicketNo;
getBagRowLine(data.deviceNo);
bagDialog.value.show = true;
} }
const tableData = ref([]); const tableData = ref([]);
...@@ -1040,6 +1148,8 @@ const searchData = ()=>{ ...@@ -1040,6 +1148,8 @@ const searchData = ()=>{
getTableData(); getTableData();
} }
const total = ref(0);
const getTableData = ()=> { const getTableData = ()=> {
let keyWord = formInline.value.keyword?.replace(/#/g, '%23'); let keyWord = formInline.value.keyword?.replace(/#/g, '%23');
const params = { const params = {
...@@ -1061,6 +1171,7 @@ const getTableData = ()=> { ...@@ -1061,6 +1171,7 @@ const getTableData = ()=> {
getDataFun(url,params).then(res => { getDataFun(url,params).then(res => {
if (res && res.code === 1) { if (res && res.code === 1) {
const { list } = res.data; const { list } = res.data;
total.value = res.data.total;
disposeType(list); disposeType(list);
tableData.value = list; tableData.value = list;
} }
......
src/views/dustOverview/components/valveSettingDialog.vue
View file @ c80f0375
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<div class="setting-row"> <div class="setting-row">
<div class="input-group"> <div class="input-group">
<span>仓室编号：</span> <span>仓室编号：</span>
<el-select v-model="valveForm.compartNo" style="width: 120px" @change="handleRoomChange"> <el-select v-model="valveForm.frontCompartNo" style="width: 120px" @change="handleRoomChange">
<el-option <el-option
v-for="cell in statusData" v-for="cell in statusData"
:key="cell.compartNo" :key="cell.frontCompartNo"
:label="`${cell.compartNo}仓`" :label="`${cell.frontCompartNo}仓`"
:value="cell.compartNo" :value="cell.frontCompartNo"
/> />
</el-select> </el-select>
</div> </div>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<span>电磁阀分布数量：</span> <span>电磁阀分布数量：</span>
<el-input-number <el-input-number
v-model="valveForm.valveNum" v-model="valveForm.valveNum"
:min="1" :min="0"
controls-position="right" controls-position="right"
style="width: 120px" style="width: 120px"
:class="{ 'is-error': errorMessage }" :class="{ 'is-error': errorMessage }"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<span>布袋数量：</span> <span>布袋数量：</span>
<el-input-number <el-input-number
v-model="valveForm.bagNum" v-model="valveForm.bagNum"
:min="1" :min="0"
controls-position="right" controls-position="right"
style="width: 120px" style="width: 120px"
/> />
...@@ -81,10 +81,10 @@ ...@@ -81,10 +81,10 @@
v-for="(cell, colIndex) in statusData" v-for="(cell, colIndex) in statusData"
:key="colIndex" :key="colIndex"
class="valve-cell" class="valve-cell"
:class="{ 'active-cell': cell.compartNo === valveForm.compartNo }" :class="{ 'active-cell': cell.frontCompartNo === valveForm.frontCompartNo }"
@click="valveForm.compartNo = cell.compartNo; handleRoomChange(cell.compartNo)" @click="valveForm.frontCompartNo = cell.frontCompartNo; handleRoomChange(cell.frontCompartNo)"
> >
<div class="cell-index">{{ cell.compartNo }}仓</div> <div class="cell-index">{{ cell.frontCompartNo }}仓</div>
<div class="cell-value">{{ cell.valveNum }} <span>({{ cell.bagNum }})</span></div> <div class="cell-value">{{ cell.valveNum }} <span>({{ cell.bagNum }})</span></div>
</div> </div>
</div> </div>
...@@ -119,7 +119,7 @@ const emit = defineEmits(["update:modelValue", "confirm"]); ...@@ -119,7 +119,7 @@ const emit = defineEmits(["update:modelValue", "confirm"]);
const valveForm = ref({ const valveForm = ref({
total: 0, total: 0,
rows: 0, rows: 0,
compartNo: 0, frontCompartNo: 0,
valveNum: 0, valveNum: 0,
bagNum: 0 bagNum: 0
}); });
...@@ -135,7 +135,7 @@ const currentTotalValves = computed(() => { ...@@ -135,7 +135,7 @@ const currentTotalValves = computed(() => {
// 计算当前修改后的总数量 // 计算当前修改后的总数量
const projectedTotalValves = computed(() => { const projectedTotalValves = computed(() => {
// 找到当前修改的仓室 // 找到当前修改的仓室
const selectedRoom = statusData.value.find(cell => cell.compartNo === valveForm.value.compartNo); const selectedRoom = statusData.value.find(cell => cell.frontCompartNo === valveForm.value.frontCompartNo);
if (!selectedRoom) return currentTotalValves.value; if (!selectedRoom) return currentTotalValves.value;
// 计算替换后的总数 // 计算替换后的总数
...@@ -167,7 +167,7 @@ const initializeState = () => { ...@@ -167,7 +167,7 @@ const initializeState = () => {
// // 如果有数据，默认选中第一个仓室 // // 如果有数据，默认选中第一个仓室
// if (statusData.value.length > 0) { // if (statusData.value.length > 0) {
// valveForm.value.compartNo = statusData.value[0].index; // valveForm.value.frontCompartNo = statusData.value[0].index;
// valveForm.value.valveNum = statusData.value[0].valveNum; // valveForm.value.valveNum = statusData.value[0].valveNum;
// valveForm.value.bagNum = statusData.value[0].valveNum; // 默认布阀数量等于电磁阀数量 // valveForm.value.bagNum = statusData.value[0].valveNum; // 默认布阀数量等于电磁阀数量
// } // }
...@@ -178,7 +178,7 @@ const getAllocation = (params) => { ...@@ -178,7 +178,7 @@ const getAllocation = (params) => {
getValveAllocation(params).then(res => { getValveAllocation(params).then(res => {
if (res.code === 1 && res.data.valveList.length > 0) { if (res.code === 1 && res.data.valveList.length > 0) {
statusData.value = res.data.valveList; statusData.value = res.data.valveList;
valveForm.value.compartNo = statusData.value[0].compartNo; valveForm.value.frontCompartNo = statusData.value[0].frontCompartNo;
valveForm.value.valveNum = statusData.value[0].valveNum; valveForm.value.valveNum = statusData.value[0].valveNum;
valveForm.value.bagNum = statusData.value[0].bagNum; valveForm.value.bagNum = statusData.value[0].bagNum;
} }
...@@ -189,7 +189,7 @@ const getAllocation = (params) => { ...@@ -189,7 +189,7 @@ const getAllocation = (params) => {
// 当选中的仓室改变时，更新电磁阀分布数量 // 当选中的仓室改变时，更新电磁阀分布数量
const handleRoomChange = (roomIndex) => { const handleRoomChange = (roomIndex) => {
const selectedRoom = statusData.value.find(cell => cell.compartNo === roomIndex); const selectedRoom = statusData.value.find(cell => cell.frontCompartNo === roomIndex);
if (selectedRoom) { if (selectedRoom) {
valveForm.value.valveNum = selectedRoom.valveNum; valveForm.value.valveNum = selectedRoom.valveNum;
valveForm.value.bagNum = selectedRoom.bagNum; valveForm.value.bagNum = selectedRoom.bagNum;
...@@ -227,7 +227,7 @@ const handleAverageDistribute = () => { ...@@ -227,7 +227,7 @@ const handleAverageDistribute = () => {
}); });
// 更新当前选中仓室的值 // 更新当前选中仓室的值
handleRoomChange(valveForm.value.compartNo); handleRoomChange(valveForm.value.frontCompartNo);
errorMessage.value = ""; // 重置错误信息 errorMessage.value = ""; // 重置错误信息
}; };
...@@ -240,7 +240,7 @@ const handleSave = () => { ...@@ -240,7 +240,7 @@ const handleSave = () => {
} }
// 保存当前选中仓室的电磁阀分布数量 // 保存当前选中仓室的电磁阀分布数量
const selectedRoom = statusData.value.find(cell => cell.compartNo === valveForm.value.compartNo); const selectedRoom = statusData.value.find(cell => cell.frontCompartNo === valveForm.value.frontCompartNo);
if (selectedRoom) { if (selectedRoom) {
selectedRoom.valveNum = valveForm.value.valveNum; selectedRoom.valveNum = valveForm.value.valveNum;
selectedRoom.bagNum = valveForm.value.bagNum; selectedRoom.bagNum = valveForm.value.bagNum;
...@@ -251,6 +251,7 @@ const handleSave = () => { ...@@ -251,6 +251,7 @@ const handleSave = () => {
const handleConfirm = () => { const handleConfirm = () => {
// 最终确认时再次验证总数是否符合要求 // 最终确认时再次验证总数是否符合要求
console.log(statusData.value);
const totalValves = statusData.value.reduce((sum, cell) => sum + cell.valveNum, 0); const totalValves = statusData.value.reduce((sum, cell) => sum + cell.valveNum, 0);
if (totalValves > valveForm.value.total) { if (totalValves > valveForm.value.total) {
errorMessage.value = `电磁阀总数超出限制 ${totalValves - valveForm.value.total} 个，请调整后再提交`; errorMessage.value = `电磁阀总数超出限制 ${totalValves - valveForm.value.total} 个，请调整后再提交`;
...@@ -367,11 +368,12 @@ const handleConfirm = () => { ...@@ -367,11 +368,12 @@ const handleConfirm = () => {
.cell-value { .cell-value {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: end;
font-size: 16px; font-size: 16px;
color: #606266; color: #606266;
span { span {
font-size: 12px; font-size: 12px;
line-height: 18px;
color: #909399; color: #909399;
margin-left: 2px; margin-left: 2px;
} }
......
src/views/dustOverview/index.vue
View file @ c80f0375
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<img src="@/assets/icons/warn.png" alt="dust" /> <img src="@/assets/icons/warn.png" alt="dust" />
<div class="title"> <div class="title">
<span>泄漏告警(条)</span> <span>泄漏告警(条)</span>
<div class="content">{{dusterLeakNum}}</div> <div class="content">{{ dusterLeakNum }}</div>
</div> </div>
</div> </div>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<img src="@/assets/icons/health.png" alt="dust" /> <img src="@/assets/icons/health.png" alt="dust" />
<div class="title"> <div class="title">
<span>综合健康度</span> <span>综合健康度</span>
<div class="content">{{healthPercent}}</div> <div class="content">{{ healthPercent }}</div>
</div> </div>
</div> </div>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<img src="@/assets/icons/close.png" alt="dust" /> <img src="@/assets/icons/close.png" alt="dust" />
<div class="title"> <div class="title">
<span>闭环(条)</span> <span>闭环(条)</span>
<div class="content">{{closeLoopNum}}</div> <div class="content">{{ closeLoopNum }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -37,11 +37,7 @@ ...@@ -37,11 +37,7 @@
filterable filterable
:filter-method="filterProductionLine" :filter-method="filterProductionLine"
> >
<el-option <el-option key="all" label="全部" value="all" />
key="all"
label="全部"
value="all"
/>
<el-option <el-option
v-for="item in productionLineFiltered" v-for="item in productionLineFiltered"
:key="item.productionLineId" :key="item.productionLineId"
...@@ -66,7 +62,10 @@ ...@@ -66,7 +62,10 @@
<el-button type="primary" class="search-btn" @click="onSubmit" <el-button type="primary" class="search-btn" @click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button type="success" class="add-btn" @click="handleAddDustCollector" <el-button
type="success"
class="add-btn"
@click="handleAddDustCollector"
>新增</el-button >新增</el-button
> >
</el-form-item> </el-form-item>
...@@ -129,9 +128,7 @@ ...@@ -129,9 +128,7 @@
</template> </template>
<template #pressureDiffLow="{ row }"> <template #pressureDiffLow="{ row }">
<span> <span> {{ row.pressureDiffLow }}～{{ row.pressureDiffHigh }} </span>
{{ row.pressureDiffLow }}～{{ row.pressureDiffHigh }}
</span>
</template> </template>
<template #operation="{ row }"> <template #operation="{ row }">
...@@ -167,7 +164,17 @@ ...@@ -167,7 +164,17 @@
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount, computed, watch } from "vue"; import { ref, onMounted, onBeforeUnmount, computed, watch } from "vue";
import { getDusterLeakNum, getHealthPercent, getCloseLoopNum, getProductionLine, getDusterList, postAddDuster, postUpdateDuster, postAddCompartAllocation, postAddValveInfo } from "@/request/api/dustOverview"; import {
getDusterLeakNum,
getHealthPercent,
getCloseLoopNum,
getProductionLine,
getDusterList,
postAddDuster,
postUpdateDuster,
postAddCompartAllocation,
postAddValveInfo,
} from "@/request/api/dustOverview";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import CommonTable from "@/components/commonTable/index.vue"; import CommonTable from "@/components/commonTable/index.vue";
import { ElMessageBox, ElMessage } from "element-plus"; import { ElMessageBox, ElMessage } from "element-plus";
...@@ -177,14 +184,14 @@ import AddDustCollectorDialog from "./components/addDustCollectorDialog.vue"; ...@@ -177,14 +184,14 @@ import AddDustCollectorDialog from "./components/addDustCollectorDialog.vue";
const formInline = ref({ const formInline = ref({
deviceName: "", deviceName: "",
region: 'all', region: "all",
}); });
const currentPage = ref(1); const currentPage = ref(1);
const pageSize = ref(10); const pageSize = ref(10);
const total = ref(0); const total = ref(0);
const dusterLeakNum = ref(0); const dusterLeakNum = ref(0);
const healthPercent = ref('100%'); const healthPercent = ref("100%");
const closeLoopNum = ref(0); const closeLoopNum = ref(0);
const productionLine = ref([]); const productionLine = ref([]);
...@@ -259,7 +266,6 @@ const valveForm = ref({ ...@@ -259,7 +266,6 @@ const valveForm = ref({
const isAddDustCollectorVisible = ref(false); const isAddDustCollectorVisible = ref(false);
const currentEditingDustCollector = ref(null); const currentEditingDustCollector = ref(null);
watch(productionLine, (newVal) => { watch(productionLine, (newVal) => {
productionLineFiltered.value = newVal; productionLineFiltered.value = newVal;
}); });
...@@ -268,7 +274,7 @@ const filterProductionLine = (query) => { ...@@ -268,7 +274,7 @@ const filterProductionLine = (query) => {
if (!query) { if (!query) {
productionLineFiltered.value = productionLine.value; productionLineFiltered.value = productionLine.value;
} else { } else {
productionLineFiltered.value = productionLine.value.filter(item => productionLineFiltered.value = productionLine.value.filter((item) =>
item.productionLineName.toLowerCase().includes(query.toLowerCase()) item.productionLineName.toLowerCase().includes(query.toLowerCase())
); );
} }
...@@ -285,7 +291,7 @@ const getStatusType = (status) => { ...@@ -285,7 +291,7 @@ const getStatusType = (status) => {
const getHealthScoreColor = (score) => { const getHealthScoreColor = (score) => {
// 去除百分号 // 去除百分号
const value = parseInt(score.replace('%', '')); const value = parseInt(score.replace("%", ""));
if (value >= 90) return "#67C23A"; if (value >= 90) return "#67C23A";
if (value >= 70) return "#E6A23C"; if (value >= 70) return "#E6A23C";
return "#F56C6C"; return "#F56C6C";
...@@ -316,12 +322,10 @@ const onSubmit = () => { ...@@ -316,12 +322,10 @@ const onSubmit = () => {
getData(); getData();
}; };
// 修改打开弹窗的处理函数 // 修改打开弹窗的处理函数
const handleHealthScoreClick = (row) => { const handleHealthScoreClick = (row) => {
if (row.compartNum < 1) { if (row.compartNum < 1) {
ElMessageBox.alert('当前仓室数量为0，无法进行设置', '提示'); ElMessageBox.alert("当前仓室数量为0，无法进行设置", "提示");
return; return;
} }
currentEditingRow.value = JSON.parse(JSON.stringify(row)); currentEditingRow.value = JSON.parse(JSON.stringify(row));
...@@ -331,15 +335,15 @@ const handleHealthScoreClick = (row) => { ...@@ -331,15 +335,15 @@ const handleHealthScoreClick = (row) => {
// 确认设置 // 确认设置
const handleRoomSettingConfirm = (data) => { const handleRoomSettingConfirm = (data) => {
const params = data; const params = data;
postAddCompartAllocation(params).then(res => { postAddCompartAllocation(params).then((res) => {
if (res.code == 1) { if (res.code == 1) {
ElMessage.success('更新仓室数量成功'); ElMessage.success("更新仓室数量成功");
roomSettingVisible.value = false; roomSettingVisible.value = false;
getData(); getData();
} else { } else {
ElMessage.error(res.message); ElMessage.error(res.message);
} }
}) });
}; };
// 点击电磁阀数量时打开弹窗 // 点击电磁阀数量时打开弹窗
...@@ -349,20 +353,20 @@ const handleValveNumClick = (row) => { ...@@ -349,20 +353,20 @@ const handleValveNumClick = (row) => {
currentEditingRow.value = JSON.parse(JSON.stringify(row)); currentEditingRow.value = JSON.parse(JSON.stringify(row));
valveSettingVisible.value = true; valveSettingVisible.value = true;
} else { } else {
ElMessage.error('当前仓室数量为0，无法进行设置'); ElMessage.error("当前仓室数量为0，无法进行设置");
} }
}; };
// 确认电磁阀设置 // 确认电磁阀设置
const handleValveSettingConfirm = (updatedStatusData) => { const handleValveSettingConfirm = (updatedStatusData) => {
const list = updatedStatusData.map(item => { const list = updatedStatusData.map((item) => {
return { return {
"compartNo": item.compartNo, frontCompartNo: item.frontCompartNo,
"valveNum": item.valveNum, valveNum: item.valveNum,
"bagNum": item.bagNum, bagNum: item.bagNum,
"dusterNo": item.dusterNo dusterNo: item.dusterNo,
} };
}) });
setValveInfo(list); setValveInfo(list);
}; };
...@@ -373,103 +377,108 @@ const handleAddDustCollector = () => { ...@@ -373,103 +377,108 @@ const handleAddDustCollector = () => {
}; };
const setValveInfo = (data) => { const setValveInfo = (data) => {
postAddValveInfo(data).then(res => { postAddValveInfo(data).then((res) => {
if (res.code == 1) { if (res.code == 1) {
ElMessage.success('更新电磁阀数量成功'); ElMessage.success("更新电磁阀数量成功");
valveSettingVisible.value = false; valveSettingVisible.value = false;
getData(); getData();
} else { } else {
ElMessage.error(res.message); ElMessage.error(res.message);
} }
}) });
} };
// 保存新增或编辑除尘器 // 保存新增或编辑除尘器
const handleSaveDustCollector = (data) => { const handleSaveDustCollector = (data) => {
if (data.id) { if (data.id) {
// 编辑模式 // 编辑模式
postUpdateDuster(data).then(res => { postUpdateDuster(data)
if (res.code == 1) { .then((res) => {
ElMessage.success('更新除尘器成功'); if (res.code == 1) {
isAddDustCollectorVisible.value = false; ElMessage.success("更新除尘器成功");
currentEditingDustCollector.value = null; isAddDustCollectorVisible.value = false;
getData(); currentEditingDustCollector.value = null;
} else { getData();
ElMessage.error(res.message); } else {
} ElMessage.error(res.message);
}).catch(err => { }
ElMessage.error(err.message); })
}); .catch((err) => {
ElMessage.error(err.message);
});
} else { } else {
// 新增模式 // 新增模式
postAddDuster(data).then(res => { postAddDuster(data)
if (res.code == 1) { .then((res) => {
ElMessage.success('新增除尘器成功'); if (res.code == 1) {
isAddDustCollectorVisible.value = false; ElMessage.success("新增除尘器成功");
refreshData(); isAddDustCollectorVisible.value = false;
} else { refreshData();
ElMessage.error(res.message); } else {
} ElMessage.error(res.message);
}).catch(err => { }
ElMessage.error(err.message); })
}); .catch((err) => {
ElMessage.error(err.message);
});
} }
}; };
const IdusterLeakNum = () => { const IdusterLeakNum = () => {
getDusterLeakNum().then(res => { getDusterLeakNum().then((res) => {
dusterLeakNum.value = res.data || 0; dusterLeakNum.value = res.data || 0;
}) });
} };
const IhealthPercent = () => { const IhealthPercent = () => {
getHealthPercent().then(res => { getHealthPercent().then((res) => {
healthPercent.value = res.data || '100%'; healthPercent.value = res.data || "100%";
}) });
} };
const IcloseLoopNum = () => { const IcloseLoopNum = () => {
getCloseLoopNum().then(res => { getCloseLoopNum().then((res) => {
closeLoopNum.value = res.data || 0; closeLoopNum.value = res.data || 0;
}) });
} };
const IproductionLine = () => { const IproductionLine = () => {
getProductionLine({ getProductionLine({
branchFactoryId: getToken("dataBranchFactoryId") branchFactoryId: getToken("dataBranchFactoryId"),
}).then(res => { }).then((res) => {
productionLine.value = res.data || []; productionLine.value = res.data || [];
// 默认显示全部 // 默认显示全部
productionLineFiltered.value = res.data || []; productionLineFiltered.value = res.data || [];
}) });
} };
const getData = () => { const getData = () => {
const params = { const params = {
pageNo: currentPage.value, pageNo: currentPage.value,
pageSize: pageSize.value, pageSize: pageSize.value,
productionLineId: formInline.value.region === 'all' ? '' : formInline.value.region, productionLineId:
formInline.value.region === "all" ? "" : formInline.value.region,
keyword: formInline.value.deviceName, keyword: formInline.value.deviceName,
} };
getDusterList(params).then(res => { getDusterList(params).then((res) => {
if (res.code == 1) { if (res.code == 1) {
tableData.value = res.data.records || []; tableData.value = res.data.records || [];
total.value = res.data.total || 0; total.value = res.data.total || 0;
} else { } else {
ElMessage.error(res.message); ElMessage.error(res.message);
} }
}) });
} };
const refreshData = () => { const refreshData = () => {
currentPage.value = 1; currentPage.value = 1;
pageSize.value = 10; pageSize.value = 10;
formInline.value = { formInline.value = {
region: '', region: "",
deviceName: '', deviceName: "",
} };
getData(); getData();
} };
onMounted(async () => { onMounted(async () => {
IdusterLeakNum(); IdusterLeakNum();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment