Skip to content

R
rongtong-app
Commit d990d924 authored by 胡占生's avatar 胡占生 🇨🇳
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop

parents 0e99bda0 6dc73443
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 58 deletions
src/views/drawCanvas/riskView.vue
View file @ d990d924
<template> <template>
<div class="wrap" ref="mapmidbox"> <div class="wrap" ref="mapmidbox">
<van-sticky> <van-sticky v-if="showHeader">
<header class="header"> <header class="header">
<span @click="close" class="iconLeft"> 关闭</span> <span @click="close" class="iconLeft"> 关闭</span>
<span>{{text}}</span> <span>{{text}}</span>
<span @click="confim" class="iconRight" v-show="!isView">确定</span> <span @click="confim" class="iconRight" v-show="!isViews">确定</span>
<span class="iconRight" v-show="isView"></span> <span class="iconRight" v-show="isViews"></span>
</header> </header>
</van-sticky> </van-sticky>
<grid-layout :layout.sync="layout" <grid-layout :layout.sync="layout"
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
</grid-item> </grid-item>
</grid-layout> </grid-layout>
<div class="setBtns"> <div class="setBtns">
<van-button @click="addItem" type="info" size="mini" v-if="!isView">添加房间</van-button> <van-button @click="addItem" type="info" size="mini" v-if="!isViews">添加房间</van-button>
<van-grid direction="horizontal" :column-num="2" class="footer"> <van-grid direction="horizontal" :column-num="2" class="footer" v-if="isViews">
风险等级图例: 风险等级图例:
<span class="riskTab type1"></span>重大风险 <span class="riskTab type1"></span>重大风险
<span class="riskTab type2"></span>较大风险 <span class="riskTab type2"></span>较大风险
...@@ -101,44 +101,99 @@ export default { ...@@ -101,44 +101,99 @@ export default {
roomName:'', roomName:'',
columns: ['办公', '餐饮', '住宅', '超市'], columns: ['办公', '餐饮', '住宅', '超市'],
colorList:['#FF4433','#FF9800','#FFFF00','#0091EA'], colorList:['#FF4433','#FF9800','#FFFF00','#0091EA'],
isView:true,// true:查看页面； false: 添加页面 isViews:false,// true:查看页面； false: 添加页面
showHeader:true
} }
}, },
props:{
isView: {
type: Boolean,
default: false,
},
},
mounted() { mounted() {
// screenfull.toggle(this.$refs.mapbox); // screenfull.toggle(this.$refs.mapbox);
// this.$nextTick(() => { this.$nextTick(() => {
// this.rotateBox(); // this.rotateBox();
// }); this.initRotate();
this.isView = this.$route.params.isView? true : false });
if (this._props.isView) {
console.log('作为组件传值==>>',)
this.isViews = true
this.showHeader = false
}
if (this.$route.params.isView) {
this.isViews = true
}
this.getRoomInfo() this.getRoomInfo()
window.addEventListener("onorientationchange" in window ? "orientationchange" : "resize", this.orientationChange, false);
}, },
methods: { methods: {
orientationChange(){
if (window.orientation === 180 || window.orientation === 0) {
console.log('竖屏状态！');
}
if (window.orientation === 90 || window.orientation === -90 ){
console.log('横屏状态！');
}
// let width = document.documentElement.clientWidth//页面宽度
// let height = document.documentElement.clientHeight//页面高度
// console.log('width==>>',width)
// console.log('height==>>',height)
this.rotateBox()
},
initRotate(){
let width = document.documentElement.clientWidth,//页面宽度
height = document.documentElement.clientHeight,//页面高度
wrapper = this.$refs.mapmidbox,//需要横屏的块，与全屏的块要区分开，不区分全屏的块无法显示横屏效果
style = "";//样式
console.log('width==>>',width)
console.log('height==>>',height)
style += "width:" + height + "px;";
style += "height:" + width + "px;";
style += "-webkit-transform: rotate(90deg); transform: rotate(90deg);";
// 注意旋转中点的处理
style +=
"-webkit-transform-origin: " + width / 2 + "px " + width / 2 + "px;";
style += "transform-origin: " + width / 2 + "px " + width / 2 + "px;";
wrapper.style.cssText = style;
},
rotateBox() { rotateBox() {
this.isScreenFull = !this.isScreenFull;//是否全屏状态 this.isScreenFull = !this.isScreenFull;//是否全屏状态
let width = document.documentElement.clientWidth,//页面宽度 let width = document.documentElement.clientWidth,//页面宽度
height = document.documentElement.clientHeight,//页面高度 height = document.documentElement.clientHeight,//页面高度
wrapper = this.$refs.mapmidbox,//需要横屏的块，与全屏的块要区分开，不区分全屏的块无法显示横屏效果 wrapper = this.$refs.mapmidbox,//需要横屏的块，与全屏的块要区分开，不区分全屏的块无法显示横屏效果
style = "";//样式 style = "";//样式
if (height < width) {//注意原来就是宽屏时不用横屏 console.log('width==>>',width)
return; console.log('height==>>',height)
} // if (height < width) {//注意原来就是宽屏时不用横屏
if (this.isScreenFull) { // return;
// }
if (height < width) {
// 横屏 // 横屏
style += "width:" + height + "px;"; style += "width:" + height + "px;";
style += "height:" + width + "px;"; style += "height:" + width + "px;";
style += "-webkit-transform: rotate(90deg); transform: rotate(90deg);"; style += "-webkit-transform: rotate(0deg); transform: rotate(0deg);";
// 注意旋转中点的处理 // 注意旋转中点的处理
style += style +=
"-webkit-transform-origin: " + width / 2 + "px " + width / 2 + "px;"; "-webkit-transform-origin: " + width / 2 + "px " + width / 2 + "px;";
style += "transform-origin: " + width / 2 + "px " + width / 2 + "px;"; style += "transform-origin: " + width / 2 + "px " + width / 2 + "px;";
} else { } else {
// 竖屏 // 竖屏
// style += "width:" + height + "px;";
// style += "height:" + width + "px;";
// style += "-webkit-transform: rotate(90deg); transform: rotate(90deg);";
// // 注意旋转中点的处理
// style +=
// "-webkit-transform-origin: " + width / 2 + "px " + width / 2 + "px;";
// style += "transform-origin: " + width / 2 + "px " + width / 2 + "px;";
style += "width:100%"; style += "width:100%";
style += "height:100%;"; style += "height:100%;";
style += "-webkit-transform: rotate(0); transform: rotate(0);"; style += "-webkit-transform: rotate(0); transform: rotate(0);";
style += "-webkit-transform-origin: 0 0;"; style += "-webkit-transform-origin: 0 0;";
style += "transform-origin: 0 0;"; style += "transform-origin: 0 0;";
} }
console.log('style==>>',style)
wrapper.style.cssText = style; wrapper.style.cssText = style;
}, },
getRoomInfo(){ getRoomInfo(){
...@@ -153,14 +208,14 @@ export default { ...@@ -153,14 +208,14 @@ export default {
item.position.i = item.id item.position.i = item.id
item.position.isDraggable = false item.position.isDraggable = false
item.position.isResizable = false item.position.isResizable = false
if (!this.isView) { //添加页面不显示颜色 if (!this.isViews) { //添加页面不显示颜色
item.position.c = '#eee' item.position.c = '#eee'
}else{ }else{
item.position.c = this.colorList[Math.floor(Math.random()*4)] item.position.c = this.colorList[Math.floor(Math.random()*4)]
} }
this.layout.push(item.position) this.layout.push(item.position)
}) })
console.log('layout==>>',this.layout) // console.log('layout==>>',this.layout)
} }
}).catch((err) => { }).catch((err) => {
console.log('err==>>',err) console.log('err==>>',err)
...@@ -182,8 +237,11 @@ export default { ...@@ -182,8 +237,11 @@ export default {
}, },
// 删除 // 删除
removeItem: function (val) { removeItem: function (val) {
// const index = this.layout.map(item => item.i).indexOf(val); if (val == '') {
// this.layout.splice(index, 1); const index = this.layout.map(item => item.i).indexOf(val);
this.layout.splice(index, 1);
return
}
postFun('/ledger/room/delete/'+val).then((res) => { postFun('/ledger/room/delete/'+val).then((res) => {
if (res.code == 200) { if (res.code == 200) {
Toast.success('删除成功'); Toast.success('删除成功');
...@@ -211,6 +269,14 @@ export default { ...@@ -211,6 +269,14 @@ export default {
}, },
// 确定 保存房间信息 // 确定 保存房间信息
confim(){ confim(){
if (this.roomName == '') {
Toast.fail({
title: '提示',
forbidClick: true,
message: '请先添加房间！',
})
return
}
let data = { let data = {
floorId: this.$route.params.floorId ? this.$route.params.floorId : '18', floorId: this.$route.params.floorId ? this.$route.params.floorId : '18',
name:this.roomName, name:this.roomName,
...@@ -221,6 +287,8 @@ export default { ...@@ -221,6 +287,8 @@ export default {
if (res.code == 200) { if (res.code == 200) {
Toast.success('提交成功'); Toast.success('提交成功');
this.getRoomInfo() this.getRoomInfo()
this.roomType = ''
this.roomName = ''
} }
}).catch((err) => { }).catch((err) => {
console.log('err==>>',err) console.log('err==>>',err)
...@@ -235,13 +303,13 @@ export default { ...@@ -235,13 +303,13 @@ export default {
h: 3, h: 3,
i: '', i: '',
name: this.roomName, name: this.roomName,
c: '#eee', c: '#0091EA',
type:this.roomType, type:this.roomType,
isDraggable:true, isDraggable:true,
isResizable:true isResizable:true
} }
this.layout.push(this.layOutItem) this.layout.push(this.layOutItem)
console.log('layOutItem==>>',this.layOutItem) // console.log('layOutItem==>>',this.layOutItem)
}, },
onConfirm(value) { onConfirm(value) {
this.roomType = value; this.roomType = value;
...@@ -252,11 +320,15 @@ export default { ...@@ -252,11 +320,15 @@ export default {
</script> </script>
<style scoped > <style scoped >
.router-view{
padding-bottom: 0px !important;
}
.wrap{ .wrap{
height: 100vh; height: 100vh;
width: 100vw; width: 100vw;
/* transform: rotate(90deg); /* transform: rotate(90deg);
transform-origin: bottom left; */ transform-origin: bottom left; */
position: relative;
} }
.footer{ .footer{
/* position: fixed; */ /* position: fixed; */
...@@ -298,9 +370,12 @@ export default { ...@@ -298,9 +370,12 @@ export default {
/*************************************/ /*************************************/
.setBtns{ .setBtns{
position: fixed; /* position: fixed;
top:auto;
right: auto;
left: 0; left: 0;
bottom: 0; bottom: 0; */
margin-top: 10px;
font-size: 0.3rem; font-size: 0.3rem;
padding: 10px; padding: 10px;
vertical-align: middle; vertical-align: middle;
...@@ -342,6 +417,7 @@ export default { ...@@ -342,6 +417,7 @@ export default {
.vue-grid-item .text { .vue-grid-item .text {
writing-mode:vertical-rl; writing-mode:vertical-rl;
-webkit-writing-mode: vertical-rl;
font-size: 10cqw; font-size: 10cqw;
display: flex; display: flex;
align-items: center; align-items: center;
......
src/views/riskProject/add/inherentRisks.vue
View file @ d990d924
...@@ -113,8 +113,8 @@ export default { ...@@ -113,8 +113,8 @@ export default {
}, },
created() { created() {
this.planId = this.$route.params.id || sessionStorage.getItem("planId"); this.planId = this.$route.params.id || sessionStorage.getItem("planId");
this.buildingId = this.$route.params.buildingId|| sessionStorage.getItem("buildingId"); this.buildingId = this.$route.params.buildingId || sessionStorage.getItem("buildingId");
this.buildingName = this.$route.params.buildingName|| sessionStorage.getItem("buildingName"); this.buildingName = this.$route.params.buildingName || sessionStorage.getItem("buildingName");
this.getRiskList(this.planId); this.getRiskList(this.planId);
// this.postList(); // this.postList();
}, },
...@@ -134,35 +134,47 @@ export default { ...@@ -134,35 +134,47 @@ export default {
}, },
//新增固有风险 //新增固有风险
performTasks() { performTasks() {
sessionStorage.setItem('buildingId',this.buildingId) sessionStorage.setItem('buildingId', this.buildingId)
sessionStorage.setItem('planId',this.planId) sessionStorage.setItem('planId', this.planId)
sessionStorage.setItem('buildingName',this.buildingName) sessionStorage.setItem('buildingName', this.buildingName)
this.$router.push({ this.$router.push({
name: "addInherent", name: "addInherent",
params: { params: {
id: this.active, id: this.active,
planId: this.planId, planId: this.planId,
buildingId:this.buildingId, buildingId: this.buildingId,
buildingName:this.buildingName buildingName: this.buildingName
} }
}); });
}, },
//任务执行结束 //任务执行结束
endTasks() { endTasks() {
//toDo //toDo
postFun( Dialog.confirm({
`/risk/plan/submit/${this.planId}/${this.buildingId}` title: '任务执行结束',
).then(res => { message: '是否任务执行结束',
Dialog.alert({ })
title: '任务执行结束', .then(() => {
message: res.msg, postFun(
}).then(() => { `/risk/plan/submit/${this.planId}/${this.buildingId}`
this.$router.push({ ).then(res => {
name:'riskAssess' // Dialog.alert({
// title: '任务执行结束',
// message: res.msg,
// }).then(() => {
// resolve(res.data);
this.$toast.success(res.msg)
this.$router.push({
name: 'riskAssess'
})
// });
}) })
})
.catch(() => {
// on cancel
}); });
})
}, },
handadd() { handadd() {
this.$router.push({ this.$router.push({
...@@ -223,7 +235,7 @@ export default { ...@@ -223,7 +235,7 @@ export default {
async getRiskList(id) { async getRiskList(id) {
this.$toast.loading({ this.$toast.loading({
message: "加载中...", message: "加载中...",
forbidClick: true, forbidClick: true,
loadingType: "spinner", loadingType: "spinner",
duration: 0 duration: 0
}); });
...@@ -239,7 +251,7 @@ export default { ...@@ -239,7 +251,7 @@ export default {
}, },
async changeFloor() { async changeFloor() {
let room = await this.roomList(this.value1); let room = await this.roomList(this.value1);
let risk = await this.riskList(this.planId,this.buildingId, this.value1,this.value2); let risk = await this.riskList(this.planId, this.buildingId, this.value1, this.value2);
}, },
async changeRoom() { async changeRoom() {
let risk = await this.riskList( let risk = await this.riskList(
...@@ -261,17 +273,17 @@ export default { ...@@ -261,17 +273,17 @@ export default {
}, },
// 详情 // 详情
goDetail(data) { goDetail(data) {
sessionStorage.setItem('buildingId',this.buildingId) sessionStorage.setItem('buildingId', this.buildingId)
sessionStorage.setItem('planId',this.planId) sessionStorage.setItem('planId', this.planId)
sessionStorage.setItem('buildingName',this.buildingName) sessionStorage.setItem('buildingName', this.buildingName)
sessionStorage.setItem('inherentId',data.businessId || data.id) sessionStorage.setItem('inherentId', data.businessId || data.id)
this.$router.push({ this.$router.push({
name: "addCurrent", name: "addCurrent",
params: { params: {
inherentId: data.businessId || data.id, inherentId: data.businessId || data.id,
planId: this.planId, planId: this.planId,
buildingId:this.buildingId, buildingId: this.buildingId,
buildingName:this.buildingName buildingName: this.buildingName
} }
}); });
this.showIndex = null; this.showIndex = null;
......
src/views/riskProject/add/resultPage.vue
View file @ d990d924
...@@ -3,19 +3,20 @@ ...@@ -3,19 +3,20 @@
<LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
<div class="section"> <div class="section">
<p>该次测评风险值为：</p> <p>该次测评风险值为：</p>
<div> <div class="resultScore">
<p style="font-weight: bold;font-size: 20px;">{{ score }}</p> <p style="font-weight: bold;font-size: 20px;">{{ this.$route.params.score }}</p>
</div> </div>
<p>本次评估结果评定为：{{ level }}</p> <p>本次评估结果评定为：{{ level }}</p>
<van-divider></van-divider> <van-divider></van-divider>
<van-field readonly label="所属模型：" placeholder="ls风险矩阵评估模型" /> <van-field readonly label="所属模型：" placeholder="ls风险矩阵评估模型" />
<van-field readonly label="风险发生可能性:" placeholder="一般情况不会发生" /> <van-field readonly label="风险发生可能性:" placeholder="一般情况不会发生" />
<van-field readonly label="后果严重程度" placeholder="轻微影响" /> <van-field readonly label="后果严重程度" placeholder="轻微影响" />
<van-field readonly label="判定标准：" placeholder="见下图" /> <van-field readonly label="判定标准：" placeholder="见下图" />
<van-image width="90vw" height="auto" :src="require('@/assets/workbench/sst.jpg')" />
</div> </div>
<div style="display: flex;margin: 10px 16px 0px; padding-bottom: 16px"> <div style="display: flex;margin: 10px 16px 0px; padding-bottom: 16px">
<van-button block type="info" @click="sureClose">确认本次测评结果</van-button> <van-button block type="info" @click="sureClose" style="margin-right: 4px;">确认本次测评结果</van-button>
<van-button block plain type="info" @click="resetClose">取消</van-button> <van-button block plain type="info" @click="resetClose" style="margin-left: 4px;">取消</van-button>
</div> </div>
</div> </div>
...@@ -66,10 +67,11 @@ import LHeader from "@/components/header.vue"; ...@@ -66,10 +67,11 @@ import LHeader from "@/components/header.vue";
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.wrapper{ .wrapper {
width: 100%; width: 100%;
height: 100%; height: 100%;
.section{
.section {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 10px; padding: 10px;
...@@ -77,5 +79,15 @@ import LHeader from "@/components/header.vue"; ...@@ -77,5 +79,15 @@ import LHeader from "@/components/header.vue";
background: #fff; background: #fff;
font-size: 14px; font-size: 14px;
} }
.resultScore{
width: 48px;
height: 48px;
background: #ffc600;
text-align: center;
line-height: 48px;
border-radius: 50%;
margin: 0 auto;
}
} }
</style> </style>
\ No newline at end of file
src/views/riskProject/add/taskList.vue
View file @ d990d924
...@@ -743,7 +743,6 @@ export default { ...@@ -743,7 +743,6 @@ export default {
}, },
//风险清单列表点击 //风险清单列表点击
toRiskDetail(item) { toRiskDetail(item) {
console.log(item, "LLLL");
this.$router.push({ this.$router.push({
name: "taskDetail", name: "taskDetail",
params: { params: {
......
src/views/riskProject/taskLedger/taskDetail.vue
View file @ d990d924
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</div> </div>
</van-tab> </van-tab>
<van-tab title="四色图" name="c"> <van-tab title="四色图" name="c">
<drawCanvas /> <drawCanvas :isView="true"/>
</van-tab> </van-tab>
</van-tabs> </van-tabs>
</div> </div>
......
vue.config.js
View file @ d990d924
...@@ -8,9 +8,10 @@ module.exports = { ...@@ -8,9 +8,10 @@ module.exports = {
//以上的ip和端口是我们本机的;下面为需要跨域的 //以上的ip和端口是我们本机的;下面为需要跨域的
proxy: { //配置跨域 proxy: { //配置跨域
'/app-api': { '/app-api': {
target: 'http://192.168.4.232:8080/', //这里是后台的地址 // target: 'http://192.168.4.232:8080/', //这里是后台的地址
// target: 'http://192.168.15.124:8080/', //这里是杨帆的地址 // target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
// target: 'http://192.168.10.137:8080/', //这里是昊哥的地址 // target: 'http://192.168.10.137:8080/', //这里是昊哥的地址
target: 'http://192.168.10.36:8080/', //这里是昊哥的地址
// target: 'http://localhost:8080/', //这里是后台的地址 // target: 'http://localhost:8080/', //这里是后台的地址
ws: true, ws: true,
changOrigin: true, //允许跨域 changOrigin: true, //允许跨域
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment