diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js new file mode 100644 index 00000000..f6fc0a52 --- /dev/null +++ b/back/public/config/basicConfig.js @@ -0,0 +1,48 @@ +/* + * @Author: hisense.wuhongjian + * @Date: 2022-08-25 14:37:49 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-27 14:25:39 + * @Description: 告诉大家这是什么 + */ +var _global = {} +var CONFIGITEM = { + version: 'qingdao', // 青岛 + // version: 'xihaian', // 西海岸 + // version: 'test', // 测试 + // version: 'frp', // 内网穿透 + // version: 'dev', // 开发 + vNum: 'v0.8.7.2', + configData: { + // 青岛市大数据局 + 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' + }, + // 西海岸大数据局 + xihaian: { + previewUrl: 'http://10.134.135.9:9796/', + apiURL: 'http://10.134.135.9:8888/renren-admin', + websocketURL: 'ws://10.134.135.9:8888/renren-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' + }, + // 内网穿透 + 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' + }, + dev: { + previewUrl: 'http://localhost:8080/', + apiURL: 'http://192.168.124.236:8888/renren-admin', + websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket' + } + } +} +_global.config = CONFIGITEM.configData[CONFIGITEM.version] diff --git a/back/public/index.html b/back/public/index.html index 3878a5c9..1ad5a71f 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-02 10:18:38 + * @LastEditTime: 2022-08-29 09:54:59 * @Description: 告诉大家这是什么 --> @@ -11,10 +11,11 @@ + - - - <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> - - <% } %> - - <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> - - <% } %>
diff --git a/back/src/element-ui/theme-variables.scss b/back/src/element-ui/theme-variables.scss index 9a9bacf4..019304d9 100644 --- a/back/src/element-ui/theme-variables.scss +++ b/back/src/element-ui/theme-variables.scss @@ -486,7 +486,7 @@ $--cascader-tag-background: #f0f2f5; /* Group -------------------------- */ -$--group-option-flex: 0 0 (1/5) * 100% !default; +$--group-option-flex: 0 0 20% !default; $--group-option-offset-bottom: 12px !default; $--group-option-fill-hover: rgba($--color-black, 0.06) !default; $--group-title-color: $--color-black !default; diff --git a/back/src/utils/location.js b/back/src/utils/location.js index 446e5b89..0823b330 100644 --- a/back/src/utils/location.js +++ b/back/src/utils/location.js @@ -1,12 +1,12 @@ /* * @Author: hisense.liangjunhua * @Date: 2022-08-23 10:30:11 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-08-23 10:31:30 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-25 21:05:18 * @Description: 告诉大家这是什么 */ const returnLocationStr = () => { - return 'qingdao' + return 'qingdao1' } export default returnLocationStr 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 beb88688..3db71513 100644 --- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue +++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue @@ -94,24 +94,38 @@ diff --git a/back/src/views/modules/workBench/api.js b/back/src/views/modules/workBench/api.js index e14a4780..e0975a86 100644 --- a/back/src/views/modules/workBench/api.js +++ b/back/src/views/modules/workBench/api.js @@ -1,7 +1,7 @@ // /resource/getByDept import http from '@/utils/request' -function Request({ +function Request ({ methods, url, data, success, fali }) { const _key = methods == 'get' ? 'params' : 'data' @@ -15,7 +15,7 @@ function Request({ }) }) } -function RequestPost({ +function RequestPost ({ methods, url, data, success, fali }) { return new Promise((resolve, reject) => { @@ -114,7 +114,7 @@ export const getResourceByDept = (data, success, fail) => { Request({ methods: 'get', // url: '/resource/getByDept', - url: '/workdynamics/getDeptWork', + url: '/workdynamics/page', data }).then(res => { success && success(res) diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index 04adfb58..4e0b1e4e 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -86,7 +86,8 @@ export default { getResourceByDept () { const data = { limit: 5, - page: 1 + page: 1, + name: '' } this.loadingDynamic = true Apis.getResourceByDept( diff --git a/back/src/views/modules/workBench/components/center-view.vue b/back/src/views/modules/workBench/components/center-view.vue index d40976fc..3ccf445f 100644 --- a/back/src/views/modules/workBench/components/center-view.vue +++ b/back/src/views/modules/workBench/components/center-view.vue @@ -1,3 +1,10 @@ + \ No newline at end of file + diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue index e72e18a3..4a018261 100644 --- a/back/src/views/modules/workBench/components/dept-todo-view.vue +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -100,7 +100,19 @@ import processModule from '@/mixins/process-module' export default { mixins: [mixinViewModule, processModule], data () { - return {} + return { + mixinViewModuleOptions: { + createdIsNeed: false, // 此页面是否在创建时，调用查询数据列表接口？ + activatedIsNeed: false, // 此页面是否在激活（进入）时，调用查询数据列表接口？ + getDataListURL: '', // 数据列表接口，API地址 + getDataListIsPage: false, // 数据列表接口，是否需要分页？ + deleteURL: '', // 删除接口，API地址 + deleteIsBatch: false, // 删除接口，是否需要批量？ + deleteIsBatchKey: 'id', // 删除接口，批量状态下由那个key进行标记操作？比如：pid，uid... + exportURL: '', // 导出接口，API地址 + requestCallback: null // 获取列表以后执行的回调 + } + } }, props: { dataInfo: { diff --git a/back/src/views/modules/workBench/components/risk-view.vue b/back/src/views/modules/workBench/components/risk-view.vue index f7f884d3..e65320da 100644 --- a/back/src/views/modules/workBench/components/risk-view.vue +++ b/back/src/views/modules/workBench/components/risk-view.vue @@ -61,7 +61,7 @@ export default { ) .then((res) => { console.log(res.data.data) - if (res.data.data) { + if (res.data.data && res.data.data.length > 0) { this.topData = res.data.data this.oneData = this.topData[0].count } else { diff --git a/back/src/views/modules/workBench/components/trend-view.vue b/back/src/views/modules/workBench/components/trend-view.vue index 68d95f63..f19d4dc1 100644 --- a/back/src/views/modules/workBench/components/trend-view.vue +++ b/back/src/views/modules/workBench/components/trend-view.vue @@ -91,19 +91,27 @@ export default { // if (res.data.code !== 0) { // return // } - this.data = res.data.data[0].values - this.data.map((item) => { - const time = moment(item[0] * 1000).format('YYYY-MM-DD') - this.ydata.map((itemSon, indexSon) => { - if (itemSon === time) { - this.xaxis[indexSon] = parseInt(item[1]) - } + if (res.data.data && res.data.data.length > 0) { + this.data = res.data.data[0].values + this.data.map((item) => { + const time = moment(item[0] * 1000).format('YYYY-MM-DD') + this.ydata.map((itemSon, indexSon) => { + if (itemSon === time) { + this.xaxis[indexSon] = parseInt(item[1]) + } + }) }) - }) - this.trendChartData = { - xaxis: this.ydata, - ydata: this.xaxis + this.trendChartData = { + xaxis: this.ydata, + ydata: this.xaxis + } + } else { + this.trendChartData = { + xaxis: [], + ydata: [] + } } + this.$nextTick(() => { trendLineChart('trendId', this.trendChartData) }) diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index 97a1a0b4..de1c70b3 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -37,181 +37,178 @@ import deptTodoView from '../workBench/components/dept-todo-view.vue' import * as Apis from './api.js' export default { - components: { - deptTodoView, - BottomView, - CenterView, - DeptChartView, - }, - data() { - return { - // 部门待办 - toToData: { - color: '#f86f01', - imgSrc: require('@/assets/img/workBench/todo.png'), - bgColor: 'rgba(228,138,1,0.12)', - borderColor: 'rgba(250,123,12,0.54)', - textColor: '#f86f01', - num: 0, - list: [], - type: 'todo', - url: 'activiti-my-todo-task' - }, - // 部门已办 - hasToDodoData: { - noMarginleft: true, - color: '#21b107', - imgSrc: require('@/assets/img/workBench/hasToDo.png'), - bgColor: 'rgba(37,165,13,0.12)', - borderColor: 'rgba(49,194,20,0.54)', - textColor: '#21b107', - num: 0, - list: [], - url: 'activiti-my-join-task' - }, - // 部门申请 - resourceData: [], - resourceColor: ['#7b2cff', '#fd5151', , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'], - // 部门申请 - applyData: [], - applyColor: ["#5085f2", "#e75fc3", "#f87be2", "#f2719a", "#fca4bb", "#f59a8f", "#fdb301", "#57e7ec", "#cf9ef1"], - // 部门需求 - requireData: [], - requireColor: ['#FD866A', '#9E87FF', '#58D5FF', '#73DDFF', '#73ACFF', '#FDD56A', '#FDB36A',], - loadingToDo: false, - loadingHasToDo: false, - loadingResource: false, - loadingApply: false, - loadingRequire: false, + components: { + deptTodoView, + BottomView, + CenterView, + DeptChartView + }, + data () { + return { + // 部门待办 + toToData: { + color: '#f86f01', + imgSrc: require('@/assets/img/workBench/todo.png'), + bgColor: 'rgba(228,138,1,0.12)', + borderColor: 'rgba(250,123,12,0.54)', + textColor: '#f86f01', + num: 0, + list: [], + type: 'todo', + url: 'activiti-my-todo-task' + }, + // 部门已办 + hasToDodoData: { + noMarginleft: true, + color: '#21b107', + imgSrc: require('@/assets/img/workBench/hasToDo.png'), + bgColor: 'rgba(37,165,13,0.12)', + borderColor: 'rgba(49,194,20,0.54)', + textColor: '#21b107', + num: 0, + list: [], + url: 'activiti-my-join-task' + }, + // 部门申请 + resourceData: [], + resourceColor: ['#7b2cff', '#fd5151', , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'], + // 部门申请 + applyData: [], + applyColor: ['#5085f2', '#e75fc3', '#f87be2', '#f2719a', '#fca4bb', '#f59a8f', '#fdb301', '#57e7ec', '#cf9ef1'], + // 部门需求 + requireData: [], + requireColor: ['#FD866A', '#9E87FF', '#58D5FF', '#73DDFF', '#73ACFF', '#FDD56A', '#FDB36A'], + loadingToDo: false, + loadingHasToDo: false, + loadingResource: false, + loadingApply: false, + loadingRequire: false + } + }, + mounted () { + // 部门待办 + this.getToDo() + // 部门已办 + this.getHasToDo() + // 上架 + this.getShelvesTotal() + // 申请 + this.getApplyTotal() + // 需求 + this.getRequireTotal() + }, + methods: { + // 待办 + getToDo () { + this.loadingToDo = true + const data = { + limit: 5, + page: 1 + } + Apis.getToDoTask(data, res => { + this.loadingToDo = false + if (res.data.code !== 0) { + return this.$message.error(res.data.msg) } + console.log('res----待办-------->', res.data) + this.toToData.list = res.data.data.records || [] + this.toToData.num = res.data.data.total || 0 + }, err => { + this.$message.error(err) + this.loadingToDo = false + }) }, - mounted() { - // 部门待办 - this.getToDo() - // 部门已办 - this.getHasToDo() - // 上架 - this.getShelvesTotal() - // 申请 - this.getApplyTotal() - // 需求 - this.getRequireTotal() + // 已办 + getHasToDo () { + const data = { + limit: 5, + page: 1 + } + this.loadingHasToDo = true + Apis.getHasToDoTask(data, res => { + this.loadingHasToDo = false + if (res.data.code !== 0) { + return this.$message.error(res.data.msg) + } + console.log('res----已办-------->', res.data) + this.hasToDodoData.list = res.data.data.records || [] + this.hasToDodoData.num = res.data.data.total || 0 + }, err => { + this.$message.error(err) + this.loadingHasToDo = false + console.log('err-----已办------->', err) + }) }, - methods: { - // 待办 - getToDo() { - this.loadingToDo = true; - let data = { - limit: 5, - page: 1, - } - Apis.getToDoTask(data, res => { - this.loadingToDo = false; - if (res.data.code !== 0) { - return this.$message.error(res.data.msg) - } - console.log('res----待办-------->', res.data); - this.toToData.list = res.data.data.records || [] - this.toToData.num = res.data.data.total || 0 - }, err => { - this.$message.error(err); - this.loadingToDo = false; - }) - }, - // 已办 - getHasToDo() { - let data = { - limit: 5, - page: 1, - } - this.loadingHasToDo = true; - Apis.getHasToDoTask(data, res => { - this.loadingHasToDo = false; - if (res.data.code !== 0) { - return this.$message.error(res.data.msg) - } - console.log('res----已办-------->', res.data); - this.hasToDodoData.list = res.data.data.records || [] - this.hasToDodoData.num = res.data.data.total || 0 - - }, err => { - this.$message.error(err) - this.loadingHasToDo = false; - console.log('err-----已办------->', err); - }) - }, - // 部门上架 - getShelvesTotal() { - this.loadingResource = true; - Apis.getTotalByDept({}, res => { - this.loadingResource = false; - if (res.data.code !== 0) { - return this.$message.error(res.data.msg) - } - console.log('res----部门上架-------->', res.data); - this.resourceData = this.formatList(res.data.data.total || []) - this.$nextTick(() => { - this.$refs.resourceChart.initChart(this.resourceData) - }) - }, err => { - this.$message.error(err) - this.loadingResource = false; - }) - }, - // 部门申请 - getApplyTotal() { - this.loadingApply = true; - Apis.getApply({}, res => { - this.loadingApply = false; - if (res.data.code !== 0) { - return this.$message.error(res.data.msg) - } - console.log('res----部门申请-------->', res.data); - this.applyData = this.formatList(res.data.data.total || []) - this.$nextTick(() => { - console.log('this.applyData------------>', this.applyData); - this.$refs.applyChart.initChart(this.applyData) - }) - }, err => { - this.$message.error(err) - this.loadingApply = false; - }) - }, - formatList(list = [], nameStr = 'type') { - let arr = [] - list.map(v => { - let obj = {} - obj.name = v[nameStr]; - obj.value = v.count; - arr.push(obj) - }) - return arr; - }, - // 部门需求 - getRequireTotal() { - this.loadingRequire = true; - Apis.getRequire({}, res => { - this.loadingRequire = false; - if (res.data.code !== 0) { - return this.$message.error(res.data.msg) - } - console.log('res----部门需求-------->', res.data); - this.requireData = this.formatList(res.data.data.total || [], 'flag') - this.$nextTick(() => { - this.$refs.requireChart.initChart(this.requireData) - }) - - }, err => { - this.$message.error(err) - this.loadingRequire = false; - }) - }, - + // 部门上架 + getShelvesTotal () { + this.loadingResource = true + Apis.getTotalByDept({}, res => { + this.loadingResource = false + if (res.data.code !== 0) { + return this.$message.error(res.data.msg) + } + console.log('res----部门上架-------->', res.data) + this.resourceData = this.formatList(res.data.data.total || []) + this.$nextTick(() => { + this.$refs.resourceChart.initChart(this.resourceData) + }) + }, err => { + this.$message.error(err) + this.loadingResource = false + }) }, + // 部门申请 + getApplyTotal () { + this.loadingApply = true + Apis.getApply({}, res => { + this.loadingApply = false + if (res.data.code !== 0) { + return this.$message.error(res.data.msg) + } + console.log('res----部门申请-------->', res.data) + this.applyData = this.formatList(res.data.data.total || []) + this.$nextTick(() => { + console.log('this.applyData------------>', this.applyData) + this.$refs.applyChart.initChart(this.applyData) + }) + }, err => { + this.$message.error(err) + this.loadingApply = false + }) + }, + formatList (list = [], nameStr = 'type') { + const arr = [] + list.map(v => { + const obj = {} + obj.name = v[nameStr] + obj.value = v.count + arr.push(obj) + }) + return arr + }, + // 部门需求 + getRequireTotal () { + this.loadingRequire = true + Apis.getRequire({}, res => { + this.loadingRequire = false + if (res.data.code !== 0) { + return this.$message.error(res.data.msg) + } + console.log('res----部门需求-------->', res.data) + this.requireData = this.formatList(res.data.data.total || [], 'flag') + this.$nextTick(() => { + this.$refs.requireChart.initChart(this.requireData) + }) + }, err => { + this.$message.error(err) + this.loadingRequire = false + }) + } + + } } - \ No newline at end of file + diff --git a/front/public/index.html b/front/public/index.html index 47173ea4..e6feb11d 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-23 16:38:21 + * @LastEditTime: 2022-08-29 09:55:26 * @Description: 告诉大家这是什么 --> @@ -26,47 +26,6 @@ - - - @@ -74,10 +33,9 @@ - + - @@ -108,7 +66,16 @@ - + + diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index 0a408c80..9f110087 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -2,55 +2,95 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-04-01 10:51:45 + * @LastEditTime: 2022-08-27 14:25:54 * @Description: 系统静态参数配置 */ var _global = {} var CONFIGITEM = { - version: 'qingdao', + version: 'qingdao', //青岛 + //version: 'xihaian', // 西海岸 + //version: 'dev', // 开发 + //version: 'test', // 测试 + //version: 'frp', // 内网穿透 + vNum: 'v0.8.7.2', configData: { + // 青岛市大数据局 qingdao: { - // bdMapUrl: 'http://15.2.21.238:9890/tiles-sd/tiles', - // bdMapUrl: 'http://15.72.178.129:9890/tiles-sd/tiles', - bdMapUrl: 'http://15.72.178.148:9890/tiles-sd/tiles', - fileService: 'http://15.72.178.148:1080/files/', - websocketService: 'ws://15.72.178.136:8777', - gisService: 'http://15.72.178.148:8585', - pageOfficeService: 'http://15.72.178.136:9393/', - refreshTimerFlag: true, loginInfo: { // 视频平台登陆信息 - // loginIp: '10.132.191.3', - loginPort: '8320', - // userName: 'chengshiyunnao', - // userPwd: 'QDyjj@2021', loginIp: '10.132.191.3', + loginPort: '8320', userName: 'ynszdz', userPwd: 'Admin@123', - channelList: [ - '37020002001310000022', - '37020001001310000210', - '37020002001310000026', - '37020002001310000031' - ], - channels: [ - { channelId: '37020002001310000022' }, - { channelId: '37020001001310000210' }, - { channelId: '37020002001310000026' }, - { channelId: '37020002001310000031' } - ], - name_32: - 'General_DSS-LightWeight-Client_x86_V2.1.0.2110.R.20211106.exe', - url_32: - '/static/General_DSS-LightWeight-Client_x86_V2.1.0.2110.R.20211106.exe', - name_64: - 'General_DSS-LightWeight-Client_x64_V2.1.0.2110.R.20211106.exe', - url_64: - '/static/General_DSS-LightWeight-Client_x64_V2.1.0.2110.R.20211106.exe' }, - MAX_CIRCLE_RADIUS: 20000, - maxMapZoom: 10 + backUrl: 'http://15.72.183.90:8001', + 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', + POI_URL: + 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', }, - } + // 西海岸大数据局 + xihaian: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + backUrl: 'http://10.134.135.9:9797', + previewUrl: 'http://10.134.135.9:9796/', + websocketURL: '10.134.135.9:8888/renren-admin', + POI_URL: + 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 开发 + dev: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + backUrl: 'http://localhost:8001', + previewUrl: 'http://192.168.124.236:9796/', + websocketURL: '192.168.124.236:8888/renren-admin', + POI_URL: + 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 测试 + test: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + backUrl: 'http://192.168.124.243:9797', + previewUrl: 'http://192.168.124.243:9796/', + websocketURL: '192.168.124.243:8888/renren-admin', + POI_URL: + 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + // 内网穿透 + frp: { + loginInfo: { + // 视频平台登陆信息 + loginIp: '', + loginPort: '', + userName: '', + userPwd: '', + }, + backUrl: 'http://124.222.94.39:9797', + previewUrl: 'http://124.222.94.39:9796/', + websocketURL: '124.222.94.39:8888/renren-admin', + POI_URL: + 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address', + }, + }, } _global.config = CONFIGITEM.configData[CONFIGITEM.version] diff --git a/front/public/static/config/footerData.js b/front/public/static/config/footerData.js deleted file mode 100644 index 87f76588..00000000 --- a/front/public/static/config/footerData.js +++ /dev/null @@ -1,48 +0,0 @@ -/* - * @Author: zhangfeihu - * @Date: 2022-06-16 16:37:31 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-20 16:18:04 - * @FilePath: \qiantai\front\public\static\config\footerData.js - * @Description: 底部菜单数据配置配置 - */ -// const footerDataList = { -// 市局 -// company: { -// left: '青岛市大数据发展管理局建设', -// right: '海信网络科技股份有限公司' -// }, -// address: [ -// { -// name: '鲁IC备00000000号', -// value: '政府标识码3702000106', -// }, -// { -// name: '版权所有：青岛市大数据发展管理局', -// value: '地址：山东省青岛市香港中路17号市级机关办公楼', -// }, -// { -// name: '电话：0532-8561234', -// value: '传真：0532-2145122', -// }, -// ] -// 西海岸 -// company: { -// left: '青岛西海岸新区大数据发展促进局建设', -// right: 'v0.81' -// }, -// address: [ -// { -// name: '鲁IC备00000000号', -// value: '政府标识码3702000106', -// }, -// { -// name: '版权所有：青岛西海岸新区大数据发展促进局', -// value: '地址：青岛市西海岸新区长江中路369号', -// }, -// { -// name: '电话：0532-86986596', -// value: '传真：0532-86986596', -// }, -// ] -// } diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index fa7bddbe..99de00c7 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -2,12 +2,13 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-23 16:38:39 + * @LastEditTime: 2022-08-29 09:55:56 * @Description: 数据资源参数配置 */ -//const newLocation = 'qingdao' +// eslint-disable-next-line no-undef +const newLocation = CONFIGITEM.version // const newLocation = 'baotou' -const newLocation = 'qingdao' +// const newLocation = 'xihaian' // 数据资源数据 const whoShow = {} @@ -23,7 +24,7 @@ const mapTestNum = {} // 底部数据 const footerDataList = {} // qingdao -if (newLocation === 'qingdao') { +if (newLocation !== 'baotou' && newLocation !== 'xihaian') { whoShow.itShowQingDao = true infrastructure.deptName = '青岛市大数据发展管理局' infrastructure.deptId = '1067246875800000066' @@ -38,8 +39,8 @@ if (newLocation === 'qingdao') { // { name: '个人中心', key: 'personalCenter' }, { name: '区市站点', key: 'mapTest' }, // { name: '后台管理', key: 'houtaiguanli' }, - { name: '典型赋能案例', key: 'assignCase' }, - // { name: '融合服务', key: 'integrationServices' }, + // { name: '典型赋能案例', key: 'assignCase' }, + { name: '融合服务', key: 'integrationServices' }, { name: 'CIM专区', key: 'cimSpecialArea' }, ] footerDataList.footerList = { @@ -502,7 +503,8 @@ else if (newLocation === 'xihaian') { footerDataList.footerList = { company: { left: '青岛西海岸新区大数据发展促进局建设', - right: 'v0.8.3.3', + // eslint-disable-next-line no-undef + right: CONFIGITEM.vNum, }, address: [ { diff --git a/front/public/static/config/mapConfig.js b/front/public/static/config/mapConfig.js index ca89b5fc..16513f8b 100644 --- a/front/public/static/config/mapConfig.js +++ b/front/public/static/config/mapConfig.js @@ -2,21 +2,21 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-02 18:19:32 + * @LastEditTime: 2022-08-25 11:16:44 * @Description: 地图静态参数配置 */ var _mapConfig = {} ;(function () { var L = window.L || {} - // // 定义底图初始化化参数 // 请在此处更改你的配置********************************************** - var CONFIGKEY = 'qingdao_highgo' + // eslint-disable-next-line no-undef + var CONFIGKEY = CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao' // var CONFIGKEY = 'dev'; // 请在上面更改你的配置*********************************************** var BASECONFIGITEM = { - qingdao: { + xihaian: { base: 'xihaian', CURRENT_MAP_OPTIONS: { // crs: CRS_4490, @@ -26,7 +26,7 @@ var _mapConfig = {} zoom: 10, }, }, - qingdao_highgo: { + qingdao: { DATABASE_TYPE: 'Highgo', POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute' ISERVER_URL: '15.2.21.238:8090', @@ -78,59 +78,6 @@ var _mapConfig = {} icon: 'other_map.png', }, }, - //测试环境地图 - dev: { - DATABASE_TYPE: 'Highgo', - POI_TYPE: 'Supermap', // POI接口类型 'Supermap'、'Amap'、'Survey_Institute' - ISERVER_URL: '15.2.21.238:8090', - WORKPLACE_NAME: 'HIMAP-HIGHGO', - MAP_NAME: 'QDMAP', - DATASOURCE_NAME: 'HISENSE_map', - ATMOSPHERE_URL: 'http://15.2.21.151:9015/service-main', - CURRENT_MAP_OPTIONS: { - // crs: CRS_4490, - center: [36.17, 120.13], - maxZoom: 7, - minZoom: 0, - zoom: 3, - }, - BDMAP_CONFIG: { - location: 'qingdao', - _initpos: { - point: [120.392795, 36.072854], - zoom: 2, - }, - _keyframes: [ - [121.6011191295479, 36.73422934263509], - [119.83371870221472, 36.082854], - [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_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', - }, - }, } var MAPCONFIGMIXTRE = { CURRENT_SERVER_NAME: CONFIGKEY, diff --git a/front/src/api/cimSpecialArea.js b/front/src/api/cimSpecialArea.js index adaa71d3..cc23282a 100644 --- a/front/src/api/cimSpecialArea.js +++ b/front/src/api/cimSpecialArea.js @@ -1,8 +1,8 @@ /* * @Author: hisense.liangjunhua * @Date: 2022-08-19 14:25:45 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-08-19 15:25:03 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-27 15:52:54 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -27,7 +27,7 @@ export function cimImgResources(params) { method: 'get', }) } -// cim+算法 +// CIM+组件 export function cimAssemblyResources() { return request({ url: '/resource/cimAssemblyResources', diff --git a/front/src/api/file.js b/front/src/api/file.js index 70115607..be2bf1fb 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-20 17:16:35 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-11 19:02:33 + * @LastEditTime: 2022-08-25 14:13:30 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -61,11 +61,11 @@ export function count() { export function getVideoList(params) { return axios.get( 'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' + - params.name + - '&pageNo=' + - params.pageNo + - '&pageSize=' + - params.pageSize, + params.name + + '&pageNo=' + + params.pageNo + + '&pageSize=' + + params.pageSize, config2 ) } @@ -73,17 +73,17 @@ export function getVideoList(params) { export function getRecord(params) { return axios.get( 'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' + - params.serviceName + - '&orderField=' + - params.orderField + - '&orderType=' + - params.orderType + - '&pageNum=' + - params.pageNum + - '&pageSize=' + - params.pageSize + - '&serviceType=' + - params.serviceType, + params.serviceName + + '&orderField=' + + params.orderField + + '&orderType=' + + params.orderType + + '&pageNum=' + + params.pageNum + + '&pageSize=' + + params.pageSize + + '&serviceType=' + + params.serviceType, config2 ) } @@ -91,9 +91,9 @@ export function getRecord(params) { export function getHls(params) { return axios.get( 'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' + - params.cameraId + - '&protocol=' + - params.protocol, + params.cameraId + + '&protocol=' + + params.protocol, config2 ) } @@ -101,14 +101,15 @@ export function getHls(params) { export function getCameraInfoByAreaId(params) { return axios.get( 'http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=' + - params.areaId, + params.areaId, config2 ) } //能力集市基础设施-摄像头 export function getCameraByCondition(params) { return axios.get( - 'http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition?' + params, + 'http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition?' + + params, config2 ) } diff --git a/front/src/assets/detailsAll/uesBefore.png b/front/src/assets/detailsAll/uesBefore.png new file mode 100644 index 00000000..ed886432 Binary files /dev/null and b/front/src/assets/detailsAll/uesBefore.png differ diff --git a/front/src/assets/home/fn/cjtd.png b/front/src/assets/home/fn/cjtd.png new file mode 100644 index 00000000..4de0df2d Binary files /dev/null and b/front/src/assets/home/fn/cjtd.png differ diff --git a/front/src/assets/home/fn/jcss.png b/front/src/assets/home/fn/jcss.png new file mode 100644 index 00000000..0ecceed4 Binary files /dev/null and b/front/src/assets/home/fn/jcss.png differ diff --git a/front/src/assets/home/fn/sjzy.png b/front/src/assets/home/fn/sjzy.png new file mode 100644 index 00000000..5d0ade2d Binary files /dev/null and b/front/src/assets/home/fn/sjzy.png differ diff --git a/front/src/assets/home/fn/zjfw.png b/front/src/assets/home/fn/zjfw.png new file mode 100644 index 00000000..34af25eb Binary files /dev/null and b/front/src/assets/home/fn/zjfw.png differ diff --git a/front/src/supermap/map-init.js b/front/src/supermap/map-init.js index 580cab82..fc90354b 100644 --- a/front/src/supermap/map-init.js +++ b/front/src/supermap/map-init.js @@ -134,7 +134,7 @@ export function HieimpMap() { // console.log('地市级行政区划', result); // }); switch (_mapConfig.config.CURRENT_SERVER_NAME) { - case 'qingdao_highgo': + case 'qingdao': if (type === 'tiled') { tileMapUrl = _mapConfig.config.TITLE_LAYER.mapUrl } else if (type === 'remote') { @@ -144,7 +144,7 @@ export function HieimpMap() { } renderMapFun(mapId, tileMapUrl, centerPoint) break - case 'qingdao': + case 'xihaian': const tileMap = L.map(mapId, { crs: L.CRS.EPSG4326, // renderer: L.svg(), diff --git a/front/src/utils/location.js b/front/src/utils/location.js index 63fa730e..a52f1c7c 100644 --- a/front/src/utils/location.js +++ b/front/src/utils/location.js @@ -1,13 +1,14 @@ /* * @Author: hisense.liangjunhua * @Date: 2022-08-22 18:22:16 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-08-23 09:31:02 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-25 21:05:32 * @Description: 告诉大家这是什么 */ const returnLocationStr = () => { - return 'qingdao' + // eslint-disable-next-line no-undef + return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao1' } export default returnLocationStr diff --git a/front/src/utils/placeHolder.js b/front/src/utils/placeHolder.js new file mode 100644 index 00000000..58e36d4e --- /dev/null +++ b/front/src/utils/placeHolder.js @@ -0,0 +1,21 @@ +/* + * @Author: hisense.wuhongjian + * @Date: 2022-08-25 19:41:20 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-08-25 20:14:53 + * @Description: 告诉大家这是什么 + */ +export function placeHolderWords(name) { + const words = { + 坐标系: '服务坐标系，如WGS84、CGCS2000等', + 覆盖区域: '服务覆盖区域，如全国、青岛、城阳区等', + 切片尺寸: '切片尺寸，切片服务填写，填写瓦片大小，如256*256', + 切片策略: '切片策略，切片服务填写，如栅格、矢量', + 最小级别: '地图缩放最小级别，如1、2', + 最大级别: '地图缩放最大级别，如18、19、20', + 图层预览地址: '地址，图层预览效果将在详情页展示，如http://xxx.com', + 服务地址: '服务调用地址', + 样式服务地址: '样式服务地址，用于获取图层的展示样式，如不同的地图底色样式', + } + return words[name] || name +} diff --git a/front/src/views/assignCase/components/queryPage.vue b/front/src/views/assignCase/components/queryPage.vue index 27aea63c..df87e6e2 100644 --- a/front/src/views/assignCase/components/queryPage.vue +++ b/front/src/views/assignCase/components/queryPage.vue @@ -4,7 +4,8 @@
-

典型赋能案例

+

典型赋能案例

+

赋能案例

@@ -86,7 +87,7 @@ import { useRouter } from 'vue-router' // import { pinyin } from 'pinyin-pro' // import { Empty } from 'ant-design-vue' - + const whoShow1 = ref(whoShow) const router = useRouter() const listBg = ref('') const contenBox = ref([]) diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 6ae354a3..b760d478 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-17 14:11:08 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-08-03 11:47:41 + * @LastEditTime: 2022-08-25 19:52:03 * @Description: 上架 --> diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index c792ace5..70b37fed 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -1,7 +1,7 @@