From ed6a7e85b238737d27c6c5c0f0a89e6fabd749a9 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Fri, 28 Oct 2022 13:59:44 +0800 Subject: [PATCH 01/19] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/apply.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 688ed0ed..0f99b1cd 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -103,7 +103,7 @@ -
+
Date: Fri, 28 Oct 2022 14:57:23 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=97=A5=E6=9C=9F=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/abilityStatistics/index.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index ac6bb284..8c544ba2 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -26,7 +26,7 @@ 日期： - @@ -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 = '' From 7e6fb8417a64a9c851592169296caf4269ebf87a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 Oct 2022 15:25:03 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A0=87=E9=A2=98?= =?UTF-8?q?=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 | 10 ++++++---- back/src/views/main-navbar.vue | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js index acefdd06..4e8b0e9a 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..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/views/main-navbar.vue b/back/src/views/main-navbar.vue index f624e6cd..0959e0bb 100644 --- a/back/src/views/main-navbar.vue +++ b/back/src/views/main-navbar.vue @@ -221,7 +221,7 @@ export default { .aui-navbar__header { width: 25%; .aui-navbar__brand { - margin-left: 20px; + margin-left: -30px; a { font-size: 22px; color: #ffffff; From 6967b3f1da6ec762deac2fbf17e260c0e87081c6 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Fri, 28 Oct 2022 16:37:48 +0800 Subject: [PATCH 04/19] =?UTF-8?q?1.=E5=AE=8C=E6=88=90=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E9=9B=86=E5=B8=82=EF=BC=9A=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD?= =?UTF-8?q?-=E4=BC=9A=E5=AE=A2=E5=8E=85=EF=BC=8C=E5=AD=97=E6=95=B0?= =?UTF-8?q?=E5=A4=AA=E5=A4=9A=E6=97=B6=EF=BC=8C=E5=B1=95=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E7=BE=8E=E8=A7=82=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=202.?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=EF=BC=9A?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=A8=A1=E5=BC=8F=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4=EF=BC=8C=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=AD=A3=E5=BA=8F=E6=8E=92=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=8C=89=E7=85=A7=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=203=E5=AE=8C=E6=88=90.?= =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1=EF=BC=9A=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E7=82=B9=E5=87=BB=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=8F=AA=E8=83=BD=E6=8C=89=E7=85=A7=E6=AD=A3?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=EF=BC=8C=E4=B8=8D=E8=83=BD=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/integrationServiceOrder.vue | 4 +- front/src/views/home/infrastructurePage.vue | 3811 ++++++++--------- 2 files changed, 1904 insertions(+), 1911 deletions(-) diff --git a/front/src/views/home/components/integrationServiceOrder.vue b/front/src/views/home/components/integrationServiceOrder.vue index fc13a08c..48f9debf 100644 --- a/front/src/views/home/components/integrationServiceOrder.vue +++ b/front/src/views/home/components/integrationServiceOrder.vue @@ -47,12 +47,10 @@ const integrationOrder = reactive({ // 融合服务--排序 const changeOrder = (i, val, type) => { - - console.log('i, val, type------------>', i, val, type); integrationOrder.orderField = val integrationOrder.orderType = type; // 0 apply_count ASC - let _index = integrationOrderList.value.findIndex(x => x.value = val) + let _index = integrationOrderList.value.findIndex(x => x.value == val) if (_index > -1) { integrationOrderList.value[_index].orderType = type } diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index ff73deae..270ed253 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -105,7 +105,13 @@ 面积：{{ item.area }}m²
- {{ item.description }} + + + {{ item.description }} + +
From 2774650d96f1248b04703b93fe46c4e71ebd8803 Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 28 Oct 2022 17:04:37 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=96=B0=E6=89=8B=E6=8C=87=E5=8D=97--?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8B=E6=9E=B6=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/instructionManual/components/menuBook.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue index 82412857..d27eb5fe 100644 --- a/front/src/views/instructionManual/components/menuBook.vue +++ b/front/src/views/instructionManual/components/menuBook.vue @@ -267,12 +267,10 @@ }) window.open(newpage.href, '_blank') } else if (data === '资源下架') { - window.sessionStorage.setItem('type', JSON.stringify('apply')) + // 跳转到个人中心--我的发布 + window.sessionStorage.setItem('type', JSON.stringify('push')) const newpage = router.resolve({ path: '/personalCenter', - query: { - tabTypeName: '能力上架' - } }) window.location.href = newpage.href } From 7e53463eaf03d81d6e90c638360d6d08f7a83efa Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Sat, 29 Oct 2022 16:26:39 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/router/index.js | 2 - .../views/modules/ability/shipinziyuan.vue | 356 ++++++++++ .../src/views/modules/ability/shujuziyuan.vue | 384 ++++++++++ back/src/views/modules/ability/yunandwang.vue | 662 ++++++++++++++++++ 4 files changed, 1402 insertions(+), 2 deletions(-) create mode 100644 back/src/views/modules/ability/shipinziyuan.vue create mode 100644 back/src/views/modules/ability/shujuziyuan.vue create mode 100644 back/src/views/modules/ability/yunandwang.vue 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/modules/ability/shipinziyuan.vue b/back/src/views/modules/ability/shipinziyuan.vue new file mode 100644 index 00000000..3e2d31dc --- /dev/null +++ b/back/src/views/modules/ability/shipinziyuan.vue @@ -0,0 +1,356 @@ + + + + diff --git a/back/src/views/modules/ability/shujuziyuan.vue b/back/src/views/modules/ability/shujuziyuan.vue new file mode 100644 index 00000000..ca345074 --- /dev/null +++ b/back/src/views/modules/ability/shujuziyuan.vue @@ -0,0 +1,384 @@ + + + + diff --git a/back/src/views/modules/ability/yunandwang.vue b/back/src/views/modules/ability/yunandwang.vue new file mode 100644 index 00000000..76138863 --- /dev/null +++ b/back/src/views/modules/ability/yunandwang.vue @@ -0,0 +1,662 @@ + + + + From 5f155dc69aaa267a281e467ee2381503fd704e72 Mon Sep 17 00:00:00 2001 From: guoyue Date: Mon, 31 Oct 2022 14:07:39 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/home/components/CanAssignCase.vue | 18 +++++++++++++++++- .../components/integrationServiceOrder.vue | 15 +++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/front/src/views/home/components/CanAssignCase.vue b/front/src/views/home/components/CanAssignCase.vue index 71f0598b..9070763f 100644 --- a/front/src/views/home/components/CanAssignCase.vue +++ b/front/src/views/home/components/CanAssignCase.vue @@ -1,5 +1,7 @@ From 15426bccdc2134994800437f26e9a0ed6de9f9a5 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 31 Oct 2022 16:03:12 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/home.js | 9 +- front/src/views/home/apply.vue | 247 ++++++++++++++++----------------- 2 files changed, 130 insertions(+), 126 deletions(-) diff --git a/front/src/api/home.js b/front/src/api/home.js index b3043eec..0b8269c3 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 * @LastEditors: Light - * @LastEditTime: 2022-10-26 10:35:36 + * @LastEditTime: 2022-10-31 15:52:57 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -63,6 +63,13 @@ export function pageWithAttrs(data) { data, }) } +// 筛选 +export function getAppListByDept() { + return request({ + url: '/resource/getAppListByDept', + method: 'get', + }) +} // 获取hls视频流 export function getHls(params) { return request({ diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 0f99b1cd..26e1fcf8 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -260,7 +260,11 @@ import { getCategoryTreePage, endProcess } from '@/api/personalCenter' import mybus from '@/myplugins/mybus' import { sgcDel, getApplyForm } from '@/api/personalCenter' - import { pageWithAttrs, updateIntegrationServices } from '@/api/home' + import { + pageWithAttrs, + updateIntegrationServices, + getAppListByDept, + } from '@/api/home' import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js' import { getIntegrationDetail, soldierApply } from '@/api/home' import { useStore } from 'vuex' @@ -782,25 +786,18 @@ }) } } - pageWithAttrs({ - pageNum: 1, - pageSize: 99999, - type: '应用资源', - name: '', - infoList: [], - }).then((res) => { + getAppListByDept().then((res) => { + console.log('res=====>', res.data.data) if (res.data.code == 0) { - if (res.data.data.records.length == 0) { + if (res.data.data.length == 0) { message.warning('该关键词，暂无应用资源！') } else { // 过滤本单位的应用系统 - res.data.data.records.map((val) => { - if (val.deptName === deptName) { - systemOptions2.value.push({ - value: val.name, - label: val.name, - }) - } + res.data.data.map((val) => { + systemOptions2.value.push({ + value: val.NAME, + label: val.NAME, + }) }) // console.log('第一次获取===================>', systemOptions2.value) } @@ -958,130 +955,130 @@ } From 1ad52d954c4cc507d92abc2c09848d3f3875f425 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 31 Oct 2022 16:29:19 +0800 Subject: [PATCH 11/19] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=88=91?= =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/components/header.vue | 2 ++ front/src/views/personalCenter/components/MyApply.vue | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index fe336352..bac92f97 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -587,6 +587,7 @@ :deep(.ant-list-item) { border-bottom: 0.01rem solid #ccc; padding: 0.1rem; + cursor: default; } :deep(.ant-list-item-meta-title) { @@ -602,6 +603,7 @@ -webkit-line-clamp: 2; word-break: break-all; -webkit-box-orient: vertical; + cursor: default; } button { diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 7654f29e..32306460 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -44,12 +44,12 @@
名称：{{ - item.cameraList ? item.system : item.title || item.name + item.cameraList ? item.system : (item.title || item.name) }}
From 2156e70433904b1ffe34394bc03cd7a9d060e3f6 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Mon, 31 Oct 2022 17:47:38 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/abilityStatistics/index.vue | 8 +-- .../views/home/detailsPageconetentTree.vue | 49 ++++++++++--------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index 8c544ba2..d55a4e06 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -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 }, diff --git a/front/src/views/home/detailsPageconetentTree.vue b/front/src/views/home/detailsPageconetentTree.vue index 9401b8a0..d3bd2e2f 100644 --- a/front/src/views/home/detailsPageconetentTree.vue +++ b/front/src/views/home/detailsPageconetentTree.vue @@ -185,31 +185,32 @@ treeData.value.sort((a, b) => { return sortArr.indexOf(a.key) - sortArr.indexOf(b.key) }) - let deptId=user.value.deptId - treeData.value.forEach((child) => { - let childern=child.children - childern.forEach((childs) => {//第一层：市级 - if(childs.key==deptId ){ - childs.show=true - child.show=true - mybus.emit('paramsGetResources', [childs.key]) - selectId.value =childs.key - } - if(childs.children && childs.children.length>0){//第二层 区级 - let qu=childs.children - qu.forEach((qu) => { - if(qu.key==deptId ){ - qu.show=true - childs.show=true - child.show=true - mybus.emit('paramsGetResources', [qu.key]) - selectId.value = qu.key - } - }) - } - }) + //根据不同的权限展示不同的能力超市左侧树 + // let deptId=user.value.deptId + // treeData.value.forEach((child) => { + // let childern=child.children + // childern.forEach((childs) => {//第一层：市级 + // if(childs.key==deptId ){ + // childs.show=true + // child.show=true + // mybus.emit('paramsGetResources', [childs.key]) + // selectId.value =childs.key + // } + // if(childs.children && childs.children.length>0){//第二层 区级 + // let qu=childs.children + // qu.forEach((qu) => { + // if(qu.key==deptId ){ + // qu.show=true + // childs.show=true + // child.show=true + // mybus.emit('paramsGetResources', [qu.key]) + // selectId.value = qu.key + // } + // }) + // } + // }) - }) + // }) console.log('左侧树结构数据======================>', treeData.value) showKey.value++ From 61bb1291c22bef829303933c1d4fd6176a9e4fe1 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Mon, 31 Oct 2022 18:10:48 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/sys/user.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 @@ - - - - - From ad6a1c14de207349284a24cadfdf2dc7d62e4662 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 31 Oct 2022 20:23:26 +0800 Subject: [PATCH 16/19] =?UTF-8?q?BUg=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/DetailsPageconetent.vue | 13 +++++++++++++ front/src/views/home/infrastructurePage.vue | 13 ++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 02e9a0b3..42474b96 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1190,6 +1190,15 @@ const re = /^[0-9\u4E00-\u9FA5]*$/ const getAppResources2 = () => { globalFlag.value = false + let newQuery = JSON.parse( + JSON.stringify(router.currentRoute.value.query) + ) + newQuery.str = searchValue.value + router + .replace({ + query: newQuery, + }) + .then(() => {}) mybus.emit('changeRoomInput', searchValue.value) if ( whoShow1.value.itShowQingDao && @@ -1544,6 +1553,9 @@ paramsGetResources2.value.regionId = ids getAppResources() }) + mybus.on('changeSearchValue', (val) => { + searchValue.value = val + }) mybus.on('paramsGetResources', (ids) => { if (ids && ids.length > 0) { paramsGetResources.deptIds = ids @@ -1846,6 +1858,7 @@ }, beforeUnmount() { mybus.off('getCameraByParentId') + mybus.off('changeSearchValue') mybus.off('selectCardsitem') mybus.off('paramsGetResources') mybus.off('changeCondition') diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index a6b971d5..80efcaff 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -943,6 +943,10 @@ const fileList = ref([]) const useForm = Form.useForm const roomInput = ref('') + let roomStr = router.currentRoute.value.query.str + if (roomStr) { + roomInput.value = roomStr + } const rulesRef = reactive({ bookDate: [ { @@ -1238,7 +1242,14 @@ } // 搜索 const onSearch = (searchValue) => { - debugger + let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query)) + newQuery.str = roomInput.value + router + .replace({ + query: newQuery, + }) + .then(() => {}) + mybus.emit('changeSearchValue', roomInput.value) searchData() chengguoSearch() } From abd89f6eeb7fd72e47f0bf4ace0223acfc6cf551 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 1 Nov 2022 09:20:18 +0800 Subject: [PATCH 17/19] Merge branch 'hi-ucs-pre' into release # Conflicts: # back/public/config/basicConfig.js --- back/public/config/basicConfig.js | 2 +- back/src/i18n/zh-CN.js | 4 ++-- back/src/views/main-navbar.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index c3ad3fd6..1f847ce8 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: Light - * @LastEditTime: 2022-11-01 09:15:08 + * @LastEditTime: 2022-11-01 09:20:12 * @Description: 告诉大家这是什么 */ var _global = {} diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js index 2f5ea310..acefdd06 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 = '删除' diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue index 2c212e54..0df84d2c 100644 --- a/back/src/views/main-navbar.vue +++ b/back/src/views/main-navbar.vue @@ -12,7 +12,7 @@ $t("brand.lg") }} —— - 政务系统能力知识库 + 后台管理系统
From c6c2fa57ccee5dde921106becc5238749e9caf89 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Tue, 1 Nov 2022 15:36:50 +0800 Subject: [PATCH 18/19] =?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 19/19] =?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": "王二生" } ],