Commit 6bac48e8 authored by wei's avatar wei

新增四色图

parent 434fdbf2
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div style="display: flex;"> <div style="display: flex;">
<van-field readonly required name="roomName" :value="form.roomName" label="所属房间" placeholder="请输入" <van-field readonly required name="roomName" :value="form.roomName" label="所属房间" placeholder="请输入"
@click="seletRoom('room')" :rules="[{ required: true, message: '所属房间不能为空' }]" /> @click="seletRoom('room')" :rules="[{ required: true, message: '所属房间不能为空' }]" />
<van-button style="color: #cccc;background-color: #f0f1f5;" icon="plus" type="info" /> <van-button style="color: #cccc;background-color: #f0f1f5;" icon="plus" type="info" @click="tjfjClcik"/>
</div> </div>
<van-field required clickable name="name" v-model="form.name" label="风险源名称" placeholder="请输入" <van-field required clickable name="name" v-model="form.name" label="风险源名称" placeholder="请输入"
...@@ -341,9 +341,9 @@ export default { ...@@ -341,9 +341,9 @@ export default {
}, },
created() { created() {
var userInfo = getUserInfo() var userInfo = getUserInfo()
this.form.buildingIds = this.$route.params.buildingId this.form.buildingIds = this.$route.params.buildingId ||sessionStorage.getItem("buildingId")
this.form.planId = this.$route.params.planId this.form.planId = this.$route.params.planId||sessionStorage.getItem("planId")
this.form.buildingName = '1号楼' this.form.buildingName = this.$route.params.buildingName||sessionStorage.getItem("buildingName")
this.form.userId = userInfo.userId this.form.userId = userInfo.userId
this.form.userName = userInfo.userName this.form.userName = userInfo.userName
this.form.deptName = userInfo.dept.deptName this.form.deptName = userInfo.dept.deptName
...@@ -699,6 +699,16 @@ export default { ...@@ -699,6 +699,16 @@ export default {
this.mainDutyPeopLe = value.userName; this.mainDutyPeopLe = value.userName;
this.showMainDutyPeopLe = false; this.showMainDutyPeopLe = false;
}, },
//添加房间
tjfjClcik(){
this.$router.push({
name:"riskView",
params:{
floorId:18,
isView:false
}
})
},
cancel() { cancel() {
this.$router.go(-1); this.$router.go(-1);
......
...@@ -114,8 +114,8 @@ export default { ...@@ -114,8 +114,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; this.buildingId = this.$route.params.buildingId|| sessionStorage.getItem("buildingId");
this.buildingName = this.$route.params.buildingName; this.buildingName = this.$route.params.buildingName|| sessionStorage.getItem("buildingName");
this.getRiskList(this.planId); this.getRiskList(this.planId);
// this.postList(); // this.postList();
}, },
...@@ -135,12 +135,17 @@ export default { ...@@ -135,12 +135,17 @@ export default {
}, },
//新增固有风险 //新增固有风险
performTasks() { performTasks() {
sessionStorage.setItem('buildingId',this.buildingId)
sessionStorage.setItem('planId',this.planId)
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
} }
}); });
}, },
......
...@@ -352,6 +352,9 @@ export default { ...@@ -352,6 +352,9 @@ export default {
return timestampToTime(new Date(time), "DT2", true); return timestampToTime(new Date(time), "DT2", true);
}, },
performTasks() { performTasks() {
sessionStorage.setItem('buildingId',this.messageList.riskBuildingListDtos[0].buildingId)
sessionStorage.setItem('planId',this.messageList.id)
sessionStorage.setItem('buildingName',this.messageList.riskBuildingListDtos[0].buildingName)
this.$router.push({ this.$router.push({
name: "riskInherent", name: "riskInherent",
params: { params: {
...@@ -435,9 +438,9 @@ export default { ...@@ -435,9 +438,9 @@ export default {
// 楼层id: floorId // 楼层id: floorId
// 是否查看 : isView: true/false (true:查看,false:添加) // 是否查看 : isView: true/false (true:查看,false:添加)
this.$router.push({ this.$router.push({
name:"riskView ", name:"riskView",
params:{ params:{
floorId:1, floorId:18,
isView:true isView:true
} }
}) })
......
...@@ -9,9 +9,9 @@ module.exports = { ...@@ -9,9 +9,9 @@ module.exports = {
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://localhost:8080/', //这里是后台的地址 // target: 'http://localhost:8080/', //这里是后台的地址
ws: true, ws: true,
changOrigin: true, //允许跨域 changOrigin: true, //允许跨域
// logLevel: 'debug', // 显示代理调试信息 // logLevel: 'debug', // 显示代理调试信息
......
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