From e91f66feb3cdb688c255f60bcb3b81b029098dd3 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期四, 29 二月 2024 13:07:09 +0800 Subject: [PATCH] 功能调整 --- src/components/tool/value-table.vue | 18 +++++++++--------- src/components/view/role-manage.vue | 2 +- src/components/view/system-log.vue | 5 +---- src/components/view/a5-laboratory-management.vue | 8 ++++---- src/assets/api/controller.js | 9 +++++++-- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js index 4f6bea2..a814049 100644 --- a/src/assets/api/controller.js +++ b/src/assets/api/controller.js @@ -6,8 +6,8 @@ dataReporting, enums, capacityScope, - laboratoryScope - + laboratoryScope, + systemLog } } @@ -68,6 +68,7 @@ addEnum: "/enum/addEnum", //娣诲姞鏋氫妇 upEnum: "/enum/upEnum", //淇敼鏋氫妇 delEnum: "/enum/delEnum", //鍒犻櫎鏋氫妇 + selectEnumByCategory: "/enum/selectEnumByCategory", //閫氳繃鍒嗙被鏌ヨ鏋氫妇 } const capacityScope = { @@ -87,3 +88,7 @@ delItemParameter: "/laboratoryScope/delParameter", //鍒犻櫎瀹為獙瀹ゅ弬鏁� upItemParameter: "/laboratoryScope/upParameter", //淇敼瀹為獙瀹ゅ弬鏁� } + +const systemLog = { + selectSystemLogList: "/systemLog/selectSystemLogList", //鑾峰彇鏃ュ織 +} \ No newline at end of file diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue index 648a160..0cef9a8 100644 --- a/src/components/tool/value-table.vue +++ b/src/components/tool/value-table.vue @@ -54,7 +54,7 @@ :summary-method="getSummaries"> <el-table-column type="selection" width="65" v-if="data.showSelect"> </el-table-column> - <el-table-column align="center" type="index" label="搴忓彿" width="70" v-if="data.isIndex"> + <el-table-column type="index" align="center" label="搴忓彿" width="70" v-if="data.isIndex"> </el-table-column> <el-table-column :prop="a.label" :label="a.value" sortable="custom" v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="160"> @@ -92,7 +92,7 @@ <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`" v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input> <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" - style="width: 100%;" :disabled="isDisabled(a.label)"> + style="width: 100%;" :disabled="isDisabled(a.label)" clearable> <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value" :label="b.label"></el-option> </el-select> @@ -108,7 +108,7 @@ <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`" v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input> <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" - style="width: 100%;" :disabled="isDisabled(a.label)"> + style="width: 100%;" :disabled="isDisabled(a.label)" clearable> <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value" :label="b.label"></el-option> </el-select> @@ -132,7 +132,7 @@ <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`" v-if="showType(a.label, data.selectField) == null"></el-input> <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" - style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`"> + style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable> <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value" :label="b.label"></el-option> </el-select> @@ -147,7 +147,7 @@ <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`" v-if="showType(a.label, data.selectField) == null"></el-input> <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" - style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`"> + style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable> <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value" :label="b.label"></el-option> </el-select> @@ -223,8 +223,8 @@ order: 'asc' } }, - isIndex: true, - showSelect: true, + isIndex: false, + showSelect: false, select: true, row: 1, do: [{ @@ -264,8 +264,8 @@ order: 'asc' } }, - isIndex: true, - showSelect: true, + isIndex: false, + showSelect: false, select: true, row: 1, do: [{ diff --git a/src/components/view/a5-laboratory-management.vue b/src/components/view/a5-laboratory-management.vue index d3a92ef..c1a056c 100644 --- a/src/components/view/a5-laboratory-management.vue +++ b/src/components/view/a5-laboratory-management.vue @@ -53,12 +53,12 @@ v-model="componentData.entity.laboratoryName" @keyup.enter.native="refreshTable()"></el-input></div> </div> <div class="search_thing"> - <div class="search_label">瀹為獙瀹ょ紪鐮�</div> + <div class="search_label">瀹為獙瀹ょ紪鐮侊細</div> <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.laboratoryNumber" @keyup.enter.native="refreshTable()"></el-input></div> </div> <div class="search_thing"> - <div class="search_label">璐熻矗浜�</div> + <div class="search_label">璐熻矗浜猴細</div> <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.head" @keyup.enter.native="refreshTable()"></el-input></div> </div> @@ -108,8 +108,8 @@ }], tagField: {}, selectField: {}, - requiredAdd:['laboratoryName','laboratoryNumber','head','phoneNumber','address'], - requiredUp:['laboratoryName','laboratoryNumber','head','phoneNumber','address'] + requiredAdd:['laboratoryName','laboratoryNumber','head','phoneNumber'], + requiredUp:['laboratoryName','laboratoryNumber','head','phoneNumber'] }, entityCopy: {}, upIndex: 0, diff --git a/src/components/view/role-manage.vue b/src/components/view/role-manage.vue index 7fdf0e2..9bc9e85 100644 --- a/src/components/view/role-manage.vue +++ b/src/components/view/role-manage.vue @@ -127,9 +127,9 @@ order: 'asc' } }, - isIndex: true, showSelect: false, select: true, + isIndex: true, do: [{ font: '缂栬緫', type: 'text', diff --git a/src/components/view/system-log.vue b/src/components/view/system-log.vue index 1cbce7a..a415609 100644 --- a/src/components/view/system-log.vue +++ b/src/components/view/system-log.vue @@ -83,8 +83,6 @@ } }, isIndex: true, - showSelect: false, - select: false, do: [], tagField: {}, selectField: {}, @@ -92,8 +90,7 @@ requiredUp:[] }, entityCopy: {}, - upIndex: 0, - addDia: false + upIndex: 0 } }, mounted() { -- Gitblit v1.9.3