BUG修改

This commit is contained in:
a0049873 2022-07-21 15:36:01 +08:00
parent 10f3323676
commit 681dceaa47
5 changed files with 42 additions and 32 deletions

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-11 10:11:40
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-15 18:41:00
* @LastEditTime: 2022-07-21 15:03:51
* @Description: 告诉大家这是什么
-->
<!DOCTYPE html>
@ -44,8 +44,8 @@
// window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin';
// window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin';
// window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin';
window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
// window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin';
// WebSocket地址
window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket';

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 16:45:25
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-18 17:42:59
* @LastEditTime: 2022-07-21 15:09:22
* @Description: 告诉大家这是什么
-->
<!DOCTYPE html>
@ -49,7 +49,8 @@
window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
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.238:8888/renren-admin';
window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
window.SITE_CONFIG['websocketURL'] = '15.2.21.236: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';

View File

@ -1,8 +1,8 @@
<!--
* @Author: hisense.wuhongjian
* @Date: 2022-05-06 11:12:00
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-20 11:05:25
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-21 15:32:49
* @Description: 告诉大家这是什么
-->
<template>
@ -12,17 +12,36 @@
</a-config-provider>
</div>
</template>
<script>
<script setup>
import zhCN from 'ant-design-vue/es/locale/zh_CN'
import Cookies from 'js-cookie'
import { onBeforeUnmount } from 'vue'
import mybus from '@/myplugins/mybus'
export default {
name: 'App',
data() {
return {
locale: zhCN,
}
},
// export default {
// name: 'App',
// data() {
// return {
// ,
// }
// },
// }
const locale = zhCN
const token = Cookies.get('ucsToken')
console.log('token=================>', token)
var ws = new WebSocket(
`ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
)
// ws.send()
// onmessage
ws.onmessage = function (e) {
console.log('服务器返回的信息: ' + e.data)
mybus.emit('getMynotice')
}
onBeforeUnmount(() => {
// 4.,
ws.close()
})
</script>
<style lang="less">
@import '~@/vab/styles/vab.less';

View File

@ -122,7 +122,6 @@
import { mynotice } from '@/api/home'
import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home'
import Cookies from 'js-cookie'
import mybus from '@/myplugins/mybus'
const store = useStore()
const router = useRouter()
@ -286,17 +285,7 @@
// })
// }
// -- cookie
const token = Cookies.get('ucsToken')
console.log('token=================>', token)
var ws = new WebSocket(
`ws://15.2.21.238:8888/renren-admin/websocket?token=${token}`
)
// ws.send()
// onmessage
ws.onmessage = function (e) {
// console.log(': ' + e.data)
getMynotice()
}
onMounted(() => {
getSgcTotal().then((res) => {
// console.log('========================>', res.data.data.count)
@ -335,8 +324,6 @@
onBeforeUnmount(() => {
mybus.off('getSgcNum')
mybus.off('getMynotice')
// 4.,
ws.close()
})
</script>
<style lang="less" scoped>

View File

@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-07-12 09:42:44
* @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-18 17:54:55
* @LastEditTime: 2022-07-21 14:58:34
* @Description:我的申请 能力申请 查看详情
-->
<template>
@ -104,11 +104,14 @@
}}
</span>
</div>
<div class="btn" v-if="val.type == '组件服务'">技术文档</div>
<div></div>
<!-- <div class="btn" v-if="val.type == '组件服务'">技术文档</div> -->
</div>
<div class="ability-bottom">
<div class="dec">资源描述{{ val.description }}</div>
<div class="result">申请结果{{ val.applyState }}</div>
<div class="result">
申请结果{{ val.ended ? '审核完成' : '审核中' }}
</div>
</div>
</div>
</div>