diff --git a/back/src/views/modules/activiti/RoomExamineAdmin.vue b/back/src/views/modules/activiti/RoomExamineAdmin.vue index f5a7aaa6..b441ae1c 100644 --- a/back/src/views/modules/activiti/RoomExamineAdmin.vue +++ b/back/src/views/modules/activiti/RoomExamineAdmin.vue @@ -2,7 +2,7 @@
@@ -195,6 +195,17 @@ + + 附件： + + 下载 + +
取 消 确 定 @@ -233,8 +244,8 @@ export default { num: '', file: '', name: '', - roomName: '', creator: '', + roomNameA: '', } }, mounted() { @@ -244,10 +255,9 @@ export default { getSerach() { this.$http .get( - `/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomName}&state=${this.value}` + `/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomNameA}&state=${this.value}` ) .then(({ data: res }) => { - console.log(res, 7777777) this.tableData = res.data.list this.total = res.data.total }) @@ -276,10 +286,10 @@ export default { this.creator = item.creator } else { this.dialogVisible = true - this.$http.get(`bookMeeting/${item.id}`).then(({ data: res }) => { - this.file = res.data.file - }) } + this.$http.get(`bookMeeting/${item.id}`).then(({ data: res }) => { + this.file = res.data.file + }) this.lookData = item }, diff --git a/back/src/views/modules/myAgent/ConferenceRoom.vue b/back/src/views/modules/myAgent/ConferenceRoom.vue index 132875e9..10478c69 100644 --- a/back/src/views/modules/myAgent/ConferenceRoom.vue +++ b/back/src/views/modules/myAgent/ConferenceRoom.vue @@ -228,7 +228,7 @@ export default { ruleForm: { name: '', num: '', - area: '', + area: 0, capacity: '', pic: '', id: '', @@ -246,7 +246,7 @@ export default { ], area: [ { required: true, message: '请输入会议室面积', trigger: 'blur' }, - { min: 1, trigger: 'blur' }, + { min: 1, type: 'number', trigger: 'blur' }, ], description: [ { required: true, message: '请填写描述内容', trigger: 'blur' }, diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue index d1478efa..978c611b 100644 --- a/back/src/views/modules/putOnTheShelf/index.vue +++ b/back/src/views/modules/putOnTheShelf/index.vue @@ -39,7 +39,7 @@ + tip="支持.doc,.docx,.zip,.ppt,.pdf类型，大小不超过100M"> diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 3d02e283..01b07ed6 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-29 09:57:31 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-09-14 10:50:37 * @Description: 系统静态参数配置 */ var _global = {} @@ -43,6 +43,7 @@ var CONFIGITEM = { backUrl: 'http://10.134.135.9:9797', previewUrl: 'http://10.134.135.9:9796/', websocketURL: '10.134.135.9:8888/renren-admin', + // websocketURL: '10.18.1.99:8889/renren-admin', // 研发 POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', }, @@ -57,7 +58,8 @@ var CONFIGITEM = { }, backUrl: 'http://localhost:8001', previewUrl: 'http://192.168.124.236:9796/', - websocketURL: '192.168.124.236:8888/renren-admin', + // websocketURL: '192.168.124.236:8888/renren-admin', + websocketURL: '10.18.1.99:8889/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', }, diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 99de00c7..da0b9fd3 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -122,12 +122,15 @@ else if (newLocation === 'baotou') { { name: '能力集市', key: 'DetailsPageconetent' }, { name: '能力云图', key: 'capabilityCloud' }, { name: '能力统计', key: 'abilityStatistics' }, + { name: '技术文档', key: 'instructionManual' }, // { name: '开发指南', key: 'developmentGuide' }, { name: '需求中心', key: 'demandCenter' }, // { name: '个人中心', key: 'personalCenter' }, // { name: '区市站点', key: 'mapTest' }, // { name: '后台管理', key: 'houtaiguanli' }, { name: '赋能案例', key: 'assignCase' }, + { name: '融合服务', key: 'integrationServices' }, + { name: 'CIM专区', key: 'cimSpecialArea' }, ] footerDataList.footerList = { company: { @@ -493,12 +496,15 @@ else if (newLocation === 'xihaian') { { name: '能力集市', key: 'DetailsPageconetent' }, { name: '能力云图', key: 'capabilityCloud' }, { name: '能力统计', key: 'abilityStatistics' }, + { name: '技术文档', key: 'instructionManual' }, // { name: '开发指南', key: 'developmentGuide' }, { name: '需求中心', key: 'demandCenter' }, // { name: '个人中心', key: 'personalCenter' }, // { name: '区市站点', key: 'mapTest' }, // { name: '后台管理', key: 'houtaiguanli' }, { name: '赋能案例', key: 'assignCase' }, + { name: '融合服务', key: 'integrationServices' }, + { name: 'CIM专区', key: 'cimSpecialArea' }, ] footerDataList.footerList = { company: { diff --git a/front/public/static/download/通用能力服务平台UCS用户手册-v3.5.docx b/front/public/static/download/通用能力服务平台UCS用户手册-v3.5.docx new file mode 100644 index 00000000..7af29aac Binary files /dev/null and b/front/public/static/download/通用能力服务平台UCS用户手册-v3.5.docx differ diff --git a/front/src/App.vue b/front/src/App.vue index ce2073f2..82c2265f 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -13,62 +13,56 @@
diff --git a/front/src/api/home.js b/front/src/api/home.js index ab5cc85a..fd8c10fe 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -368,6 +368,16 @@ export function getIntegrationServicesList(params) { params, }) } + +// 融合服务--更新 +export function updateIntegrationServices(data) { + return request({ + url: '/fuse', + method: 'put', + data, + }) +} + // 全局搜索 export function getCountByFuzzyQuery(params) { return request({ diff --git a/front/src/assets/detailsAll/back.png b/front/src/assets/detailsAll/back.png new file mode 100644 index 00000000..6ba80511 Binary files /dev/null and b/front/src/assets/detailsAll/back.png differ diff --git a/front/src/global/GlobalConfig.js b/front/src/global/GlobalConfig.js index dcee9c52..b3d218e3 100644 --- a/front/src/global/GlobalConfig.js +++ b/front/src/global/GlobalConfig.js @@ -505,3 +505,6 @@ export const RECOURCE_G_ICON = { resourceProtection: '/src/assets/resourceManageMap/pic/point-resettlement-circle.png', } + +// 能力集市-默认选中tab +export const DETAIL_PAGE_CONTENT_DEFAULT_TAB = '应用资源' diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js index 0be17a7a..f0841cf8 100644 --- a/front/src/supermap/advance-init.js +++ b/front/src/supermap/advance-init.js @@ -60,7 +60,7 @@ export function MapFun(mapObj) { /** * 定义地物编辑服务 */ - const featureService = L.supermap.featureService( + const featureService = L.supermap && L.supermap.featureService && L.supermap.featureService( _mapConfig.config.EDITORDATA_URL ) diff --git a/front/src/supermap/map-init.js b/front/src/supermap/map-init.js index fc90354b..63006203 100644 --- a/front/src/supermap/map-init.js +++ b/front/src/supermap/map-init.js @@ -123,7 +123,8 @@ export function HieimpMap() { // debugger; // 获取图层信息 - L.supermap + L.supermap && L.supermap + .layerInfoService && L.supermap .layerInfoService(_mapConfig.config.QUERY_URL) .getLayersInfo(function (result) { // doSomething diff --git a/front/src/views/capabilityCloud/components/capabilityCloudBack.vue b/front/src/views/capabilityCloud/components/capabilityCloudBack.vue new file mode 100644 index 00000000..d549654d --- /dev/null +++ b/front/src/views/capabilityCloud/components/capabilityCloudBack.vue @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/front/src/views/capabilityCloud/index.vue b/front/src/views/capabilityCloud/index.vue index 04dd8dc9..914a45c5 100644 --- a/front/src/views/capabilityCloud/index.vue +++ b/front/src/views/capabilityCloud/index.vue @@ -7,6 +7,7 @@ --> diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 5279f043..f1d89e99 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -12,55 +12,32 @@
模糊搜索 - + - -
-
- +
+ {{ - item.name + - '(' + - (globalData.data.filter((val) => val.type === item.name)[0] - .count || '0') + - ')' + item.name + + '(' + + (globalData.data.filter((val) => val.type === item.name)[0] + .count || '0') + + ')' }} @@ -69,111 +46,45 @@
-