zengh
2022-05-16 63ad2c3598400370dd7da5534659fd7e768a0a4a
src/views/activitys/real.vue
@@ -27,7 +27,6 @@
      <!-- @row-click="rowClick" -->
      <template slot="menuLeft">
        <el-button
          type="danger"
          v-show="true"
          size="mini"
          icon="el-icon-delete"
@@ -188,7 +187,7 @@
        dialogClickModal: false,
        column: [
          {
            label: "任务标题",
            label: "巡查标题",
            prop: "rname",
            search: true,
            searchSpan: 4,
@@ -201,25 +200,48 @@
              },
            ],
          },
          {
            label: "下发时间",
            label: "开始时间",
            type: "datetime",
            prop: "time",
            width: 160,
            addDisplay: false,
            viewDisplay: false,
            editDisplay: false,
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
          },{
            label: "结束时间",
            type: "datetime",
            prop: "endtime",
            width: 160,
            addDisplay: false,
            viewDisplay: false,
            editDisplay: false,
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
          },
          {
            label: "开始时间",
            type: 'datetimerange',
            hide: true,
            prop: "timeList",
            width: 160,
            span: 12,
            startPlaceholder: '任务开始时间',
            endPlaceholder: '预估结束时间',
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
            rules: [
              {
                required: true,
                message: "请选择报警时间",
                message: "请选择时间范围",
                trigger: "blur",
              },
            ],
          },
          {
            label: "任务封面",
            label: "封面",
            prop: "url",
            // align:'center',
            width: 80,
@@ -256,7 +278,7 @@
          //   ],
          // },
          {
            label: "任务内容",
            label: "巡查内容",
            prop: "content",
            span: 24,
          },
@@ -306,90 +328,147 @@
          //   span: 5,
          // },
          {
            label: "省份",
            prop: "province",
            // search: true,
            width: 100,
            searchSpan: 2,
            searchLabelWidth: 45,
            placeholder: "省份",
            type: "select",
            value: "36",
            label: "所属辖区",
            prop: "jurisdiction",
            searchLabelWidth: 80,
            search: true,
            searchSpan: 4,
            overHidden: true,
            parent: false,
            type: "tree",
            dicUrl: "/api/jurisdiction/lazy-tree",
            props: {
              label: "name",
              value: "code",
              label: "title",
              value: "id",
            },
            cascaderItem: ["city", "district"],
            dicUrl: "/api/blade-system/region/select",
            span: 6,
            className: "cityreal1",
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
            checkStrictly: true,
            rules: [
              {
                required: true,
                message: "请选择所属辖区",
                trigger: "click",
              },
            ],
          },
          // {
          //   label: "省份",
          //   hide: true,
          //   prop: "province",
          //   // search: true,
          //   width: 100,
          //   searchSpan: 2,
          //   searchLabelWidth: 45,
          //   placeholder: "省份",
          //   type: "select",
          //   value: "36",
          //   props: {
          //     label: "name",
          //     value: "code",
          //   },
          //   cascaderItem: ["city", "district"],
          //   dicUrl: "/api/blade-system/region/select",
          //   span: 6,
          //   className: "cityreal1",
          //   addDisplay: true,
          //   editDisplay: true,
          //   viewDisplay: true,
          // },
          // {
          //   label: "地市",
          //   hide: true,
          //   prop: "city",
          //   type: "select",
          //   width: 100,
          //   searchPlaceholder: "地市",
          //   placeholder: "地市",
          //   searchLabelWidth: 1,
          //   value: "3601",
          //   searchSpan: 2,
          //   // search: true,
          //   props: {
          //     label: "name",
          //     value: "code",
          //   },
          //   dicUrl: "/api/blade-system/region/select?code={{key}}",
          //   span: 3,
          //   labelWidth: "0",
          //   className: "cityreal2",
          //   addDisplay: true,
          //   editDisplay: true,
          //   viewDisplay: true,
          // },
          // {
          //   label: "区县",
          //   hide: true,
          //   searchSpan: 2,
          //   searchLabelWidth: 1,
          //   width: 100,
          //   searchPlaceholder: "区县",
          //   placeholder: "区县",
          //   // search: true,
          //   prop: "district",
          //   type: "select",
          //   props: {
          //     label: "name",
          //     value: "code",
          //   },
          //   dicUrl: "/api/blade-system/region/select?code={{key}}",
          //   span: 3,
          //   labelWidth: "0",
          //   className: "cityreal3",
          //   addDisplay: true,
          //   editDisplay: true,
          //   viewDisplay: true,
          // },
          {
            label: "集合点",
            prop: "gathername",
            labelWidth: 100,
            span: 9,
            overHidden: true,
            rules: [
              {
                required: true,
                message: "请选择地址",
                trigger: "blur",
              },
            ],
          },
          {
            label: "地市",
            prop: "city",
            type: "select",
            width: 100,
            searchPlaceholder: "地市",
            placeholder: "地市",
            searchLabelWidth: 1,
            value: "3601",
            searchSpan: 2,
            // search: true,
            props: {
              label: "name",
              value: "code",
            },
            dicUrl: "/api/blade-system/region/select?code={{key}}",
            span: 3,
            labelWidth: "0",
            className: "cityreal2",
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
            label: null,
            prop: "map",
            labelWidth: 10,
            searchSpan: 0,
            // maxlength: 5,
            hide: true,
            span: 2,
            // display:false,
            component: "AvueMap",
          },
          {
            label: "区县",
            searchSpan: 2,
            searchLabelWidth: 1,
            width: 100,
            searchPlaceholder: "区县",
            placeholder: "区县",
            // search: true,
            prop: "district",
            type: "select",
            props: {
              label: "name",
              value: "code",
            },
            dicUrl: "/api/blade-system/region/select?code={{key}}",
            span: 3,
            labelWidth: "0",
            className: "cityreal3",
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
          },
          {
            label: "任务状态",
            label: "巡查状态",
            prop: "rtype",
            type: "select",
            span: 6,
            value: "0",
            value: "2",
            rules: [
              {
                required: true,
                message: "请选择巡查状态",
                trigger: "blur",
              },
            ],
            dicData: [
              {
                label: "任务开始",
                value: "0",
              },
              {
                label: "正在进行",
                value: "1",
                value: "2",
              },
              {
                label: "任务结束",
                value: "2",
                value: "1",
              },
              {
                label: "正在进行",
                value: "0",
              },
            ],
            // label: "任务状态",
@@ -424,6 +503,21 @@
          //   editDisplay: false,
          // },
          {
            label: "发布人",
            prop: "fname",
            // multiple: true,
            // dicUrl: "/api/catalogs/catalogs/getBigTree",
            // props: {
            //   label: "title",
            // },
            width: 72,
            // hide: true,
            // leafOnly: "",
            addDisplay: false,
            editDisplay: false,
            viewDisplay: false,
          },
          {
            label: "积分数值",
            prop: "integral",
            type: "number",
@@ -432,12 +526,12 @@
            // props: {
            //   label: "title",
            // },
            span: 6,
            width: 72,
            // hide: true,
            minRows: 1,
            value: 1,
            value: 5,
            // leafOnly: "",
            disabled: true,
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
@@ -459,6 +553,13 @@
            addDisplay: true,
            editDisplay: true,
            viewDisplay: true,
            rules: [
              {
                required: true,
                message: "请输入接收人数",
                trigger: "blur",
              },
            ],
          },
          // {
          //   label: "巡逻路线",
@@ -474,7 +575,7 @@
          // },
          {
            label: "请在下方地图中,建立路径!",
            labelWidth: "0",
            labelWidth: 0,
            className: "mapClass",
            prop: "haveMap",
            hide: true,
@@ -539,15 +640,17 @@
          this.form.wd = val.latitude;
          this.form.jd = val.longitude;
          this.form.gather = val.latitude + "," + val.longitude;
          var address = val.formattedAddress.toString();
          if (address.search("县") != -1) {
            this.form.place = address.substring(
            this.form.gathername = address.substring(
              address.indexOf("县") + 1,
              address.length
            );
          }
          if (address.search("区") != -1) {
            this.form.place = address.substring(
            this.form.gathername = address.substring(
              address.indexOf("区") + 1,
              address.length
            );
@@ -616,7 +719,7 @@
    },
  },
  computed: {
    ...mapGetters(["permission", "flowRoutes", "rotesData"]),
    ...mapGetters(["permission", "flowRoutes", "rotesData", "userInfo"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.real_add, false),
@@ -648,12 +751,18 @@
  methods: {
    rowSave(row, done, loading) {
      // console.log(row);
      // console.log(this.userInfo);
      // return;
      var userId1 = this.userInfo.user_id;
      var username = this.userInfo.nick_name;
      var phone = this.userInfo.phone;
      let latleng = row.map.latitude + "," + row.map.longitude;
      let d = {
        line: row.line, //路线
        rname: row.rname, //标题
        url: row.url, //封面
        time: row.time, //下发时间
        time: row.timeList[0], //下发时间
        endtime: row.timeList[1], //结束时间
        province: row.$province, //省
        city: row.$city, //城市
        district: row.$district, //区县
@@ -661,6 +770,15 @@
        integral: row.integral + "", //积分
        content: row.content, //内容
        rtype: row.rtype, //任务状态
        fid: userId1, //发起人id
        serid: userId1, //发起人id
        fname: username, //发起人id
        captain: username, //队长
        phone: phone, //发起人电话
        jurisdiction: row.jurisdiction,
        gather: row.gather, //地址经纬度
        gathername: row.map.formattedAddress, //地址经纬度
        tasktype: "0", //任务类型0:治安巡查 1:治安义务宣传 2:治安防范培训
      };
      // console.log(d);
      // done();
@@ -697,6 +815,8 @@
    },
    rowUpdate(row, index, done, loading) {
      let that = this;
      row.time = row.timeList[0];
      row.endtime = row.timeList[1];
      update(row).then(
        () => {
          this.onLoad(this.page);
@@ -774,6 +894,9 @@
        });
    },
    beforeOpen(done, type) {
      this.form.timeList = [];
      this.form["timeList"][0]= this.form["time"];
      this.form["timeList"][1]= this.form["endtime"];
      // console.log(type, "this.formthis.formthis.form");
      // console.log(type);
      // if (["edit", "view"].includes(type)) {
@@ -804,7 +927,8 @@
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
      getList(page.currentPage, page.pageSize).then((res) => {
      params["tasktype"] = "0"; // 治安巡查
      getList(page.currentPage, page.pageSize, params).then((res) => {
        const data = res.data.data;
        this.page.total = data.total;