diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index e1298e06..c3ad3fd6 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-31 14:22:11 + * @LastEditors: Light + * @LastEditTime: 2022-11-01 09:15:08 * @Description: 告诉大家这是什么 */ var _global = {} @@ -17,34 +17,34 @@ var CONFIGITEM = { // 青岛市大数据局 qingdao: { previewUrl: 'http://15.72.183.90:7008/', - apiURL: 'http://15.72.183.90:8000/renren-admin', - websocketURL: 'ws://15.72.183.90:8000/renren-admin/websocket' + apiURL: 'http://15.72.183.90:8000/ucs-admin', + websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket' }, // 西海岸大数据局 xihaian: { previewUrl: 'http://10.134.135.9:9796/', - // apiURL: 'http://10.134.135.9:8888/renren-admin', - // apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发 - apiURL: 'http://192.168.124.236:8888/renren-admin', - // apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄 - websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket' + // apiURL: 'http://10.134.135.9:8888/ucs-admin', + // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发 + apiURL: 'http://192.168.124.236:8888/ucs-admin', + // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄 + websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket' }, // 测试 test: { previewUrl: 'http://192.168.124.243:9796/', - apiURL: 'http://192.168.124.243:8888/renren-admin', - websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket' + apiURL: 'http://192.168.124.243:8888/ucs-admin', + websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket' }, // 内网穿透 frp: { previewUrl: 'http://124.222.94.39:9796/', - apiURL: 'http://124.222.94.39:8888/renren-admin', - websocketURL: 'ws://124.222.94.39:8888/renren-admin/websocket' + apiURL: 'http://124.222.94.39:8888/ucs-admin', + websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket' }, dev: { previewUrl: 'http://localhost:8080/', - apiURL: 'http://192.168.124.243:8888/renren-admin', - websocketURL: 'ws://192.168.243.243:8888/renren-admin/websocket' + apiURL: 'http://192.168.124.243:8888/ucs-admin', + websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket' } } } diff --git a/back/src/i18n/zh-TW.js b/back/src/i18n/zh-TW.js index 3e6f2cd5..55803337 100644 --- a/back/src/i18n/zh-TW.js +++ b/back/src/i18n/zh-TW.js @@ -3,8 +3,10 @@ const t = {} t.loading = '加載中...' t.brand = {} -t.brand.lg = '能力管理中心' -t.brand.mini = '一体化综合指挥' + // t.brand.lg = '能力管理中心' + // t.brand.mini = '一体化综合指挥' +t.brand.lg = '通用服务平台' +t.brand.mini = '城市云脑' t.add = '新增' t.delete = '刪除' @@ -25,7 +27,7 @@ t.choose = '請選擇' t.fileName = '文件名' t.design = '在線設計' t.preview = '預覽' -t.reset='重置' +t.reset = '重置' t.prompt = {} t.prompt.title = '提示' @@ -544,4 +546,4 @@ t.notice.new = '有新通知' t.notice.disconnect = '連接斷開' t.notice.disconnectMessage = 'WebSocket連接已斷開，請檢查網絡' -export default t +export default t \ No newline at end of file diff --git a/back/src/router/index.js b/back/src/router/index.js index 299a5852..6945f87b 100644 --- a/back/src/router/index.js +++ b/back/src/router/index.js @@ -105,7 +105,6 @@ router.beforeEach((to, from, next) => { return next({ name: 'login' }) } window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0) - debugger fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList) next({ ...to, replace: true }) }).catch(() => { @@ -138,7 +137,6 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) { */ function fnAddDynamicMenuRoutes (menuList = [], routes = []) { var temp = [] - debugger for (var i = 0; i < menuList.length; i++) { if (menuList[i].children && menuList[i].children.length >= 1) { temp = temp.concat(menuList[i].children) diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue index 2ea7ba47..2c212e54 100644 --- a/back/src/views/main-navbar.vue +++ b/back/src/views/main-navbar.vue @@ -222,7 +222,7 @@ export default { .aui-navbar__header { width: 25%; .aui-navbar__brand { - margin-left: 20px; + margin-left: -30px; a { font-size: 22px; color: #ffffff; diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index ac6bb284..d55a4e06 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -26,7 +26,7 @@ 日期： - @@ -161,7 +161,7 @@ - + @@ -321,7 +321,7 @@ export default { { name: '基础设施', key: 3 }, { name: '数据资源', key: 4 }, { name: '知识库', key: 5 }, - { name: '会议室', value: 6 } + { name: '会客厅', value: 6 } ], tableData: [], tableDataClone: [], @@ -347,9 +347,9 @@ export default { { name: '开发组件', value: 3 }, { name: '业务组件', value: 4 }, { name: '应用资源', value: 5 }, - { name: '会议室', value: 6 } + { name: '会客厅', value: 6 } ], // 类型备选列表 - typeOptions1: [// 能力上架隐藏会议室 + typeOptions1: [// 能力上架隐藏会客厅 { name: '智能算法', value: 1 }, { name: '图层服务', value: 2 }, { name: '开发组件', value: 3 }, @@ -909,8 +909,10 @@ export default { // 点击查询按钮查询数据 getDataList() { if (this.value1 && this.value1.length > 0) { - this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd') - this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd') + // this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd') + // this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd') + this.startDate = this.value1[0] + this.endDate = this.value1[1] } else { this.startDate = '' this.endDate = '' diff --git a/back/src/views/modules/sys/dept.vue b/back/src/views/modules/sys/dept.vue index b2c3d076..56fe60cc 100644 --- a/back/src/views/modules/sys/dept.vue +++ b/back/src/views/modules/sys/dept.vue @@ -3,22 +3,36 @@
- {{ $t('add') }} + {{ $t('add') }} + - - + + + + + +
@@ -31,12 +45,16 @@ import AddOrUpdate from './dept-add-or-update' import qs from 'qs' export default { mixins: [mixinViewModule], - data () { + data() { return { mixinViewModuleOptions: { getDataListURL: '/sys/dept/list', deleteURL: '/sys/dept' - } + }, + total: 0, + limit: 10, + page: 1, + dataList: [] } }, components: { @@ -45,16 +63,35 @@ export default { watch: { dataList: { handler: function () { - this.init() + this.getData() } } }, methods: { - init () { - debugger - this.$http.get('/sys/dept/list').then((res) => { - res.data.data.map((item, index) => { - if (item.district != null || item.children.length > 0) { + // 分页, 每页条数 + pageSizeChangeHandle (val) { + this.page = 1 + this.limit = val + this.getData() + }, + // 分页, 当前页 + pageCurrentChangeHandle (val) { + this.page = val + this.getData() + }, + getData() { + // debugger + let _data = { + limt: this.limit, + page: this.page, + } + this.$http.get('sys/dept/page', { + params: _data + }).then((res) => { + this.total = res.data.data.total; + res.data.data.list.map((item, index) => { + console.log('item, index------------>', item, index); + if (item.district != null || item.children.length >= 0) { this.$http.get('/sys/region/' + item.district).then((data) => { this.dataList[index].district = data.data.data.name console.log('datafrom', this.dataList) @@ -72,10 +109,10 @@ export default { } }) }) - } + }, }, - created () { - this.init() + created() { + this.getData() } } diff --git a/back/src/views/modules/sys/user.vue b/back/src/views/modules/sys/user.vue index c77ab078..11e3ab37 100644 --- a/back/src/views/modules/sys/user.vue +++ b/back/src/views/modules/sys/user.vue @@ -45,21 +45,21 @@ - - - - -