diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js index ae6c7a55..98b075fb 100644 --- a/back/src/mixins/view-module.js +++ b/back/src/mixins/view-module.js @@ -2,7 +2,7 @@ import Cookies from 'js-cookie' import qs from 'qs' import { deepClone } from '@/utils/form-generator/index' export default { - data() { + data () { /* eslint-disable */ return { // 设置属性 @@ -38,19 +38,19 @@ export default { } /* eslint-enable */ }, - created() { + created () { if (this.mixinViewModuleOptions.createdIsNeed) { this.query() } }, - activated() { + activated () { if (this.mixinViewModuleOptions.activatedIsNeed) { this.query() } }, methods: { // 获取数据列表 - query() { + query () { this.dataListLoading = true this.$http.get( this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({ @@ -109,11 +109,15 @@ export default { } console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL) - // if (this.dataList[0].type === '组件服务') { - // this.dataList.map(val => { - // val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域') - // }) - // } + if (this.dataList[0].type === '组件服务') { + this.dataList.map(val => { + val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域' || item.attrType === '组件类型') + }) + } else if (this.dataList[0].type === '应用资源') { + this.dataList.map(val => { + val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域') + }) + } if (this.mixinViewModuleOptions.requestCallback) { this.mixinViewModuleOptions.requestCallback(res.data) } @@ -123,11 +127,11 @@ export default { }) }, // 多选 - dataListSelectionChangeHandle(val) { + dataListSelectionChangeHandle (val) { this.dataListSelections = val }, // 排序 - dataListSortChangeHandle(data) { + dataListSortChangeHandle (data) { if (!data.order || !data.prop) { this.order = '' this.orderField = '' @@ -138,13 +142,13 @@ export default { this.query() }, // 分页, 每页条数 - pageSizeChangeHandle(val) { + pageSizeChangeHandle (val) { this.page = 1 this.limit = val this.query() }, // 分页, 当前页 - pageCurrentChangeHandle(val) { + pageCurrentChangeHandle (val) { this.page = val this.query() }, @@ -153,7 +157,7 @@ export default { this.query() }, // 新增 - addOrUpdateHandle(id) { + addOrUpdateHandle (id) { this.addOrUpdateVisible = true this.disabled = false this.$nextTick(() => { @@ -164,7 +168,7 @@ export default { }, // 组件服务新增 - addOrUpdateHandleAI(id) { + addOrUpdateHandleAI (id) { // const infoList = [] let showList = [] this.$http.get('category/getCategoryTree').then(({ data: res }) => { @@ -222,7 +226,7 @@ export default { }, 100) }, // 应用资源新增 - addOrUpdateHandleServe(id) { + addOrUpdateHandleServe (id) { // const infoList = [] let showList = [] this.$http.get('category/getCategoryTree').then(({ data: res }) => { @@ -280,7 +284,7 @@ export default { }, 100) }, // 修改 - UpdateHandle(val) { + UpdateHandle (val) { this.addOrUpdateVisible = true this.disabled = false const cloneVal = deepClone(val) @@ -305,7 +309,7 @@ export default { }) }, // 关闭当前窗口 - closeCurrentTab(data) { + closeCurrentTab (data) { var tabName = this.$store.state.contentTabsActiveName this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName) if (this.$store.state.contentTabs.length <= 0) { @@ -317,7 +321,7 @@ export default { } }, // 删除 - deleteHandle(id) { + deleteHandle (id) { if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) { return this.$message({ message: this.$t('prompt.deleteBatch'), @@ -351,7 +355,7 @@ export default { }).catch(() => { }) }, - deleteHandle2(id) { + deleteHandle2 (id) { console.log('删除========================》', id, this.dataListSelections) const ids = [] if (id) { @@ -369,7 +373,7 @@ export default { }) }, // 导出 - exportHandle() { + exportHandle () { var params = qs.stringify({ token: Cookies.get('ucsToken'), ...this.dataForm diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 0cf6f430..ccc5ff7b 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -66,6 +66,38 @@ header-align="center" align="center" > + + + + - diff --git a/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue index 245903a5..bfe3f459 100644 --- a/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue +++ b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue @@ -104,12 +104,12 @@ @click="taskHandle(scope.row)" >{{ $t('manage') }} - {{ $t('process.viewFlowImage') }} + > --> diff --git a/back/src/views/modules/myAgent/CommentModeration.vue b/back/src/views/modules/myAgent/CommentModeration.vue index d592773a..1fefa8ea 100644 --- a/back/src/views/modules/myAgent/CommentModeration.vue +++ b/back/src/views/modules/myAgent/CommentModeration.vue @@ -104,12 +104,12 @@ @click="taskHandle(scope.row)" >{{ $t('manage') }} - {{ $t('process.viewFlowImage') }} + > --> diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue index ceae9900..cde3984b 100644 --- a/back/src/views/modules/myAgent/CompetencyApplication.vue +++ b/back/src/views/modules/myAgent/CompetencyApplication.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-27 11:27:22 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-29 16:31:26 + * @LastEditTime: 2022-07-25 09:39:01 * @Description: 能力申请 --> diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue index af120d5e..75305f2e 100644 --- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue +++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue @@ -21,6 +21,7 @@ :label=" itemsonson.type != ' multipleAdditions' ? itemsonson.name : '' " + v-show="!(itemsonson.name==='平台地址'|| itemsonson.name==='SDK安装包' || itemsonson.name==='接口请求方式' || itemsonson.name==='服务接口')" >
{{ multipleAdditionsItem }}
--> - + + +
{ + if (val.name === '部署与使用') { + val.children.map(val => { + if (val.name === '使用方式') { + val.children.map(val => { + if (val.name === '使用方式') { + if (val.note1 === 'SDK') { + this.showSDK = true + } else if (val.note1 === '平台对接') { + this.showDocking = true + } else if (val.note1 === '调用接口') { + this.showInterface = true + } + } + }) + } + }) + } + }) } } } diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue index 13153689..b7ce4506 100644 --- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -83,6 +83,7 @@ - + + diff --git a/front/public/leaflet/leaflet-tilelayer-wmts.js b/front/public/leaflet/leaflet-tilelayer-wmts.js new file mode 100644 index 00000000..c9372723 --- /dev/null +++ b/front/public/leaflet/leaflet-tilelayer-wmts.js @@ -0,0 +1,80 @@ +/* + * @Author: hisense.wuhongjian + * @Date: 2022-07-25 17:13:49 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-07-26 10:23:40 + * @Description: 告诉大家这是什么 + */ +;(L.TileLayer.WMTS = L.TileLayer.extend({ + defaultWmtsParams: { + service: 'WMTS', + request: 'GetTile', + version: '1.0.0', + layer: '', + style: '', + tilematrixset: '', + format: 'image/jpeg', + }, + initialize: function (a, b) { + this._url = a + var c = {}, + d = Object.keys(b) + d.forEach((a) => { + c[a.toLowerCase()] = b[a] + }) + var e = L.extend({}, this.defaultWmtsParams), + f = c.tileSize || this.options.tileSize + for (var g in ((e.width = + c.detectRetina && L.Browser.retina ? (e.height = 2 * f) : (e.height = f)), + c)) + e.hasOwnProperty(g) && 'matrixIds' != g && (e[g] = c[g]) + ;(this.wmtsParams = e), + (this.matrixIds = b.matrixIds || this.getDefaultMatrix()), + L.setOptions(this, b) + }, + onAdd: function (a) { + ;(this._crs = this.options.crs || a.options.crs), + L.TileLayer.prototype.onAdd.call(this, a) + }, + getTileUrl: function (a) { + var b = this.options.tileSize, + c = a.multiplyBy(b) + ;(c.x += 1), (c.y -= 1) + var d = c.add(new L.Point(b, b)), + e = this._tileZoom, + f = this._crs.project(this._map.unproject(c, e)), + g = this._crs.project(this._map.unproject(d, e)) + tilewidth = g.x - f.x + var h = this.matrixIds[e].identifier, + i = h, + j = this.matrixIds[e].topLeftCorner.lng, + k = this.matrixIds[e].topLeftCorner.lat, + l = Math.floor((f.x - j) / tilewidth), + m = -Math.floor((f.y - k) / tilewidth), + n = L.Util.template(this._url, { s: this._getSubdomain(a) }) + return ( + n + + L.Util.getParamString(this.wmtsParams, n) + + '&tilematrix=' + + i + + '&tilerow=' + + m + + '&tilecol=' + + l + ) + }, + setParams: function (a, b) { + return L.extend(this.wmtsParams, a), b || this.redraw(), this + }, + getDefaultMatrix: function () { + for (var a = Array(22), b = 0; 22 > b; b++) + a[b] = { + identifier: '' + b, + topLeftCorner: new L.LatLng(20037508.3428, -20037508.3428), + } + return a + }, +})), + (L.tileLayer.wmts = function (a, b) { + return new L.TileLayer.WMTS(a, b) + }) diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index d66ea6b5..c6e2de12 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,13 +1,13 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-18 15:07:32 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-07-26 15:16:46 * @Description: 数据资源参数配置 */ -const newLocation = 'qingdao' +//const newLocation = 'qingdao' // const newLocation = 'baotou' -// const newLocation = 'xihaian' +const newLocation = 'xihaian' // 数据资源数据 const whoShow = {} @@ -31,7 +31,7 @@ if (newLocation === 'qingdao') { { name: '能力云图', key: 'capabilityCloud' }, { name: '能力统计', key: 'abilityStatistics' }, // { name: '开发指南', key: 'developmentGuide' }, - { name: '指导手册', key: 'instructionManual' }, + { name: '技术文档', key: 'instructionManual' }, { name: '需求中心', key: 'demandCenter' }, // { name: '个人中心', key: 'personalCenter' }, { name: '区市站点', key: 'mapTest' }, diff --git a/front/public/static/config/mapConfig.js b/front/public/static/config/mapConfig.js index b627ff6a..4f8dcf5b 100644 --- a/front/public/static/config/mapConfig.js +++ b/front/public/static/config/mapConfig.js @@ -2,78 +2,31 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2021-12-07 13:33:55 + * @LastEditTime: 2022-07-26 14:34:24 * @Description: 地图静态参数配置 */ -var _mapConfig = {}; +var _mapConfig = {} -(function () { - var L = window.L || {}; +;(function () { + var L = window.L || {} // // 定义底图初始化化参数 // 请在此处更改你的配置********************************************** - var CONFIGKEY = 'qingdao_highgo'; + var CONFIGKEY = 'qingdao' // var CONFIGKEY = 'dev'; // 请在上面更改你的配置*********************************************** var BASECONFIGITEM = { - 'qingdao': { - DATABASE_TYPE: 'Highgo', - POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute' - ISERVER_URL: '15.2.21.238:8090', - WORKPLACE_NAME: 'weifang', - MAP_NAME: 'weifang', - DATASOURCE_NAME: 'himap_wf', - ATMOSPHERE_URL: 'http://15.2.21.151:9015/service-main', - BDMAP_CONFIG: { - location: 'qingdao', - _initpos: { - point: [120.392795, 36.072854], - zoom: 11 - }, - _keyframes: [ - [119.165174, 36.718389], - [119.186697, 36.723567], - [119.16803, 36.713863] - ] - }, + qingdao: { + base: 'xihaian', CURRENT_MAP_OPTIONS: { - center: [36.076209, 120.349632], - maxZoom: 17, - minZoom: 7, - zoom: 12, + // crs: CRS_4490, + center: [36.17, 120.13], + maxZoom: 18, + minZoom: 0, + zoom: 10, }, - TILEDTYPE: 'H_zxy', // 底图服务类型 超图瓦片'Sci' 超图ZXY瓦片'S_zxy' 自有ZXY瓦片 'H_zxy' - TILEDCONFIG: { - digitalMap: { - tiledUrl: 'http://15.2.21.238:9889/{z}/{x}/{y}.png', - tiledName: '电子地图', - tiledIconURI: '', - options: { - center: [36.71, 119.16205], - zoom: 11, - minZoom:10, - maxZoom: 15 - } - }, - satelliteMap: { - tiledUrl: 'http://15.2.21.238:9888/{z}/{x}/{y}.png', - tiledName: '卫星地图', - tiledIconURI: '', - options: { - center: [36.71, 119.19], - zoom: 13, - minZoom: 5, - maxZoom: 15 - } - } - }, - MAPTYPE: 'digitalMap', // 默认地图类型 电子地图 - TILEDMODE: 'bd', // 瓦片类型 百度 - TITLE_LAYER: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'tiled', name: '矢量', icon: 'vector_map.png' }, - TITLE_LAYER_REMOTE: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'remote', name: '影像', icon: 'satellite_map.png' }, - TITLE_LAYER_DARK: { mapUrl: 'http://10.16.3.2:8090/iserver/services/map-ShanDong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' }, }, - 'qingdao_highgo': { + qingdao_highgo: { DATABASE_TYPE: 'Highgo', POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute' ISERVER_URL: '15.2.21.238:8090', @@ -92,23 +45,41 @@ var _mapConfig = {}; location: 'qingdao', _initpos: { point: [120.392795, 36.072854], - zoom: 2 + zoom: 2, }, _keyframes: [ [121.6011191295479, 36.73422934263509], [119.83371870221472, 36.082854], - [120.25937000453506, 36.34563716789656] - ] + [120.25937000453506, 36.34563716789656], + ], }, MAP_VENDOR: 'Supermap', // 地图厂商 Supermap bdmap 3dbdmap - TITLE_LAYER: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' }, - TITLE_LAYER_REMOTE: { mapUrl: 'http://q3d.qd.gov.cn:8195/portalproxy/vw6bffpy/TileServer/arcgis/rest/services/normal_2021_4490Arcgis/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' }, + TITLE_LAYER: { + mapUrl: + 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', + type: 'tiled', + name: '矢量', + icon: 'vector_map.png', + }, + TITLE_LAYER_REMOTE: { + mapUrl: + 'http://q3d.qd.gov.cn:8195/portalproxy/vw6bffpy/TileServer/arcgis/rest/services/normal_2021_4490Arcgis/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', + type: 'tiled', + name: '矢量', + icon: 'vector_map.png', + }, // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' }, // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-QingdaoRemoteImageMap/rest/maps/QingdaoRemoteImageMap', type: 'remote', name: '影像', icon: 'satellite_map.png' }, - TITLE_LAYER_DARK: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' }, + TITLE_LAYER_DARK: { + mapUrl: + 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', + type: 'dark', + name: '其他', + icon: 'other_map.png', + }, }, //测试环境地图 - 'dev': { + dev: { DATABASE_TYPE: 'Highgo', POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute' ISERVER_URL: '15.2.21.238:8090', @@ -127,38 +98,94 @@ var _mapConfig = {}; location: 'qingdao', _initpos: { point: [120.392795, 36.072854], - zoom: 2 + zoom: 2, }, _keyframes: [ [121.6011191295479, 36.73422934263509], [119.83371870221472, 36.082854], - [120.25937000453506, 36.34563716789656] - ] + [120.25937000453506, 36.34563716789656], + ], }, MAP_VENDOR: 'Supermap', // 地图厂商 Supermap bdmap 3dbdmap - TITLE_LAYER: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' }, - TITLE_LAYER_REMOTE: { mapUrl: 'http://q3d.qd.gov.cn:8195/portalproxy/s9arfiqe/TileServer/arcgis/rest/services/normal2021_test/MapServer?key=p9PW1ipy9P3QHILzmsNOk8Gc', type: 'tiled', name: '矢量', icon: 'vector_map.png' }, + TITLE_LAYER: { + mapUrl: + 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', + type: 'tiled', + name: '矢量', + icon: 'vector_map.png', + }, + TITLE_LAYER_REMOTE: { + mapUrl: + 'http://q3d.qd.gov.cn:8195/portalproxy/s9arfiqe/TileServer/arcgis/rest/services/normal2021_test/MapServer?key=p9PW1ipy9P3QHILzmsNOk8Gc', + type: 'tiled', + name: '矢量', + icon: 'vector_map.png', + }, // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.72.177.174:8195/portalproxy/TileServer/arcgis/rest/services/normal2021/MapServer?key=iOgQotfgfyLvhj6WgfDTpq7F', type: 'tiled', name: '矢量', icon: 'vector_map.png' }, // TITLE_LAYER_REMOTE: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-QingdaoRemoteImageMap/rest/maps/QingdaoRemoteImageMap', type: 'remote', name: '影像', icon: 'satellite_map.png' }, - TITLE_LAYER_DARK: { mapUrl: 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', type: 'dark', name: '其他', icon: 'other_map.png' }, + TITLE_LAYER_DARK: { + mapUrl: + 'http://15.2.21.238:8090/iserver/services/map-ugcv5-shandong/rest/maps/shandong', + type: 'dark', + name: '其他', + icon: 'other_map.png', + }, }, - }; + } var MAPCONFIGMIXTRE = { CURRENT_SERVER_NAME: CONFIGKEY, - BUFFER_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/spatialAnalysis-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/restjsr/spatialanalyst', - QUERY_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/map-HIMAP_HIGHGO/rest/maps/' + BASECONFIGITEM[CONFIGKEY].MAP_NAME, + BUFFER_URL: + 'http://' + + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + + '/iserver/services/spatialAnalysis-' + + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + + '/restjsr/spatialanalyst', + QUERY_URL: + 'http://' + + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + + '/iserver/services/map-HIMAP_HIGHGO/rest/maps/' + + BASECONFIGITEM[CONFIGKEY].MAP_NAME, // QUERY_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/data-HIMAP_HIGHGO/rest/data/datasources/HISENSE_himap', - DYNAMIC_ROAD_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/spatialAnalysis-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/restjsr/spatialanalyst', - DYNMIC_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/map-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/maps/' + BASECONFIGITEM[CONFIGKEY].MAP_NAME, + DYNAMIC_ROAD_URL: + 'http://' + + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + + '/iserver/services/spatialAnalysis-' + + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + + '/restjsr/spatialanalyst', + DYNMIC_URL: + 'http://' + + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + + '/iserver/services/map-' + + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + + '/rest/maps/' + + BASECONFIGITEM[CONFIGKEY].MAP_NAME, // 数据库型 // NETWORK_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/transportationAnalyst-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/networkanalyst/BuildNetwork_2@' + BASECONFIGITEM[CONFIGKEY].DATASOURCE_NAME, // 程工系统测试环境，因为是文件型，和数据库性有区别，发布时请注意 - NETWORK_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/transportationAnalyst-road/rest/networkanalyst/BuildNetwork_2@road', - PLOTTING_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/plot-JY/rest/plot/', - POI_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', - EDITORDATA_URL: 'http://' + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + '/iserver/services/data-' + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + '/rest/data', + NETWORK_URL: + 'http://' + + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + + '/iserver/services/transportationAnalyst-road/rest/networkanalyst/BuildNetwork_2@road', + PLOTTING_URL: + 'http://' + + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + + '/iserver/services/plot-JY/rest/plot/', + POI_URL: + 'http://' + + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + + '/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + EDITORDATA_URL: + 'http://' + + BASECONFIGITEM[CONFIGKEY].ISERVER_URL + + '/iserver/services/data-' + + BASECONFIGITEM[CONFIGKEY].WORKPLACE_NAME + + '/rest/data', ADDRESS_MATCH_URL: `http://${BASECONFIGITEM[CONFIGKEY].ISERVER_URL}/iserver/services/addressmatch-Address/restjsr/v1/address`, - TITLE_LAYER_ARRAY: BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_ARRAY || [BASECONFIGITEM[CONFIGKEY].TITLE_LAYER, BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_REMOTE, BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_DARK] - }; - _mapConfig.config = Object.assign(BASECONFIGITEM[CONFIGKEY], MAPCONFIGMIXTRE); -})(); + TITLE_LAYER_ARRAY: BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_ARRAY || [ + BASECONFIGITEM[CONFIGKEY].TITLE_LAYER, + BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_REMOTE, + BASECONFIGITEM[CONFIGKEY].TITLE_LAYER_DARK, + ], + } + _mapConfig.config = Object.assign(BASECONFIGITEM[CONFIGKEY], MAPCONFIGMIXTRE) +})() diff --git a/front/src/App.vue b/front/src/App.vue index 245c68e0..0dce7f04 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-05-06 11:12:00 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-21 17:09:10 + * @LastEditTime: 2022-07-26 11:27:50 * @Description: 告诉大家这是什么 -->