From 584e17205f4cabd39bbc1b5d2489a59b48aa739e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 05 九月 2023 16:29:41 +0800
Subject: [PATCH] 报警号管理界面，功能
---
src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue | 24 ++--
src/store/mutation-types.js | 2
src/store/modules/DepartTree.js | 4
src/views/mdc/base/AlarmManager.vue | 124 ++++++++++++++----------
src/mixins/JeecgListMixin.js | 4
src/store/getters.js | 2
src/store/modules/Departs.js | 6
src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue | 81 ++++++++-------
8 files changed, 135 insertions(+), 112 deletions(-)
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 8e4268d..a009d47 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -197,7 +197,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
// that.$message.success(res.message);
- this.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
@@ -205,7 +205,7 @@
that.onClearSelected();
} else {
// that.$message.warning(res.message);
- this.$notification.warning({
+ that.$notification.warning({
message:'娑堟伅',
description:res.message
});
diff --git a/src/store/getters.js b/src/store/getters.js
index 5bcfbea..a43a210 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -20,7 +20,7 @@
},
sysSafeMode: state => state.user.sysSafeMode,
ProductionNode:state => state.Production.ProductionTree,
- DepartNode:state => state.Depart.DepartTree,
+ DepartNode:state => state.Departs.DepartTree,
DepartTree:state => state.DepartTree.DepartTreeType
diff --git a/src/store/modules/DepartTree.js b/src/store/modules/DepartTree.js
index ea9c359..b2a52a7 100644
--- a/src/store/modules/DepartTree.js
+++ b/src/store/modules/DepartTree.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
-import { SET_DEPARTTREE } from "@/store/mutation-types"
+import { SYS_DEPARTTREE } from "@/store/mutation-types"
import { getAction } from '@/api/manage'
const DepartTree = {
@@ -29,7 +29,7 @@
ajaxGetDictItems('depart_is', null).then((res) => {
if (res.success) {
const result = res.result
- Vue.ls.set(SET_DEPARTTREE, result)
+ Vue.ls.set(SYS_DEPARTTREE, result)
commit('SET_DEPARTTREE', result)
resolve(res)
}else{
diff --git a/src/store/modules/Departs.js b/src/store/modules/Departs.js
index d485eb9..2189cd2 100644
--- a/src/store/modules/Departs.js
+++ b/src/store/modules/Departs.js
@@ -2,9 +2,9 @@
import { queryTreeListByDepart } from "@/api/Tree"
import { SYS_DEPART } from "@/store/mutation-types"
import { getAction } from '@/api/manage'
-
-const Depart = {
+const Departs = {
state: {
+
token: '',
//閮ㄩ棬鏍�
DepartTree:[]
@@ -43,4 +43,4 @@
}
}
-export default Depart
\ No newline at end of file
+export default Departs
\ No newline at end of file
diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js
index ab0c16d..fca9097 100644
--- a/src/store/mutation-types.js
+++ b/src/store/mutation-types.js
@@ -32,4 +32,4 @@
//閮ㄩ棬鏍�
export const SYS_DEPART = 'SYS_DEPART'
//閮ㄩ棬鏍戞潈闄�
-export const SET_DEPARTTREE = 'SYS_DEPARTTREE'
\ No newline at end of file
+export const SYS_DEPARTTREE = 'SYS_DEPARTTREE'
\ No newline at end of file
diff --git a/src/views/mdc/base/AlarmManager.vue b/src/views/mdc/base/AlarmManager.vue
index 2da413e..b8378ab 100644
--- a/src/views/mdc/base/AlarmManager.vue
+++ b/src/views/mdc/base/AlarmManager.vue
@@ -7,33 +7,46 @@
@keyup.enter.native="searchQuery"
>
<a-row :gutter="24">
+ <!--<a-col-->
+ <!--:xl="4"-->
+ <!--:lg="4"-->
+ <!--:md="4"-->
+ <!--:sm="24"-->
+ <!-->-->
+ <!--<a-form-item label="璁惧缂栧彿">-->
+ <!--<a-input-->
+ <!--placeholder="璇疯緭鍏ヨ澶囩紪鍙�"-->
+ <!--v-model="queryParam.equipmentId"-->
+ <!--></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--<a-col-->
+ <!--:xl="4"-->
+ <!--:lg="4"-->
+ <!--:md="4"-->
+ <!--:sm="24"-->
+ <!-->-->
+ <!--<a-form-item label="璁惧鍚嶇О">-->
+ <!--<a-input-->
+ <!--placeholder="璇疯緭鍏ヨ澶囧悕绉�"-->
+ <!--v-model="queryParam.equipmentName"-->
+ <!--></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
<a-col
- :xl="4"
- :lg="4"
- :md="4"
+ :xl="6"
+ :lg="7"
+ :md="8"
:sm="24"
>
- <a-form-item label="璁惧缂栧彿">
- <a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
- v-model="queryParam.equipmentId"
- ></a-input>
+ <a-form-item label="鎺у埗绯荤粺绫诲瀷">
+ <j-dict-select-tag
+ placeholder="璇烽�夋嫨鎺у埗绯荤粺绫诲瀷"
+ v-model="queryParam.driveType"
+ dictCode="mdc_driveType"
+ />
</a-form-item>
</a-col>
- <a-col
- :xl="4"
- :lg="4"
- :md="4"
- :sm="24"
- >
- <a-form-item label="璁惧鍚嶇О">
- <a-input
- placeholder="璇疯緭鍏ヨ澶囧悕绉�"
- v-model="queryParam.equipmentName"
- ></a-input>
- </a-form-item>
- </a-col>
-
<a-col
:xl="4"
:lg="4"
@@ -53,10 +66,10 @@
:md="4"
:sm="24"
>
- <a-form-item label="鎶ヨ鎻忚堪">
+ <a-form-item label="鎶ヨ鍐呭">
<a-input
- placeholder="璇疯緭鍏ユ姤璀︽弿杩�"
- v-model="queryParam.alarmDescription"
+ placeholder="璇疯緭鍏ユ姤璀﹀唴瀹�"
+ v-model="queryParam.alarmContent"
></a-input>
</a-form-item>
</a-col>
@@ -102,12 +115,12 @@
@click="handleAddTRype"
type="primary"
icon="plus"
- >椹卞姩鏂板</a-button>
- <a-button
- @click="handleAdd"
- type="primary"
- icon="plus"
- >璁惧鏂板</a-button>
+ >鏂板</a-button>
+ <!--<a-button-->
+ <!--@click="handleAdd"-->
+ <!--type="primary"-->
+ <!--icon="plus"-->
+ <!-->璁惧鏂板</a-button>-->
<!--<a-upload-->
<!--name="file"-->
<!--:showUploadList="false"-->
@@ -223,18 +236,18 @@
return parseInt(index) + 1;
}
},
- {
- title: '璁惧缂栧彿',
- align: "center",
- // sorter: true,
- dataIndex: 'equipmentId'
- },
- {
- title: '璁惧鍚嶇О',
- align: "center",
- // sorter: true,
- dataIndex: 'equipmentName'
- },
+ // {
+ // title: '璁惧缂栧彿',
+ // align: "center",
+ // // sorter: true,
+ // dataIndex: 'equipmentId'
+ // },
+ // {
+ // title: '璁惧鍚嶇О',
+ // align: "center",
+ // // sorter: true,
+ // dataIndex: 'equipmentName'
+ // },
{
title: '鎶ヨ鍙�',
align: "center",
@@ -242,10 +255,10 @@
dataIndex: 'alarmCode'
},
{
- title: '鎶ヨ鎻忚堪',
+ title: '鎶ヨ鍐呭',
align: "center",
// sorter: true,
- dataIndex: 'alarmDescription'
+ dataIndex: 'alarmContent'
},
{
@@ -254,11 +267,17 @@
// sorter: true,
dataIndex: 'driveType'
},
+ // {
+ // title: '鏄惁杩囨护',
+ // align: "center",
+ // dataIndex: 'isUse',
+ // customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUse'], text) : ''),
+ // },
{
+ dataIndex:'isUse_dictText',
title: '鏄惁杩囨护',
align: "center",
- dataIndex: 'isUse',
- customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isUse'], text) : ''),
+ // dictCode:'alarm_is_use'
},
{
title: '鎿嶄綔',
@@ -270,9 +289,9 @@
}
],
url: {
- list: "/mdc/alarmInfo/page",
- delete: "/mdc/alarmInfo/delete",
- deleteBatch: "/mdc/alarmInfo/deleteBatch",
+ list: "/mdc/mdcAlarmInfo/list",
+ delete: "/mdc/mdcAlarmInfo/delete",
+ deleteBatch: "/mdc/mdcAlarmInfo/deleteBatch",
importExcelUrl: "mdc/mdcDriveTypeParamConfig/importExcel",
},
@@ -281,7 +300,7 @@
}
},
created() {
- this.$set(this.dictOptions, 'isUse', [{ text: '鏄�', value: '1' }, { text: '鍚�', value: '2' }])
+ this.$set(this.dictOptions, 'isUse', [{ text: '鏄�', value: '0' }, { text: '鍚�', value: '-1' }])
this.getSuperFieldList();
},
computed: {
@@ -305,9 +324,8 @@
},
getSuperFieldList() {
let fieldList = [];
- fieldList.push({ type: 'string', value: 'equipmentId', text: '璁惧缂栧彿', dictCode: '' })
fieldList.push({ type: 'string', value: 'alarmCode', text: '鎶ヨ鍙�', dictCode: '' })
- fieldList.push({ type: 'string', value: 'alarmDescription', text: '鎶ヨ鎻忚堪', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'alarmDescription', text: '鎶ヨ鍐呭', dictCode: '' })
fieldList.push({ type: 'int', value: 'driveType', text: '璁惧椹卞姩绫诲瀷', dictCode: '' })
fieldList.push({ type: 'switch', value: 'isUse', text: '鏄惁杩囨护' })
this.superFieldList = fieldList
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
index d2b30a5..c269a76 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
@@ -5,20 +5,20 @@
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="24">
- <a-col :span="24">
- <a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <!--<a-input v-decorator="['equipmentId', validatorRules.equipmentId]">-->
- <a-input :disabled='disabled' placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-decorator="['equipmentId', validatorRules.equipmentId]"></a-input>
- </a-form-item>
- </a-col>
+ <!--<a-col :span="24">-->
+ <!--<a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+ <!--<!–<a-input v-decorator="['equipmentId', validatorRules.equipmentId]">–>-->
+ <!--<a-input :disabled='disabled' placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-decorator="['equipmentId', validatorRules.equipmentId]"></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
<a-col :span="24">
<a-form-item label="鎶ヨ鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="璇疯緭鍏ユ姤璀﹀彿" v-decorator="['alarmCode', validatorRules.alarmCode]"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
- <a-form-item label="鎶ヨ鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input placeholder="璇疯緭鍏ユ姤璀︽弿杩�" v-decorator="['alarmDescription', validatorRules.alarmDescription]"></a-input>
+ <a-form-item label="鎶ヨ鍐呭" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input placeholder="璇疯緭鍏ユ姤璀﹀唴瀹�" v-decorator="['alarmContent', validatorRules.alarmContent]"></a-input>
</a-form-item>
</a-col>
<a-col :span='24'>
@@ -106,7 +106,7 @@
},
url: {
// add: '/mdc/alarmInfo/add',
- edit: '/mdc/alarmInfo/edit',
+ edit: '/mdc/mdcAlarmInfo/edit',
//椹卞姩绫诲瀷
initShiftList: '/mdc/mdcequipment/driveTypeSelected',
},
@@ -124,7 +124,7 @@
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model,'equipmentId', 'alarmCode', 'alarmDescription','driveType'))
+ this.form.setFieldsValue(pick(this.model, 'alarmCode', 'alarmContent','driveType'))
})
},
initShiftList() {
@@ -146,7 +146,7 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
- formData.isUse = this.isUse ? "1" : "2"
+ formData.isUse = this.isUse ? "0" : "-1"
let obj
if (!this.model.id) {
// obj = postAction(this.url.add, formData)
@@ -158,7 +158,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("娣诲姞鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"娣诲姞鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
index 1edd5a3..438c3e8 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerForm.vue
@@ -11,15 +11,20 @@
</a-form-item>
</a-col>
<a-col :span="24">
- <a-form-item label="鎶ヨ鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input placeholder="璇疯緭鍏ユ姤璀︽弿杩�" v-decorator="['alarmDescription', validatorRules.alarmDescription]"></a-input>
+ <a-form-item label="鎶ヨ鍐呭" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input placeholder="璇疯緭鍏ユ姤璀﹀唴瀹�" v-decorator="['alarmContent', validatorRules.alarmContent]"></a-input>
</a-form-item>
</a-col>
<a-col :span='24'>
<a-form-item label="椹卞姩绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['driveType', validatorRules. driveType]" placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
- :options="shiftList">
- </a-select>
+ <!--<a-select v-decorator="['driveType', validatorRules. driveType]" placeholder="璇烽�夋嫨椹卞姩绫诲瀷"-->
+ <!--:options="shiftList">-->
+ <!--</a-select>-->
+ <j-dict-select-tag
+ placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
+ v-decorator="['driveType', validatorRules.driveType]"
+ dictCode="mdc_driveType"
+ />
</a-form-item>
</a-col>
<a-col :span="24">
@@ -27,28 +32,28 @@
<a-switch :default-checked = 'showM' v-decorator="['isUse', validatorRules.isUse]"></a-switch>
</a-form-item>
</a-col>
- <a-col :span='24'>
- <a-form-item
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- label="鏂板鏂瑰紡"
- hidden>
- <a-input
- v-decorator="[
- 'addWay',
- { rules:
- [
- { required: true, message: '' }
- ],
- initialValue: '2'
- }
- ]"
- placeholder="璇疯緭鍏ユ柊澧炴柟寮�"
- allowClear
- >
- </a-input>
- </a-form-item>
- </a-col>
+ <!--<a-col :span='24'>-->
+ <!--<a-form-item-->
+ <!--:labelCol="labelCol"-->
+ <!--:wrapperCol="wrapperCol"-->
+ <!--label="鏂板鏂瑰紡"-->
+ <!--hidden>-->
+ <!--<a-input-->
+ <!--v-decorator="[-->
+ <!--'addWay',-->
+ <!--{ rules:-->
+ <!--[-->
+ <!--{ required: true, message: '' }-->
+ <!--],-->
+ <!--initialValue: '2'-->
+ <!--}-->
+ <!--]"-->
+ <!--placeholder="璇疯緭鍏ユ柊澧炴柟寮�"-->
+ <!--allowClear-->
+ <!-->-->
+ <!--</a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
</a-row>
</a-form>
</a-spin>
@@ -100,11 +105,11 @@
},
confirmLoading: false, form: this.$form.createForm(this),
validatorRules: {
- driveType:{
- rules: [{
- required: true, message: '璇烽�夋嫨椹卞姩绫诲瀷!',
- }],
- },
+ // driveType:{
+ // rules: [{
+ // required: true, message: '璇烽�夋嫨椹卞姩绫诲瀷!',
+ // }],
+ // },
// isUse:{
// rules: [{
// required: true, message: !',
@@ -117,12 +122,12 @@
},
alarmDescription:{
rules: [{
- required: true, message: '璇疯緭鍏ユ姤璀︽弿杩�!',
+ required: true, message: '璇疯緭鍏ユ姤璀﹀唴瀹�!',
}],
},
},
url: {
- add: '/mdc/alarmInfo/add',
+ add: '/mdc/mdcAlarmInfo/add',
// edit:'/mdc/alarmInfo/edit',
//椹卞姩绫诲瀷
initShiftList: '/mdc/mdcequipment/driveTypeSelected',
@@ -150,7 +155,7 @@
this.visible = true
this.form.resetFields()
this.model = Object.assign({}, record)
- this.initShiftList()
+ // this.initShiftList()
this.$nextTick(() => {
})
@@ -169,11 +174,11 @@
let formData = Object.assign(this.model, values)
// console.log(formData)
// formData.isUse = formData.isUse ? "1" : "2"
- formData.isUse = formData.isUse == true || formData.isUse == undefined ? "1" : "2"
- putAction(this.url.add, formData).then((res) => {
+ formData.isUse = formData.isUse == true || formData.isUse == undefined ? "0" : "-1"
+ postAction(this.url.add, formData).then((res) => {
if (res.success) {
// that.$message.success(res.message)
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
--
Gitblit v1.9.3