Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfptweb-public...

shuishen

2021-07-16 9135b7afb074e1480e04afdee560ec7d38d66e07

 src/views/realTimePolice/real.vue

@@ -168,7 +168,7 @@
          dialogClickModal: false,
          column: [
            {
              label: "警情类型",
              label: "任务类型",
              prop: "alarmType",
              search: false,
              searchSpan: 3,
@@ -183,9 +183,22 @@
              //cascaderItem: ["city", "district"],
              dicUrl:
                "/api/blade-system/dict-biz/child-list?parentId=1356523651644043266",
              control:(val,form)=>{
                if (val){
                  debugger
                }
                return {
                  text2:{
                    display:true
                  },
                  text3:{
                    label:'内容3'
                  }
                }
              },
            },
            {
              label: "报警时间",
              label: "下发时间",
              type: "datetime",
              width: 160,
              format: "yyyy-MM-dd HH:mm:ss",
@@ -353,13 +366,13 @@
                },
              ],
            },
            {
              label: "派发人",
              prop: "alarmPeople",
              width: 90,
              addDisplay: false,
              editDisplay: false,
            },
            // {
            //   label: "派发人",
            //   prop: "alarmPeople",
            //   width: 90,
            //   addDisplay: false,
            //   editDisplay: false,
            // },
            {
              label: "处警员",
              prop: "securityArr",
@@ -375,6 +388,18 @@
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
            },
            {
              label: "巡逻路线",
              prop: "xllx",
              hide: true,
              display:true,
              type: "tree",
              filter:false,
              dicUrl: "/api/routeIn/routein/tree",
              props: {
                label: "title"
              },
            }
          ],
        },
@@ -433,13 +458,23 @@
        },
        immediate: true,
      },
      //随意一个
      // 'form.deviceName'() {
      //   if (this.initFlag) {
      //     this.initData();
      //   }
      // }

      'form.alarmType':{
        handler(val){
          var xllx =this.findObject(this.option.column,'xllx')
          if(val==="巡逻任务"){
            xllx.display=true
            xllx.rules=[{
              required: true,
              message: "请选择巡逻路线",
              trigger: "blur"
            }]
          }else{
            xllx.display=false
            xllx.rules=[]
          }
        },
        immediate: true
      },
    },
    computed: {
      ...mapGetters(["permission", "flowRoutes"]),
@@ -479,7 +514,7 @@
        if (row.securityArr == "" || row.securityArr == null) {
          row.jtype = "0";
          row.alarmPeople = "";
        }else {
        } else {
          row.jtype = "1";
          //已派发保安
          row.alarmPeople = userId;
@@ -516,7 +551,7 @@
        if (row.securityArr == "" || row.securityArr == null) {
          row.jtype = "0";
          row.alarmPeople = "";
        }else {
        } else {
          row.jtype = "1";
          //已派发保安
          row.alarmPeople = userId;