diff --git a/src/api/index.js b/src/api/index.js
index 0ca2cf0e..49a04b0a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -86,6 +86,13 @@ const api = {
get: async function(params){
return await http.get(this.url, params);
}
+ },
+ get: {
+ url: `${config.API_URL}/dic_info`,
+ name: "获取字典数据",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
}
},
app: {
diff --git a/src/components/scDicSelect/index.vue b/src/components/scDicSelect/index.vue
new file mode 100644
index 00000000..ab501d73
--- /dev/null
+++ b/src/components/scDicSelect/index.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/config/dicSelect.js b/src/config/dicSelect.js
new file mode 100644
index 00000000..26e9d6cc
--- /dev/null
+++ b/src/config/dicSelect.js
@@ -0,0 +1,21 @@
+import API from "@/api";
+
+//字典选择器配置
+
+export default {
+ apiObj: API.dic.get, //上传请求API对象
+ parseData: function (res) {
+ return {
+ data: res.data, //分析行数据字段结构
+ msg: res.message, //分析描述字段结构
+ code: res.code //分析状态字段结构
+ }
+ },
+ request: {
+ name: 'name' //规定搜索字段
+ },
+ props: {
+ label: 'name', //映射label显示字段
+ value: 'key', //映射value值字段
+ }
+}
diff --git a/src/main.js b/src/main.js
index a9b38ea2..c94dde62 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,6 +19,7 @@ import scUploadMultiple from './components/scUpload/multiple'
import scFormTable from './components/scFormTable'
import scTableSelect from './components/scTableSelect'
import scPageHeader from './components/scPageHeader'
+import scDicSelect from './components/scDicSelect'
import auth from './directives/auth'
import role from './directives/role'
@@ -44,6 +45,7 @@ app.component('scUploadMultiple', scUploadMultiple);
app.component('scFormTable', scFormTable);
app.component('scTableSelect', scTableSelect);
app.component('scPageHeader', scPageHeader);
+app.component('scDicSelect', scDicSelect);
//注册全局指令
app.directive('auth', auth)
diff --git a/src/router/systemRouter.js b/src/router/systemRouter.js
index e8495b5d..a22a1bd8 100644
--- a/src/router/systemRouter.js
+++ b/src/router/systemRouter.js
@@ -41,6 +41,15 @@ const routes = [{
icon: "el-icon-data-analysis",
},
component: () => import(/* webpackChunkName: "report" */ '@/views/template/report'),
+ },
+ {
+ name: "dicselect",
+ path: "/vab/dicselect",
+ meta: {
+ title: "字典选择器",
+ icon: "el-icon-document-copy",
+ },
+ component: () => import(/* webpackChunkName: "dicselect" */ '@/views/vab/dicselect'),
}
]
}
diff --git a/src/style/fix.less b/src/style/fix.less
index 442a4ea1..73c27c99 100644
--- a/src/style/fix.less
+++ b/src/style/fix.less
@@ -18,6 +18,7 @@
.el-dialog__title {font-size: 17px;font-weight: bold;}
.el-drawer__header>:first-child {font-size: 17px;font-weight: bold;}
.el-tree.menu .el-tree-node__content {height:36px;}
+.el-tree.menu .el-tree-node__content .el-tree-node__label .icon {margin-right: 5px;}
.el-input-number__decrease, .el-input-number__increase {top:2px;}
.el-menu-item [class^=sc-icon-] {font-size: 18px;display: inline-block;line-height: 1;}
.el-menu-item [class^=sc-icon-], .el-submenu [class^=sc-icon-] {margin-right: 5px;vertical-align: middle;width: 24px;text-align: center;}
diff --git a/src/views/template/report/index.vue b/src/views/template/report/index.vue
index 7b78eb1d..6d938511 100644
--- a/src/views/template/report/index.vue
+++ b/src/views/template/report/index.vue
@@ -6,7 +6,13 @@
-
+
@@ -16,10 +22,7 @@
- 异步加载1
- 异步加载2
- 卸载组件
-
+
@@ -27,13 +30,10 @@
+
+
diff --git a/src/views/template/report/pages/1.vue b/src/views/template/report/pages/user.vue
similarity index 90%
rename from src/views/template/report/pages/1.vue
rename to src/views/template/report/pages/user.vue
index 7a233e3b..29827d8e 100644
--- a/src/views/template/report/pages/1.vue
+++ b/src/views/template/report/pages/user.vue
@@ -1,5 +1,5 @@
- 1
+ user
+
+