From 101d91e2cefdc13921b51a4a9c252ab6cc869a5a Mon Sep 17 00:00:00 2001 From: Raod <1130305001@qq.com> Date: Fri, 20 Aug 2021 13:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=9B=BE=E8=A1=A8=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=95=B0=E6=8D=AE=E7=BB=86=E5=8C=96=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/src/router/index.js | 2 +- report-ui/src/views/dict/dict-item.vue | 3 ++- .../bigscreen/designer/form/dynamicComponents.vue | 8 ++++++-- .../report/bigscreen/designer/form/dynamicForm.vue | 1 + .../src/views/report/bigscreen/designer/tools.js | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/report-ui/src/router/index.js b/report-ui/src/router/index.js index 41070f3c..db23066a 100644 --- a/report-ui/src/router/index.js +++ b/report-ui/src/router/index.js @@ -57,7 +57,7 @@ export const constantRouterMap = [ children: [ { path: 'file', name: 'file', component: () => import('@/views/file-management/index'), meta: { title: '文件管理', icon: 'iconfill_folder', keepAlive: true, requireAuth: true, permission: 'fileManage'} }, { path: 'dict', name: 'dict', component: () => import('@/views/dict/index'), meta: { title: '数据字典', icon: 'iconzidian', keepAlive: true, requireAuth: true, permission: 'dictManage'} }, - { path: 'dictItem', name: 'dictItem', component: () => import('@/views/dict/dict-item'), meta: { title: '字典项', icon: 'iconzidianxiang', keepAlive: true, requireAuth: true, permission: 'dictItemManage'} }, + { path: 'dictItem', name: 'dictItem', component: () => import('@/views/dict/dict-item'), hidden: true, meta: { title: '字典项', icon: 'iconzidianxiang', keepAlive: true, requireAuth: true, permission: 'dictItemManage'} }, ] }, { path: '/bigscreen/viewer', component: () => import('@/views/report/bigscreen/viewer'), hidden: true, meta: { requireAuth: true }}, diff --git a/report-ui/src/views/dict/dict-item.vue b/report-ui/src/views/dict/dict-item.vue index e72494f8..efe51310 100644 --- a/report-ui/src/views/dict/dict-item.vue +++ b/report-ui/src/views/dict/dict-item.vue @@ -177,7 +177,8 @@ export default { rules: [ { required: true, message: "状态不能为空", trigger: "blur" } ], - disabled: false + disabled: false, + defaultValue: 1 }, { label: "排序", // 排序 diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue index 3ef49c2b..4ce13ac1 100644 --- a/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue +++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicComponents.vue @@ -27,7 +27,7 @@ @@ -57,6 +57,7 @@ export default { }, props: { chartType: String, + dictKey: String, props: ["formData"] }, data() { @@ -66,7 +67,7 @@ export default { userNameList: [], // 用户 setParamList: [], // 对应的不同的图形数据参数 params: {}, - chartProperties: {} + chartProperties: {}, }; }, computed: { @@ -113,6 +114,9 @@ export default { }, selectParams(val, key) { this.chartProperties[key] = val; + }, + getDictKey(){ + return this.dictKey == null ? 'CHART_PROPERTIES' : this.dictKey } } }; diff --git a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue index 7b1c3040..afcd303f 100644 --- a/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue +++ b/report-ui/src/views/report/bigscreen/designer/form/dynamicForm.vue @@ -137,6 +137,7 @@ v-if="item.type == 'dycustComponents' && inputShow[item.name]" v-model="formData[item.name]" :chart-type="item.chartType" + :dict-key='item.dictKey' @change="changed($event, item.name)" />