Commit 0c3cb633 by liangzhen

字典

1 parent 40fd3ee1
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"scss": "^0.2.4", "scss": "^0.2.4",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-cli": "^2.9.6", "vue-cli": "^2.9.6",
"vue-i18n": "^8.27.0",
"vue-router": "^3.5.1", "vue-router": "^3.5.1",
"vuex": "^3.6.2", "vuex": "^3.6.2",
"xlsx": "^0.18.5" "xlsx": "^0.18.5"
...@@ -14232,6 +14233,11 @@ ...@@ -14232,6 +14233,11 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/vue-i18n": {
"version": "8.27.0",
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.0.tgz",
"integrity": "sha512-SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="
},
"node_modules/vue-loader": { "node_modules/vue-loader": {
"version": "17.4.2", "version": "17.4.2",
"dev": true, "dev": true,
...@@ -24060,6 +24066,11 @@ ...@@ -24060,6 +24066,11 @@
"version": "2.3.4", "version": "2.3.4",
"dev": true "dev": true
}, },
"vue-i18n": {
"version": "8.27.0",
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.0.tgz",
"integrity": "sha512-SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="
},
"vue-loader": { "vue-loader": {
"version": "17.4.2", "version": "17.4.2",
"dev": true, "dev": true,
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"scss": "^0.2.4", "scss": "^0.2.4",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-cli": "^2.9.6", "vue-cli": "^2.9.6",
"vue-i18n": "^8.27.0",
"vue-router": "^3.5.1", "vue-router": "^3.5.1",
"vuex": "^3.6.2", "vuex": "^3.6.2",
"xlsx": "^0.18.5" "xlsx": "^0.18.5"
......
...@@ -21,9 +21,5 @@ export const artPolicyExamineAdd = FRAMEWORK_ASSERT + '/kl-tech-policy/' ...@@ -21,9 +21,5 @@ export const artPolicyExamineAdd = FRAMEWORK_ASSERT + '/kl-tech-policy/'
// 审查 查询 // 审查 查询
export const examineSearch = FRAMEWORK_ASSERT + '/klTechPolicyCheck/qu' export const examineSearch = FRAMEWORK_ASSERT + '/klTechPolicyCheck/qu'
// 字典管理
export const dictionarySearch = FRAMEWORK_ASSERT + '/dict/'
// 维护 查询
export const dictionaryMaintenanceSearch = FRAMEWORK_ASSERT + '/dictDetail/' export const dictionaryMaintenanceSearch = FRAMEWORK_ASSERT + '/dictDetail/'
...@@ -445,7 +445,7 @@ export function queryGuanLianZiChanSelect(params) { ...@@ -445,7 +445,7 @@ export function queryGuanLianZiChanSelect(params) {
} }
// 日志管理,列表 // 日志管理,列表
export function queryLogManageTable(params) { export function queryLogManageTable(params) {
return post(ARCH_MANAGE + '/sysEventLog/', params) return post(ARCH_MANAGE + '/sysEventLog/page', params)
} }
// 日志管理,存储上限 // 日志管理,存储上限
export function queryLogManageStorageUpper(params) { export function queryLogManageStorageUpper(params) {
......
...@@ -94,3 +94,74 @@ export function roleBatchDelete(params) { ...@@ -94,3 +94,74 @@ export function roleBatchDelete(params) {
export function roleEnableOrUnEnable(params) { export function roleEnableOrUnEnable(params) {
return post(`${ARCH_MANAGE}/role/enableOrUnEnable/`, params) return post(`${ARCH_MANAGE}/role/enableOrUnEnable/`, params)
} }
//架构多为分析模块
export function getFrameworkSecondByTEC(params) {
return post(`${JGDWFX}/show/second/getFrameworkSecondByTEC`, params)
}
//业务域表格数据
export function getCurrentBusTable(params) {
return post(`${JGDWFX}/charts/getCurrentBusTable`, params)
}
//业务域统计图
export function getCurrentBusCharts(params) {
return post(`${JGDWFX}/charts/getCurrentBusCharts`, params)
}
//应用统计图
export function getCurrentAppCharts(params) {
return post(`${JGDWFX}/charts/getCurrentAppCharts`, params)
}
//应用表格数据
export function getCurrentAppTable(params) {
return post(`${JGDWFX}/charts/getCurrentAppTable`, params)
}
//业务支撑度统计图
export function getCurrentZcdCharts(params) {
return post(`${JGDWFX}/charts/getCurrentZcdCharts`, params)
}
//业务支撑度表格数据
export function getCurrentZcdTable(params) {
return post(`${JGDWFX}/charts/getCurrentZcdTable`, params)
}
//字典管理
// 查询数据字典管理获取列表数据
export function getDataDictionaryList(params) {
return post(`${ARCH_MANAGE}/dict/`, params)
}
// 新建数据字典数据
export function newlyDataDictionary(params) {
return post(`${ARCH_MANAGE}/dict/create`, params)
}
// 修改数据字典数据
export function modifyDataDictionary(params) {
return post(`${ARCH_MANAGE}/dict/update`, params)
}
// 根据id查询数据字典详情 回显修改数据
export function getDataDictionaryDetailById(params) {
return post(`${ARCH_MANAGE}/dictDetail/details`, params)
}
// 改变数据字典禁用启用状态
export function changeDataDictionaryState(params) {
return post(`${ARCH_MANAGE}/dict/delete`, params)
}
// 查询数据字典详情列表数据
export function getDataDictionaryDetailList(params) {
return post(`${ARCH_MANAGE}/dictDetail/`, params)
}
// 新建数据字典详情
export function newlyDataDictionaryDetail(params) {
return post(`${ARCH_MANAGE}/dictDetail/create`, params)
}
// 修改 数据字典详情
export function modifyDataDictionaryDetail(params) {
return post(`${ARCH_MANAGE}/dictDetail/update`, params)
}
import Vue from 'vue'
import ElementUI from 'element-ui'
import locale from 'element-ui/lib/locale';
import VueI18n from 'vue-i18n'
import messages from './langs'
Vue.use(VueI18n)
//从localStorage中拿到用户的语言选择,如果没有,那默认中文。
const i18n = new VueI18n({
locale: localStorage.getItem('locale') || 'cn',
messages
})
locale.i18n((key, value) => i18n.t(key, value))
export default i18n
\ No newline at end of file
import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
const cn = {
menu: {
'chinese':'中文',
'english':'英文',
'personalCenter':'个人中心',
'homepage':'数据概览',
'bookingManagement':'预约管理',
},
home:{
'dataOverview':'预约数据概览',
'currentStatistics':'当前系统用户统计'
},
message: {
'hello': '你好,世界',
'msg': '提示',
},
myel:{
'lastWeek':'最近一周',
'lastMonth':'最近一个月',
'lastThreeMonths':'最近三个月',
},
...zhLocale
}
export default cn;
import enLocale from 'element-ui/lib/locale/lang/en'
const en = {
menu: {
'chinese':'chinese',
'english':'english',
'personalCenter':'Personal Center',
'homepage':'Data overview',
'bookingManagement':'booking management',
},
home:{
'dataOverview':'Appointment data overview',
'currentStatistics':'Current statistics'
},
message: {
'hello': 'hello, world',
'msg': 'point out',
},
myel:{
'lastWeek':'Last week',
'lastMonth':'Last month',
'lastThreeMonths':'Last three months',
},
...enLocale
}
export default en;
import en from './en';
import cn from './cn';
export default {
en: en,
cn: cn
}
\ No newline at end of file
...@@ -10,6 +10,7 @@ import './styles/common.scss' ...@@ -10,6 +10,7 @@ import './styles/common.scss'
import initDirective from './directive' import initDirective from './directive'
import './icons' // icon import './icons' // icon
import { postRequest, postRequestShared } from '@/api/index' import { postRequest, postRequestShared } from '@/api/index'
import i18n from './i18n/i18n.js';
initDirective(Vue) initDirective(Vue)
Vue.prototype.$echarts = echarts Vue.prototype.$echarts = echarts
...@@ -53,6 +54,7 @@ Vue.component('my-dialog', myDialog) ...@@ -53,6 +54,7 @@ Vue.component('my-dialog', myDialog)
import myDialog1 from './components/common/dialog.vue' import myDialog1 from './components/common/dialog.vue'
Vue.component('my-dialog1', myDialog1) Vue.component('my-dialog1', myDialog1)
new Vue({ new Vue({
i18n,
router, router,
store, store,
render: (h) => h(App), render: (h) => h(App),
......
...@@ -348,11 +348,11 @@ export const routes = [ ...@@ -348,11 +348,11 @@ export const routes = [
name: "personnel", name: "personnel",
component: () => import("@/views/system/personnel/index.vue"), component: () => import("@/views/system/personnel/index.vue"),
}, },
// { {
// path: '/main/organization', path: '/main/dictionary',
// meta: { title: "组织管理" }, meta: { title: "字典管理" },
// component: () => import("@/views/system/organization/index.vue"), component: () => import("@/views/system/dictionary/index.vue"),
// }, },
{ {
path: '/main/roleAdmin', path: '/main/roleAdmin',
meta: { title: "角色管理" }, meta: { title: "角色管理" },
......
...@@ -179,9 +179,19 @@ export const menuOptions = [ ...@@ -179,9 +179,19 @@ export const menuOptions = [
//新建的 //新建的
{ {
name: '系统功能', name: '系统功能',
width: '700', width: '1000',
children: [
{
name: '字典管理',
children: [ children: [
{ {
name: '字典管理',
path: '/main/dictionary',
},
],
},
{
name: '用户与组织管理', name: '用户与组织管理',
children: [ children: [
{ {
......
...@@ -2136,7 +2136,7 @@ export default { ...@@ -2136,7 +2136,7 @@ export default {
} }
.filter-tree { .filter-tree {
width: 300px; // width: 300px;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
} }
...@@ -2225,6 +2225,7 @@ export default { ...@@ -2225,6 +2225,7 @@ export default {
> .el-tree-node__content { > .el-tree-node__content {
background-color: #0d867f; background-color: #0d867f;
color: #fff; color: #fff;
box-sizing: border-box;
} }
/deep/ /deep/
...@@ -2240,7 +2241,7 @@ export default { ...@@ -2240,7 +2241,7 @@ export default {
} }
.left_container { .left_container {
width: 20%; width: 15%;
margin-right: 20px; margin-right: 20px;
} }
......
...@@ -245,7 +245,6 @@ ...@@ -245,7 +245,6 @@
getCurrentAppTable, getCurrentAppTable,
getCurrentZcdCharts, getCurrentZcdCharts,
getCurrentZcdTable, getCurrentZcdTable,
addLog
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
mixins: [mixins], mixins: [mixins],
...@@ -362,12 +361,6 @@ ...@@ -362,12 +361,6 @@
let type = val.dataIndex + 1; let type = val.dataIndex + 1;
this.params.appType = type + ""; this.params.appType = type + "";
this.getCurrentAppTable(); this.getCurrentAppTable();
addLog({
eventtype: "1", //事件类型
eventcontent: this.$route.meta.title, //事件内容
logtype: "0", //日志类型
loglev: "0" //日志级别
});
}, },
getCurrentBusChartClick(val) { getCurrentBusChartClick(val) {
...@@ -698,8 +691,10 @@ ...@@ -698,8 +691,10 @@
.btn-wrap { .btn-wrap {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px;
.iptx { .iptx {
width: 250px; width: 250px;
margin-right: 15px;
} }
.el-button { .el-button {
margin-right: 0 !important; margin-right: 0 !important;
...@@ -714,6 +709,7 @@ ...@@ -714,6 +709,7 @@
@import '@/styles/common.scss'; @import '@/styles/common.scss';
.box-wrap { .box-wrap {
width: 100%; width: 100%;
overflow-y: auto;
.left-box { .left-box {
.add-row{ .add-row{
font-size: $com_fontSize; font-size: $com_fontSize;
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div style="margin-bottom:10px;display:flex; margin-left: 20px"> <div style="margin-bottom:10px;display:flex; margin-left: 20px">
<label class="form-label">资产名称</label> <label class="form-label" style="margin-top:3px;">资产名称</label>
<div class="tree-div" @click="openTree()" > <div class="tree-div" @click="openTree()" >
<div class="checkedName">{{checkedName}}</div> <div class="checkedName">{{checkedName}}</div>
<i class="el-icon-arrow-down" style="position: absolute;right: 12px;top: 10px;color: #b6c2d1;" ></i> <i class="el-icon-arrow-down" style="position: absolute;right: 12px;top: 10px;color: #b6c2d1;" ></i>
...@@ -577,6 +577,9 @@ ...@@ -577,6 +577,9 @@
} }
} }
} }
.form-label{
margin: 0 10px
}
</style> </style>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!