Commit 6bac48e8 authored by wei's avatar wei
Browse files

新增四色图

parent 434fdbf2

src/views/riskProject/add/addInherent.vue

+14 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
            <div style="display: flex;">

                <van-field readonly required name="roomName" :value="form.roomName" label="所属房间" placeholder="请输入"

                @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>



            <van-field required clickable name="name" v-model="form.name" label="风险源名称" placeholder="请输入"
@@ -341,9 +341,9 @@ export default { 
    },

    created() {

        var userInfo = getUserInfo()

        this.form.buildingIds = this.$route.params.buildingId

        this.form.planId = this.$route.params.planId

        this.form.buildingName = '1号楼'

        this.form.buildingIds = this.$route.params.buildingId ||sessionStorage.getItem("buildingId")

        this.form.planId = this.$route.params.planId||sessionStorage.getItem("planId")

        this.form.buildingName = this.$route.params.buildingName||sessionStorage.getItem("buildingName")

        this.form.userId = userInfo.userId

        this.form.userName = userInfo.userName

        this.form.deptName = userInfo.dept.deptName
@@ -699,6 +699,16 @@ export default { 
            this.mainDutyPeopLe = value.userName;

            this.showMainDutyPeopLe = false;

        },

        //添加房间

        tjfjClcik(){

            this.$router.push({

                name:"riskView",

                params:{

                floorId:18,

                isView:false

                }

            })

        },



        cancel() {

            this.$router.go(-1);

src/views/riskProject/add/inherentRisks.vue

+8 −3
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ export default { 
  },

  created() {

    this.planId = this.$route.params.id || sessionStorage.getItem("planId");

    this.buildingId = this.$route.params.buildingId;

    this.buildingName = this.$route.params.buildingName;

    this.buildingId = this.$route.params.buildingId|| sessionStorage.getItem("buildingId");

    this.buildingName = this.$route.params.buildingName|| sessionStorage.getItem("buildingName");

    this.getRiskList(this.planId);

    //   this.postList();

  },
@@ -135,12 +135,17 @@ export default { 
    },

    //新增固有风险

    performTasks() {

      sessionStorage.setItem('buildingId',this.buildingId)

      sessionStorage.setItem('planId',this.planId)

      sessionStorage.setItem('buildingName',this.buildingName)

     

      this.$router.push({

        name: "addInherent",

        params: {

          id: this.active,

          planId: this.planId,

          buildingId:this.buildingId

          buildingId:this.buildingId,

          buildingName:this.buildingName

        }

      });

    },

src/views/riskProject/add/taskList.vue

+5 −2
Original line number Diff line number Diff line
@@ -352,6 +352,9 @@ export default { 
      return timestampToTime(new Date(time), "DT2", true);

    },

    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({

        name: "riskInherent",

        params: {
@@ -437,7 +440,7 @@ export default { 
      this.$router.push({

        name:"riskView",

        params:{

          floorId:1,

          floorId:18,

          isView:true

        }

      })

vue.config.js

+2 −2
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ module.exports = { 
    proxy: { //配置跨域

      '/app-api': {

        // 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://localhost:8080/', //这里是后台的地址

        // target: 'http://localhost:8080/', //这里是后台的地址

        ws: true,

        changOrigin: true, //允许跨域 

        // logLevel: 'debug',  // 显示代理调试信息