diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index 9608ff60..913ffc94 100644 --- a/back/public/config/basicConfig.js +++ b/back/public/config/basicConfig.js @@ -2,16 +2,16 @@ * @Author: hisense.wuhongjian * @Date: 2022-08-25 14:37:49 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-12 15:25:01 + * @LastEditTime: 2022-10-13 16:46:41 * @Description: 告诉大家这是什么 */ var _global = {} var CONFIGITEM = { // version: 'qingdao', // 青岛 // version: 'xihaian', // 西海岸 - // version: 'test', // 测试 + version: 'dev', // 测试 // version: 'frp', // 内网穿透 - version: 'xihaian', // 开发 + // version: 'xihaian', // 开发 vNum: 'v0.8.7.2', configData: { // 青岛市大数据局 @@ -43,7 +43,7 @@ var CONFIGITEM = { }, dev: { previewUrl: 'http://localhost:8080/', - apiURL: 'http://192.168.124.236:8888/renren-admin', + apiURL: 'http://192.168.124.233:8888/renren-admin', websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket' } } diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue index 3e01307e..3e20ad3d 100644 --- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue +++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue @@ -27,7 +27,7 @@ - + @@ -226,7 +226,7 @@ export default { name: '', applicationArea: '', description: '', - sceneUrl:'', + sceneUrl: '', fuseAttrList: [ { attrType: '使用步骤', @@ -373,10 +373,10 @@ export default { update: 'put' } this.dataForm.fuseResourceList = this.getFuseResourceList() - if (this.imageUrl == '') { - this.$message.error('请上传图片!') - return - } + // if (this.imageUrl == '') { + // this.$message.error('请上传图片!') + // return + // } this.dataForm.fuseAttrList.find(v => v.attrType == '服务图片').attrValue = this.imageUrl || '' const _obj = Object.assign({}, this.dataForm, { type: '赋能场景' diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 4e0eaedd..b3005ac8 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-10-13 13:50:44 + * @LastEditTime: 2022-10-13 18:10:05 * @Description: 系统静态参数配置 */ var _global = {} @@ -11,7 +11,7 @@ var CONFIGITEM = { // version: 'xihaian', // 西海岸 // version: 'dev', // 开发 // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) - version: 'test', // 测试 + version: 'qingdao', // 测试 //version: 'frp', // 内网穿透 vNum: 'v0.8.7.2', configData: { @@ -28,8 +28,7 @@ var CONFIGITEM = { previewUrl: 'http://15.72.183.90:7008/', //frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/', //apiURL: 'http://15.72.183.90:8000/renren-admin', - // websocketURL: '15.72.183.90:8000/renren-admin', - websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄 + websocketURL: '15.72.183.90:8000/renren-admin', POI_URL: 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', }, @@ -86,7 +85,7 @@ 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.233: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 a75068ec..bbd6e6cc 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-29 09:55:56 + * @LastEditTime: 2022-10-13 15:29:31 * @Description: 数据资源参数配置 */ // eslint-disable-next-line no-undef @@ -51,10 +51,10 @@ if (newLocation !== 'baotou' && newLocation !== 'xihaian') { right: '海信网络科技股份有限公司', }, address: [ - { - name: '鲁IC备00000000号', - value: '政府标识码3702000106', - }, + // { + // name: '鲁IC备00000000号', + // value: '政府标识码3702000106', + // }, { name: '版权所有:青岛市大数据发展管理局', value: '地址:山东省青岛市香港中路17号市级机关办公楼', @@ -523,6 +523,11 @@ else if (newLocation === 'xihaian') { }, ], } - xhaHasPermissionUser.list = ['xihaian01', 'xihaian02', 'xihaian03', 'xihaian04', 'admin'] - + xhaHasPermissionUser.list = [ + 'xihaian01', + 'xihaian02', + 'xihaian03', + 'xihaian04', + 'admin', + ] } diff --git a/front/src/views/abilityStatistics/components/AbilityTotal.vue b/front/src/views/abilityStatistics/components/AbilityTotal.vue index 9c26c740..66dfc5bd 100644 --- a/front/src/views/abilityStatistics/components/AbilityTotal.vue +++ b/front/src/views/abilityStatistics/components/AbilityTotal.vue @@ -25,7 +25,19 @@ " > - + + + 482 + + {{ item.amount }} diff --git a/front/src/views/abilityStatistics/components/Footer.vue b/front/src/views/abilityStatistics/components/Footer.vue index 4609ed53..0a552d1c 100644 --- a/front/src/views/abilityStatistics/components/Footer.vue +++ b/front/src/views/abilityStatistics/components/Footer.vue @@ -1,3 +1,10 @@ +