ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
sjl
2024-12-04 20:00:04 +08:00
parent f5c226ba28
commit e5d4aae846
16 changed files with 414 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/authority/role/index.vue
View File

@@ -11,7 +11,7 @@
<el-button v-auth.role="'add'" type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
<el-button v-auth.role="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>
<!-- 表格操作 -->

2
frontend/src/views/authority/user/index.vue
View File

@@ -11,7 +11,7 @@
<el-button v-auth.user="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
<el-button v-auth.user="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>
<!-- 表格操作 -->

2
frontend/src/views/demo/proTable/index.vue
View File

@@ -12,7 +12,7 @@
<el-button type='primary' :icon='Download' plain @click='downloadFile'>导出用户数据</el-button>
<el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
批量删除用户
删除用户
</el-button>
</template>
<!-- 表格操作 -->

2
frontend/src/views/machine/device/components/monitorTab.vue
View File

@@ -10,7 +10,7 @@
<!-- 表格 header 按钮 -->
<template #tableHeader='scope'>
<el-button type='primary' :icon='CirclePlus'>新增</el-button>
<el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>批量删除</el-button>
<el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>删除</el-button>
</template>
<!-- 表格操作 -->
<template #operation>

2
frontend/src/views/machine/device/index.vue
View File

@@ -13,7 +13,7 @@
<el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()'>导入</el-button>
<el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>
<!-- 表格操作 -->

25
frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
View File

@@ -65,6 +65,7 @@ const spanMethod = ({
}: SpanMethodProps) => {
if (columnIndex === 0 ) { // 检查是否为第一列
if (rowIndex === 2 ||rowIndex === 21) { // 检查是否为第三行
return {
rowspan: 2, // 合并行数
@@ -92,7 +93,7 @@ const spanMethod = ({
};
}
}
if (columnIndex === 1 ){
if (columnIndex === 1 || columnIndex === 2){
if (rowIndex === 2
|| rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
|| rowIndex === 16|| rowIndex === 18
@@ -123,28 +124,6 @@ const spanMethod = ({
// };
// }
}
else if(columnIndex === 2) { // 检查是否为第三列
if (rowIndex === 2
|| rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
|| rowIndex === 16|| rowIndex === 18
|| rowIndex === 21) {
return {
rowspan: 2,
colspan: 1,
};
}
else if (rowIndex === 3
|| rowIndex === 9|| rowIndex === 11|| rowIndex === 13|| rowIndex === 15
|| rowIndex === 17|| rowIndex === 19
|| rowIndex === 22) { // 检查是否为第四行
return {
rowspan: 0, // 不显示该单元格
colspan: 0,
};
}
}
};
// 关闭弹窗

4
frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="dialog-footer">
<el-button :icon='CirclePlus' type="primary" @click="openAddDialog">新增</el-button>
<el-button :icon='Delete' type="danger" plain :disabled='!multipleSelection.length' @click="deleteSelectedRows">批量删除</el-button>
<el-button :icon='Delete' type="danger" plain :disabled='!multipleSelection.length' @click="deleteSelectedRows">删除</el-button>
</div>
<div class="table-container">
<el-table :data="tableData"
@@ -125,7 +125,7 @@
const options: Ref<CascaderOption[]> = ref([]); // 修改这里
onMounted(async () => {
const dictCode = ''; // 替换为实际需要的字典代码
const dictCode = '误差体系指标项'; // 替换为实际需要的字典代码
const resDictTree: Dict.ResDictTree = {
name: dictCode,
id: '',

2
frontend/src/views/machine/errorSystem/index.vue
View File

@@ -10,7 +10,7 @@
<el-button type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
<el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>
<!-- 表格操作 -->

2
frontend/src/views/machine/testScript/index.vue
View File

@@ -11,7 +11,7 @@
<el-button v-auth.testScript="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
<el-button v-auth.testScript="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>
<!-- 表格操作 -->

2
frontend/src/views/machine/testSource/components/parameterTable.vue
View File

@@ -15,7 +15,7 @@
</el-button>
<el-button v-auth.testSource="'batchDelete'" type='danger' :icon='Delete'
plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>
<!-- 表格操作 -->

2
frontend/src/views/machine/testSource/index.vue
View File

@@ -11,7 +11,7 @@
<el-button v-auth.testSource="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
<el-button v-auth.testSource="'batchDelete'" type='danger' :icon='Delete'
plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>
<!-- 表格操作 -->

2
frontend/src/views/plan/planList/index.vue
View File

@@ -14,7 +14,7 @@
</el-button>
<el-button type='primary' :icon='CirclePlus' @click='openAddDialog'>新增</el-button>
<el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>
批量删除
删除
</el-button>
<input type='file' style='display: none' ref='fileInput' @change='handleFiles'>
</template>

2
frontend/src/views/system/dictionary/dictData/index.vue
View File

@@ -11,7 +11,7 @@
<el-button v-auth.dict="'show_export'" type='primary' :icon='Download' plain @click="downloadFile">导出</el-button>
<el-button v-auth.dict="'show_batchDelete'" type="danger" :icon="Delete" plain :disabled="!scope.isSelected"
@click="batchDelete(scope.selectedListIds)">
批量删除
删除
</el-button>
</template>

217
frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
View File

@@ -1,7 +1,11 @@
<template>
<el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind='dialogMiddle' @close="close">
<el-form :model='formContent' ref='dialogFormRef' :rules='rules' class='form-two'>
<el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind="dialogBig" @close="close">
<el-form :model='formContent' ref='dialogFormRef' :rules='rules'>
<el-divider>基础数据</el-divider>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label='数据模型' :label-width='140' prop='dataType'>
<el-select v-model="formContent.dataType" clearable placeholder="请选择数据模型">
<el-option
@@ -12,15 +16,13 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='指标名称' :label-width='140' prop='name'>
<el-input v-model='formContent.name' placeholder='请输入' autocomplete='off' />
</el-form-item>
<el-form-item label='别名' :label-width='140' prop='otherName'>
<el-input v-model='formContent.otherName' placeholder='请输入' autocomplete='off' />
</el-form-item>
<el-form-item label='显示名称' :label-width='140' prop='showName'>
<el-input v-model='formContent.showName' placeholder='请输入' autocomplete='off' />
<el-input v-model='formContent.name' placeholder='请输入指标名称' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='相别' :label-width='140' prop='phase'>
<el-select v-model="formContent.phase" clearable placeholder="请选择相别">
<el-option
@@ -31,23 +33,63 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label='显示名称' :label-width='140' prop='showName'>
<el-input v-model='formContent.showName' placeholder='请输入显示名称' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='别名' :label-width='140' prop='otherName'>
<el-input v-model='formContent.otherName' placeholder='请输入别名' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='单位' :label-width='140' prop='unit'>
<el-input v-model='formContent.unit' placeholder='请输入单位' autocomplete='off' />
<el-select v-model="formContent.unit" clearable placeholder="请选择单位">
<el-option v-for="item in dictStore.getDictData('Unit_Type')" :key="item.id" :label="item.name"
:value="item.code"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label='指标数据类型' :label-width='140' prop='type'>
<el-input v-model='formContent.type' placeholder='请输入指标数据类型' autocomplete='off' />
<el-select v-model="formContent.type" clearable placeholder="请选择指标数据类型">
<el-option
:label="'Number'"
:value="'Number'"
/>
<el-option
:label="'Float'"
:value="'Float'"
/>
<el-option
:label="'Enum'"
:value="'Enum'"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='次数' :label-width='140'>
<el-row :gutter="20">
<el-col :span="11">
<el-input v-model="formContent.harmStart" placeholder="请输入起始次数" autocomplete="off" />
<el-input v-model="formContent.harmStart" placeholder="起始次数" autocomplete="off"/>
</el-col>
<el-col :span="2" class="text-center" style="line-height: 32px;">-</el-col>
<el-col :span="2">-</el-col>
<el-col :span="11">
<el-input v-model="formContent.harmEnd" placeholder="请输入结束次数" autocomplete="off" />
<el-input v-model="formContent.harmEnd" placeholder="结束次数" autocomplete="off"/>
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='数据统计类型' :label-width='140' prop='statMethod'>
<el-select v-model="selectedStatMethods" multiple placeholder="请选择数据统计类型">
<el-option
@@ -58,9 +100,16 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label='系统类别' :label-width='140' prop='systemType'>
<el-input v-model='formContent.systemType' placeholder='请输入' autocomplete='off' />
<el-input v-model='formContent.systemType' placeholder='请输入系统类别' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='报表数据来源' :label-width='140' prop='resourcesId'>
<el-select v-model="formContent.resourcesId" clearable placeholder="请选择报表数据来源">
<el-option
@@ -71,6 +120,8 @@
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='数据表表名' :label-width='140' prop='classId'>
<el-select v-model="formContent.classId" clearable placeholder="请选择数据表表名">
<el-option
@@ -81,12 +132,21 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label='限值字段名称' :label-width='140' prop='limitName'>
<el-input v-model='formContent.limitName' placeholder='请输入限值字段名称' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='限值表名' :label-width='140' prop='limitTable'>
<el-input v-model='formContent.limitTable' placeholder='请输入限值表名' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='超标判断方式' :label-width='140' prop='formula'>
<el-select v-model="formContent.formula" clearable placeholder="请选择超标判断方式">
<el-option
@@ -97,55 +157,99 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label='排序' :label-width='140'>
<el-input-number v-model='formContent.sort' :min='1' :max='999'/>
</el-form-item>
</el-col>
</el-row>
<el-divider>拓展数据</el-divider>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label='参数缺省值' :label-width='140' prop='defaultValue'>
<el-input v-model='formContent.defaultValue' placeholder='请输入参数缺省值' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='事件类别' :label-width='140' prop='eventType'>
<el-input v-model='formContent.eventType' placeholder='请输入事件类别' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='设置最大值' :label-width='140' prop='maxNum'>
<el-input-number v-model='formContent.maxNum' controls-position="right" style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label='设置最小值' :label-width='140' prop='minNum'>
<el-input-number v-model='formContent.minNum' controls-position="right" style="width: 300px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='枚举序列' :label-width='140' prop='setValue'>
<el-input v-model='formContent.setValue' placeholder='请输入枚举序列' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='字符串长度上限' :label-width='140' prop='strlen'>
<el-input-number v-model='formContent.strlen' controls-position="right" style="width: 300px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label='上送规则' :label-width='140' prop='tranRule'>
<el-input v-model='formContent.tranRule' placeholder='请输入上送规则' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='当前值' :label-width='140' prop='curSts'>
<el-input v-model='formContent.curSts' placeholder='请输入当前值' autocomplete='off'/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label='二次值转一次值公式' :label-width='140' prop='primaryFormula'>
<el-input v-model='formContent.primaryFormula' placeholder='请输入公式' autocomplete='off'/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="是否可远程控制" :label-width="140">
<el-radio-group v-model="formContent.ctlSts">
<el-radio label="是" :value="1"></el-radio>
<el-radio label="否" :value="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否存储" :label-width="140">
<el-radio-group v-model="formContent.storeFlag">
<el-radio label="是" :value="1"></el-radio>
<el-radio label="否" :value="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="数据是否上送" :label-width="140">
<el-radio-group v-model="formContent.tranFlag">
<el-radio label="是" :value="1"></el-radio>
<el-radio label="否" :value="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -160,27 +264,52 @@
</el-dialog>
</template>
<script setup lang='ts'>
import { dialogMiddle } from '@/utils/elementBind'
import {dialogBig} from '@/utils/elementBind'
import {type Dict} from '@/api/system/dictionary/interface'
import {ElMessage, type FormItemRule} from 'element-plus'
import {addDictPq, updateDictPq} from '@/api/system/dictionary/dictPq'
import {computed, type Ref, ref} from 'vue';
import {useDictStore} from '@/stores/modules/dict'
const dictStore = useDictStore()
const selectedStatMethods = ref<string[]>([])
// 定义弹出组件元信息
const dialogFormRef = ref()
function useMetaInfo() {
const dialogVisible = ref(false)
const titleType = ref('add')
const formContent = ref<Dict.ResDictPq>({
const formContent = reactive<Dict.ResDictPq>({
id: '',
name: '',
phase: '',
sort: 100,
dataType: '',
state: 1,
name: '',
otherName: '',
showName: '',
phase: '',
unit: '',
type: 'Number',
harmStart: '',
harmEnd: '',
systemType: '',
resourcesId: '',
classId: '',
limitName: '',
limitTable: '',
formula: '',
sort: 100,
defaultValue: '',
eventType: '',
maxNum: '',
minNum: '',
setValue: '',
strlen: '',
tranRule: '',
curSts: '',
primaryFormula: '',
ctlSts: 0,
storeFlag: 0,
tranFlag: 0,
state: 1,
})
return {dialogVisible, titleType, formContent}
}
@@ -188,15 +317,38 @@
const {dialogVisible, titleType, formContent} = useMetaInfo()
// 清空formContent
const resetFormContent = () => {
formContent.value = {
Object.assign(formContent, {
id: '',
name: '',
phase: '',
sort: 100,
dataType: '',
state: 1,
name: '',
otherName: '',
showName: '',
phase: '',
unit: '',
type: 'Number',
harmStart: '',
harmEnd: '',
systemType: '',
resourcesId: '',
classId: '',
}
limitName: '',
limitTable: '',
formula: '',
sort: 100,
defaultValue: '',
eventType: '',
maxNum: '',
minNum: '',
setValue: '',
strlen: '',
tranRule: '',
curSts: '',
primaryFormula: '',
ctlSts: 0,
storeFlag: 0,
tranFlag: 0,
state: 1,
})
}
let dialogTitle = computed(() => {
@@ -226,11 +378,11 @@
try {
dialogFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
formContent.value.statMethod = selectedStatMethods.value.join(',')
if (formContent.value.id) {
await updateDictPq(formContent.value);
formContent.statMethod = selectedStatMethods.value.join(',')
if (formContent.id) {
await updateDictPq(formContent);
} else {
await addDictPq(formContent.value);
await addDictPq(formContent);
}
ElMessage.success({message: `${dialogTitle.value}成功！`})
close()
@@ -251,7 +403,7 @@
dialogVisible.value = true
selectedStatMethods.value = data.statMethod ? data.statMethod.split(',') : []
if (data.id) {
formContent.value = { ...data }
Object.assign(formContent, {...data})
} else {
resetFormContent()
}
@@ -264,6 +416,5 @@
}>()
</script>

2
frontend/src/views/system/dictionary/dictPq/index.vue
View File

@@ -9,7 +9,7 @@
<el-button v-auth.dictPq="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
<el-button v-auth.dictPq="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>

2
frontend/src/views/system/dictionary/dictType/index.vue
View File

@@ -10,7 +10,7 @@
<el-button v-auth.dict="'export'" type='primary' :icon='Download' plain @click='downloadFile()'>导出</el-button>
<el-button v-auth.dict="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
@click='batchDelete(scope.selectedListIds)'>
批量删除
删除
</el-button>
</template>