diff --git a/README.md b/README.md deleted file mode 100644 index e69de29b..00000000 diff --git a/back/public/index.html b/back/public/index.html index 1ad5a71f..a85aae63 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-29 09:54:59 + * @LastEditTime: 2022-12-29 17:34:35 * @Description: 告诉大家这是什么 --> @@ -39,7 +39,8 @@ window.SITE_CONFIG['previewUrl'] = _global.config.previewUrl; window.SITE_CONFIG['apiURL'] = _global.config.apiURL; // WebSocket地址 - window.SITE_CONFIG['socketURL'] =_global.config.socketURL; + // window.SITE_CONFIG['socketURL'] =_global.config.socketURL; + window.SITE_CONFIG['websocketURL'] = _global.config.websocketURL diff --git a/back/src/App.vue b/back/src/App.vue index 36cb8b9d..482fc825 100644 --- a/back/src/App.vue +++ b/back/src/App.vue @@ -24,7 +24,7 @@ line-height: 32px !important; justify-content: center !important; min-width: 80px !important; - border-radius:2px !important; + border-radius:2px !important; } */ /* .el-button--primary { vertical-align: middle !important; @@ -34,7 +34,7 @@ line-height: 32px !important; justify-content: center !important; min-width: 80px !important; - border-radius:2px !important; + border-radius:2px !important; } */ + + + + + \ No newline at end of file diff --git a/back/src/views/modules/ability/assignedScene/city-add.vue b/back/src/views/modules/ability/assignedScene/city-add.vue new file mode 100644 index 00000000..ef905e15 --- /dev/null +++ b/back/src/views/modules/ability/assignedScene/city-add.vue @@ -0,0 +1,839 @@ + + + + + + + + \ No newline at end of file diff --git a/back/src/views/modules/ability/assignedScene/components/ability-add.vue b/back/src/views/modules/ability/assignedScene/components/ability-add.vue new file mode 100644 index 00000000..cb8a5fc5 --- /dev/null +++ b/back/src/views/modules/ability/assignedScene/components/ability-add.vue @@ -0,0 +1,239 @@ + + + \ No newline at end of file diff --git a/back/src/views/modules/ability/assignedScene/components/scene-one-input.vue b/back/src/views/modules/ability/assignedScene/components/scene-one-input.vue index 9664655f..2b906467 100644 --- a/back/src/views/modules/ability/assignedScene/components/scene-one-input.vue +++ b/back/src/views/modules/ability/assignedScene/components/scene-one-input.vue @@ -1,20 +1,39 @@ @@ -115,6 +134,31 @@ export default { } \ No newline at end of file diff --git a/back/src/views/modules/ability/assignedScene/index.vue b/back/src/views/modules/ability/assignedScene/index.vue index f5de944a..d1165cc4 100644 --- a/back/src/views/modules/ability/assignedScene/index.vue +++ b/back/src/views/modules/ability/assignedScene/index.vue @@ -1,6 +1,21 @@ diff --git a/front/src/views/capacitySquare/components/application.vue b/front/src/views/capacitySquare/components/application.vue index 098d9882..16db8334 100644 --- a/front/src/views/capacitySquare/components/application.vue +++ b/front/src/views/capacitySquare/components/application.vue @@ -32,7 +32,11 @@ {{ val }} + +
+ 共{{total}}项 +
@@ -64,6 +68,7 @@ const area = ref(null) const typeName = ref('全市') const typeName2 = ref('全部') + const total = ref(0) if (selectArea && selectArea !== '全部') { typeName2.value = selectArea area.value = selectArea @@ -131,6 +136,7 @@ if (res.data.data.total.length < 9) { dom.removeEventListener('scroll', viewMonitor, true) } + total.value= res.data.data.total // appList res.data.data.appList.map((val) => { if (!val.pic) { @@ -198,6 +204,12 @@ } .application { padding: 0 0.15rem; + .bottom1 { + margin-top: 67px; + margin-left: 928px; + color: #fff; + font-size: 0.2rem; + } .select { margin: 0.1rem 0 0.1rem 0.2rem; color: #fff; @@ -225,6 +237,7 @@ background-size: 100%; } } + .bottom { cursor: pointer; position: absolute; diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue index 535c36ab..78f196be 100644 --- a/front/src/views/demandCenter/demandDetails.vue +++ b/front/src/views/demandCenter/demandDetails.vue @@ -388,7 +388,13 @@ } } const closeMain = () => { - window.history.go(-1) + const showKey = router.currentRoute.value.query.showKey + router.push({ + path: '/demandCenter', + query: { + toShowKey:showKey + }, + }) } onMounted(() => { // const formData = computed(() => store.getters['home/demandDetailsData']) diff --git a/front/src/views/demandCenter/index.vue b/front/src/views/demandCenter/index.vue index 3240310d..22b0e3d5 100644 --- a/front/src/views/demandCenter/index.vue +++ b/front/src/views/demandCenter/index.vue @@ -175,6 +175,7 @@ const showDetail = (item) => { path: '/demandDetails', query: { id: item.id, + showKey:selectedKeys.value, }, }) } @@ -186,6 +187,10 @@ const toView = () => { } onMounted(() => { + const toShowKey = router.currentRoute.value.query.toShowKey + if(toShowKey){ + selectedKeys.value=toShowKey + } const params = { page: pageNum.value, limit: pageSize.value, diff --git a/front/src/views/home/components/H5Player.vue b/front/src/views/home/components/H5Player.vue index 36b900aa..0755e2a6 100644 --- a/front/src/views/home/components/H5Player.vue +++ b/front/src/views/home/components/H5Player.vue @@ -188,6 +188,9 @@ // that.pausePlay(iWndIndex) if (!that.unStopable) { setTimeout(() => { + that.videoDom = that.$refs.video333.querySelector('video') || {} + debugger + that.videoDom.pause() // that.exportCanvasAsPNG('12preview_playCanvas0', 'test') }, 0) @@ -234,7 +237,7 @@ }, (e) => { console.error(e) - // message.error('错误代码:' + e) + message.error('网络繁忙,请稍后再试') } ) }, diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index 2b51a89d..ba178039 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -92,9 +92,12 @@
查看更多
- +