Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
This commit is contained in:
gaoyuanwei
commit
3b7f8b745a
|
|
@ -28,10 +28,10 @@
|
|||
<!-- 站点配置 -->
|
||||
<script>
|
||||
window.SITE_CONFIG = {};
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
|
||||
// window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
|
||||
// window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
|
||||
// window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
|
||||
window.SITE_CONFIG['backUrl'] = 'http://15.72.183.90:8001';
|
||||
window.SITE_CONFIG['previewUrl'] = 'http://15.72.183.90:7008/';
|
||||
window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/document/#/devModelFile/';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin';
|
||||
window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// 包头
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://10.110.205.1:8001';
|
||||
|
|
@ -45,10 +45,10 @@
|
|||
// 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['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['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.238:8888/renren-admin';
|
||||
// window.SITE_CONFIG['POI_URL'] = 'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
|
||||
// 穿透版本
|
||||
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
|
||||
|
|
|
|||
|
|
@ -1,13 +1,22 @@
|
|||
/*
|
||||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2020-07-07 16:03:23
|
||||
<<<<<<< HEAD
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-07-07 17:30:10
|
||||
=======
|
||||
* @LastEditors: hisense.liangjunhua
|
||||
* @LastEditTime: 2022-07-07 17:41:25
|
||||
>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
|
||||
* @Description: 数据资源参数配置
|
||||
*/
|
||||
const newLocation = 'qingdao'
|
||||
// const newLocation = 'baotou'
|
||||
<<<<<<< HEAD
|
||||
// const newLocation = 'xihaian'
|
||||
=======
|
||||
// const newLocation = 'xihaian'
|
||||
>>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
|
||||
|
||||
// 数据资源数据
|
||||
const whoShow = {}
|
||||
|
|
|
|||
|
|
@ -113,31 +113,21 @@ const actions = {
|
|||
* @param {*} { commit, dispatch, state }
|
||||
* @returns
|
||||
*/
|
||||
async getUserInfo({ commit }) {
|
||||
const { data } = await getUserInfo()
|
||||
getUserInfo({ commit }) {
|
||||
return new Promise((resolve, reject)=>{
|
||||
getUserInfo().then( (res) =>{
|
||||
console.log('res', res)
|
||||
const data = res.data
|
||||
if (!data) {
|
||||
message.error(`验证失败，请重新登录...`)
|
||||
return false
|
||||
reject()
|
||||
}
|
||||
// debugger
|
||||
commit('setUsername', data.data.username)
|
||||
commit('setRole', data.data.roleIdList.length)
|
||||
commit('setUserId', data.data.id)
|
||||
// TODO 获取用户信息，后续执行部分操作
|
||||
// let { username, avatar, roles, ability } = data
|
||||
// if (username && roles && Array.isArray(roles)) {
|
||||
// dispatch('acl/setRole', roles, {
|
||||
// root: true,
|
||||
// })
|
||||
// if (ability && ability.length > 0)
|
||||
// dispatch('acl/setAbility', ability, {
|
||||
// root: true,
|
||||
// })
|
||||
// commit('setUsername', username)
|
||||
// commit('setAvatar', avatar)
|
||||
// } else {
|
||||
// message.error('用户信息接口异常')
|
||||
// }
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -114,10 +114,14 @@ instance.interceptors.response.use(
|
|||
location.reload()
|
||||
}, 1000)
|
||||
}
|
||||
debugger;
|
||||
response['Access-Control-Expose-Headers'] = 'redirect'
|
||||
const { code, message } = response.data
|
||||
if (response.headers.token) {
|
||||
setAccessToken(response.headers.token)
|
||||
debugger
|
||||
// setAccessToken(response.headers.token)
|
||||
// store.dispatch('user/getUserInfo')
|
||||
} else {
|
||||
if (response.headers.redirect) {
|
||||
// window.location.href = response.headers.redirect
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-04-01 17:23:11
|
||||
* @LastEditors: hisense.liangjunhua
|
||||
* @LastEditTime: 2022-06-29 09:54:19
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-07-07 18:15:38
|
||||
* @Description: 告诉大家这是什么
|
||||
*/
|
||||
/**
|
||||
|
|
@ -20,6 +20,7 @@ import {
|
|||
} from '@/config'
|
||||
import { setAccessToken, getAccessToken } from '@/utils/accessToken'
|
||||
router.beforeEach(async (to, from, next) => {
|
||||
// 初始化拦截
|
||||
// debugger
|
||||
// const SSOTOKEN = to.query.SSOToken
|
||||
// if (SSOTOKEN) {
|
||||
|
|
@ -29,11 +30,14 @@ router.beforeEach(async (to, from, next) => {
|
|||
// console.log('token', token)
|
||||
let hasToken = token || store.getters['user/accessToken']
|
||||
// debugger
|
||||
// 未开启登录拦截状态
|
||||
if (!loginInterception) hasToken = true
|
||||
// console.log('hasToken存在巨大问题', hasToken)
|
||||
debugger
|
||||
if (hasToken) {
|
||||
setAccessToken(hasToken)
|
||||
setAccessToken(token)
|
||||
await store.dispatch('user/getUserInfo')
|
||||
debugger
|
||||
next()
|
||||
} else {
|
||||
let accessRoutes = []
|
||||
|
|
@ -44,11 +48,17 @@ router.beforeEach(async (to, from, next) => {
|
|||
if (routesWhiteList.indexOf(to.path) !== -1) {
|
||||
next()
|
||||
} else {
|
||||
await store.dispatch('user/getUserInfo')
|
||||
store.dispatch('user/getUserInfo').then((res)=>{
|
||||
debugger
|
||||
next()
|
||||
})
|
||||
// if (recordRoute)
|
||||
// next({ path: '/login', query: { redirect: to.path }, replace: true })
|
||||
// else next({ path: '/login', replace: true })
|
||||
next()
|
||||
// debugger
|
||||
// setTimeout(()=>{
|
||||
// next()
|
||||
// }, 500)
|
||||
// window.open('http://www.baidu.com', '_self')
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,11 @@
|
|||
<div class="infrastructrue-tab">
|
||||
<div v-for="(item, index) in tabList" :key="index" class="tabBox">
|
||||
<b class="leftType">{{ item.title }}</b>
|
||||
<a-button @click="nullClick" v-if="item.title == '视频标签'">
|
||||
清空
|
||||
</a-button>
|
||||
<button @click="nullClick" v-if="item.title == '视频标签'">清空</button>
|
||||
<span
|
||||
v-for="itemContent in item.content"
|
||||
:key="itemContent"
|
||||
@click="tabClick(index, itemContent, item)"
|
||||
@click="tabClick(index, itemContent)"
|
||||
:class="
|
||||
clickList[index].content.indexOf(itemContent.labelName) != -1 ||
|
||||
clickList[index].content.indexOf(itemContent) != -1
|
||||
|
|
@ -117,8 +115,8 @@
|
|||
</template>
|
||||
<script setup>
|
||||
import VideoSurveillance from '@/views/home/videoSurveillance'
|
||||
import { getCategoryTreePage } from '@/api/personalCenter'
|
||||
import { dataType } from 'element-plus/es/components/table-v2/src/common'
|
||||
// import { getCategoryTreePage } from '@/api/personalCenter'
|
||||
// import { dataType } from 'element-plus/es/components/table-v2/src/common'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { message } from 'ant-design-vue'
|
||||
import { ref, reactive, onMounted } from 'vue'
|
||||
|
|
@ -245,7 +243,7 @@
|
|||
clickList.value.push(params)
|
||||
})
|
||||
mybus.off('tranferToList')
|
||||
mybus.on('tranferToList', (data) => {
|
||||
mybus.on('tranferToList', () => {
|
||||
console.log('获取到的列表数据')
|
||||
})
|
||||
}
|
||||
|
|
@ -255,7 +253,6 @@
|
|||
let tableHeight = ref('600')
|
||||
//tab切换点击事件
|
||||
const tabClick = (indexFather, name) => {
|
||||
console.log(clickList.value, indexFather, name)
|
||||
selectedRowKeys.value = []
|
||||
selectedList.value = []
|
||||
if (clickList.value[indexFather].content.indexOf(name) != -1) {
|
||||
|
|
@ -405,10 +402,10 @@
|
|||
message.error('请选择需要申请的数据')
|
||||
}
|
||||
}
|
||||
// 添加至购物车
|
||||
const addShopCar = () => {
|
||||
console.log('添加至购物车')
|
||||
}
|
||||
// // 添加至购物车
|
||||
// const addShopCar = () => {
|
||||
// console.log('添加至购物车')
|
||||
// }
|
||||
const getCamera = () => {
|
||||
console.log('初始化调用')
|
||||
getCameraByParentId(mapSearchParam.value).then((res) => {
|
||||
|
|
@ -455,7 +452,7 @@
|
|||
key: 'channelId',
|
||||
},
|
||||
])
|
||||
const allClick = ref([])
|
||||
// const allClick = ref([])
|
||||
const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
|
||||
console.log('hahhahah', record, selected, selectedRows, nativeEvent)
|
||||
if (selected) {
|
||||
|
|
@ -551,19 +548,6 @@
|
|||
}
|
||||
.tabBox {
|
||||
margin-bottom: 0.16rem;
|
||||
:deep(.ant-btn:active) {
|
||||
color: unset;
|
||||
border-color: unset;
|
||||
}
|
||||
:deep(.ant-btn) {
|
||||
margin-left: 10px;
|
||||
border: 1px solid #666666;
|
||||
color: #666666;
|
||||
border-radius: 10px;
|
||||
}
|
||||
:deep(.ant-btn:hover) {
|
||||
color: #40a9ff;
|
||||
}
|
||||
}
|
||||
.tabBox:last-of-type {
|
||||
margin-bottom: 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue