diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue
index b1601b32..e6ddedec 100644
--- a/back/src/views/modules/ability/IntegratedServices-add.vue
+++ b/back/src/views/modules/ability/IntegratedServices-add.vue
@@ -53,10 +53,8 @@
组合能力
-
+ :modalType="modalType" ref="jcssDom">
+ :modalType="modalType" ref="jcssDom">
', data);
this.dataForm = data;
this.$nextTick(() => {
for (const key in this.refsParseArray) {
@@ -369,7 +371,7 @@ export default {
let _imgObj = data.fuseAttrList.find(v => v.attrType == '服务图片') || {};
this.imageUrl = _imgObj.attrValue;
- // 组合能力
+ // 组合能力--特殊处理
Object.keys(this.getListParams).map(k => {
let arr = data.fuseResourceList.filter(v => v.type == k);
let arr2 = [];
@@ -391,14 +393,9 @@ export default {
file.type === 'image/jpeg' ||
file.type === 'image/jpg' ||
file.type === 'image/png'
- // const isLt2M = file.size / 1024 / 1024 < 2
-
if (!isImage) {
this.$message.error('上传头像图片只能是 jpg/png 格式!')
}
- // if (!isLt2M) {
- // this.$message.error('上传头像图片大小不能超过 2MB!')
- // }
return isImage
},
addUploadRemoveFile(file, fileList) {
@@ -410,14 +407,10 @@ export default {
file.type === 'image/jpeg' ||
file.type === 'image/jpg' ||
file.type === 'image/png'
- // const isLt2M = file.size / 1024 / 1024 < 2
if (!isImage) {
this.$message.error('上传头像图片只能是 jpg/png 格式!')
}
- // if (!isLt2M) {
- // this.$message.error('上传头像图片大小不能超过 2MB!')
- // }
return isImage
},
editUploadRemoveFile(file, fileList) {
@@ -429,7 +422,6 @@ export default {
return this.$message.error(res.msg)
}
this.imageUrl = res.data
- // this.imageUrl = URL.createObjectURL(file.raw);
},
},
beforeDestroy() {
diff --git a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
index 6c78daa0..bf8d6c71 100644
--- a/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
+++ b/back/src/views/modules/ability/assignedScene/components/infrastructure-modal.vue
@@ -2,7 +2,8 @@
{{ type }}
-
添加
+
{{ modalType == 'add' ? '添加' : '编辑' }}
+
@@ -34,8 +35,8 @@
关键词
-
+
搜索
@@ -59,8 +60,8 @@
-
@@ -75,7 +76,7 @@
-
+
@@ -98,6 +99,10 @@ export default {
type: String,
default: "基础设施"
},
+ modalType: {
+ type: String,
+ default: 'add'
+ }
},
data() {
const getYunList = () => {
@@ -109,9 +114,7 @@ export default {
return {
showKey: 0,
showModal: false,
- transferData: [], // 穿梭框所有数据
selectedArray: [], // 已选择的数据id
- allData: [],
displayList: [], // 用于展示的list
btnList: ['视频资源', '云资源', '感知资源'],
showText: {
@@ -133,35 +136,41 @@ export default {
list: []
},
],
- activeBtn: '视频资源',
- checkList: [],
currentList: [],
dataListLoading: false,
dataList: [],
pageData: {
- limit: 10,
- page: 1,
total: 0,
},
cameraName: '',
+ postData: {},
+ activeBtn: '视频资源',
+ checkList: [],
+ searchData: {
+ cameraName: '',
+ pageSize: 10,
+ pageNum: 1,
+ parentId: ''
+ },
+ dataFormCopy: {}
}
},
watch: {
async showModal(newVal) {
if (newVal) {
- await this.getData();
// 默认选中复选框
this.$nextTick(() => {
this.selectCheckbox()
})
+ if (this.modalType == 'add') {
+ this.clear()
+ }
}
}
},
mounted() {
// 获取视频资源
this.getVideoBtn()
- // 获取列表
- this.getData()
},
methods: {
selectCheckbox() {
@@ -176,24 +185,24 @@ export default {
})
if (list.length) {
list.forEach((row) => {
- this.$refs.dataTable.toggleRowSelection(row, true)
+ this.$refs.dataTable && this.$refs.dataTable.toggleRowSelection(row, true)
})
}
}
},
+ showAction() {
+ this.showModal = true;
+ },
+ // 详情
async getDataInfo(dataForm) {
+ this.modalType == 'edit'
+ this.dataFormCopy = dataForm;
await this.getVideoBtn();
- await this.getData();
let arr = [];
let attrValue = dataForm.fuseResourceList.filter(v => v.type == this.type);
if (attrValue.length > 0) {
attrValue.map(val => {
- let item = this.dataList.find(v => v.idtCameraChannel == val.resourceId) || {};
- let _obj = {
- type: val.type,
- idtCameraChannel: val.resourceId,
- name: item.channelName
- };
+ let _obj = Object.assign({}, val, val.resource)
arr.push(_obj);
});
}
@@ -201,28 +210,31 @@ export default {
this.displayList = JSON.parse(JSON.stringify(arr));
// 已选中
this.selectedArray = arr.map(v => v.idtCameraChannel);
- },
- handleShowModal() {
- this.showModal = true;
+ this.dataList = JSON.parse(JSON.stringify(arr));
+ this.pageData.total = arr.length;
+ // 默认选中复选框
+ this.$nextTick(() => {
+ this.selectCheckbox()
+ })
},
// 点击复选框
dataListSelectionChangeHandle(data) {
this.selectedArray = data;
},
- pageCurrentChangeHandle(page) {
- this.pageData.page = page;
+ pageCurrentChangeHandle(pageNum) {
+ this.searchData.pageNum = pageNum;
this.getData()
},
- pageSizeChangeHandle(limit) {
- this.pageData.limit = limit;
+ pageSizeChangeHandle(pageSize) {
+ this.searchData.pageSize = pageSize;
this.getData()
},
changeBtn(btn) {
this.activeBtn = btn;
+ this.currentList = this.tabData.find(v => v.tabName == btn).list || [];
this.checkList = [];
- this.cameraName = '';
+ this.searchData.cameraName = '';
this.getData()
- this.currentList = this.tabData.find(v => v.tabName == btn).list || []
},
// 获取视频标签列表
getVideoBtn() {
@@ -234,7 +246,12 @@ export default {
}
this.tabData[0].list = res.data.data || [];
- this.changeBtn(this.activeBtn)
+ this.$nextTick(() => {
+ this.currentList = this.tabData.find(v => v.tabName == this.activeBtn).list || [];
+ if (this.modalType == 'add') {
+ this.clear()
+ }
+ })
}).catch(err => {
reject(err)
this.$message.error(err);
@@ -255,23 +272,19 @@ export default {
} else {
this.checkList.push(item.labelCode)
}
- console.log('this.checkList------------>', this.checkList);
- this.getData()
+ this.$nextTick(() => {
+ this.getData()
+ })
},
// 获取列表
- getData(parentId = '') {
- this.allData = [];
- let postData = {
- parentId: parentId,
- cameraName: this.cameraName,
+ getData() {
+ let postData = Object.assign({}, {
checkStatus: 1,
- pageNum: this.pageData.page,
- pageSize: this.pageData.limit,
gpsX: '',
gpsY: '',
radius: '',
labelCodes: this.checkList.join(),
- }
+ }, this.searchData);
return new Promise((resolve, reject) => {
this.$http.get('/api/project/selectByParentIdNew', { params: postData }).then(res => {
resolve(res)
@@ -285,10 +298,9 @@ export default {
this.$message.error(err);
})
})
-
},
changeParentId(parentId) {
- console.log('parentId------------>', parentId);
+ this.searchData.parentId = parentId;
this.getData(parentId)
},
confirmSubmitHandle() {
@@ -301,7 +313,7 @@ export default {
this.dataList.map(v => {
if (idtCameraChannelArray.includes(v.idtCameraChannel)) {
this.displayList.push({
- name: v.channelName
+ channelName: v.channelName
})
}
})
@@ -312,16 +324,12 @@ export default {
},
close() {
this.showModal = false;
- this.cameraName = ''
+ this.searchData.cameraName = ''
this.selectedArray = [];
- this.allData = [];
- this.transferData = [];
this.$emit('closeModal');
},
clear() {
- this.cameraName = ''
- this.selectedArray = [];
- this.getData()
+ this.changeBtn('视频资源')
},
}
diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue
index 4dae6e13..04adfb58 100644
--- a/back/src/views/modules/workBench/components/bottom-view.vue
+++ b/back/src/views/modules/workBench/components/bottom-view.vue
@@ -167,7 +167,8 @@ export default {
.dynamic-box {
width: 770px;
- height: 335px;
+ height: 285px;
+ position: relative;
}
.dynamicView {
@@ -223,6 +224,9 @@ export default {
width: 100%;
color: #2b2b2b;
font-size: 14px;
+ position: absolute;
+ right: 15px;
+ bottom: 10px;
}
.recommendView {
diff --git a/front/public/index.html b/front/public/index.html
index 77bd069e..b244c384 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
@@ -48,18 +48,17 @@
// window.SITE_CONFIG['websocketURL'] = '15.2.21.243: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://10.134.135.9:9797';
- // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
- // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
- // window.SITE_CONFIG['websocketURL'] = '10.134.135.9:8888/renren-admin';
- // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
+ window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
+ window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+ window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
+ window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
// 开发
- window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
- window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
- window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
- window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
- window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
- window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin';
+ // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
+ // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
+ // window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/';
+ // window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/';
+ // window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin';
+ // window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin';
// window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 穿透版本
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 8b559241..d1e42258 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-09 11:46:27
+ * @LastEditTime: 2022-08-06 10:43:53
* @Description: 数据资源参数配置
*/
const newLocation = 'qingdao'
diff --git a/front/src/api/home.js b/front/src/api/home.js
index 417b6e6e..ca2b548a 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-01 19:19:40
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-18 16:24:44
+ * @LastEditTime: 2022-08-09 10:37:31
* @Description: 告诉大家这是什么
*/
import request from '@/utils/request'
@@ -370,3 +370,11 @@ export function getDevelopDocTree(params) {
params,
})
}
+// 能力广场 应用资源
+export function selectAppList(params) {
+ return request({
+ url: '/resource/selectAppList',
+ method: 'get',
+ params,
+ })
+}
diff --git a/front/src/assets/capacitySquare/algorithm-bg.png b/front/src/assets/capacitySquare/algorithm-bg.png
new file mode 100644
index 00000000..f33b9a0a
Binary files /dev/null and b/front/src/assets/capacitySquare/algorithm-bg.png differ
diff --git a/front/src/assets/capacitySquare/algorithm-photo.jpg b/front/src/assets/capacitySquare/algorithm-photo.jpg
new file mode 100644
index 00000000..f805185d
Binary files /dev/null and b/front/src/assets/capacitySquare/algorithm-photo.jpg differ
diff --git a/front/src/assets/capacitySquare/algorithm-photo2.jpg b/front/src/assets/capacitySquare/algorithm-photo2.jpg
new file mode 100644
index 00000000..1446ca86
Binary files /dev/null and b/front/src/assets/capacitySquare/algorithm-photo2.jpg differ
diff --git a/front/src/assets/capacitySquare/algorithm-title-bg.png b/front/src/assets/capacitySquare/algorithm-title-bg.png
new file mode 100644
index 00000000..47760e80
Binary files /dev/null and b/front/src/assets/capacitySquare/algorithm-title-bg.png differ
diff --git a/front/src/assets/capacitySquare/backShop.png b/front/src/assets/capacitySquare/backShop.png
new file mode 100644
index 00000000..66e7d34b
Binary files /dev/null and b/front/src/assets/capacitySquare/backShop.png differ
diff --git a/front/src/assets/capacitySquare/bg.png b/front/src/assets/capacitySquare/bg.png
new file mode 100644
index 00000000..09fba2b3
Binary files /dev/null and b/front/src/assets/capacitySquare/bg.png differ
diff --git a/front/src/assets/capacitySquare/bt-bg.png b/front/src/assets/capacitySquare/bt-bg.png
new file mode 100644
index 00000000..47760e80
Binary files /dev/null and b/front/src/assets/capacitySquare/bt-bg.png differ
diff --git a/front/src/assets/capacitySquare/header-bg.png b/front/src/assets/capacitySquare/header-bg.png
new file mode 100644
index 00000000..32d0ab52
Binary files /dev/null and b/front/src/assets/capacitySquare/header-bg.png differ
diff --git a/front/src/assets/capacitySquare/header-light.png b/front/src/assets/capacitySquare/header-light.png
new file mode 100644
index 00000000..5dc92143
Binary files /dev/null and b/front/src/assets/capacitySquare/header-light.png differ
diff --git a/front/src/assets/capacitySquare/select-bg.png b/front/src/assets/capacitySquare/select-bg.png
new file mode 100644
index 00000000..7fce5677
Binary files /dev/null and b/front/src/assets/capacitySquare/select-bg.png differ
diff --git a/front/src/assets/capacitySquare/select-light1.png b/front/src/assets/capacitySquare/select-light1.png
new file mode 100644
index 00000000..4085d06d
Binary files /dev/null and b/front/src/assets/capacitySquare/select-light1.png differ
diff --git a/front/src/assets/capacitySquare/select-light2.png b/front/src/assets/capacitySquare/select-light2.png
new file mode 100644
index 00000000..4c995c22
Binary files /dev/null and b/front/src/assets/capacitySquare/select-light2.png differ
diff --git a/front/src/assets/capacitySquare/webfont.ttf b/front/src/assets/capacitySquare/webfont.ttf
new file mode 100644
index 00000000..5fafbad6
Binary files /dev/null and b/front/src/assets/capacitySquare/webfont.ttf differ
diff --git a/front/src/assets/capacitySquare/yyzy.jpg b/front/src/assets/capacitySquare/yyzy.jpg
new file mode 100644
index 00000000..e282e231
Binary files /dev/null and b/front/src/assets/capacitySquare/yyzy.jpg differ
diff --git a/front/src/assets/home/abilitysquare.png b/front/src/assets/home/abilitysquare.png
new file mode 100644
index 00000000..e7356f6c
Binary files /dev/null and b/front/src/assets/home/abilitysquare.png differ
diff --git a/front/src/router/index.js b/front/src/router/index.js
index 729ba193..64493985 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -64,6 +64,15 @@ export const constantRoutes = [
icon: 'error-warning-line',
},
},
+ {
+ path: '/capacitySquare',
+ name: 'capacitySquare',
+ component: () => import('@/views/capacitySquare'),
+ meta: {
+ title: '能力广场',
+ icon: 'error-warning-line',
+ },
+ },
{
path: '/mapTest',
name: 'mapTest',
diff --git a/front/src/views/capacitySquare/components/algorithm.vue b/front/src/views/capacitySquare/components/algorithm.vue
new file mode 100644
index 00000000..dadd7f2d
--- /dev/null
+++ b/front/src/views/capacitySquare/components/algorithm.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ {{ item.name }}
+ {{ item.deptName }}
+
+
+
+
+
+
+
+
+
diff --git a/front/src/views/capacitySquare/components/application.vue b/front/src/views/capacitySquare/components/application.vue
new file mode 100644
index 00000000..9e253de7
--- /dev/null
+++ b/front/src/views/capacitySquare/components/application.vue
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+
+
+
{{ item.name }}
+
{{ item.deptName || '--' }}
+
+
+
+
+
+
+
diff --git a/front/src/views/capacitySquare/components/layer.vue b/front/src/views/capacitySquare/components/layer.vue
new file mode 100644
index 00000000..78a33f3c
--- /dev/null
+++ b/front/src/views/capacitySquare/components/layer.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ {{ item.name }}
+ {{ item.deptName }}
+
+
+
+
+
+
+
+
+
diff --git a/front/src/views/capacitySquare/index.vue b/front/src/views/capacitySquare/index.vue
new file mode 100644
index 00000000..42469bc4
--- /dev/null
+++ b/front/src/views/capacitySquare/index.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+
diff --git a/front/src/views/newHome/components/WorkDynamics.vue b/front/src/views/newHome/components/WorkDynamics.vue
index f4d6907e..57c58253 100644
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@@ -113,6 +113,37 @@
+
@@ -142,6 +173,7 @@
abilityToTypeFunctionData.value = item
}
let abilityToType = ref(['组件服务', '应用资源'])
+ let abilitySquare = ref(['智能算法', '图层服务', '应用资源'])
let componentType = ref([
'智能算法',
'图层服务',
@@ -154,6 +186,11 @@
const showModal = () => {
visible.value = true
}
+ // 能力广场
+ const visibleAbilitySquare = ref(false)
+ const showAbilitySquare = () => {
+ visibleAbilitySquare.value = true
+ }
let componentTypeValueOld = ref('')
function componentTypeValueFunction(item) {
if (componentTypeValueOld.value != item) {
@@ -252,6 +289,28 @@
watch(abilityToTypeFunctionData, () => {
componentTypeValue.value = ''
})
+ // 能力广场
+ const handleOkAbilitySquare = (e) => {
+ let snumSquare = ref({})
+ snumSquare.value = {
+ abilityToType: abilitySquareFunctionData.value,
+ }
+ const applypage = router.resolve({
+ path: '/capacitySquare', // 跳转的页面路由
+ query: snumSquare.value,
+ })
+ window.open(applypage.href, '_blank')
+ console.log(e, abilitySquareFunctionData.value, 'hahhaha')
+ visibleAbilitySquare.value = false
+ abilitySquareFunctionData.value = '智能算法'
+ }
+ let abilitySquareFunctionData = ref('智能算法')
+ function abilitySquareFunction(item) {
+ abilitySquareFunctionData.value = item
+ }
+ function handlecancelAbilitySquare() {
+ abilitySquareFunctionData.value = '智能算法'
+ }