修复了广西联通的一些bug
This commit is contained in:
parent
f92db374b1
commit
1941d45586
@ -42,6 +42,7 @@ if (process.env.NODE_ENV == 'development') {
|
|||||||
// axios.defaults.baseURL = 'http://124.71.178.44:100/'
|
// axios.defaults.baseURL = 'http://124.71.178.44:100/'
|
||||||
// tag: 本地
|
// tag: 本地
|
||||||
axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
|
axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
|
||||||
|
// axios.defaults.baseURL = 'http://120.196.217.6:7000/';
|
||||||
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
|
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
|
||||||
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
|
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
|
||||||
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
|
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
<div style="margin-left:10px">
|
<div style="margin-left:10px">
|
||||||
<p>{{ $store.state.userInfo.companyName }}</p>
|
<p>{{ $store.state.userInfo.companyName }}</p>
|
||||||
<!-- 横琴和鹤洲不需要客服电话-->
|
<!-- 横琴和鹤洲不需要客服电话-->
|
||||||
<!-- <p>客服电话:{{$store.state.userInfo.customerServicePhone}}</p> -->
|
<p>客服电话:{{$store.state.userInfo.customerServicePhone}}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="flex2" style="margin-top:20px">
|
<!-- <div class="flex2" style="margin-top:20px">
|
||||||
@ -216,7 +216,7 @@ export default {
|
|||||||
window.open("/equipmentCenter.html#/equipmentCenterIndx", "_blank");
|
window.open("/equipmentCenter.html#/equipmentCenterIndx", "_blank");
|
||||||
},
|
},
|
||||||
goto5(){
|
goto5(){
|
||||||
window.open("/firm/projectManage#/firm/projectManage", "_self");
|
window.open("/index.html#/firm/projectManage", "_self");
|
||||||
},
|
},
|
||||||
loginOut() {
|
loginOut() {
|
||||||
this.$store.commit("setUserInfo", null);
|
this.$store.commit("setUserInfo", null);
|
||||||
@ -268,7 +268,7 @@ export default {
|
|||||||
}else{
|
}else{
|
||||||
window.open("/#/projectList", "_self");
|
window.open("/#/projectList", "_self");
|
||||||
}
|
}
|
||||||
}if( type == 5 || type == 6 || type == 7 ){
|
}if( type == 5 || type == 6 ){
|
||||||
window.open("/index.html#/projectIndex", "_self");
|
window.open("/index.html#/projectIndex", "_self");
|
||||||
}else {
|
}else {
|
||||||
routeUrl = this.$router.resolve({
|
routeUrl = this.$router.resolve({
|
||||||
|
|||||||
@ -29,6 +29,7 @@ const routes2 = [
|
|||||||
name: '授权',
|
name: '授权',
|
||||||
component: () => import('../views/home/authorization.vue')
|
component: () => import('../views/home/authorization.vue')
|
||||||
},
|
},
|
||||||
|
// 中建四局的登录页面
|
||||||
// {
|
// {
|
||||||
// path: '/',
|
// path: '/',
|
||||||
// name: 'HomeTwo',
|
// name: 'HomeTwo',
|
||||||
@ -1453,6 +1454,7 @@ const routes2 = [
|
|||||||
component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'),
|
component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'),
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
// 中建四局的看板
|
||||||
// children: [{
|
// children: [{
|
||||||
// path: 'index',
|
// path: 'index',
|
||||||
// name: '数据看板-首页概览',
|
// name: '数据看板-首页概览',
|
||||||
|
|||||||
@ -619,6 +619,7 @@ export default {
|
|||||||
getSafeData() {
|
getSafeData() {
|
||||||
selectWorkerSafeEducationStatisticsApi({ sn: this.searchsn }).then(
|
selectWorkerSafeEducationStatisticsApi({ sn: this.searchsn }).then(
|
||||||
(res) => {
|
(res) => {
|
||||||
|
console.log('培训学校',res)
|
||||||
var xData = [],
|
var xData = [],
|
||||||
yData1 = [],
|
yData1 = [],
|
||||||
yData2 = [];
|
yData2 = [];
|
||||||
@ -650,6 +651,7 @@ export default {
|
|||||||
//设备在线统计
|
//设备在线统计
|
||||||
getDevCountStatictis() {
|
getDevCountStatictis() {
|
||||||
getProjectDevStatisticsCountApi({ sn: this.searchsn }).then((res) => {
|
getProjectDevStatisticsCountApi({ sn: this.searchsn }).then((res) => {
|
||||||
|
console.log('设备在线统计',res.result.videoList)
|
||||||
if (res.result) {
|
if (res.result) {
|
||||||
var arr3 = res.result.environmentList;
|
var arr3 = res.result.environmentList;
|
||||||
var arr2 = res.result.ufaceList;
|
var arr2 = res.result.ufaceList;
|
||||||
|
|||||||
@ -209,6 +209,7 @@ export default {
|
|||||||
// return timer;
|
// return timer;
|
||||||
},
|
},
|
||||||
getTypeName(val){
|
getTypeName(val){
|
||||||
|
// console.log('点击',val)
|
||||||
let text = ""
|
let text = ""
|
||||||
this.alarmTypeArr.forEach(item=>{
|
this.alarmTypeArr.forEach(item=>{
|
||||||
if(item.value == val){
|
if(item.value == val){
|
||||||
|
|||||||
@ -172,11 +172,15 @@
|
|||||||
<div class="dialog_content">
|
<div class="dialog_content">
|
||||||
<!-- default-expand-all -->
|
<!-- default-expand-all -->
|
||||||
<!-- <div>项目模块</div> -->
|
<!-- <div>项目模块</div> -->
|
||||||
|
<!-- <div>
|
||||||
|
<el-checkbox v-model="checkAll" @change="selectAll">全选</el-checkbox>
|
||||||
|
</div> -->
|
||||||
<el-tree ref="tree"
|
<el-tree ref="tree"
|
||||||
node-key="authorityId"
|
node-key="authorityId"
|
||||||
:props="props"
|
:props="props"
|
||||||
:data="projectMenus"
|
:data="projectMenus"
|
||||||
show-checkbox
|
show-checkbox
|
||||||
|
|
||||||
@check-change="handleCheckChange"
|
@check-change="handleCheckChange"
|
||||||
>
|
>
|
||||||
<span class="custom-tree-node" slot-scope="{ node, data }">
|
<span class="custom-tree-node" slot-scope="{ node, data }">
|
||||||
@ -233,6 +237,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
checkAll:false, //是否全选
|
||||||
addEditForm: {
|
addEditForm: {
|
||||||
roleName: "",
|
roleName: "",
|
||||||
roleDesc: "",
|
roleDesc: "",
|
||||||
@ -488,10 +493,22 @@ export default {
|
|||||||
// this.pagInfo.pageNo = val;
|
// this.pagInfo.pageNo = val;
|
||||||
// this.getList();
|
// this.getList();
|
||||||
// },
|
// },
|
||||||
handleCheckChange(data, checked, indeterminate) {
|
handleCheckChange(e) {
|
||||||
|
console.log('eeee',e)
|
||||||
// console.log(data, checked, indeterminate);
|
// console.log(data, checked, indeterminate);
|
||||||
console.log(this.$refs.tree.getCheckedKeys());
|
// console.log('选择',this.$refs.tree.getCheckedKeys());
|
||||||
}
|
},
|
||||||
|
// 全选反选
|
||||||
|
// selectAll(){
|
||||||
|
// if(this.checkAll){
|
||||||
|
// console.log('111111',this.$refs)
|
||||||
|
// // this.$refs.tree.setCheckedNodes(this.projectMenus);
|
||||||
|
// }else{
|
||||||
|
// this.$nextTick(()=>{
|
||||||
|
// this.$refs.tree.setCheckedNodes([])
|
||||||
|
// })
|
||||||
|
// }
|
||||||
|
// },
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user