diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 439b09bc..e5900aae 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -646,4 +646,7 @@ export default { // ::v-deep .el-table .cell { // width: 200px; // } +::v-deep .el-upload-list__item-name { + width: 400px; +} diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index 29cf2c4e..3a23cc9b 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -729,4 +729,7 @@ export default { .el-tooltip__popper { max-width: 50%; } +::v-deep .el-upload-list__item-name { + width: 400px; +} diff --git a/front/public/index.html b/front/public/index.html index 04ec2b7b..040ff813 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.liangjunhua - * @LastEditTime: 2022-07-14 09:34:08 + * @LastEditTime: 2022-07-14 10:58:46 * @Description: 告诉大家这是什么 --> @@ -49,7 +49,7 @@ window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index b58168f4..86d0f684 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -197,6 +197,13 @@ export function getMyComment(params) { params, }) } +export function demandComment(params) { + return request({ + url: '/demandComment/'+ params, + method: 'get', + params, + }) +} // 能力上架属性名查询 export function getCategoryTree(params) { return request({ diff --git a/front/src/supermap/config/coordinateConfig.js b/front/src/supermap/config/coordinateConfig.js index 0538b55b..dcde84a1 100644 --- a/front/src/supermap/config/coordinateConfig.js +++ b/front/src/supermap/config/coordinateConfig.js @@ -2,14 +2,14 @@ * @Author: hisense.wuhongjian * @Date: 2021-10-13 09:30:54 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2021-10-13 15:04:58 + * @LastEditTime: 2022-07-14 16:28:27 * @Description: 点位-位置匹配 */ const DIVISION = { qingdao: [ { districtName: '城阳区', - name: '城阳区', + name: '城阳区(约1.5万)', districtCOde: '', latLng: { lat: 36.31, @@ -18,7 +18,7 @@ const DIVISION = { }, { districtName: '李沧区', - name: '李沧区', + name: '李沧区(约0.6万)', districtCOde: '', latLng: { lat: 36.17, @@ -27,7 +27,7 @@ const DIVISION = { }, { districtName: '市北区', - name: '市北区', + name: '市北区(约0.7万)', districtCOde: '', latLng: { lat: 36.1, @@ -36,7 +36,7 @@ const DIVISION = { }, { districtName: '市南区', - name: '市南区', + name: '市南区(约0.4万)', districtCOde: '', latLng: { lat: 36.06, @@ -45,7 +45,7 @@ const DIVISION = { }, { districtName: '崂山区', - name: '崂山区', + name: '崂山区(约2.0万)', districtCOde: '', latLng: { lat: 36.11, @@ -54,7 +54,7 @@ const DIVISION = { }, { districtName: '即墨区', - name: '即墨区', + name: '即墨区(约1.4万)', districtCOde: '', latLng: { lat: 36.39, @@ -63,7 +63,7 @@ const DIVISION = { }, { districtName: '胶州市', - name: '胶州市', + name: '胶州市(约1.5万)', districtCOde: '', latLng: { lat: 36.27, @@ -72,7 +72,7 @@ const DIVISION = { }, { districtName: '平度市', - name: '平度市', + name: '平度市(约1.6万)', districtCOde: '', latLng: { lat: 36.78, @@ -81,7 +81,7 @@ const DIVISION = { }, { districtName: '莱西市', - name: '莱西市', + name: '莱西市(约1.0万)', districtCOde: '', latLng: { lat: 36.89, @@ -90,7 +90,7 @@ const DIVISION = { }, { districtName: '西海岸新区', - name: '西海岸新区', + name: '西海岸新区(约4.1万)', districtCOde: '', latLng: { lat: 35.99, diff --git a/front/src/views/demandCenter/index.vue b/front/src/views/demandCenter/index.vue index 291e3558..2416925c 100644 --- a/front/src/views/demandCenter/index.vue +++ b/front/src/views/demandCenter/index.vue @@ -35,7 +35,7 @@ > diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 47d0dd5f..03d81ba4 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -10,10 +10,17 @@ }}
-
@@ -84,7 +97,7 @@ p-id="3062" width="40" height="40" - v-if="item.applyState == '通过'" + v-if="item.applyState == '通过' && item.type !== '应用资源'" style="margin-left: 10px" >
{{ item.shareType || '--' }} @@ -142,13 +157,28 @@
-
+
浏览量：{{ item.visits || 0 }}次
-
+
申请量：{{ item.applyCount || 0 }}次
-
+
数据量：{{ item.sjlCount || 0 }}
@@ -208,8 +238,11 @@ > 查看详情 - + 一键申请 ', typeObj); - if(!typeObj) { - selData.value = 'total'; + console.log('typeObj------------>', typeObj) + if (!typeObj) { + selData.value = 'total' } - if(typeObj && typeObj.type === '融合服务') { + if (typeObj && typeObj.type === '融合服务') { orderList.value = [ { value: 'collectCount', name: '收藏量', - orderType: 'DESC' + orderType: 'DESC', }, { value: 'create_date', name: '发布时间', - orderType: 'DESC' + orderType: 'DESC', }, { value: 'update_date', name: '更新时间', - orderType: 'DESC' + orderType: 'DESC', }, ] } - - }) let videoUrl = ref('') const options = reactive({ diff --git a/front/src/views/instructionManual/components/abilityDocTree.vue b/front/src/views/instructionManual/components/abilityDocTree.vue index 9bd66da0..b1874596 100644 --- a/front/src/views/instructionManual/components/abilityDocTree.vue +++ b/front/src/views/instructionManual/components/abilityDocTree.vue @@ -1,98 +1,120 @@ diff --git a/front/src/views/instructionManual/index.vue b/front/src/views/instructionManual/index.vue index b4adf50f..13a5a215 100644 --- a/front/src/views/instructionManual/index.vue +++ b/front/src/views/instructionManual/index.vue @@ -12,7 +12,7 @@
-
+
@@ -22,7 +22,6 @@
-
@@ -37,53 +36,58 @@ import flatten from '@turf/flatten' const titleList = ref([ { name: '新手指引', - className: 'newGuide' + className: 'newGuide', }, { name: '技术文档', - className: 'doc' - } + className: 'doc', + }, ]) const titleData = ref(titleList.value[0]) const clickData = ref({}) const treeArray = ref([]) const treeArrayCopy = ref([]) -let typeList = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']; - +let typeList = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库'] const treeClick = (item) => { - clickData.value = item; - console.log('clickData------------>', item); + clickData.value = item + console.log('clickData------------>', item) titleData.value = titleList.value[1] } const getTreeData = () => { - getDevelopDocTree({}).then((res) => { - console.log('res------文档树------>', res); - if (res.data.code !== 0) { - return message.error(res.data.msg) - } - treeArray.value = res.data.data || []; - treeArrayCopy.value = JSON.parse(JSON.stringify(treeArray.value)) - }).catch((err) => { - message.error(err) - }); + getDevelopDocTree({}) + .then((res) => { + console.log('res------文档树------>', res) + if (res.data.code !== 0) { + return message.error(res.data.msg) + } + treeArray.value = res.data.data || [] + treeArrayCopy.value = JSON.parse(JSON.stringify(treeArray.value)) + }) + .catch((err) => { + message.error(err) + }) } const changeName = (item) => { - titleData.value = item; + titleData.value = item if (item.name == '新手指引') { clickData.value = {} } if (item.name == '技术文档') { if (!clickData.value.title) { clickData.value = {} - treeArray.value = []; + treeArray.value = [] treeArrayCopy.value.map((val, i) => { let obj = Object.assign({}, val, { title: val.title, - show: (i === 0 && val.children && val.children.length > 0) || typeList.includes(val.title) ? true : false, - children: [] + show: + (i === 0 && val.children && val.children.length > 0) || + typeList.includes(val.title) + ? true + : false, + children: [], }) formData(val.children, obj) treeArray.value.push(obj) @@ -93,13 +97,16 @@ const changeName = (item) => { } } - const formData = (children = [], dataItem) => { children.map((item, index) => { let _obj = Object.assign({}, item, { title: item.title, - show: (index === 0 && item.children && item.children.length > 0) || typeList.includes(item.title) ? true : false, - children: [] + show: + (index === 0 && item.children && item.children.length > 0) || + typeList.includes(item.title) + ? true + : false, + children: [], }) if (item.children && item.children.length > 0) { formData(item.children, _obj) @@ -119,8 +126,6 @@ const getFirstData = (firstObj = {}) => { onMounted(() => { getTreeData() }) - - diff --git a/front/src/views/personalCenter/components/Demand.vue b/front/src/views/personalCenter/components/Demand.vue new file mode 100644 index 00000000..c81f92ef --- /dev/null +++ b/front/src/views/personalCenter/components/Demand.vue @@ -0,0 +1,216 @@ + + + + diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 8e13ed69..73ed4267 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -1,6 +1,6 @@