From c6c2fa57ccee5dde921106becc5238749e9caf89 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Tue, 1 Nov 2022 15:36:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9C=81=E5=8E=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/config/basicConfig.js | 28 +++++++++---------- back/src/utils/request.js | 2 +- .../modules/sys/log-data-modification-log.vue | 6 ++-- front/src/api/file.js | 2 +- front/src/config/default/setting.config.js | 6 ++-- front/vue.config.js | 4 +-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index e1298e06..8f85d563 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-31 14:22:11 + * @LastEditTime: 2022-11-01 09:22:02 * @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.243.243:8888/ucs-admin/websocket' } } } diff --git a/back/src/utils/request.js b/back/src/utils/request.js index 5e057959..14820e3c 100644 --- a/back/src/utils/request.js +++ b/back/src/utils/request.js @@ -14,7 +14,7 @@ import isPlainObject from 'lodash/isPlainObject' const http = axios.create({ baseURL: window.SITE_CONFIG.apiURL, - // baseURL: 'http://15.2.21.238:8888/renren-admin/', + // baseURL: 'http://15.2.21.238:8888/ucs-admin/', timeout: 1000 * 180, withCredentials: true }) diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue index a482cea2..b9cb1e34 100644 --- a/back/src/views/modules/sys/log-data-modification-log.vue +++ b/back/src/views/modules/sys/log-data-modification-log.vue @@ -52,15 +52,15 @@ > diff --git a/front/src/api/file.js b/front/src/api/file.js index b4f0d1ce..4640320c 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -128,7 +128,7 @@ export function initiateMeet(data) { // data: data, // }) return axios.post( - 'http://10.134.135.92:8888/renren-admin/enke/initiateMeet', + 'http://10.134.135.92:8888/ucs-admin/enke/initiateMeet', data, config2 ) diff --git a/front/src/config/default/setting.config.js b/front/src/config/default/setting.config.js index 204825b6..6e1d2218 100644 --- a/front/src/config/default/setting.config.js +++ b/front/src/config/default/setting.config.js @@ -23,9 +23,9 @@ const setting = { // baseURL: 'mock-server', // 请求接口 // 丁港 - baseURL: 'http://15.72.183.90:8000/renren-admin', - // : 'http://15.2.21.238:8888/renren-admin/', - // 'http://15.72.183.90:8000/renren-admin', + baseURL: 'http://15.72.183.90:8000/ucs-admin', + // : 'http://15.2.21.238:8888/ucs-admin/', + // 'http://15.72.183.90:8000/ucs-admin', // 黄工 // baseURL: // process.env.NODE_ENV === 'development' diff --git a/front/vue.config.js b/front/vue.config.js index efe1ac52..f63c3cc4 100644 --- a/front/vue.config.js +++ b/front/vue.config.js @@ -74,12 +74,12 @@ module.exports = { // // }, // // 注释掉的地方是前端配置代理访问后端的示例 // proxy: { - // '/renren-admin': { + // '/ucs-admin': { // target: `http://15.2.21.238:8888`, // // ws: true, // changeOrigin: true, // // pathRewrite: { - // // '^/': '/renren-admin/', + // // '^/': '/ucs-admin/', // // }, // }, // }, From 6eae78fd3b28168697247e4150bdf85377d9274e Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Tue, 1 Nov 2022 16:13:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/ability/shipinziyuan.vue | 21 +++--- .../src/views/modules/ability/shujuziyuan.vue | 64 ++++++++++--------- 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/back/src/views/modules/ability/shipinziyuan.vue b/back/src/views/modules/ability/shipinziyuan.vue index 3e2d31dc..d39f3da2 100644 --- a/back/src/views/modules/ability/shipinziyuan.vue +++ b/back/src/views/modules/ability/shipinziyuan.vue @@ -77,12 +77,6 @@ width="150" > @@ -211,9 +212,9 @@ export default { "e": "市南区" }, { - "a": "青岛一建青岛公共卫生中心大门", + "a": "一建公共卫生中心大门", "b": "101_37020201581314000519", - "c": "青岛一建青岛公共卫生中心", + "c": "一建公共卫生中心", "d": "市住房城乡建设局", "e": "市南区" }, diff --git a/back/src/views/modules/ability/shujuziyuan.vue b/back/src/views/modules/ability/shujuziyuan.vue index ca345074..c63e97f8 100644 --- a/back/src/views/modules/ability/shujuziyuan.vue +++ b/back/src/views/modules/ability/shujuziyuan.vue @@ -19,7 +19,7 @@ 上架盘点入库 @@ -52,19 +52,19 @@ > @@ -76,13 +76,8 @@ align="center" width="150" > + @@ -220,71 +222,71 @@ export default { "a": "供水营业网点信息", "b": "307013109015000204", "c": "供水营业网点信息", - "d": "青岛西海岸新区城市管理局（区水务局）", - "e ": "2022-10-28" + "d": "西海岸新区城市管理局（区水务局）", + "e": "张虎" }, { "a": "新建体育公园、笼式场地", "b": "307013100673000036", "c": "新建体育公园、笼式场地", - "d": "青岛市体育局", - "e ": "2022-10-28" + "d": "体育局", + "e": "张虎" }, { "a": "西海岸新区供水领域自然人欠费信息", "b": "307013109015000211", "c": "西海岸新区供水领域自然人欠费信息", - "d": "青岛西海岸新区城市管理局（区水务局）", - "e ": "2022-10-28" + "d": "西海岸新区城市管理局（区水务局）", + "e": "李阳" }, { - "a": "青岛西海岸新区交通运输局", + "a": "西海岸新区交通运输局", "b": "307013109071000108", "c": "公交站点查询", - "d": "青岛西海岸新区交通运输局", - "e ": "2022-10-27" + "d": "西海岸新区交通运输局", + "e": "李阳" }, { "a": "全市主要经济指标", "b": "307013107004000062", "c": "胶州市国民经济分行业数据", "d": "胶州市统计局", - "e ": "2022-10-13" + "e": "李阳" }, { "a": "乡村之星信息", "b": "307013100000000187", "c": "乡村之星信息", - "d": "青岛市农业农村局", - "e ": "2022-10-13" + "d": "农业农村局", + "e": "李阳" }, { "a": "建设项目环境影响评价审批信息", "b": "307013107777000033", "c": "建设单位、建设项目、审批文号", - "d": "青岛市生态环境局胶州分局", - "e ": "2022-10-13" + "d": "生态环境局胶州分局", + "e": "王二生" }, { "a": "新时代文明实践阵地信息表", "b": "307013108760000022", "c": "镇街、阵地名称、专管员、联系电话", "d": "莱西市夏格庄镇人民政府", - "e ": "2022-09-29" + "e": "王二生" }, { "a": "泊里镇非物质文化遗产信息", "b": "307013109000000067", "c": "泊里镇非物质文化遗产的名称、简介等信息", - "d": "青岛市黄岛区泊里镇人民政府", - "e ": "2022-10-11" + "d": "黄岛区泊里镇人民政府", + "e": "王二生" }, { "a": "人才住房建设情况", "b": "307013100482000025", "c": "人才住房项目数量、人才住房房屋套数、人才住房面积、人才住房目标任务房屋套数、人才住房房屋总面积", - "d": "青岛市住房和城乡建设局", - "e ": "2022-09-18" + "d": "住房和城乡建设局", + "e": "王二生" } ], From d4d2b06e1d001fcaa5c3520fe31639b643c24ed5 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Nov 2022 16:52:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=9E=8D=E5=90=88?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/i18n/zh-CN.js | 6 +- back/src/i18n/zh-TW.js | 8 +- back/src/views/main-navbar.vue | 2 +- .../src/views/modules/ability/bsabilityai.vue | 44 +++++---- .../modules/ability/bsabilityservice.vue | 91 ++++++------------- .../modules/ability/businessComponents.vue | 54 ++++++----- .../modules/ability/commonCapabilities.vue | 43 +++++---- 7 files changed, 116 insertions(+), 132 deletions(-) diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js index acefdd06..8901b962 100644 --- a/back/src/i18n/zh-CN.js +++ b/back/src/i18n/zh-CN.js @@ -3,8 +3,8 @@ const t = {} t.loading = '加载中...' t.brand = {} -t.brand.lg = '能力管理中心' -t.brand.mini = '一体化综合指挥' +t.brand.lg = '生态运营平台' +t.brand.mini = '政务信息系统' t.add = '新增' t.delete = '删除' @@ -576,4 +576,4 @@ t.infrastructure.street = '所在街道' t.infrastructure.department = '所属部门' t.infrastructure.associatedApplication = '关联应用' -export default t +export default t \ No newline at end of file diff --git a/back/src/i18n/zh-TW.js b/back/src/i18n/zh-TW.js index 3e6f2cd5..ab7786c5 100644 --- a/back/src/i18n/zh-TW.js +++ b/back/src/i18n/zh-TW.js @@ -3,8 +3,8 @@ const t = {} t.loading = '加載中...' t.brand = {} -t.brand.lg = '能力管理中心' -t.brand.mini = '一体化综合指挥' +t.brand.lg = '生态运营平台' +t.brand.mini = '政务信息系统' t.add = '新增' t.delete = '刪除' @@ -25,7 +25,7 @@ t.choose = '請選擇' t.fileName = '文件名' t.design = '在線設計' t.preview = '預覽' -t.reset='重置' +t.reset = '重置' t.prompt = {} t.prompt.title = '提示' @@ -544,4 +544,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/views/main-navbar.vue b/back/src/views/main-navbar.vue index 0836b83d..7be568af 100644 --- a/back/src/views/main-navbar.vue +++ b/back/src/views/main-navbar.vue @@ -12,7 +12,7 @@ $t("brand.lg") }} —— - 后台管理系统 + 能力知识库
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 5c408fe9..571373df 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -29,7 +29,7 @@ --> 上架盘点入库 @@ -48,7 +48,6 @@ v-loading="dataListLoading" :data="dataList" border - style="width: 100%" height="650px" @selection-change="handleSelectionChange" > @@ -60,7 +59,6 @@ > - + + @@ -294,7 +302,7 @@ export default { orderField: 'total', orderType: 'DESC', pageNum: this.currentPage, - pageSize: 15, + pageSize: 10, type: '组件服务', }; this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index dc2ec6a9..5df46152 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -31,7 +31,7 @@ 上架盘点入库 @@ -51,7 +51,6 @@ :data="dataList" border @selection-change="dataListSelectionChangeHandle" - style="width: 100%" height="650px" > - - + + + - + - - + diff --git a/back/src/views/modules/ability/businessComponents.vue b/back/src/views/modules/ability/businessComponents.vue index 690ff7d5..3680f180 100644 --- a/back/src/views/modules/ability/businessComponents.vue +++ b/back/src/views/modules/ability/businessComponents.vue @@ -29,7 +29,7 @@ --> 上架盘点入库 @@ -48,7 +48,6 @@ v-loading="dataListLoading" :data="dataList" border - style="width: 100%" height="650px" @selection-change="handleSelectionChange" > @@ -60,37 +59,47 @@ > - + + @@ -294,7 +302,7 @@ export default { orderField: 'total', orderType: 'DESC', pageNum: this.currentPage, - pageSize: 15, + pageSize: 10, type: '组件服务', }; this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { @@ -302,13 +310,12 @@ export default { this.total = parseInt(res.data.data.total); }) }, - //翻页 handleCurrentChange (val) { console.log('val------------>', val) this.currentPage = val; this.getDataList(); }, - //删除，可以批量删除 + //删除，可以批量删除 deleteHandle2 (id) { console.log('删除========================》', id, this.dataListSelections) const ids = [] @@ -326,7 +333,7 @@ export default { this.getDataList() }) }, - //多选多选 + //多选多选 handleSelectionChange(val){ this.dataListSelections = val; }, @@ -348,7 +355,7 @@ export default { }) }, reset () { - this.getDataList(); + this.getDataList(); }, findValue (list, type) { const found = list.find((item) => item.attrType === type) @@ -513,6 +520,7 @@ export default { this.$message.error('查询信息不能为空') } }, + // fullScreen () { // if (window.outerHeight === screen.availHeight) { // if (window.outerWidth === screen.availWidth) { // this.qp = false diff --git a/back/src/views/modules/ability/commonCapabilities.vue b/back/src/views/modules/ability/commonCapabilities.vue index 7b11f9e0..28c1e7dc 100644 --- a/back/src/views/modules/ability/commonCapabilities.vue +++ b/back/src/views/modules/ability/commonCapabilities.vue @@ -5,7 +5,7 @@ @@ -29,7 +29,7 @@ --> 上架盘点入库 @@ -48,7 +48,6 @@ v-loading="dataListLoading" :data="dataList" border - style="width: 100%" height="650px" @selection-change="handleSelectionChange" > @@ -60,37 +59,36 @@ > - + > --> @@ -294,7 +292,7 @@ export default { orderField: 'total', orderType: 'DESC', pageNum: this.currentPage, - pageSize: 15, + pageSize: 10, type: '组件服务', }; this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { @@ -307,7 +305,7 @@ export default { this.currentPage = val; this.getDataList(); }, - //删除，可以批量删除 + //删除，可以批量删除 deleteHandle2 (id) { console.log('删除========================》', id, this.dataListSelections) const ids = [] @@ -325,7 +323,7 @@ export default { this.getDataList() }) }, - //多选多选 + //多选多选 handleSelectionChange(val){ this.dataListSelections = val; }, @@ -347,7 +345,7 @@ export default { }) }, reset () { - this.getDataList(); + this.getDataList(); }, findValue (list, type) { const found = list.find((item) => item.attrType === type) @@ -512,6 +510,7 @@ export default { this.$message.error('查询信息不能为空') } }, + // fullScreen () { // if (window.outerHeight === screen.availHeight) { // if (window.outerWidth === screen.availWidth) { // this.qp = false