admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.0.0.60/dhp/zhgdyun into dev-xiaole

Browse Source
This commit is contained in:
骆乐 2022-07-06 10:38:19 +08:00
commit 4d98dab01d
4 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/assets/js/http.js
View File

@ -44,6 +44,7 @@ if (process.env.NODE_ENV == 'development') {
// tag: 本地
axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌二期
// axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
// axios.defaults.baseURL = 'http://120.196.217.6:7000/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
@ -78,13 +79,11 @@ else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = window.location.protocol + "//" + host + "/"
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
// axios.defaults.baseURL = 'http://192.168.34.125:6023/';
axios.defaults.baseURL = 'http://139.9.66.234:8/'
// axios.defaults.baseURL = 'http://139.9.66.234:8/'
// axios.defaults.baseURL = 'http://192.168.34.148:6023/
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
}
// axios.defaults.baseURL = 'http://139.9.66.234:8/'
// tag: 河南
if (COMPANY == 'henan') {
axios.defaults.baseURL = 'http://124.71.178.44:100/'

20
src/pages/equipmentCenter/equipmentCenter.js
View File

@ -103,19 +103,19 @@ if (COMPANY == 'xingxuan') {
router.push(companyModule[0].modulePath);
break;
case 5:
if (data.styleType == 1 || !data.styleType) {
router.push("/projectIndex");
} else {
router.push("/projectV2/taskList");
}
// if (data.styleType == 1 || !data.styleType) {
// router.push("/projectIndex");
// } else {
// router.push("/projectV2/taskList");
// }
store.commit("setProjectSn", data.sn);
break;
case 6:
if (data.styleType == 1 || !data.styleType) {
router.push("/projectIndex");
} else {
router.push("/projectV2/taskList");
}
// if (data.styleType == 1 || !data.styleType) {
// router.push("/projectIndex");
// } else {
// router.push("/projectV2/taskList");
// }
store.commit("setProjectSn", data.sn);
break;
}

22
src/pages/index/index.js
View File

@ -117,19 +117,21 @@ if (COMPANY == 'xingxuan') {
router.push(companyModule[0].modulePath);
break;
case 5:
if (data.styleType == 1 || !data.styleType) {
router.push("/projectIndex");
} else {
router.push("/projectV2/taskList");
}
// if (data.styleType == 1 || !data.styleType) {
// debugger
// router.push("/projectIndex");
// } else {
// router.push("/projectV2/taskList");
// }
store.commit("setProjectSn", data.sn);
break;
case 6:
if (data.styleType == 1 || !data.styleType) {
router.push("/projectIndex");
} else {
router.push("/projectV2/taskList");
}
// if (data.styleType == 1 || !data.styleType) {
// debugger
// router.push("/projectIndex");
// } else {
// router.push("/projectV2/taskList");
// }
store.commit("setProjectSn", data.sn);
break;
}

24
src/views/projectFront/highModulus/planConfig.vue
View File

@ -48,8 +48,8 @@
</div>
<div style="height: 100%" ref="mapbox">
<vue-scroll style="height:calc(100% - 30px);">
<div class="img-box" :style="{'width': imgWidth + 'px', height: imgHeight + 'px', transform: 'scale(' + imgZoom +')'}">
<img ref="map" v-if="activeImgUrl" style="border: 1px solid #eee;" :style="{'width': imgWidth + 'px', height: imgHeight + 'px'}" :src="activeImgUrl"/>
<div class="img-box" @mousewheel.prevent="rollImg" :style="{'width': imgWidth + 'px', height: imgHeight + 'px', transform: 'scale(' + imgZoom +')'}">
<img ref="map" v-if="activeImgUrl" style="border: 1px solid #eee;" :style="{'width': imgWidth + 'px', height: imgHeight + 'px'}" :src="activeImgUrl"/>
<ul class="point-list" v-if="activeImgUrl">
<li v-for="(item,index) in pointList" :key="index" :ref="'point'+index" :style="{'top': item.mapY + 'px', 'left': item.mapX + 'px', 'display': item.status, 'transform': 'scale(' + 1/imgZoom +')'+ ' ' + item.transform}" >
<div class="point-dialog" :class="{'right_detail': item.mapY < 251 || item.mapX < 107}" :style="{'display': item.showDetail ? 'block':'none'}">
@ -447,13 +447,28 @@ export default {
},
changeImgSize(val){
if(val == 1){
this.imgZoom = this.imgZoom + 0.5
this.imgZoom = this.imgZoom + 0.2
console.log(this.imgZoom)
}else if(val == 2){
this.imgZoom = (this.imgZoom - 0.5) <= 0 ? this.imgZoom:this.imgZoom - 0.5
console.log(this.imgZoom)
}
},
// 缩放图片
rollImg() {
/* 获取当前页面的缩放比 若未设置zoom缩放比，则为默认100%，即1，原图大小 */
var zoom = parseInt(this.$refs.map.style.zoom) || 100;
/* event.wheelDelta 获取滚轮滚动值并将滚动值叠加给缩放比zoom wheelDelta统一为±120，其中正数表示为向上滚动，负数表示向下滚动 */
zoom += event.wheelDelta / 12;
/* 最小范围 和 最大范围 的图片缩放尺度 */
if (zoom >= 80 && zoom <500) {
this.$refs.map.style.zoom = zoom + "%";
}
return false;
},
// 添加鼠标监听事件
move(val,e){
console.log(val,e.pageX,e.pageY)
@ -737,4 +752,7 @@ export default {
.pointFixed{
position: fixed;
}
</style>