From 64ef4c95a1b026105dc208df0206567ed384fa5d Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Fri, 26 Aug 2022 09:27:34 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/config/basicConfig.js | 6 +- back/src/utils/location.js | 6 +- .../ability/components/combine-ability.vue | 443 +++++++++--------- front/src/utils/location.js | 4 +- front/src/utils/placeHolder.js | 21 + .../components/PutOnTheShelf.vue | 5 +- .../LayerService/LayerServiceInformation.vue | 10 +- front/src/views/home/infrastructurePage.vue | 9 +- front/src/views/home/integrationServices.vue | 1 + 9 files changed, 261 insertions(+), 244 deletions(-) create mode 100644 front/src/utils/placeHolder.js diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js index deb8521f..f7118272 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-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: { // 青岛市大数据局 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/components/combine-ability.vue b/back/src/views/modules/ability/components/combine-ability.vue index 55c9fb28..81dffd6b 100644 --- a/back/src/views/modules/ability/components/combine-ability.vue +++ b/back/src/views/modules/ability/components/combine-ability.vue @@ -31,240 +31,239 @@ import InfrastructureModal from '../assignedScene/components/infrastructure-modal.vue' import DisplayList from '../assignedScene/components/display-list.vue' - -let 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": "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": "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 - } +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: '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: '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 + } ] -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' - }, - '组件服务': { - idKey: 'id', - nameKey: 'name' - }, +const keyObj = { + 数据资源: { + idKey: 'id', + nameKey: 'name' + }, + 组件服务: { + idKey: 'id', + nameKey: 'name' + } } export default { - props: { - type: { - type: String, - default: "" - }, - nameArray: { - type: Array, - default: () => ["未选择名称", "已选择名称"], - }, - // 最多选择的数据个数 - maxNum: { - type: Number, - default: 10 - }, - getDataParams: { - type: Object, - default: () => { - return { - methods: "get", - url: "", - postData: {} - }; - } - } + props: { + type: { + type: String, + default: '' }, - data() { + nameArray: { + type: Array, + default: () => ['未选择名称', '已选择名称'] + }, + // 最多选择的数据个数 + maxNum: { + type: Number, + default: 10 + }, + getDataParams: { + type: Object, + default: () => { return { - showKey: 0, - showModal: false, - transferData: [], - selectedArray: [], - allData: [], - displayList: [], // 用于展示的list - }; - }, - watch: { - showModal(newVal) { - if (newVal) { - this.getData(); - } + methods: 'get', + url: '', + postData: {} } - }, - methods: { - async getDataInfo(dataForm) { - await this.getData(); - let arr = []; - let attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type); - if (attrValue.length > 0) { - attrValue.map(val => { - let _obj = { - type: val.type, - id: val.resourceId, - name: val.resource && val.resource.name - }; - arr.push(_obj); - }); - } + } + } + }, + data () { + return { + showKey: 0, + showModal: false, + transferData: [], + selectedArray: [], + allData: [], + displayList: [] // 用于展示的list + } + }, + watch: { + showModal (newVal) { + if (newVal) { + this.getData() + } + } + }, + methods: { + async getDataInfo (dataForm) { + await this.getData() + const arr = [] + const attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type) + if (attrValue.length > 0) { + attrValue.map(val => { + const _obj = { + type: val.type, + id: val.resourceId, + name: val.resource && val.resource.name + } + arr.push(_obj) + }) + } - // 展示 - this.displayList = JSON.parse(JSON.stringify(arr)); - // 已选中 - this.selectedArray = arr.map(v => v.id); - this.$nextTick(() => { - console.log(999, this.displayList); - }); - }, - // 获取列表 - getData() { - if (this.getDataParams.url === '') { - return; - } - this.$http[this.getDataParams.methods](this.getDataParams.url, { - params: this.getDataParams.postData - }).then(res => { - console.log('res.data----获取列表-------->', res.data); - if (res.data.code !== 0) { - return this.$message.error(res.msg); - } - 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)); - }).catch(err => { - this.$message.error(err); - }) - }, - filterMethod(query, item) { - return item.name && item.name.indexOf(query) > -1; - }, - confirmSubmitHandle() { - if (this.selectedArray.length > this.maxNum) { - return this.$message.error("最多选择十条数据！"); - } - this.showModal = false; - this.displayList = []; - this.allData.map(v => { - if (this.selectedArray.includes(v.id)) { - this.displayList.push(v); - } - }); - 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.displayList = JSON.parse(JSON.stringify(arr)) + // 已选中 + this.selectedArray = arr.map(v => v.id) + this.$nextTick(() => { + console.log(999, this.displayList) + }) }, - components: { InfrastructureModal, DisplayList } + // 获取列表 + getData () { + if (this.getDataParams.url === '') { + return + } + this.$http[this.getDataParams.methods](this.getDataParams.url, { + params: this.getDataParams.postData + }).then(res => { + console.log('res.data----获取列表-------->', res.data) + if (res.data.code !== 0) { + return this.$message.error(res.msg) + } + 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)) + }).catch(err => { + this.$message.error(err) + }) + }, + filterMethod (query, item) { + return item.name && item.name.indexOf(query) > -1 + }, + confirmSubmitHandle () { + if (this.selectedArray.length > this.maxNum) { + return this.$message.error('最多选择十条数据！') + } + this.showModal = false + this.displayList = [] + this.allData.map(v => { + if (this.selectedArray.includes(v.id)) { + this.displayList.push(v) + } + }) + 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 = [] + } + }, + components: { InfrastructureModal, DisplayList } }