diff --git a/src/layouts/admin/components/config.vue b/src/layouts/admin/components/config.vue index e4bcc76..7ebb3d7 100644 --- a/src/layouts/admin/components/config.vue +++ b/src/layouts/admin/components/config.vue @@ -1,359 +1,359 @@ - - - - - + + + + + diff --git a/src/template/dialog.vue b/src/template/dialog.vue index 32498b3..87e4bc9 100644 --- a/src/template/dialog.vue +++ b/src/template/dialog.vue @@ -1,79 +1,79 @@ - - + + diff --git a/src/views/auth/audit/index.vue b/src/views/auth/audit/index.vue index 22d2832..057185b 100644 --- a/src/views/auth/audit/index.vue +++ b/src/views/auth/audit/index.vue @@ -1,136 +1,136 @@ - - + + diff --git a/src/views/auth/menu/popupApi.vue b/src/views/auth/menu/popupApi.vue index b401df2..0d51e28 100644 --- a/src/views/auth/menu/popupApi.vue +++ b/src/views/auth/menu/popupApi.vue @@ -78,7 +78,7 @@ const form: any = reactive({ }) const rules = { code: [ - { required: true, message: '标识不能为空', trigger: 'blur' }, + { required: true, message: '请输入标识', trigger: 'blur' }, { pattern: /^[a-zA-Z_]{1}[a-zA-Z0-9_]{2,20}$/, message: '请输入至少3-20位英文', diff --git a/src/views/auth/role/popupForm.vue b/src/views/auth/role/popupForm.vue index 5eb3501..46462f1 100644 --- a/src/views/auth/role/popupForm.vue +++ b/src/views/auth/role/popupForm.vue @@ -46,8 +46,8 @@ const form = reactive({ type: 0 }) const rules = { - name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }], - code: [{ required: true, message: '角色编码不能为空', trigger: 'blur' }] + name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }], + code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }] } const dialogVisible = ref(false) const title = ref('新增菜单') diff --git a/src/views/auth/userList/popupEdit.vue b/src/views/auth/userList/popupEdit.vue index 7acafe2..e8930bc 100644 --- a/src/views/auth/userList/popupEdit.vue +++ b/src/views/auth/userList/popupEdit.vue @@ -140,15 +140,15 @@ const form = reactive({ }) const formRef = ref() const rules: Partial>> = { - name: [{ required: true, message: '用户名不能为空', trigger: 'blur' }], - role: [{ required: true, message: '角色不能为空', trigger: 'blur' }], - password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }], - loginName: [{ required: true, message: '登录名不能为空', trigger: 'blur' }], - casualUser: [{ required: true, message: '用户类型不能为空', trigger: 'blur' }], - smsNotice: [{ required: true, message: '短信通知不能为空', trigger: 'blur' }], - emailNotice: [{ required: true, message: '邮件通知不能为空', trigger: 'blur' }], + name: [{ required: true, message: '请输入用户名', trigger: 'blur' }], + role: [{ required: true, message: '请输入角色', trigger: 'blur' }], + password: [{ required: true, message: '请输入用户密码', trigger: 'blur' }], + loginName: [{ required: true, message: '请输入登录名', trigger: 'blur' }], + casualUser: [{ required: true, message: '请输入用户类型', trigger: 'blur' }], + smsNotice: [{ required: true, message: '请输入短信通知', trigger: 'blur' }], + emailNotice: [{ required: true, message: '请输入邮件通知', trigger: 'blur' }], email: [ - { required: false, message: '邮箱不能为空', trigger: 'blur' }, + { required: false, message: '请输入邮箱', trigger: 'blur' }, { type: 'email', message: "'请输入正确的邮箱地址", @@ -156,16 +156,16 @@ const rules: Partial>> = { } ], phone: [ - { required: false, message: '手机号不能为空', trigger: 'blur' }, + { required: false, message: '请输入手机号', trigger: 'blur' }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' } ], - limitTime: [{ required: true, message: '时间段不能为空', trigger: 'blur' }], + limitTime: [{ required: true, message: '请选择时间段', trigger: 'blur' }], limitIpStart: [ - { required: true, message: '起始IP不能为空', trigger: 'blur' }, + { required: true, message: '请输入起始IP', trigger: 'blur' }, { required: true, validator: (rule: any, value: string, callback: any) => { @@ -183,7 +183,7 @@ const rules: Partial>> = { } ], limitIpEnd: [ - { required: true, message: '结束IP不能为空', trigger: 'blur' }, + { required: true, message: '请输入结束IP', trigger: 'blur' }, { required: true, validator: (rule: any, value: string, callback: any) => { diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue index f0a5aa4..3ceda3f 100644 --- a/src/views/govern/alarm/Device.vue +++ b/src/views/govern/alarm/Device.vue @@ -9,7 +9,7 @@ @change="sourceChange" :options="deviceTreeOptions" :show-all-levels="false" - :props="{ checkStrictly: true }" + :props="{ checkStrictly: true, value: 'id', label: 'name' }" clearable > diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue index 39e02b9..35b27bb 100644 --- a/src/views/govern/alarm/Steady.vue +++ b/src/views/govern/alarm/Steady.vue @@ -9,7 +9,7 @@ @change="sourceChange" :options="deviceTreeOptions" :show-all-levels="false" - :props="{ checkStrictly: true }" + :props="{ checkStrictly: true, value: 'id', label: 'name' }" clearable > diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue index 7d53603..0f99888 100644 --- a/src/views/govern/alarm/Transient.vue +++ b/src/views/govern/alarm/Transient.vue @@ -10,7 +10,7 @@ v-model.trim="tableStore.table.params.cascader" :options="deviceTreeOptions" :show-all-levels="false" - :props="{ checkStrictly: true }" + :props="{ checkStrictly: true, value: 'id', label: 'name' }" clearable > @@ -121,23 +121,24 @@ const tableStore = new TableStore({ method: 'POST', publicHeight: 65, exportName: '暂态事件', - column: [ { + column: [ + { title: '序号', width: 80, formatter: (row: any) => { return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 } }, - { title: '设备名称', field: 'equipmentName', minWidth: 120,align: 'center' }, - { title: '工程名称', field: 'engineeringName', minWidth: 120,align: 'center' }, - { title: '项目名称', field: 'projectName', minWidth: 120,align: 'center' }, - { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 180,sortable: true }, - { title: '监测点名称', field: 'lineName', minWidth: 120,align: 'center' }, - { title: '事件描述', field: 'showName', minWidth: 120,align: 'center' }, - { title: '事件发生位置', field: 'evtParamPosition',minWidth: 150, align: 'center' }, - { title: '相别', field: 'evtParamPhase',minWidth: 80, align: 'center' }, - { title: '持续时间(s)', field: 'evtParamTm',minWidth: 80, align: 'center',sortable: true }, - { title: '暂降(聚升)幅值(%)', minWidth: 100, field: 'evtParamVVaDepth', align: 'center',sortable: true }, + { title: '设备名称', field: 'equipmentName', minWidth: 120, align: 'center' }, + { title: '工程名称', field: 'engineeringName', minWidth: 120, align: 'center' }, + { title: '项目名称', field: 'projectName', minWidth: 120, align: 'center' }, + { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 180, sortable: true }, + { title: '监测点名称', field: 'lineName', minWidth: 120, align: 'center' }, + { title: '事件描述', field: 'showName', minWidth: 120, align: 'center' }, + { title: '事件发生位置', field: 'evtParamPosition', minWidth: 150, align: 'center' }, + { title: '相别', field: 'evtParamPhase', minWidth: 80, align: 'center' }, + { title: '持续时间(s)', field: 'evtParamTm', minWidth: 80, align: 'center', sortable: true }, + { title: '暂降(聚升)幅值(%)', minWidth: 100, field: 'evtParamVVaDepth', align: 'center', sortable: true }, { title: '操作', @@ -153,7 +154,7 @@ const tableStore = new TableStore({ render: 'basicButton', loading: 'loading1', disabled: row => { - return !row.wavePath + return !row.wavePath }, click: async row => { row.loading1 = true @@ -234,24 +235,24 @@ const tableStore = new TableStore({ icon: 'el-icon-DataLine', render: 'basicButton', disabled: row => { - return row.showName != '未知'; + return row.showName != '未知' } }, { - name: 'edit', - title: '波形补召', - type: 'primary', - icon: 'el-icon-Check', - render: 'basicButton', - disabled: row => { - return row.wavePath || row.showName === '未知'; - }, - click: row => { - getFileByEventId(row.id).then(res => { + name: 'edit', + title: '波形补召', + type: 'primary', + icon: 'el-icon-Check', + render: 'basicButton', + disabled: row => { + return row.wavePath || row.showName === '未知' + }, + click: row => { + getFileByEventId(row.id).then(res => { ElMessage.success(res.message) tableStore.index() }) - } + } } ] } @@ -313,7 +314,6 @@ const sourceChange = (e: any) => { tableStore.table.params.engineeringid = e[1] || '' tableStore.table.params.projectId = e[2] || '' } - } // tableStore.table.params.engineeringid = e[1] || '' diff --git a/src/views/govern/alarm/index.vue b/src/views/govern/alarm/index.vue index 800ff85..f43ca87 100644 --- a/src/views/govern/alarm/index.vue +++ b/src/views/govern/alarm/index.vue @@ -34,19 +34,19 @@ const deviceTree = ref([]) const activeName = ref('1') const key = ref(0) getDeviceTree().then(res => { - res.data.forEach((item: any) => { - item.value = item.id - item.label = item.name - item.children.forEach((child: any) => { - child.value = child.id - child.label = child.name - child.children.forEach((grand: any) => { - grand.value = grand.id - grand.label = grand.name - delete grand.children - }) - }) - }) + // res.data.forEach((item: any) => { + // item.value = item.id + // item.label = item.name + // item.children.forEach((child: any) => { + // child.value = child.id + // child.label = child.name + // child.children.forEach((grand: any) => { + // grand.value = grand.id + // grand.label = grand.name + // delete grand.children + // }) + // }) + // }) deviceTree.value = res.data key.value += 1 }) diff --git a/src/views/govern/device/control/supplementaryRecruitment/history.vue b/src/views/govern/device/control/supplementaryRecruitment/history.vue index ffcab25..28cd313 100644 --- a/src/views/govern/device/control/supplementaryRecruitment/history.vue +++ b/src/views/govern/device/control/supplementaryRecruitment/history.vue @@ -1,589 +1,589 @@ - - - - + + + + diff --git a/src/views/govern/manage/basic/popupVersion.vue b/src/views/govern/manage/basic/popupVersion.vue index bd7a23a..9e761ff 100644 --- a/src/views/govern/manage/basic/popupVersion.vue +++ b/src/views/govern/manage/basic/popupVersion.vue @@ -153,15 +153,15 @@ const form = reactive({ file: [] }) const rules = { - type: [{ required: true, message: '装置类型不能为空', trigger: 'change' }], - devType: [{ required: true, message: '装置型号不能为空', trigger: 'change' }], - versionNo: [{ required: true, message: '版本号不能为空', trigger: 'blur' }], - versionType: [{ required: true, message: '版本类型不能为空', trigger: 'blur' }], - versionAgreement: [{ required: true, message: '版本协议不能为空', trigger: 'blur' }], - versionDate: [{ required: true, message: '版本日期不能为空', trigger: 'blur' }], - description: [{ required: true, message: '描述不能为空', trigger: 'blur' }], - crcInfo: [{ required: true, message: 'CRC校验不能为空', trigger: 'blur' }], - file: [{ required: true, message: '升级文件不能为空', trigger: 'blur' }] + type: [{ required: true, message: '请选择装置类型', trigger: 'change' }], + devType: [{ required: true, message: '请选择装置型号', trigger: 'change' }], + versionNo: [{ required: true, message: '请输入版本号', trigger: 'blur' }], + versionType: [{ required: true, message: '请输入版本类型', trigger: 'blur' }], + versionAgreement: [{ required: true, message: '请输入版本协议', trigger: 'blur' }], + versionDate: [{ required: true, message: '请输入版本日期', trigger: 'blur' }], + description: [{ required: true, message: '请输入描述', trigger: 'blur' }], + crcInfo: [{ required: true, message: '请输入CRC校验', trigger: 'blur' }], + file: [{ required: true, message: '请输入升级文件', trigger: 'blur' }] } const typeChange = () => { // console.log(form.type) diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue index e065e6d..68342e5 100644 --- a/src/views/govern/manage/factory.vue +++ b/src/views/govern/manage/factory.vue @@ -233,13 +233,13 @@ const form = reactive({ sort: 0 }) const rules = reactive({ - name: [{ required: true, message: '设备名不能为空', trigger: 'blur' }], - ndid: [{ required: true, message: '网络设备id不能为空', trigger: 'blur' }], - devType: [{ required: true, message: '设备类型不能为空', trigger: 'change' }], - devModel: [{ required: true, message: '设备型号不能为空', trigger: 'change' }], - devAccessMethod: [{ required: true, message: '接入方式不能为空', trigger: 'blur' }], - cntractNo: [{ required: true, message: '合同号不能为空', trigger: 'blur' }], - sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }] + name: [{ required: true, message: '请输入设备名', trigger: 'blur' }], + ndid: [{ required: true, message: '请输入网络设备id', trigger: 'blur' }], + devType: [{ required: true, message: '请选择设备类型', trigger: 'change' }], + devModel: [{ required: true, message: '请选择设备型号', trigger: 'change' }], + devAccessMethod: [{ required: true, message: '请输入接入方式', trigger: 'blur' }], + cntractNo: [{ required: true, message: '请输入合同号', trigger: 'blur' }], + sort: [{ required: true, message: '请输入排序', trigger: 'blur' }] }) const qrcodeFlag = ref(false) const tableKey = ref(0) diff --git a/src/views/govern/sensitiveLoadMange/detail.vue b/src/views/govern/sensitiveLoadMange/detail.vue index 1e863ab..dcef612 100644 --- a/src/views/govern/sensitiveLoadMange/detail.vue +++ b/src/views/govern/sensitiveLoadMange/detail.vue @@ -63,12 +63,12 @@ const form = reactive({ sort:100 }) const rules = { - substationName: [{ required: true, message: '所属厂站名称不能为空', trigger: 'blur' }], - name: [{ required: true, message: '敏感用户名称不能为空', trigger: 'blur' }], - loadType: [{ required: true, message: '请选择敏感负荷类型', trigger: 'blur' }], - installedCapacity: [{ required: true, message: '用户协议容量不能为空', trigger: 'blur' }], - userAgreementCapacity: [{ required: true, message: '装机容量不能为空', trigger: 'blur' }], - sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }] + substationName: [{ required: true, message: '请输入所属厂站名称', trigger: 'blur' }], + name: [{ required: true, message: '请输入敏感用户名称', trigger: 'blur' }], + loadType: [{ required: true, message: '请输入请选择敏感负荷类型', trigger: 'blur' }], + installedCapacity: [{ required: true, message: '请输入用户协议容量', trigger: 'blur' }], + userAgreementCapacity: [{ required: true, message: '请输入装机容量', trigger: 'blur' }], + sort: [{ required: true, message: '请输入排序', trigger: 'blur' }] } const dialogVisible = ref(false) diff --git a/src/views/govern/terminal/deviceLedger/index.vue b/src/views/govern/terminal/deviceLedger/index.vue index a95a515..6fa6be2 100644 --- a/src/views/govern/terminal/deviceLedger/index.vue +++ b/src/views/govern/terminal/deviceLedger/index.vue @@ -1,423 +1,423 @@ - - - + + + diff --git a/src/views/govern/terminal/deviceMonitor/index.vue b/src/views/govern/terminal/deviceMonitor/index.vue index 4410c82..c02c2d3 100644 --- a/src/views/govern/terminal/deviceMonitor/index.vue +++ b/src/views/govern/terminal/deviceMonitor/index.vue @@ -1,424 +1,424 @@ - - - + + + diff --git a/src/views/setting/dictionary/list/popupDetailEdit.vue b/src/views/setting/dictionary/list/popupDetailEdit.vue index 06f4109..b27ab14 100644 --- a/src/views/setting/dictionary/list/popupDetailEdit.vue +++ b/src/views/setting/dictionary/list/popupDetailEdit.vue @@ -1,126 +1,142 @@ - - + + diff --git a/src/views/setting/dictionary/list/popupEdit.vue b/src/views/setting/dictionary/list/popupEdit.vue index 69303d4..b5834b0 100644 --- a/src/views/setting/dictionary/list/popupEdit.vue +++ b/src/views/setting/dictionary/list/popupEdit.vue @@ -1,110 +1,111 @@ - - + + diff --git a/src/views/setting/dictionary/tree/popupForm.vue b/src/views/setting/dictionary/tree/popupForm.vue index 59568aa..a2a5d35 100644 --- a/src/views/setting/dictionary/tree/popupForm.vue +++ b/src/views/setting/dictionary/tree/popupForm.vue @@ -1,19 +1,41 @@