wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

bug修复

This commit is contained in:
wuhongjian 2022-08-26 09:27:34 +08:00
parent d7d2c56ec7
commit 64ef4c95a1
9 changed files with 261 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/public/config/basicConfig.js
View File

@ -2,16 +2,16 @@
* @Author: hisense.wuhongjian
* @Date: 2022-08-25 14:37:49
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-25 15:19:56
* @LastEditTime: 2022-08-25 19:14:13
* @Description: 告诉大家这是什么
*/
var _global = {}
var CONFIGITEM = {
// version: 'qingdao', //青岛
version: 'qingdao', // 青岛
// version: 'xihaian', // 西海岸
// version: 'test', // 测试
// version: 'frp', // 内网穿透
version: 'dev', // 开发
// version: 'dev', // 开发
vNum: 'v0.8.7.1',
configData: {
// 青岛市大数据局

6
back/src/utils/location.js
View File

@ -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

261
back/src/views/modules/ability/components/combine-ability.vue
View File

@ -31,125 +31,124 @@
import InfrastructureModal from '../assignedScene/components/infrastructure-modal.vue'
import DisplayList from '../assignedScene/components/display-list.vue'
let sjzyArray = [
const sjzyArray = [
{
"zyname": "城阳区图书馆总分馆、社区图书室明细信息",
"sjcczl": 0.02,
"zycode": "307013110716000007",
"ygxjghjls": 0,
"jghxxjlzs": 0,
"neibukeshi": "",
"xgxt": "城阳区图书馆及总分馆、社区图书室明细信息",
"ygxdsjccl": 0,
"zygszl": "et",
"ykfjghjls": 0,
"syqk": 0,
"zyformat": "电子表格",
"guid": "277c51e0-066b-441d-9262-6e53ce6fc99a",
"TGBM": "城阳区文化和旅游局",
"ykfdsjccl": 0
zyname: '城阳区图书馆总分馆、社区图书室明细信息',
sjcczl: 0.02,
zycode: '307013110716000007',
ygxjghjls: 0,
jghxxjlzs: 0,
neibukeshi: '',
xgxt: '城阳区图书馆及总分馆、社区图书室明细信息',
ygxdsjccl: 0,
zygszl: 'et',
ykfjghjls: 0,
syqk: 0,
zyformat: '电子表格',
guid: '277c51e0-066b-441d-9262-6e53ce6fc99a',
TGBM: '城阳区文化和旅游局',
ykfdsjccl: 0
},
{
"zyname": "2021年度西海岸新区科技型中小企业名单信息",
"sjcczl": 0,
"zycode": "307013109000000010",
"ygxjghjls": 0,
"jghxxjlzs": 0,
"neibukeshi": "高新技术科",
"xgxt": "2021年度西海岸新区科技型中小企业名单信息，企业名称，入库编号。",
"ygxdsjccl": 0,
"zygszl": "access",
"ykfjghjls": 0,
"syqk": 0,
"zyformat": "数据库",
"guid": "6ed1a478-443a-48ee-8af0-4c7ac2681a94",
"TGBM": "青岛西海岸新区工业和信息化局（区科技局、区大数据局）",
"ykfdsjccl": 0
zyname: '2021年度西海岸新区科技型中小企业名单信息',
sjcczl: 0,
zycode: '307013109000000010',
ygxjghjls: 0,
jghxxjlzs: 0,
neibukeshi: '高新技术科',
xgxt: '2021年度西海岸新区科技型中小企业名单信息，企业名称，入库编号。',
ygxdsjccl: 0,
zygszl: 'access',
ykfjghjls: 0,
syqk: 0,
zyformat: '数据库',
guid: '6ed1a478-443a-48ee-8af0-4c7ac2681a94',
TGBM: '青岛西海岸新区工业和信息化局（区科技局、区大数据局）',
ykfdsjccl: 0
},
{
"zyname": "西海岸新区高新技术企业名单信息",
"sjcczl": 0,
"zycode": "307013109000000012",
"ygxjghjls": 0,
"jghxxjlzs": 0,
"neibukeshi": "高新技术科",
"xgxt": "西海岸新区高新技术企业名单信息",
"ygxdsjccl": 0,
"zygszl": "access",
"ykfjghjls": 0,
"syqk": 0,
"zyformat": "数据库",
"guid": "770a9127-e7fd-4a6b-ba17-c80cf06ab670",
"TGBM": "青岛西海岸新区工业和信息化局（区科技局、区大数据局）",
"ykfdsjccl": 0
zyname: '西海岸新区高新技术企业名单信息',
sjcczl: 0,
zycode: '307013109000000012',
ygxjghjls: 0,
jghxxjlzs: 0,
neibukeshi: '高新技术科',
xgxt: '西海岸新区高新技术企业名单信息',
ygxdsjccl: 0,
zygszl: 'access',
ykfjghjls: 0,
syqk: 0,
zyformat: '数据库',
guid: '770a9127-e7fd-4a6b-ba17-c80cf06ab670',
TGBM: '青岛西海岸新区工业和信息化局（区科技局、区大数据局）',
ykfdsjccl: 0
},
{
"zyname": "西海岸新区高新技术企业认定补助名单信息",
"sjcczl": 0,
"zycode": "307013109000000011",
"ygxjghjls": 0,
"jghxxjlzs": 0,
"neibukeshi": "高新技术科",
"xgxt": "西海岸新区高新技术企业认定补助名单信息，企业名称、扶持项目。",
"ygxdsjccl": 0,
"zygszl": "access",
"ykfjghjls": 0,
"syqk": 0,
"zyformat": "数据库",
"guid": "ae52c5f8-ef6e-4ae9-a657-79dcb6f65643",
"TGBM": "青岛西海岸新区工业和信息化局（区科技局、区大数据局）",
"ykfdsjccl": 0
zyname: '西海岸新区高新技术企业认定补助名单信息',
sjcczl: 0,
zycode: '307013109000000011',
ygxjghjls: 0,
jghxxjlzs: 0,
neibukeshi: '高新技术科',
xgxt: '西海岸新区高新技术企业认定补助名单信息，企业名称、扶持项目。',
ygxdsjccl: 0,
zygszl: 'access',
ykfjghjls: 0,
syqk: 0,
zyformat: '数据库',
guid: 'ae52c5f8-ef6e-4ae9-a657-79dcb6f65643',
TGBM: '青岛西海岸新区工业和信息化局（区科技局、区大数据局）',
ykfdsjccl: 0
},
{
"zyname": "青岛西海岸新区第六批区级非物质文化遗产代表性项目名录",
"sjcczl": 0,
"zycode": "307013109026000037",
"ygxjghjls": 0,
"jghxxjlzs": 0,
"neibukeshi": "艺术科",
"xgxt": "青岛西海岸新区第六批区级非物质文化遗产代表性项目名录，如项目类别、序号、项目名称、申报单位",
"ygxdsjccl": 0,
"zygszl": "et",
"ykfjghjls": 0,
"syqk": 0,
"zyformat": "电子表格",
"guid": "6d80a3b1-744e-4292-a904-0168d640b1fc",
"TGBM": "青岛西海岸新区文化和旅游局（区新闻出版广电局、区文物局）",
"ykfdsjccl": 0
zyname: '青岛西海岸新区第六批区级非物质文化遗产代表性项目名录',
sjcczl: 0,
zycode: '307013109026000037',
ygxjghjls: 0,
jghxxjlzs: 0,
neibukeshi: '艺术科',
xgxt: '青岛西海岸新区第六批区级非物质文化遗产代表性项目名录，如项目类别、序号、项目名称、申报单位',
ygxdsjccl: 0,
zygszl: 'et',
ykfjghjls: 0,
syqk: 0,
zyformat: '电子表格',
guid: '6d80a3b1-744e-4292-a904-0168d640b1fc',
TGBM: '青岛西海岸新区文化和旅游局（区新闻出版广电局、区文物局）',
ykfdsjccl: 0
}
]
let res = {
"code": 0,
"msg": "success",
"data": {
"PageCount": "2115",
"data": sjzyArray,
"rows": "10573"
const res = {
code: 0,
msg: 'success',
data: {
PageCount: '2115',
data: sjzyArray,
rows: '10573'
}
}
let keyObj = {
'数据资源': {
idKey: 'zycode',
nameKey: 'zyname'
},
'组件服务': {
const keyObj = {
数据资源: {
idKey: 'id',
nameKey: 'name'
},
组件服务: {
idKey: 'id',
nameKey: 'name'
}
}
export default {
props: {
type: {
type: String,
default: ""
default: ''
},
nameArray: {
type: Array,
default: () => ["未选择名称", "已选择名称"],
default: () => ['未选择名称', '已选择名称']
},
// 最多选择的数据个数
maxNum: {
@ -160,10 +159,10 @@ export default {
type: Object,
default: () => {
return {
methods: "get",
url: "",
methods: 'get',
url: '',
postData: {}
};
}
}
}
},
@ -174,95 +173,95 @@ export default {
transferData: [],
selectedArray: [],
allData: [],
displayList: [], // 用于展示的list
};
displayList: [] // 用于展示的list
}
},
watch: {
showModal (newVal) {
if (newVal) {
this.getData();
this.getData()
}
}
},
methods: {
async getDataInfo (dataForm) {
await this.getData();
let arr = [];
let attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type);
await this.getData()
const arr = []
const attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type)
if (attrValue.length > 0) {
attrValue.map(val => {
let _obj = {
const _obj = {
type: val.type,
id: val.resourceId,
name: val.resource && val.resource.name
};
arr.push(_obj);
});
}
arr.push(_obj)
})
}
// 展示
this.displayList = JSON.parse(JSON.stringify(arr));
this.displayList = JSON.parse(JSON.stringify(arr))
// 已选中
this.selectedArray = arr.map(v => v.id);
this.selectedArray = arr.map(v => v.id)
this.$nextTick(() => {
console.log(999, this.displayList);
});
console.log(999, this.displayList)
})
},
// 获取列表
getData () {
if (this.getDataParams.url === '') {
return;
return
}
this.$http[this.getDataParams.methods](this.getDataParams.url, {
params: this.getDataParams.postData
}).then(res => {
console.log('res.data----获取列表-------->', res.data);
console.log('res.data----获取列表-------->', res.data)
if (res.data.code !== 0) {
return this.$message.error(res.msg);
return this.$message.error(res.msg)
}
this.transferData = [];
this.transferData = []
this.allData = [];
(res.data.data || []).map(v => {
this.transferData.push({
type: this.type,
id: v[keyObj[this.type].idKey],
name: v[keyObj[this.type].nameKey] || "--"
});
});
this.allData = JSON.parse(JSON.stringify(this.transferData));
name: v[keyObj[this.type].nameKey] || '--'
})
})
this.allData = JSON.parse(JSON.stringify(this.transferData))
}).catch(err => {
this.$message.error(err);
this.$message.error(err)
})
},
filterMethod (query, item) {
return item.name && item.name.indexOf(query) > -1;
return item.name && item.name.indexOf(query) > -1
},
confirmSubmitHandle () {
if (this.selectedArray.length > this.maxNum) {
return this.$message.error("最多选择十条数据！");
return this.$message.error('最多选择十条数据！')
}
this.showModal = false;
this.displayList = [];
this.showModal = false
this.displayList = []
this.allData.map(v => {
if (this.selectedArray.includes(v.id)) {
this.displayList.push(v);
this.displayList.push(v)
}
});
this.$emit("update", {
})
this.$emit('update', {
title: this.type,
list: this.selectedArray
});
})
},
getDisplay (displayList) {
this.displayList = []
this.displayList = displayList
},
close () {
this.showModal = false;
this.selectedArray = [];
this.allData = [];
this.transferData = [];
},
this.showModal = false
this.selectedArray = []
this.allData = []
this.transferData = []
}
},
components: { InfrastructureModal, DisplayList }
}

4
front/src/utils/location.js
View File

@ -2,13 +2,13 @@
* @Author: hisense.liangjunhua
* @Date: 2022-08-22 18:22:16
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-08-25 10:55:57
* @LastEditTime: 2022-08-25 21:05:32
* @Description: 告诉大家这是什么
*/
const returnLocationStr = () => {
// eslint-disable-next-line no-undef
return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao'
return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao1'
}
export default returnLocationStr

21
front/src/utils/placeHolder.js Normal file
View File

@ -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
}

5
front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
View File

@ -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: 上架
-->
<template>
@ -233,7 +233,7 @@
:maxLength="1000"
v-if="item.type == 'input' && item.name.indexOf('名称') == -1"
v-model:value="item.note1"
:placeholder="'请输入' + item.name"
:placeholder="'请输入' + placeHolderWords(item.name)"
@change="changeIiem(item.name, item.note1)"
/>
<a-input
@ -496,6 +496,7 @@
</template>
<script setup>
import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo'
import { placeHolderWords } from '@/utils/placeHolder'
import {
ref,
defineProps,

10
front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue
View File

@ -70,27 +70,23 @@
values: '',
},
{
type: '切片尺寸详情',
type: '切片尺寸',
values: '',
},
{
type: '最小级别名称',
type: '最小级别',
values: '',
},
],
})
const dataFromRight = ref({
content: [
{
type: '数据范围',
values: '',
},
{
type: '图层名称',
values: '',
},
{
type: '最大级别名称',
type: '最大级别',
values: '',
},
],

9
front/src/views/home/infrastructurePage.vue
View File

@ -588,10 +588,9 @@
:key="item.id"
style="width: 100%; height: 100%"
>
<p></p>
<a-image
width="100%"
height="100%"
width="500px"
height="281px"
:src="item.options.src"
fallback="data:image/png;base64,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"
/>
@ -2196,8 +2195,8 @@
grid-template-columns: 50% 50%;
grid-template-rows: 50% 50%;
justify-content: center;
// grid-row-gap: 14px;
grid-column-gap: 20px;
grid-row-gap: 10px;
grid-column-gap: 10px;
}
.ant-pagination-item-link {
background-color: #5580f7;

1
front/src/views/home/integrationServices.vue
View File

@ -182,6 +182,7 @@
resourceList.data = res.data.data.list || []
resourceTotal.value = res.data.data.total || 0
listKey2.value++
},
(err) => {
loadingData.value = false