diff --git a/src/api/coop-group.js b/src/api/coop-group.js index f4a0769deab62cc07fb2f605186255faed908f9c..88c8cf0a015f51dca687470aa2d539eae9b62e36 100644 --- a/src/api/coop-group.js +++ b/src/api/coop-group.js @@ -341,7 +341,7 @@ export function getQualityDetail(patientId) { // 协作组参数配置新增/修改 export function setParamConfig(data) { return request({ - url: `/disease-data/sys/paramConfig/addOrUpdate`, + url: `/disease-data/param/config`, method: "post", data, }) @@ -350,7 +350,7 @@ export function setParamConfig(data) { // 协作组参数配置列表 export function getParamConfigList(params) { return request({ - url: `/disease-data/sys/paramConfig/list`, + url: `/disease-data/param/config/page`, method: "get", params, }) @@ -359,7 +359,7 @@ export function getParamConfigList(params) { // 删除配置 export function delParamConfig(id) { return request({ - url: `/disease-data/sys/paramConfig/${id}`, + url: `/disease-data/param/config?id=${id}`, method: "delete", }) } diff --git a/src/api/field.js b/src/api/field.js index 17703e04ad3fd21f60a70977b3f1909968acd9ab..bf1ec4d7aa447460ec2fb6ff10d4135bfd025f38 100644 --- a/src/api/field.js +++ b/src/api/field.js @@ -12,13 +12,6 @@ export function getFieldPage(params = {}) { params, }) } -export function getFieldList(params = {}) { - return request({ - url: "/cloud-upms/field/dict/list/table", - method: "get", - params, - }) -} export function delField(id) { return request({ @@ -92,7 +85,7 @@ export function copyForm(data = {}) { // 获取 export function getFormDetail(id) { return request({ - url: `/cloud-upms//org/form/${id}`, + url: `/cloud-upms/org/form/${id}`, method: "get", }) } diff --git a/src/config/settings.js b/src/config/settings.js index 23d2578865ba8e1c15feda9c7fb316c18982047c..2e1ca5be60770a70ae35d72da1d94e21ee9c617a 100644 --- a/src/config/settings.js +++ b/src/config/settings.js @@ -44,6 +44,8 @@ module.exports = { tokenTableName: "agcs", //token存储位置localStorage sessionStorage cookie storage: "localStorage", + // 前缀名 + storagePrefixName: "agcs", //是否显示logo logo: true, //是否国定头部 固定fixed 不固定noFixed diff --git a/src/layouts/components/AppMain/index.vue b/src/layouts/components/AppMain/index.vue index 0823bc8b3444db4c9f7b026b61accab64153b241..f2b124368e3ceea6348aab51585eaaf8f2087c67 100644 --- a/src/layouts/components/AppMain/index.vue +++ b/src/layouts/components/AppMain/index.vue @@ -58,14 +58,14 @@ export default { }, }, watch: { - // $route: { - // handler(route) { - // if ("mobile" === this.device) { - // this.$store.dispatch("settings/foldSideBar") - // } - // }, - // immediate: true, - // }, + $route: { + handler(route) { + if ("mobile" === this.device) { + this.$store.dispatch("settings/foldSideBar") + } + }, + immediate: true, + }, }, created() { //重载所有路由 diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index e73a03c27dc173084461caf6fc0a7ce722a6eeaf..5dbc66d772342a4783d57f329aedf0da3831d0b9 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -3,10 +3,10 @@ * @description 所有全局配置的状态管理,如无必要请勿修改 */ -import defaultSettings from "@/config/settings"; +import defaultSettings from "@/config/settings" -const { tagsBar, logo, layout, header, themeBar, skeleton } = defaultSettings; -const theme = JSON.parse(localStorage.getItem("BYUI-VUE-THEME")) || ""; +const { tagsBar, logo, layout, header, themeBar, skeleton } = defaultSettings +const theme = JSON.parse(localStorage.getItem("BYUI-VUE-THEME")) || "" const state = { tagsBar: theme.tagsBar || tagsBar, logo, @@ -16,7 +16,7 @@ const state = { skeleton, device: "desktop", themeBar, -}; +} const getters = { collapse: (state) => state.collapse, device: (state) => state.device, @@ -26,51 +26,51 @@ const getters = { tagsBar: (state) => state.tagsBar, themeBar: (state) => state.themeBar, skeleton: (state) => state.skeleton, -}; +} const mutations = { changeLayout: (state, layout) => { - if (layout) state.layout = layout; + if (layout) state.layout = layout }, changeHeader: (state, header) => { - if (header) state.header = header; + if (header) state.header = header }, changeTagsBar: (state, tagsBar) => { - if (tagsBar) state.tagsBar = tagsBar; + if (tagsBar) state.tagsBar = tagsBar }, changeCollapse: (state) => { - state.collapse = !state.collapse; + state.collapse = !state.collapse }, foldSideBar: (state) => { - state.collapse = true; + // state.collapse = true; }, openSideBar: (state) => { - state.collapse = false; + state.collapse = false }, toggleDevice: (state, device) => { - state.device = device; + state.device = device }, -}; +} const actions = { changeLayout({ commit }, layout) { - commit("changeLayout", layout); + commit("changeLayout", layout) }, changeHeader({ commit }, header) { - commit("changeHeader", header); + commit("changeHeader", header) }, changeTagsBar({ commit }, tagsBar) { - commit("changeTagsBar", tagsBar); + commit("changeTagsBar", tagsBar) }, changeCollapse({ commit }) { - commit("changeCollapse"); + commit("changeCollapse") }, foldSideBar({ commit }) { - commit("foldSideBar"); + commit("foldSideBar") }, openSideBar({ commit }) { - commit("openSideBar"); + commit("openSideBar") }, toggleDevice({ commit }, device) { - commit("toggleDevice", device); + commit("toggleDevice", device) }, -}; -export default { state, getters, mutations, actions }; +} +export default { state, getters, mutations, actions } diff --git a/src/utils/storage.js b/src/utils/storage.js index 0e6e3fd13f88655b32e6651f1b1c31cdf53bd9fe..6991dfdbfacce1d0df8b6175f2b91770ed76cdf2 100644 --- a/src/utils/storage.js +++ b/src/utils/storage.js @@ -1,11 +1,12 @@ const ls = window.localStorage const ss = window.sessionStorage +import { storagePrefixName } from "@/config/settings" export const Local = { get(key, def) { let value = null try { - value = JSON.parse(ls.getItem(key)) + value = JSON.parse(ls.getItem(storagePrefixName + "-" + key)) } catch (e) { console.log(" ") } @@ -19,14 +20,14 @@ export const Local = { ls.setItem(i, JSON.stringify(setting[i])) } } else { - ls.setItem(key, JSON.stringify(val)) + ls.setItem(storagePrefixName + "-" + key, JSON.stringify(val)) } } catch (e) { console.log("'") } }, remove(key) { - ls.removeItem(key) + ls.removeItem(storagePrefixName + "-" + key) }, clear() { ls.clear() @@ -36,7 +37,7 @@ export const Local = { export const Session = { get(key) { try { - return JSON.parse(ss.getItem(key)) + return JSON.parse(ss.getItem(storagePrefixName + "-" + key)) } catch (e) { return null } @@ -48,11 +49,11 @@ export const Session = { ss.setItem(i, JSON.stringify(setting[i])) } } else { - ss.setItem(key, JSON.stringify(val)) + ss.setItem(storagePrefixName + "-" + key, JSON.stringify(val)) } }, remove(key) { - ss.removeItem(key) + ss.removeItem(storagePrefixName + "-" + key) }, clear() { ss.clear() diff --git a/src/views/systems/colla-group/ExportFieldConfig.vue b/src/views/systems/colla-group/ExportFieldConfig.vue deleted file mode 100644 index b6b2e5e629a5258ae3c0797ec47f41bc90c59b03..0000000000000000000000000000000000000000 --- a/src/views/systems/colla-group/ExportFieldConfig.vue +++ /dev/null @@ -1,244 +0,0 @@ - - - diff --git a/src/views/systems/colla-group/ParameterConfig.vue b/src/views/systems/colla-group/ParameterConfig.vue index 70515249637e6725b32f51b8169806d86b94f17b..57de4beaa691efc02937a8ffea24e12a26b10ec8 100644 --- a/src/views/systems/colla-group/ParameterConfig.vue +++ b/src/views/systems/colla-group/ParameterConfig.vue @@ -50,10 +50,13 @@ export default { // 查询列表 searchList: [ { - label: "参数代码", - type: "input", - prop: "code", - placeholder: "请输入参数代码", + label: "类型", + type: "select", + prop: "type", + placeholder: "请输入类型", + optsFormatter: () => { + return this.dictMap && this.dictMap["sys_param_type"] + }, }, { label: "参数值", @@ -61,12 +64,7 @@ export default { prop: "value", placeholder: "请输入参数值", }, - { - label: "类型", - type: "input", - prop: "type", - placeholder: "请输入类型", - }, + { type: "button", value: "查询", @@ -81,10 +79,29 @@ export default { }, ], columns: [ + { + label: "类型", + minWidth: 100, + value: "type", + formatter: (row) => { + return this.$handle.formatDicList( + this.dictMap["sys_param_type"], + row.type + ) + }, + }, { label: "参数代码", minWidth: 120, value: "code", + formatter: (row) => { + const item = + this.dictMap["sys_param_type"].find( + (_) => _.value === row.type + ) || {} + const list = item.children || [] + return this.$handle.formatDicList(list, row.code) + }, }, { @@ -92,21 +109,7 @@ export default { minWidth: 120, value: "value", }, - { - label: "类型", - minWidth: 100, - value: "type", - }, - { - label: "目标值名称", - minWidth: 100, - value: "targetName", - }, - { - label: "目标值", - minWidth: 100, - value: "targetValue", - }, + { label: "创建时间", minWidth: 180, @@ -151,12 +154,24 @@ export default { cacheForm: {}, formData: [ { - type: "input", + type: "select", + label: "类型", + placeholder: "请选择类型", + prop: "type", + rules: [{ required: true, message: "请选择类型" }], + func: this.typeChange, + optsFormatter: () => { + return this.dictMap && this.dictMap["sys_param_type"] + }, + }, + { + type: "select", label: "参数代码", placeholder: "请输入参数代码", prop: "code", disabled: false, rules: [{ required: true, message: "参数代码" }], + opts: [], }, { type: "input", @@ -168,22 +183,9 @@ export default { { type: "input", - label: "类型", - placeholder: "请选择类型", - prop: "type", - rules: [{ required: true, message: "请选择类型" }], - }, - { - type: "input", - label: "目标值名称", - placeholder: "请选择目标值名称", - prop: "targetName", - }, - { - type: "input", - label: "目标值", - placeholder: "请选择目标值", - prop: "targetValue", + label: "默认参数值", + placeholder: "请选择默认参数值", + prop: "defaultValue", }, ], formEdit: {}, @@ -200,6 +202,11 @@ export default { }, methods: { + typeChange(val) { + this.$refs.dialog.initFields({ code: "" }) + const opt = this.dictMap["sys_param_type"].find((_) => _.value === val) + this.formData[1].opts = (opt && opt.children) || [] + }, handleAdd(row) { this.formEdit = Object.assign({}, row) if (!this.groupId) { @@ -212,13 +219,17 @@ export default { const data = Object.assign(form, { groupId: this.groupId, }) - setParamConfig(data).then((res) => { - if (res.code === 1) { - this.$message.success("添加成功") - this.handleSearch() - this.$refs.dialog.close() - } - }) + setParamConfig(data) + .then((res) => { + if (res.code === 1) { + this.$message.success("添加成功") + this.handleSearch() + this.$refs.dialog.close() + } + }) + .finally(() => { + this.$refs.dialog.loading = false + }) }, handleDel(row) { this.$confirm(`是否删除【${row.code || ""}】?`, "提示", { diff --git a/src/views/systems/colla-group/QualityControlConfig.vue b/src/views/systems/colla-group/QualityControlConfig.vue deleted file mode 100644 index b8cd406309868574c8eccfacd4220a9f6041dae8..0000000000000000000000000000000000000000 --- a/src/views/systems/colla-group/QualityControlConfig.vue +++ /dev/null @@ -1,761 +0,0 @@ - - - diff --git a/src/views/systems/colla-group/index.vue b/src/views/systems/colla-group/index.vue index 45c2e25dd703ad5beec8d85dd961c459ed7aff4a..3f94449a99586215bb6f4d87525af1b828475d79 100644 --- a/src/views/systems/colla-group/index.vue +++ b/src/views/systems/colla-group/index.vue @@ -38,15 +38,6 @@ - - - - - - @@ -65,18 +56,14 @@ diff --git a/src/views/systems/form-config/index.vue b/src/views/systems/form-config/index.vue index e2f1050763eff4eca4f12c69331126afa2a1608a..7f4d762cf82a99f0da7bada17f99cce4c8bc29fb 100644 --- a/src/views/systems/form-config/index.vue +++ b/src/views/systems/form-config/index.vue @@ -1,12 +1,26 @@