Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-04-18 4522ab3fe8bd45ee753ef187448c1e884bbc601f

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/api/article/articleIntegral.js

New file
@@ -0,0 +1,13 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-articleIntegral/articleIntegral/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

 src/api/circle/circle.js

New file
@@ -0,0 +1,49 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-circle/circle/list',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getDetail = (id) => {
  return request({
    url: '/api/blade-circle/circle/detail',
    method: 'get',
    params: {
      id
    }
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-circle/circle/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const add = (row) => {
  return request({
    url: '/api/blade-circle/circle/save',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/blade-circle/circle/submit',
    method: 'post',
    data: row
  })
}

 src/api/disputeRecord/disputeRecord.js

New file
@@ -0,0 +1,49 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-disputeRecord/disputeRecord/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-disputeRecord/disputeRecord/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const add = (row) => {
  return request({
    url: '/api/blade-disputeRecord/disputeRecord/saveOrUpdate',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/blade-disputeRecord/disputeRecord/saveOrUpdate',
    method: 'post',
    data: row
  })
}

export const getDetail = (id) => {
  return request({
    url: '/api/blade-disputeRecord/disputeRecord/getDetail',
    method: 'get',
    params: {
      id
    }
  })
}

 src/api/logs.js

@@ -11,11 +11,12 @@
  })
}

export const getApiList = (current, size) => {
export const getApiList = (current, size,params) => {
  return request({
    url: '/api/blade-log/api/list',
    url: '/api/blade-log/api/page',
    method: 'get',
    params: {
      ...params,
      current,
      size
    }

 src/api/patrol/patrolGroup.js

@@ -38,6 +38,14 @@
  })
}

export const addTwo = (row) => {
  return request({
    url: '/api/patrol/patrolGroup/addTwo',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/patrol/patrolGroup/submit',

 src/api/place/place.js

@@ -159,6 +159,13 @@
  };


  
  // 标准地址
  export const  getPlaceAddressList = (params) => {
    return request({
      url: "/api/blade-doorplateAddress/doorplateAddress/getPlaceList",
      method: "get",
      params: params
    });
  };



 src/api/publicSecurity/taskNoFraudReporting.js

New file
@@ -0,0 +1,58 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-taskNoFraudReporting/taskNoFraudReporting/list',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getDetail = (id) => {
  return request({
    url: '/api/blade-taskNoFraudReporting/taskNoFraudReporting/detail',
    method: 'get',
    params: {
      id
    }
  })
}

// 列表详情
export const getTaskNoFraudReportingInfo = (params) => {
  return request({
    url: "/api/blade-taskNoFraudReporting/taskNoFraudReporting/getInfo",
    method: "get",
    params
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-taskNoFraudReporting/taskNoFraudReporting/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const add = (row) => {
  return request({
    url: '/api/blade-taskNoFraudReporting/taskNoFraudReporting/submit',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/blade-taskNoFraudReporting/taskNoFraudReporting/submit',
    method: 'post',
    data: row
  })
}

 src/api/resource/sms.js

@@ -69,4 +69,3 @@
    }
  })
}


 src/api/resource/smsRecord.js

New file
@@ -0,0 +1,50 @@
import request from '@/router/axios';


export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-smsRecord/smsRecord/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getDetail = (id) => {
  return request({
    url: '/api/blade-smsRecord/smsRecord/detail',
    method: 'get',
    params: {
      id
    }
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-smsRecord/smsRecord/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const add = (row) => {
  return request({
    url: '/api/blade-smsRecord/smsRecord/submit',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/blade-smsRecord/smsRecord/submit',
    method: 'post',
    data: row
  })
}

 src/api/resource/smsTemplate.js

New file
@@ -0,0 +1,49 @@
import request from '@/router/axios';

export const getList = (current, size, params) => {
  return request({
    url: '/api/blade-smsTemplate/smsTemplate/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const getDetail = (id) => {
  return request({
    url: '/api/blade-smsTemplate/smsTemplate/detail',
    method: 'get',
    params: {
      id
    }
  })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-smsTemplate/smsTemplate/remove',
    method: 'post',
    params: {
      ids,
    }
  })
}

export const add = (row) => {
  return request({
    url: '/api/blade-smsTemplate/smsTemplate/submit',
    method: 'post',
    data: row
  })
}

export const update = (row) => {
  return request({
    url: '/api/blade-smsTemplate/smsTemplate/submit',
    method: 'post',
    data: row
  })
}

 src/api/system/user.js

@@ -139,12 +139,14 @@
  })
}

export const getUserlnfoByDistrictlds = (districtIds) => {
export const getUserlnfoByDistrictlds = (current, size, params) => {
  return request({
    url: '/api/blade-system/user/getUserInfoByDistrictIds',
    url: '/api/blade-household/household/getUserInfoByDistrictIds',
    method: 'get',
    params: {
      districtIds,
      ...params,
      current,
      size,
    }
  })
}

 src/api/task/task.js

@@ -24,6 +24,27 @@
    })
}


export const getTaskNoFraudReportingList = (current, size, params) => {
  return request({
    url: '/api/blade-taskNoFraudReporting/taskNoFraudReporting/page',
    method: 'get',
    params: {
      ...params,
      current,
      size,
    }
  })
}

export const applyTaskExamine = (data) => {
  return request({
    url: "/api/blade-task/task/examine",
    method: "post",
    data
  })
}

export const getBailReportingPage = (current, size, params) => {
    return request({
        url: '/api/blade-task/task/getBailReportingPage',

 src/api/xxljob/xxljob.js

New file
@@ -0,0 +1,65 @@
import request from '@/router/axios'

export const getList = (current, size, params) => {
    return request({
        url: '/api/blade-jobInfo/jobInfo/page',
        method: 'get',
        params: {
            ...params,
            current,
            size,
        }
    })
}

export const add = (row) => {
    return request({
        url: '/api/blade-jobInfo/jobInfo/addJob',
        method: 'post',
        data: row
    })
}

export const update = (row) => {
    return request({
        url: '/api/blade-jobInfo/jobInfo/updateJob',
        method: 'post',
        data: row
    })
}

export const getDetail = (params) => {
    return request({
      url: "/api/blade-jobInfo/jobInfo/getDetail",
      method: "get",
      params: {
        ...params,
      },
    });
  };

export const remove = (ids) => {
    return request({
      url: "/api/blade-jobInfo/jobInfo/remove",
      method: "post",
      params: {
        ids,
      },
    });
  };

  export const start = (row) => {
    return request({
        url: '/api/blade-jobInfo/jobInfo/start',
        method: 'post',
        data: row
    })
}

export const stop = (row) => {
    return request({
        url: '/api/blade-jobInfo/jobInfo/stop',
        method: 'post',
        data: row
    })
}

 src/config/website.js

@@ -2,12 +2,12 @@
 * 全局配置文件
 */
export default {
  title: "saber",
  logo: "S",
  key: "saber", //配置主键,目前用于存储
  title: "jczz",
  logo: "J",
  key: "jczz", //配置主键,目前用于存储
  indexTitle: "基层智治综合协同平台",
  clientId: "saber", // 客户端id
  clientSecret: "saber_secret", // 客户端密钥
  clientId: "jczz", // 客户端id
  clientSecret: "jczz_secret_FaXfddsafRsfjlsdf2A12412", // 客户端密钥
  tenantMode: true, // 是否开启租户模式
  tenantId: "000000", // 管理组租户编号
  captchaMode: true, // 是否开启验证码模式

 src/page/login/index.vue

@@ -11,7 +11,7 @@
                <p class="title">基层智治综合协同平台</p>
            </div>
            <div class="login-border">
                <img class="img" src="/img/logo.png" alt="">
                <!-- <img class="img" src="/img/logo.png" alt=""> -->
                <div class="login-main">

                    <h4 class="login-title">

 src/util/auth.js

@@ -1,6 +1,6 @@
import Cookies from 'js-cookie'
const TokenKey = 'saber-access-token'
const RefreshTokenKey = 'saber-refresh-token'
const TokenKey = 'jczz-access-token'
const RefreshTokenKey = 'jczz-refresh-token'
const SessionId = 'JSESSIONID';
const UserId = 'b-user-id';
export function getToken() {

 src/views/article/article.vue

@@ -185,9 +185,11 @@
              prop: "articleList",
              span: 12,
              minRows: 2,
              type: "cascader",
              type: "tree",
              dataType: "string",
              multiple: true,
              tags: true,
              // search: true,
              dicData: [],
              props: {
                label: "name",

 src/views/article/components/deitDiscussion.vue

@@ -107,17 +107,7 @@
          articleId: '',
          parentId: '',
          level: '',
          children: [{
            optionContent: '',
            optionDetail: '',
            number: '',
            createTime: '',
            updateTime: '',
            deleteFlag: '',
            articleId: '',
            parentId: '',
            level: '',
          }]
          children: []
        },
        optionDiscuss: {
          emptyText: '取消',
@@ -133,6 +123,26 @@
              }],
            },
            {
              label: '议题必填',
              prop: 'mandatoryFlag',
              type: 'radio',
              value: 1,
              button: true,
              row: true,
              dicData: [{
                label: '否',
                value: 1
              }, {
                label: '是',
                value: 2
              }],
              rules: [{
                required: true,
                message: '请选择是否必填',
                trigger: 'blur'
              }],
            },
            {
              label: '选项范围',
              prop: 'optionRange',
              type: 'radio',
@@ -140,11 +150,11 @@
              button: true,
              row: true,
              dicData: [{
                label: '多选',
                value: 1
              }, {
                label: '单选',
                value: 0
              }, {
                label: '多选',
                value: 1
              }],
              rules: [{
                required: true,
@@ -153,13 +163,54 @@
              }],
            },
            {
              label: '最多选择数',
              label: '最少选',
              prop: 'optionNumberMin',
              display: false,
              row: true,
              min: 1,
              max: 10,
              type: 'number',
              step: 1,
              value: 1,
              rules: [{
                required: true,
                message: '请输入最少可选择数量',
                trigger: 'blur'
              }],
              span: 3,
            },
            {
              label: '最多选',
              prop: 'optionNumber',
              display: false,
              min: 1,
              row: true,
              max: 10,
              type: 'number',
              step: 1,
              value: 1
              value: 1,
              rules: [{
                required: true,
                message: '请输入最多可选择数量',
                trigger: 'blur'
              }],
              span: 3,
            },
            {
              width: 110,
              labelWidth: 100,
              label: "附件",
              prop: "attachment",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-pdfFile",
              accept: "application/pdf",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
            },
            {
              label: '选项内容',
@@ -167,6 +218,18 @@
              type: 'dynamic',
              span: 24,
              children: {
                rowAdd: (done) => {
                  // this.$message.success('新增回调' + this.disCussFrom.children.length);
                  this.addC(this.disCussFrom.children.length)
                  done({
                    input: '默认值'
                  });
                },
                rowDel: (row, done) => {
                  // this.$message.success('删除回调' + this.disCussFrom.children.length);
                  this.reduceC(this.disCussFrom.children.length)
                  done();
                },
                column: [{
                  label: '选项标题',
                  prop: 'optionContent',
@@ -292,16 +355,55 @@
        handler(newData) {
          // console.log('** ** ** ** ** ** **', newData)
          const column = this.findObject(this.optionDiscuss.column, "optionNumber")
          const columnMin = this.findObject(this.optionDiscuss.column, "optionNumberMin")
          if (newData == 1) {
            column.display = true
            columnMin.display = true
          } else {
            column.display = false
            columnMin.display = false
          }
        },
      },
    },

    methods: {

      addC(number) {
        console.log("******************", number)
        const column = this.findObject(this.optionDiscuss.column, "optionNumber")
        const columnMin = this.findObject(this.optionDiscuss.column, "optionNumberMin")
        column.max = number + 1
        columnMin.max = number + 1
        if (this.disCussFrom.optionNumber > number + 1) {
          this.disCussFrom.optionNumber = number + 1
        }
        if (this.disCussFrom.optionNumberMin > number + 1) {
          this.disCussFrom.optionNumberMin = number + 1
        }
      },

      editC(number) {
        console.log("******************", number)
        const column = this.findObject(this.optionDiscuss.column, "optionNumber")
        const columnMin = this.findObject(this.optionDiscuss.column, "optionNumberMin")
        column.max = number
        columnMin.max = number
      },


      reduceC(number) {
        const column = this.findObject(this.optionDiscuss.column, "optionNumber")
        const columnMin = this.findObject(this.optionDiscuss.column, "optionNumberMin")
        columnMin.max = number - 1
        column.max = number - 1
        if (this.disCussFrom.optionNumber > number - 1) {
          this.disCussFrom.optionNumber = number - 1
        }
        if (this.disCussFrom.optionNumberMin > number - 1) {
          this.disCussFrom.optionNumberMin = number - 1
        }
      },

      handleExport() {
        this.$confirm("是否导出投票人员数据?", "提示", {
@@ -322,11 +424,13 @@
          }
          data = Qs.stringify(data)
          exportBlob(
            `/api/blade-userTopics/userTopics/exportUser?${this.website.tokenHeader}=${getToken()}&` + data).then(
              `/api/blade-userTopics/userTopics/exportUser?${this.website.tokenHeader}=${getToken()}&` + data)
            .then(
            res => {
              downloadXls(res.data, `投票人员${dateNow()}.xlsx`)
              NProgress.done()
            })

        })
      },

@@ -359,7 +463,7 @@
        done()
      },

      openUser(row, type = 0) {
      openUser(row, type) {
        this.type = type
        this.popupTableUserShow = true
        this.query = {}
@@ -384,6 +488,7 @@
      },

      initData(newData) {
        console.log("======>", newData);
        this.editFlag = false
        this.popupTableShow = true
        this.articleId = newData.id
@@ -402,6 +507,33 @@
      handleSubmit(form, done) {
        done()
        form.articleId = this.articleId
        console.log("form===>", form);


        if (this.editFlag && Array.isArray(form.attachment)) {
          if (form.attachment.length > 0) {
            var urls = []
            // var split = form.attachment.split(",")
            form.attachment.forEach(url => {
              var names = url.split("jczz/")
              urls.push(names[1])
            })
            form.attachment = urls.join(",")
          } else {
            form.attachment = "";
          }
        } else {
          if (form.attachment) {
            var urls = [];
            var splits = form.attachment.split(",");
            splits.forEach(url => {
              var names = url.split("jczz/")
              urls.push(names[1])
            })
            form.attachment = urls.join(",")
          }
        }

        if (this.disCussFromListClone.length > 0) {
          this.disCussFromListClone.forEach(item => {
            if (form.children.length > 0) {
@@ -443,6 +575,17 @@
      // 提交修改
      rowUpdate(row, index, done, loading) {
        done()

        if (row.attachment.length > 0) {
          var urls = []
          var split = row.attachment.split(",")
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.attachment = urls.join(",")
        }

        if (!row.id) {
          addPd(row).then(() => {
            this.onLoad()
@@ -484,6 +627,7 @@
      },

      add() {
        this.disCussFrom = {}
        this.editFlag = true
      },

@@ -491,6 +635,7 @@
        this.disCussFrom = row
        this.disCussFromListClone = [].concat(row.children)
        this.editFlag = true
        this.editC(this.disCussFrom.children.length)
      },

      deletes(row) {
@@ -518,7 +663,7 @@
          this.userPage.total = data.total
          this.userData = data.records
          this.userData.forEach(item => {
            if (item.avatar.length > 0) {
            if (item.avatar) {
              item.avatar = website.minioUrl + item.avatar
            }
            if (item.signaturePath && item.signaturePath.length > 0) {

 src/views/article/components/discussionManageChild.vue

@@ -4,6 +4,9 @@
      @close="handleClose" @open="opens">
      <avue-form ref="DisCussFrom" :option="option" v-model="froms" @submit="handleSubmit"></avue-form>
    </el-dialog>

    <userList ref="userList" @selectPersonList="selectPersonList"></userList>

  </div>
</template>

@@ -27,6 +30,8 @@
  import {
    getDictionary
  } from '@/api/system/dict'
  import userList from "./userList.vue";


  // import {
  //   getList as getHouseholdList,
@@ -39,6 +44,9 @@

  let formData = {}
  export default {
    components: {
      userList
    },
    data() {
      return {
        dialogVisibles: false,
@@ -178,9 +186,9 @@
            {
              display: false,
              label: "选择用户",
              prop: "userIds",
              prop: "userName",
              tags: true,
              type: "tree",
              type: "input",
              multiple: true,
              span: 12,
              offset: 8,
@@ -188,16 +196,25 @@
              hide: true,
              row: true,
              // dicUrl: `/api/blade-system/user/getUserlnfoByDistrictlds?districtlds={{}}`,
              props: {
                label: 'name',
                value: 'id',
              },
              dicData: [],
              // props: {
              //   label: 'name',
              //   value: 'id',
              // },
              // dicData: [],
              rules: [{
                required: true,
                message: '请输入姓名',
                trigger: 'blur'
              }],
              focus: ({
                value,
                column
              }) => {
                // this.$message.success('focus事件查看控制台')
                // console.log('获取焦点', value, column)
                // this.$refs.userList && this.$refs.userList.resetForm()
                this.$refs.userList.show(this.discussion.articleRange)
              },
            },

            {
@@ -231,11 +248,12 @@
        dialogVisibles: false,
        articleId: '',
        discussion: {},
        id: ""
        id: "",
        personList: [],
      }
    },
    created() {
      this.getUserList()
      // this.getUserList()
    },

    mounted() {
@@ -245,9 +263,10 @@
    watch: {
      'froms.appointUser': {
        handler(newData) {
          const column = this.findObject(this.option.column, "userIds")
          const column = this.findObject(this.option.column, "userName")
          if (newData == 1) {
            column.display = true
            // this.$refs.userList.show()
          } else {
            column.display = false
          }
@@ -265,10 +284,18 @@
      }
    },
    methods: {
      selectPersonList(personList) {
        console.log(personList, "++++++++++++")
        this.personList = personList
        let nameList = personList.map(e => {
          return e.name
        })
        this.froms.userName = nameList.join(",")
      },
      getuserInfoByDistrictId() {
        getUserlnfoByDistrictlds(this.discussion.articleRange).then(res => {
          const column = this.findObject(this.option.column, "userIds")
          column.dicData = res.data.data
          column.dicData = res.data.data.records
        })
      },
      getUserList() {
@@ -280,7 +307,8 @@
      handleSubmit(form, done) {
        form.articleId = this.articleId
        form.eventType = 1
        form.userIds = JSON.stringify(form.userIds)
        form.userIds = this.personList.map(e => e.id).join(",")
        // form.userIds = JSON.stringify(form.userIds)
        if (form.appointUser == 0) {
          form.userIds = ''
        }
@@ -376,7 +404,7 @@
              this.froms.userIds = JSON.parse(this.froms.userIds)
            }
          }
          this.getuserInfoByDistrictId()
          // this.getuserInfoByDistrictId()

        })
      },

 src/views/article/components/publicSignUpChild.vue

@@ -207,8 +207,9 @@
                this.pageUser.total = data.total
                this.dataUser = data.records
                this.dataUser.forEach(item => {
                    if (item.avatar.length > 0) {
            if (item.avatar) {
                        item.avatar = website.minioUrl + item.avatar
              console.log("=avatar====>", item.avatar)
                    }
                    if (item.signaturePath && item.signaturePath.length > 0) {
                        item.signaturePath = website.minioUrl + item.signaturePath

 src/views/article/components/userList.vue

New file
@@ -0,0 +1,257 @@
<template>
  <el-dialog class="dept-user-table-dialog" width="70%" title="选择人员" modal-append-to-body="false" append-to-body="true"
    :close-on-click-model="true" :visible.sync="showDialog" @close="showDialog = false">
    <!-- <div class="left">
      <el-scrollbar>
        <basic-container>
          <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
        </basic-container>
      </el-scrollbar>
    </div> -->
    <div class="right">
      <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" v-model="form"
        :page.sync="page" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
        @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"></avue-crud>
    </div>
    <div slot="footer" class="dialog-footer">
      <el-button @click="showDialog = false">取 消</el-button>
      <el-button type="primary" @click="submit">确 定</el-button>
    </div>
  </el-dialog>


</template>

<script>
  import {
    getDeptLazyTree
  } from "@/api/system/dept";
  import {
    getUserlnfoByDistrictlds
  } from "@/api/system/user";
  import {
    mapGetters
  } from "vuex";

  export default {
    name: "DeptUserTable",
    data() {
      return {
        showDialog: false,
        form: {},
        search: {},
        selectionList: [],
        query: {},
        loading: true,
        platformLoading: false,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        treeDeptId: '',
        treeData: [],
        treeOption: {
          nodeKey: 'id',
          lazy: true,
          treeLoad: function(node, resolve) {
            const parentId = (node.level === 0) ? 0 : node.data.id
            getDeptLazyTree(parentId).then(res => {
              resolve(res.data.data.map(item => {
                return {
                  ...item,
                  leaf: !item.hasChildren
                }
              }))
            })
          },
          addBtn: false,
          menu: false,
          size: 'small',
          props: {
            labelText: '标题',
            label: 'title',
            value: 'value',
            children: 'children'
          }
        },
        option: {
          height: 'auto',
          calcHeight: 120,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          index: true,
          selection: true,
          viewBtn: true,
          dialogType: 'drawer',
          dialogClickModal: false,
          menu: false,
          addBtn: false,
          rowKey: "id",
          reserveSelection: true,
          column: [{
              label: "用户姓名",
              prop: "name",
              search: true,
              searchSpan: 4,
              display: false
            },
            {
              label: "电话",
              prop: "phoneNumber",
              slot: true,
              searchSpan: 4,
              search: true,
              display: false
            },
            {
              label: "地址",
              width: 560,
              prop: "address",
              slot: true,
              display: false
            },
            {
              label: "楼栋",
              prop: "building",
              slot: true,
              searchSpan: 4,
              search: true,
              display: false
            },
            {
              label: "单元",
              prop: "unit",
              searchSpan: 4,
              slot: true,
              search: true,
              display: false
            },

          ],
        },
        data: [],
        articleRange: '',
      }
    },
    computed: {
      ...mapGetters(["userInfo", "permission"]),
      ids() {
        let ids = []
        this.selectionList.forEach(ele => {
          console.log(ele, "---------")
          ids.push(ele.id)
        })
        return ids.join(",")
      },
      idsList() {
        let ids = []
        this.selectionList.forEach(ele => {
          ids.push({
            id: ele.id,
            name: ele.name
          })
        })
        return ids
      }
    },
    methods: {
      submit() {
        this.$emit("selectPersonList", this.idsList)
        this.showDialog = false
      },

      show(articleRange) {
        console.log("***111111111111111111***", articleRange)
        this.articleRange = articleRange
        this.showDialog = true
        this.page.currentPage = 1
        this.onLoad(this.page)
      },

      nodeClick(data) {
        this.treeDeptId = data.id
        this.page.currentPage = 1
        this.onLoad(this.page)
      },
      searchReset() {
        this.query = {}
        this.treeDeptId = ''
        this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params
        this.page.currentPage = 1
        this.onLoad(this.page, params)
        done()
      },
      selectionChange(list) {
        console.log(list, "list")
        this.selectionList = list
      },
      selectionClear() {
        this.selectionList = []
        this.$refs.crud.toggleSelection()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage
        this.onLoad(this.page)
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        this.loading = true
        params.districtIds = this.articleRange
        getUserlnfoByDistrictlds(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId)
          .then(res => {
            const data = res.data.data
            this.page.total = data.total
            this.data = data.records
            this.loading = false
            // this.selectionClear()
          })
      },
    }
  }
</script>

<style lang="scss">
  .dept-user-table-dialog {
    margin: 0 !important;

    .el-dialog {
      display: flex;
      flex-direction: column;
      margin: auto !important;
      position: absolute;
      top: 0 !important;
      left: 0 !important;
      right: 0 !important;
      bottom: 0 !important;
      //width: 1000px !important;
      height: 800px !important;

      .el-dialog__body {
        height: 0 !important;
        flex: 1;
        display: flex;

        .left {
          width: 0;
          flex: 2;
        }

        .right {
          margin-left: 10px;
          flex: 9;
        }
      }
    }
  }
</style>

 src/views/article/discussionManage.vue

@@ -19,8 +19,14 @@
          编辑议题
        </el-button>

        <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)">
        <el-button icon="el-icon-user" :size="size" v-if="row.articleType != 4" :type="type"
          @click.stop="openUserPopup(row, 0)">
          参与用户
        </el-button>

        <el-button icon="el-icon-user" v-if="row.articleType == 4" :size="size" :type="type"
          @click.stop="handleExport(row)">
          导出投票结果
        </el-button>

        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
@@ -79,6 +85,21 @@
  } from "vuex"
  import deitDiscussion from "./components/deitDiscussion"
  import discussionManageChild from "./components/discussionManageChild"
  import NProgress from 'nprogress'
  import 'nprogress/nprogress.css'
  import Qs from "qs"
  import {
    exportBlob
  } from "@/api/common"
  import {
    getToken
  } from '@/util/auth'
  import {
    downloadXls
  } from "@/util/util"
  import {
    dateNow
  } from "@/util/date"

  export default {
    components: {
@@ -157,6 +178,7 @@
              minRows: 2,
              tags: true,
              type: "tree",
              dataType: "string",
              multiple: true,
              dicData: [],
              rules: [{
@@ -488,6 +510,29 @@
      }
    },
    methods: {
      handleExport(row) {
        this.$confirm("是否导出投票结果数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          NProgress.start()
          this.query = {}
          this.query.articleId = row.id
          this.query.districtId = row.articleRange
          var data = {
            ...this.query
          }
          data = Qs.stringify(data)
          exportBlob(
              `/api/blade-userTopics/userTopics/exportDataIndex?${this.website.tokenHeader}=${getToken()}&` + data)
            .then(
              res => {
                downloadXls(res.data, `投票结果${dateNow()}.xlsx`)
                NProgress.done()
              })
        })
      },
      iscommentInput(e, data) {
        upcomment(data.id, e).then(() => {
          this.$message({
@@ -513,8 +558,8 @@
        })
      },

      openUserPopup(row) {
        this.$refs.DeitDiscussion.openUser(row)
      openUserPopup(row, type) {
        this.$refs.DeitDiscussion.openUser(row, type)
      },

      openDilog(row, type) {
@@ -529,7 +574,7 @@
          row.videoUrl = ""
        }
        row.userid = this.userInfo.user_id
        row.articleRange = JSON.stringify(row.articleList)
        row.articleRange = row.articleList
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
@@ -559,7 +604,7 @@
        )
      },
      rowUpdate(row, index, done, loading) {
        row.articleRange = JSON.stringify(row.articleList)
        row.articleRange = row.articleList
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
@@ -657,7 +702,7 @@
            // })
            this.form = {
              ...data,
              articleList: JSON.parse(data.articleRange)
              articleList: data.articleRange
            }
          })
        }
@@ -697,7 +742,7 @@
          this.page.total = data.total
          this.data = data.records
          this.data.forEach(item => {
            // item.articleRange = JSON.parse(item.articleRange)
            item.articleList = item.articleRange
            if (item.url.length > 0) {
              var urls = []
              var names = item.url.split(",")

 src/views/article/publicSignUp.vue

@@ -146,6 +146,27 @@
              }, ],
            },
            {
              label: "文章范围",
              prop: "articleList",
              span: 12,
              minRows: 2,
              type: "tree",
              multiple: true,
              dataType: "string",
              tags: true,
              dicData: [],
              rules: [{
                required: true,
                message: "请选择文章范围",
                trigger: "blur",
              }, ],
              props: {
                label: "name",
                value: 'id'
              },
              // hide: true,
            },
            {
              width: 110,
              label: "文章封面",
              prop: "url",
@@ -160,26 +181,7 @@
              // hide: true,
              span: 24,
            },
            {
              label: "文章范围",
              prop: "articleList",
              span: 12,
              minRows: 2,
              type: "tree",
              multiple: true,
              tags: true,
              dicData: [],
              rules: [{
                required: true,
                message: "请选择文章范围",
                trigger: "blur",
              }, ],
              props: {
                label: "name",
                value: 'id'
              },
              hide: true,
            },

            {
              width: 110,
              label: "文章类型",
@@ -199,25 +201,25 @@
                value: 3, //  // 类型  0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查
              }],
            },
            {
              label: "发布时间",
              prop: "dateTime",
              type: "daterange",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              searchSpan: 6,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择发布时间",
                trigger: "blur",
              }, ],
            },
            // {
            //   label: "发布时间",
            //   prop: "dateTime",
            //   type: "daterange",
            //   format: "yyyy-MM-dd",
            //   valueFormat: "yyyy-MM-dd",
            //   searchSpan: 6,
            //   searchRange: true,
            //   hide: true,
            //   addDisplay: false,
            //   editDisplay: false,
            //   viewDisplay: false,
            //   search: true,
            //   rules: [{
            //     required: true,
            //     message: "请选择发布时间",
            //     trigger: "blur",
            //   }, ],
            // },
            {
              width: 100,
              label: "发布时间",
@@ -225,6 +227,7 @@
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              editDisplay: false,
            },
            {
              width: 100,
@@ -484,7 +487,7 @@
        //   row.videoUrl = "";
        // }
        row.userid = this.userInfo.user_id
        row.articleRange = JSON.stringify(row.articleList)
        row.articleRange = row.articleList
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
@@ -510,7 +513,7 @@
        )
      },
      rowUpdate(row, index, done, loading) {
        row.articleRange = JSON.stringify(row.articleList)
        row.articleRange = row.articleList
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
@@ -604,7 +607,7 @@
              })
              data.url = urls.join(",")
            }
            data.articleList = JSON.parse(data.articleRange)
            data.articleList = data.articleRange
            this.form = data
          })
        }
@@ -643,6 +646,7 @@
          this.page.total = data.total
          this.data = data.records
          this.data.forEach(item => {
            item.articleList = item.articleRange
            if (item.url.length > 0) {
              var urls = []
              var names = item.url.split(",")

 src/views/article/rotation.vue

@@ -1,4 +1,4 @@
<!-- 走访日志 -->
<!-- 轮播图 -->
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
@@ -34,7 +34,7 @@
    data() {
      return {
        form: {
          publicFlag: 1
          publicFlag: 2
        },
        query: {},
        loading: true,
@@ -94,7 +94,12 @@
                  label: "综治",
                  value: 2
                }
              ]
              ],
              rules: [{
                required: true,
                message: "请选择类型",
                trigger: "blur",
              }, ],
            }, {
              width: 110,
              labelWidth: 100,
@@ -102,51 +107,55 @@
              prop: "publicFlag",
              span: 12,
              searchSpan: 4,
              // search: true,
              // cascader: ["communityCode"],
              type: "select",
              type: "select",
              dicData: [{
                  label: "不公开",
                  value: 1
                },
                {
                  label: "公开",
                  value: 2
                }
                }, {
                  label: "限定公开",
                  value: 1
                },

              ]
            },
            // {
            //   width: 156,
            //   labelWidth: 100,
            //   overHidden: true,
            //   label: "所属社区",
            //   // parent: false,
            //   prop: "communityCode",
            //   multiple: true,
            //   tags: true,
            //   hide: true,
            //   dateType: "string",
            //   type: "tree",
            //   dicUrl: "/api/blade-system/region/tree?deptNature={{type}}",
            //   props: {
            //     label: "name",
            //     value: "id"
            //   },
            //   rules: [{
            //     required: true,
            //     message: "请选择所属社区",
            //     trigger: "blur",
            //   }, ],
            // },
            {
              label: "范围",
              width: 156,
              labelWidth: 100,
              overHidden: true,
              label: "所属社区",
              // parent: false,
              prop: "communityCode",
              multiple: true,
              tags: true,
              hide: true,
              dataType: "string",
              addDisplay: false,
              editDisplay: false,
              type: "tree",
              dicUrl: "/api/blade-system/region/tree?deptNature={{type}}",
              props: {
                label: "name",
                value: "id"
              },
              rules: [{
                required: true,
                message: "请选择所属社区",
                trigger: "blur",
              }, ],
            },
            {
              label: "公开范围",
              prop: "rotationRange",
              width: 156,
              labelWidth: 100,
              tags: true,
              type: "tree",
              multiple: true,
              // dateType: "string",
              dataType: "string",
              editDisplay: false,
              addDisplay: false,
              cascader: ['articleId'],
              dicUrl: "/api/blade-district/district/getDistrictTree?filterFlag=1",
              rules: [{
@@ -158,7 +167,6 @@
                label: "name",
                value: 'id'
              },
              // hide: true,
            },
            {
              hide: true,
@@ -168,10 +176,11 @@
              search: false,
              viewDisabled: false,
              editDisplay: false,
              addDisplay: false,
              type: 'select',
              dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtId={{rotationRange}}`,
              formslot: true,
              cascader: ['vote'],
              // cascader: ['vote'],
              props: {
                label: "title",
                value: "id"
@@ -236,17 +245,32 @@
          const column = this.findObject(this.option.column, "rotationRange")
          if (newData == 1) {
            column.editDisplay = true
            column.addDisplay = true
          } else {
            column.editDisplay = false
            column.addDisplay = false
          }

          const column2 = this.findObject(this.option.column, "articleId")
          if (newData == 1) {
            column2.editDisplay = true
            column2.addDisplay = true
          } else {
            column2.editDisplay = false
            column2.addDisplay = false
          }

        },
      },
      'form.type': {
        handler(newData) {
          const column = this.findObject(this.option.column, "communityCode")
          if (newData != 3) {
            column.editDisplay = true
            column.addDisplay = true
          } else {
            column.editDisplay = false
            column.addDisplay = false
          }
        },
      },
    },
@@ -270,6 +294,16 @@
    },
    methods: {
      rowSave(row, done, loading) {
        // if (row.rotationRange) {
        //   row.rotationRange = JSON.stringify(row.rotationRange)
        // }
        if (row.communityCode) {
          row.communityCode = JSON.stringify(row.communityCode)
        }
        if (row.publicFlag == 2) {
          row.rotationRange = ''
          // row.rotationRange = JSON.stringify(row.rotationRange)
        }
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
@@ -295,6 +329,16 @@
        )
      },
      rowUpdate(row, index, done, loading) {
        // if (row.rotationRange) {
        //   row.rotationRange = JSON.stringify(row.rotationRange)
        // }
        if (row.communityCode) {
          row.communityCode = JSON.stringify(row.communityCode)
        }
        if (row.publicFlag == 2) {
          row.rotationRange = ''
          // row.rotationRange = JSON.stringify(row.rotationRange)
        }
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
@@ -379,6 +423,12 @@
        if (["edit", "view"].includes(type)) {
          getRotation(this.form.id).then((res) => {
            this.form = res.data.data
            // if (this.form.rotationRange) {
            //   this.form.rotationRange = JSON.parse(this.form.rotationRange)
            // }
            // if (this.form.communityCode) {
            //   this.form.communityCode = JSON.parse(this.form.communityCode)
            // }
            if (this.form.url.length > 0) {
              var urls = []
              var names = this.form.url.split(",")
@@ -432,6 +482,12 @@
          this.page.total = data.total
          this.data = data.records
          this.data.forEach(item => {
            // if (item.rotationRange) {
            //   item.rotationRange = JSON.parse(item.rotationRange)
            // }
            // if (item.communityCode) {
            //   item.communityCode = JSON.parse(item.communityCode)
            // }
            if (item.url.length > 0) {
              var urls = []
              var names = item.url.split(",")

 src/views/backblask/BackblastArticle.vue

New file
@@ -0,0 +1,772 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
      <template slot="menuLeft">
        <!-- <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_backblast_delete" @click="handleDelete">删
          除
        </el-button> -->
      </template>

      <template slot-scope="{type,size,row }" slot="menu">

        <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)" v-if="permission.article_backblast_user">
          浏览人员
        </el-button>

        <el-button v-if="row.publish == '1' && permission.article_backblast_addOrDel" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
          撤销
        </el-button>

        <el-button v-if="row.publish == '0' && permission.article_backblast_addOrDel" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
          发布
        </el-button>
      </template>

      <template slot-scope="{ row, size }" slot="publish">
        <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
        </el-tag>
      </template>

      <template slot-scope="{ row, size }" slot="iscomment">
        <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
          :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
        </el-switch>
      </template>
    </avue-crud>

    <deitDiscussion ref="DeitDiscussion">
    </deitDiscussion>
  </basic-container>
</template>

<script>
  import {
    getList,
    remove,
    update,
    add,
    getNotice,
    upcomment
  } from "@/api/article/article"

  import website from '@/config/website'
  import deitDiscussion from "./components/deitDiscussion"
  import {
    mapGetters
  } from "vuex"
  export default {
    components: {
      deitDiscussion,
    },
    data() {
      return {
        discussForm: {
          ontitle: '',
          title: '',
          openFlag: 0,
          numberRestrictions: 0,
          voteRestrictions: 0,
          userRestrictions: 0,
          signatureFlag: 0,
          endTime: '',
          articleId: '',
          createTime: '',
          updateTime: '',
          deleteFlag: '',
          repeatVote: 0,
          voteNumberPublic: 0,
          appointUser: 0,
          userIds: '',
          eventType: 1,
        },
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0,
        },
        datetime: "",
        selectionList: [],
        option: {
          labelWidth: 96,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 280,

          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          border: true,
          //stripe:true,
          index: true,
          viewBtn: false,
          selection: true,
          excelBtn: true,
          dialogClickModal: false,
          column: [{
              overHidden: true,
              label: "宣传标题",
              prop: "title",
              span: 24,
              row: true,
              searchSpan: 4,
              search: true,
              searchLabelWidth: 76,
              rules: [{
                required: true,
                message: "请输入宣传标题",
                trigger: "blur",
              }, ],
            },
            {
              label: "范围",
              prop: "articleRange",
              span: 24,
              minRows: 2,
              tags: true,
              type: "tree",
              multiple: true,
              dicUrl:"/api/blade-district/district/getDistrictTree?filterFlag=1",
              dataType:"string",
              rules: [{
                required: true,
                message: "请选择范围",
                trigger: "blur",
              }, ],
              props: {
                label: "name",
                value: 'id'
              },
              // hide: true,
            },
            {
              width: 110,
              label: "封面",
              prop: "url",
              // align:'center',
              type: "upload",
              listType: "picture-img",
              action: "/api/blade-resource/oss/endpoint/put-file",
              propsHttp: {
                res: "data",
                url: "link",
              },
              // hide: true,
              span: 24,
            },
            // {
            //   width: 110,
            //   label: "宣传类型",
            //   prop: "articleType",
            //   addDisplay: true,
            //   editDisplay: true,
            //   viewDisplay: true,
            //   searchSpan: 4,
            //   checkStrictly: true,
            //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=investigateType",
            //   props: {
            //     label: "dictValue",
            //     value: "dictKey",
            //   },
            //   search: true,
            //   type: "tree",
            //   rules: [{
            //     required: true,
            //     message: "请选择宣传类型",
            //     trigger: "blur",
            //   }, ],
            // },
            {
              width: 110,
              label: "观看得分",
              prop: "score",
              type: "number",
              align:"center",
              value:2,
              rules: [{
                required: true,
                message: "请输入观看得分",
                trigger: "blur",
              }, ],
            },
            {
              width: 100,
              label: "发布时间",
              prop: "createTime",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              search: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
            },
            {
              width: 100,
              label: "发布状态",
              prop: "publish",
              searchSpan: 4,
              value: "0",
              slot: true,
              search: true,
              type: "select",
              rules: [{
                required: true,
                message: "请选择发布状态",
                trigger: "blur",
              }, ],
              dicData: [{
                  label: "未发布",
                  value: "0",
                },
                {
                  label: "已发布",
                  value: "1",
                }
              ],
            },
            {
              span: 24,
              label: "评论区",
              prop: "iscomment",
              width: 80,
              slot: true,
              type: "switch",
              activeColor: "#13ce66",
              inactiveColor: "#ccc",
              value: '1',
              dicData: [{
                  label: "关闭",
                  value: "0",
                },
                {
                  label: "开启",
                  value: "1",
                }
              ],
            },
            {
              label: "视频",
              prop: "videoUrl",
              type: "upload",
              accept: "video/mp4",
              display: false,
              hide: true,
              span: 24,
              listType: "picture-img",
              action: "/api/depl/put-depl",
              propsHttp: {
                url: "data",
              },
            },
            {
              label: "宣传内容",
              prop: "content",
              component: "AvueUeditor",
              options: {
                action: "/api/blade-resource/oss/endpoint/put-file",
                // customConfig: {
                //   lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
                // },//wangEditor编辑的配置
                props: {
                  res: "data",
                  url: "link",
                },
              },
              hide: true,
              minRows: 6,
              span: 24,
            },
          ],
        },
        data: [],
        optionDiscuss: {
          column: [{
              label: "",
              type: 'title',
              prop: "title",
              span: 24,
              row: true,
              offset: 2,
              styles: {
                fontSize: '24px'
              }
            }, {
              labelWidth: 100,
              label: '开启投票',
              prop: 'openFlag',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '开启',
                value: 0
              }, {
                label: '不开启',
                value: 1
              }],
              rules: [{
                required: true,
                message: "请选择开启状态",
                trigger: "blur",
              }, ],
            }, {
              labelWidth: 100,
              label: '投票限制',
              prop: 'voteRestrictions',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '一人一票',
                value: 0
              }, {
                label: '一户一票',
                value: 1
              }],
              rules: [{
                required: true,
                message: "请选择投票限制",
                trigger: "blur",
              }, ],
            }, {
              labelWidth: 100,
              label: '签名',
              prop: 'signatureFlag',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '不需要',
                value: 0
              }, {
                label: '需要',
                value: 1
              }],
              rules: [{
                required: true,
                message: "请选择是否签名",
                trigger: "blur",
              }, ],
            }, {
              labelWidth: 100,
              label: '指定用户',
              prop: 'appointUser',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '不限制',
                value: 0
              }, {
                label: '指定用户',
                value: 1
              }],
              rules: [{
                required: true,
                message: "请选择是否指定用户",
                trigger: "blur",
              }, ],
            },
            {
              label: "截止时间",
              row: true,
              offset: 6,
              prop: "endTime",
              type: "datetime",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "timestamp",
              rules: [{
                required: true,
                message: "请选择截止时间",
                trigger: "blur",
              }, ],
            },
          ]
        },
        districtTree: [],
      }
    },
    watch: {
      "form.articleType": {
        handler(val) {
          if (val) {
            var videoUrl = this.findObject(this.option.column, "videoUrl")
            var content = this.findObject(this.option.column, "content")
            if (val.indexOf('ksp') != -1) {
              videoUrl.display = true
              content.display = false
              videoUrl.rules = [{
                required: false,
                message: "请选择视频",
                trigger: "blur",
              }, ]
            } else {
              videoUrl.display = false
              content.display = true
              videoUrl.rules = ""
            }
          }
        },
        immediate: true,
      }
    },
    computed: {
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.article_backblast_add, true),
          viewBtn: this.vaildData(this.permission.article_backblast_view, true),
          delBtn: this.vaildData(this.permission.article_backblast_delete, true),
          editBtn: this.vaildData(this.permission.article_backblast_edit, true),
        }
      },

      ids() {
        let ids = []
        this.selectionList.forEach((ele) => {
          ids.push(ele.id)
        })
        return ids.join(",")
      },

      showStatus() {
        return (data, type) => {
          if (data == 0) {
            return {
              text: type == 1 ? '未发布' : '关闭',
              type: 'info'
            }
          } else if (data == 1) {
            return {
              text: type == 1 ? '已发布' : '开启',
              type: 'success'
            }
          }
        }
      }
    },
    methods: {
      iscommentInput(e, data) {
        upcomment(data.id, e).then(() => {
          this.$message({
            type: "success",
            message: "操作成功!",
          })
        })
      },

      openEditPopup(row) {
        getListPd(1, 10, {
          eventType: 1,
          articleId: row.id
        }).then(res => {
          if (res.data.data.records.length == 0) {
            this.$message.warning('请先设置宣传规则!')
            setTimeout(() => {
              this.openDilog(row, 1)
            }, 200)
          } else {
            this.$refs.DeitDiscussion.initData(row)
          }
        })
      },

      openUserPopup(row) {
        this.$refs.DeitDiscussion.openUser(row)
      },

      openDilog(row, type) {
        var that = this
        this.$nextTick(() => {
          that.$refs.discussionManageChild.init(row)
        })
      },

      rowSave(row, done, loading) {
        if (row.videoUrl.length == 0) {
          row.videoUrl = ""
        }
        row.userid = this.userInfo.user_id
        // row.articleRange = JSON.stringify(row.articleList)
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
        }
        // 类型  0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查 5: 业主大会 6：反诈宣传
        row.type = 6
        add(row).then(
          () => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },
      rowUpdate(row, index, done, loading) {
        // row.articleRange = JSON.stringify(row.articleList)
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
        }

        update(row).then(
          () => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          })
          .then(() => {
            return remove(row.id)
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
          })
      },
      searchReset() {
        this.query = {}
        this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params
        this.page.currentPage = 1
        this.onLoad(this.page, params)
        done()
      },
      selectionChange(list) {
        this.selectionList = list
      },
      selectionClear() {
        this.selectionList = []
        this.$refs.crud.toggleSelection()
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据")
          return
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          })
          .then(() => {
            return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            this.$refs.crud.toggleSelection()
          })
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getNotice(this.form.id).then((res) => {
            let data = res.data.data
            // data.forEach(item=>{
            if (data.url.length > 0) {
              var urls = []
              var names = data.url.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              data.url = urls.join(",")
            }
            // })
            // this.form = {
            //   ...data,
            //   articleList: JSON.parse(data.articleRange)
            // }
          })
        }
        // con
        done()
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize
      },
      refreshChange() {
        this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const {
          dateTime
        } = this.query
        let values = {
          ...params,
        }
        if (dateTime) {
          values = {
            ...params,
            startTime: dateTime[0],
            endTime: dateTime[1],
            ...this.query,
          }
          values.dateTime = null
        }
        // 类型为反诈宣传的
        values.type = 6
        this.loading = true
        console.log(values)
        getList(page.currentPage, page.pageSize, values).then((res) => {
          const data = res.data.data
          this.page.total = data.total
          this.data = data.records
          this.data.forEach(item => {
            // item.articleRange = JSON.parse(item.articleRange)
            if (item.url.length > 0) {
              var urls = []
              var names = item.url.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              item.url = urls.join(",")
            }
          })
          this.loading = false
          this.selectionClear()
        })
        // getDistrictTree(params = {
        //   filterFlag: 1
        // }).then((res) => {
        //   const data = res.data.data
        //   this.districtTree = data
        //   const column = this.findObject(this.option.column, "articleList")
        //   column.dicData = res.data.data
        //   this.loading = false
        // })
      },
      updateFb(row) {
        if (row.publish == "0") {
          row.publish = "1"
        } else {
          row.publish = "0"
        }
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.url = urls.join(",")
        }
        update(row).then(
          () => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },
      kqcomment() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据")
          return
        }
        this.$confirm("确定将选择数据开启评论?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          }).then(() => {
            return upcomment(this.ids, "1")
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            this.$refs.crud.toggleSelection()
          })
      },
      gbcomment() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据")
          return
        }
        this.$confirm("确定将选择数据开启评论?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          }).then(() => {
            return upcomment(this.ids, "0")
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            this.$refs.crud.toggleSelection()
          })
      }
    },
  }
</script>

<style>
  .avue-upload__icon {
    line-height: 6;
  }
</style>

 src/views/backblask/BackblastPubRecord.vue

@@ -10,6 +10,21 @@
                    v-text="textDispose(row, 'policemanPhoneflag', 'policemanPhone')">
                </el-button>
            </template>

            <template slot-scope="{row, size,index}" slot="peopleForm" >
            <el-table :data="form.backblastPubPersonEntityList" v-if="form.backblastPubPersonEntityList">
              <el-table-column width="100" property="name" label="姓名"
                label-class-name="workOrderStyle"></el-table-column>
              <el-table-column width="150" property="telephone" label="手机号" label-class-name="workOrderStyle">
              </el-table-column>
              <el-table-column width="160" property="idCard" label="身份证号" label-class-name="workOrderStyle">
              </el-table-column>
              <el-table-column width="150" property="occupation" label="职业" label-class-name="workOrderStyle">
              </el-table-column>
              <el-table-column width="160" property="address" label="居住地" label-class-name="workOrderStyle">
              </el-table-column>
            </el-table>
          </template>
            <!-- <template slot="menuLeft">
                <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
                </el-button>
@@ -80,10 +95,10 @@
                dialogClickModal: false,
                column: [
                    {
                        label: "宣传地址",
                        label: "地址",
                        prop: "address",
                        align: 'center',
                        minWidth: 210,
                        // align: 'center',
                        minWidth: 180,
                        labelWidth:120,
                        search: true,
                        searchSpan: 5,
@@ -91,17 +106,58 @@
                        row:true,
                        span:24,
                    }, {
                        label: "宣传内容",
                        label: "宣防内容",
                        prop: "pubContent",
                        labelWidth:120,
                        align: 'center',
                        // align: 'center',
                        type:"textarea",
                        row:true,
                        span:24,
                        overHidden:true,
                    },

                    {
                        label: "宣传图片",
                        label: "是否下载国家反诈app",
                        prop: "isFzApp",
                        labelWidth: 120,
                        // align: 'center',
                        type: "select",
                        row: true,
                        span: 24,
                        overHidden: true,
                        hide: true,
                        dicData: [{
                            label: "是",
                            value: 1
                        },
                        {
                            label: "否",
                            value: 2
                        }
                        ],
                    },
                    {
                        label: "是否打开预警共能",
                        prop: "isOpenAlarm",
                        labelWidth: 120,
                        // align: 'center',
                        type: "select",
                        row: true,
                        span: 24,
                        overHidden: true,
                        hide: true,
                        dicData: [{
                            label: "是",
                            value: 1
                        },
                        {
                            label: "否",
                            value: 2
                        }
                        ],
                    },
                    {
                        label: "宣防佐证照片",
                        prop: "pubUrls",
                        // align: 'center',
                        fileType: 'img',
@@ -113,7 +169,7 @@
                        row:true,
                        span:24,
                    }, {
                        label: "宣传时间",
                        label: "时间",
                        prop: "createTime",
                        align: 'center',
                        labelWidth:120,
@@ -140,25 +196,41 @@
                        searchSpan: 4,
                        width: 120
                    }, {
                        label: "地区",
                        label: "所属街道",
                        prop: "townName",
                        align: 'center',
                        search: true,
                        searchSpan: 3,
                        searchSpan: 4,
                        searchLabelWidth: 46,
                        labelWidth: 120,
                        width: 156,
                        searchPlaceholder: '请输入地区'
                        searchPlaceholder: '请输入街道'
                    }, {
                        label: "辖区派出所",
                        prop: "pcsName",
                        align: 'center',
                        labelWidth:120,
                        search: true,
                        search: false,
                        searchSpan: 4,
                        searchLabelWidth: 96,
                        searchPlaceholder: '请输入辖区派出所'
                    }],
                        searchPlaceholder: '请输入辖区派出所',
                        hide:true
                    },
                    {
                        label: "宣防对象",
                        prop: "people",
                        align: 'center',
                        labelWidth: 120,
                        search: false,
                        searchSpan: 4,
                        searchLabelWidth: 96,
                        searchPlaceholder: '请输入辖区派出所',
                        hide:true,
                        span:24,
                        slot: true,
                        formslot: true
                    },
                ],
            },
            data: []
        }
@@ -368,7 +440,8 @@
        beforeOpen(done, type) {
            if (["edit", "view"].includes(type)) {
                getDetail(this.form.id).then(res => {
                    
                     console.log("===>",res);
                     this.$set(this.form,"backblastPubPersonEntityList",res.data.data.backblastPubPersonEntityList)
                })
                done()
            } else {
@@ -395,6 +468,7 @@
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    this.$set(item, 'policemanPhoneflag', false)
                    if (item.pubUrls && item.pubUrls != '' && item.pubUrls != null && item.pubUrls.length) {
                        var urls = []
                        var names = item.pubUrls.split(",").filter(item => item != '')
@@ -416,4 +490,8 @@
.avue-upload__icon {
    line-height: 6;
}

.workOrderStyle {
  font-weight: normal;
}
</style>

 src/views/backblask/BackblastWarnHanRec.vue

@@ -80,9 +80,9 @@
                dialogClickModal: false,
                column: [
                    {
                        label: "预警地址",
                        label: "地址",
                        prop: "address",
                        align: 'center',
                        // align: 'center',
                        minWidth: 210,
                        search: true,
                        searchSpan: 5,
@@ -91,9 +91,9 @@
                        labelWidth:120,
                        row:true,
                    }, {
                        label: "预警核实内容",
                        label: "核实内容信息",
                        prop: "recContent",
                        align: 'center',
                        // align: 'center',
                        minWidth:150,
                        labelWidth:120,
                        type:"textarea",
@@ -102,7 +102,7 @@
                        overHidden:true,
                    },
                    {
                        label: "预警核实图片",
                        label: "核实现场照片",
                        prop: "sceUrls",
                        // align: 'center',
                        labelWidth:120,
@@ -114,7 +114,7 @@
                        dataType: "string",
                        width: 110,
                    }, {
                        label: "预警核实时间",
                        label: "时间",
                        prop: "createTime",
                        labelWidth:120,
                        align: 'center',
@@ -397,6 +397,7 @@
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    this.$set(item, 'policemanPhoneflag', false)
                    if (item.sceUrls && item.sceUrls != '' && item.sceUrls != null && item.sceUrls.length) {
                        var urls = []
                        var names = item.sceUrls.split(",").filter(item => item != '')

 src/views/backblask/components/deitDiscussion.vue

New file
@@ -0,0 +1,336 @@
<template>
  <div>
    <el-dialog :title="title" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
      <basic-container>
        <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
          @search-reset="searchReset">
          <!-- <template slot-scope="{type,size,row }" slot="menuLeft">
            <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
            </el-button>
          </template> -->
        </avue-crud>
      </basic-container>
    </el-dialog>
  </div>
</template>

<script>
import {
  addPd,
  updatePd
} from "@/api/discuss/publicDiscuss"

import {
  getList as getPage
} from "@/api/article/articleIntegral"
import 'nprogress/nprogress.css'
import website from '@/config/website'


import {
  getLists,
  getList,
  getDetail,
  add,
  update,
  remove
} from "@/api/discuss/topics"

export default {
  data() {
    return {
      popupTableShow: false,
      popupTableUserShow: false,

      loading: true,

      title: '浏览人员信息',
      editFlag: false,
      disCussFromListClone: {},
      disCussFrom: {
        discussContent: '',
        optionRange: 0,
        sort: 1,
        optionContent: '',
        optionDetail: '',
        number: '',
        createTime: '',
        updateTime: '',
        deleteFlag: '',
        articleId: '',
        parentId: '',
        level: '',
        children: [{
          optionContent: '',
          optionDetail: '',
          number: '',
          createTime: '',
          updateTime: '',
          deleteFlag: '',
          articleId: '',
          parentId: '',
          level: '',
        }]
      },
      // 表单数据
      form: {
        optionRange: 0,
      },
      data: [],
      articleId: '',
      userData: [],
      userOption: {
        labelWidth: 96,
        searchLabelWidth: 96,
        searchShow: true,
        searchMenuSpan: 3,
        // menuWidth: 500,
        menu: false,
        height: "400px",
        calcHeight: 54,
        dialogWidth: 950,
        tip: false,
        border: true,
        //stripe:true,
        index: true,
        editBtn: false,
        addBtn: false,
        viewBtn: false,
        selection: true,
        delBtn: false,
        excelBtn: true,
        dialogClickModal: false,
        header: true,
        column: [{
          label: '姓名',
          prop: 'realName',
          searchSpan: 4,
          search: true,
          searchLabelWidth: 46,
          width:100,
        }, {
          label: '头像',
          type: 'upload',
          listType: "picture-img",
          prop: 'avatar',
          width:100,
        }, {
          label: '手机',
          prop: 'phone',
          searchSpan: 4,
          searchLabelWidth: 60,
          search: true,
          width:100,

        }, {
          label: '小区',
          prop: 'aoiName',
          width:180,
          overHidden:true,
        }, {
          label: '地址',
          prop: 'address',
          minWidth:100,
          overHidden:true,

        }, {
          label: '浏览时间',
          prop: 'createTime',
          width:160,
        },
        {
          label: '获得积分',
          prop: 'score',
          width:160,
          width:80,
          align:"center",
        }
      ]
      },
      // 分页信息
      userPage: {
        pageSize: 10,
        pageSizes: [10, 20, 30, 50, 100],
        currentPage: 1,
        total: 0
      },
      query: {},
      type: '',
      newData: {},
      articleRange: {},
      tops: {},
    }
  },

  watch: {
    'disCussFrom.optionRange': {
      handler(newData) {
        // console.log('** ** ** ** ** ** **', newData)
        const column = this.findObject(this.optionDiscuss.column, "optionNumber")
        if (newData == 1) {
          column.display = true
        } else {
          column.display = false
        }
      },
    },
  },

  methods: {
    userHandleClose() {
      this.popupTableUserShow = false
    },
    searchReset() {
      this.query ={}
      this.getUserPage(this.userPage, this.query)
    },

    searchChange(params, done) {
      this.query = params
      this.query.districtId = this.newData.articleRange
      if (this.type == 0) {
        this.query.articleId = this.articleId
      } else {
        this.query.topicsId = this.tops.id
      }
      this.userPage.currentPage = 1
      this.getUserPage(this.userPage, this.query)
      done()
    },

    openUser(row, type = 0) {
      this.type = type
      this.popupTableUserShow = true
      this.query = {}
      this.articleId = row.id
      this.getUserPage(this.userPage, this.userParams)
    },

    initData(newData) {
      console.log("======>",  newData);
      this.editFlag = false
      this.popupTableShow = true
      this.articleId = newData.id
      this.query.level = 1
      this.query.articleId = this.articleId
      this.newData = newData
      this.query.districtId = newData.articleRange
      this.onLoad(this.userPage, this.query)
    },

    handleClose() {
      this.popupTableShow = false
      this.disCussFrom = {}
    },

    handleReset() {
      this.editFlag = false
    },

    // 提交修改
    rowUpdate(row, index, done, loading) {
      done()

      if (row.attachment.length > 0) {
        var urls = []
        var split = row.attachment.split(",")
        split.forEach(url => {
          var names = url.split("jczz/")
          urls.push(names[1])
        })
        row.attachment = urls.join(",")
      }

      if (!row.id) {
        addPd(row).then(() => {
          this.onLoad()

          this.$message({
            type: "success",
            message: "操作成功!"
          })
        })
      } else {
        updatePd(row).then(() => {
          this.onLoad()

          this.$message({
            type: "success",
            message: "操作成功!"
          })
        })
      }
    },

    rowDel(row) {
      this.$confirm("确定将选择数据删除?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      })
        .then(() => {
          return remove(row.id)
        })
        .then(() => {
          this.getUserPage(this.userPage)

          this.$message({
            type: "success",
            message: "操作成功!"
          })
        })
    },

    add() {
      this.editFlag = true
    },

    edit(row) {
      this.disCussFrom = row
      this.disCussFromListClone = [].concat(row.children)
      this.editFlag = true
    },

    deletes(row) {
      this.$confirm("确定将选择数据删除?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      }).then(() => {
        return remove(row.id)
      }).then(() => {
        let param = {}
        this.onLoad(this.userPage, param)
        this.$message({
          type: "success",
          message: "操作成功!"
        })
      })
    },
    getUserPage(page, params = {}) {
      params['articleId'] = this.articleId
      getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
        const data = res.data.data
        this.userPage.total = data.total
        this.userData = data.records
        this.userData.forEach(item => {
          if (item.avatar.length > 0) {
            item.avatar = website.minioUrl + item.avatar
          }
        })
      })
    },

    onLoad(page, params = {}) {
      this.loading = true
      getLists(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
        const data = res.data.data
        this.data = data
        this.loading = false
      })
    }
  },
}
</script>

<style lang="scss" scoped></style>

 src/views/cGovernance/taskECall.vue

@@ -2,21 +2,39 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
                </el-button>
            </template>

      <template slot="menu" slot-scope="{row, size, index}">
        <el-button size="small" type="text" icon="el-icon-share" plain @click="share(row)">分享
        </el-button>
      </template>

            <template slot-scope="{row, size}" slot="phone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneflag')"
                    v-text="textDispose(row, 'phoneflag', 'phone')">
                </el-button>
            </template>
        </avue-crud>

    <el-dialog title="分享" append-to-body :visible.sync="sharePopup" center @close="popupClose">
      <div style="display: flex; justify-content: center; ">
        <el-radio-group v-model="circleRadio">
          <el-radio :label="0">邻里圈</el-radio>
          <el-radio :label="1">协同圈</el-radio>
        </el-radio-group>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="sharePopup = false">取 消</el-button>
        <el-button type="primary" @click="shareCircle()">确 定</el-button>
      </span>
    </el-dialog>
    </basic-container>
</template>

@@ -28,6 +46,9 @@
    add,
    getECallEvent
} from "@/api/task/eCall"
  import {
    add as circleAdd,
  } from "@/api/circle/circle"
import {
    getList as getHouseList,
    getDetatil as getHouseDetail
@@ -63,12 +84,15 @@
            },
            datetime: "",
            selectionList: [],
        sharePopup: false,
        circleRadio: 0,
        shareCircleRow: {},
            option: {
                labelWidth: 96,
                searchLabelWidth: 96,
          // searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,
          menuWidth: 310,

                height: "auto",
                calcHeight: 54,
@@ -145,13 +169,11 @@
                        label: "name",
                        value: "id",
                    },
                    rules: [
                        {
              rules: [{
                            required: true,
                            message: "请选择所属社区",
                            trigger: "blur",
                        },
                    ],
              }, ],
                },

                {
@@ -192,7 +214,8 @@
                    {
                        validator: validatorPhone,
                        trigger: 'blur'
                    }],
                }
              ],
                    slot: true
                },
                {
@@ -507,6 +530,41 @@
            this.selectionList = []
            this.$refs.crud.toggleSelection()
        },

      share(row) {
        console.table(row)
        this.shareCircleRow = row
        this.sharePopup = true
      },
      // 分享圈子
      shareCircle() {
        this.sharePopup = false
        let param = {}
        param.circleType = this.circleRadio
        param.houseCode = this.shareCircleRow.addressCode
        param.circleImages = this.shareCircleRow.imageUrls
        param.communityCode = this.shareCircleRow.communityCode
        param.circleText = this.shareCircleRow.remark
        param.evenType = 2
        param.eventId = this.shareCircleRow.id
        circleAdd(param).then(
          () => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },
      popupClose() {
        this.sharePopup = false
      },
        handleDelete () {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据")

 src/views/disputeRecord/disputeRecord.vue

New file
@@ -0,0 +1,866 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
            <template slot-scope="{row, size}" slot="phoneOne">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'phoneOneflag')"
                    v-text="textDispose(row, 'phoneOneflag', 'phoneOne')">
                </el-button>
            </template>
            <template slot-scope="{row, size}" slot="idCardOne">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'idCardOneflag')"
                    v-text="textDispose(row, 'idCardOneflag', 'idCardOne')">
                </el-button>
            </template>


            <template slot="menuLeft">
                <el-button type="success" size="small" plain v-if="permission.dispute_record_import"
                    icon="el-icon-upload2" @click="handleImport">导入
                </el-button>
                <el-button type="warning" size="small" plain v-if="permission.dispute_record_export"
                    icon="el-icon-download" @click="handleExport">导出
                </el-button>
            </template>
        </avue-crud>
        <el-dialog title="矛盾纠纷事件数据导入" append-to-body :visible.sync="excelBox" width="555px">
            <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
                <template slot="excelTemplate">
                    <el-button size="small" type="primary" @click="handleTemplate">
                        点击下载<i class="el-icon-download el-icon--right"></i>
                    </el-button>
                </template>
            </avue-form>
        </el-dialog>
    </basic-container>
</template>

<script>
import {
    mapGetters
} from "vuex"
import {
    getList,
    add,
    update,
    remove,
    getDetail
} from "@/api/disputeRecord/disputeRecord"
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import Qs from "qs"
import {
    exportBlob
} from "@/api/common"
import {
    getToken
} from '@/util/auth'
import {
    downloadXls
} from "@/util/util"
import {
    dateNow
} from "@/util/date"
import website from '@/config/website'
export default {
    data() {
        let isCardId = function (rule, value, callback) {
            // 15位和18位身份证号码的正则表达式
            var regIdCard =
                /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/

            // 如果通过该验证，说明身份证格式正确，但准确性还需计算
            if (regIdCard.test(value) || value == '') {
                if (value.length == 18) {
                    var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
                        5, 8, 4, 2) // 将前17位加权因子保存在数组里
                    var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2) // 这是除以11后，可能产生的11位余数、验证码，也保存成数组
                    var idCardWiSum = 0 // 用来保存前17位各自乖以加权因子后的总和
                    for (var i = 0; i < 17; i++) {
                        idCardWiSum += value.substring(i, i + 1) * idCardWi[i]
                    }

                    var idCardMod = idCardWiSum % 11 // 计算出校验码所在数组的位置
                    var idCardLast = value.substring(17) // 得到最后一位身份证号码

                    // 如果等于2，则说明校验码是10，身份证号码最后一位应该是X
                    if (idCardMod == 2) {
                        if (idCardLast == "X" || idCardLast == "x") {
                            callback()
                        } else {
                            callback(new Error("身份证号格式有误！"))
                        }
                    } else {
                        // 用计算出的验证码与最后一位身份证号码匹配，如果一致，说明通过，否则是无效的身份证号码
                        if (idCardLast == idCardY[idCardMod]) {
                            callback()
                        } else {
                            callback(new Error("身份证号格式有误！"))
                        }
                    }
                } else {
                    callback()
                }
            } else {
                //alert("身份证格式不正确!");
                callback(new Error("身份证号格式有误！"))
            }

            callback()
        }

        //手机号格式校验
        let validatorPhone = function (rule, value, callback) {
            if (value) {
                if (!/^1[3456789]\d{9}$/.test(value)) {
                    callback(new Error('手机号格式有误！'))
                } else {
                    callback()
                }
            }
            callback()
        }
        return {
            excelForm: {},
            excelBox: false,
            excelOption: {
                submitBtn: false,
                emptyBtn: false,
                column: [{
                    label: '模板上传',
                    prop: 'excelFile',
                    type: 'upload',
                    drag: true,
                    loadText: '模板上传中，请稍等',
                    span: 24,
                    propsHttp: {
                        res: 'data'
                    },
                    tip: '请上传 .xls,.xlsx 标准格式文件',
                    action: "/api/blade-disputeRecord/disputeRecord/import-disputeRecord"
                },
                // {
                //     label: "数据覆盖",
                //     prop: "isCovered",
                //     type: "switch",
                //     align: "center",
                //     width: 80,
                //     dicData: [{
                //         label: "否",
                //         value: 0
                //     },
                //     {
                //         label: "是",
                //         value: 1
                //     }
                //     ],
                //     value: 0,
                //     slot: true,
                //     rules: [{
                //         required: true,
                //         message: "请选择是否覆盖",
                //         trigger: "blur"
                //     }]
                // },
                {
                    label: '模板下载',
                    prop: 'excelTemplate',
                    formslot: true,
                    span: 24,
                }
                ]
            },
            form: {},
            query: {},
            loading: true,

            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            datetime: "",
            selectionList: [],
            option: {
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                menuWidth: 210,
                tip: false,
                searchShow: true,
                searchMenuSpan: 3,
                border: true,
                index: true,
                editBtn: true,
                delBtn: true,
                addBtn: true,
                viewBtn: true,
                refreshBtn: true,
                searchShowBtn: true,
                columnBtn: true,
                dialogClickModal: false,
                column: [
                    {
                        label: "事发地址",
                        prop: "address",
                        // align: 'center',
                        minWidth: 210,
                        search: true,
                        searchSpan: 5,
                        display: false,
                        overHidden: true,
                    },
                    {
                        label: "事发地址",
                        prop: "location",
                        align: 'center',
                        minWidth: 210,
                        span: 12,
                        hide: true,
                        overHidden: true,
                        labelWidth: 150,
                        // row: true,
                        type: 'map',
                        dataType: "string",
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {
                                required: true,
                                message: "请选择巡查地址",
                                trigger: "blur",
                            },
                        ],
                    }, {
                        width: 150,
                        label: "事发时间",
                        prop: "eventTime",
                        type: "datetime",
                        labelWidth: 150,
                        format: "yyyy-MM-dd HH:mm:ss",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                        rules: [
                            {
                                required: true,
                                message: "请选择事发时间",
                                trigger: "blur",
                            },
                        ],
                    }, {
                        label: "事发时间",
                        prop: "dateTime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择事发时间",
                            trigger: "blur",
                        },],
                    }, {
                        label: "纠纷内容",
                        prop: "disputeContent",
                        // align: 'center',
                        minWidth: 150,
                        labelWidth: 150,
                        type: "textarea",
                        row: true,
                        span: 24,
                        overHidden: true,
                        rules: [
                            {
                                required: true,
                                message: "请输入纠纷内容",
                                trigger: "blur",
                            },
                        ],
                    },
                    {
                        label: "纠纷类型",
                        prop: "disputeType",
                        align: 'center',
                        minWidth: 150,
                        labelWidth: 150,
                        search: true,
                        searchSpan: 4,
                        dataType: "number",
                        type: "select",
                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=disputeType",
                        props: {
                            label: "dictValue",
                            value: "dictKey",
                        },
                        rules: [{
                            required: true,
                            message: "请选择纠纷类型",
                            trigger: "blur",
                        },],
                    },
                    {
                        label: "是否受伤",
                        prop: "injuryFlag",
                        align: 'center',
                        width: 80,
                        search: true,
                        searchSpan: 3,
                        labelWidth: 150,
                        type: "select",
                        dicData: [
                            {
                                label: "是",
                                value: 1
                            },
                            {
                                label: "否",
                                value: 0
                            }
                        ],
                        rules: [
                            {
                                required: true,
                                message: "请选择是否受伤",
                                trigger: "blur",
                            },
                        ],
                    },
                    {
                        label: "受伤情况描述",
                        prop: "injuryDesc",
                        align: 'center',
                        minWidth: 150,
                        labelWidth: 150,
                        display: false,
                        hide: true,
                        row: true,
                        span: 24,
                        overHidden: true,
                        rules: [
                            {
                                required: false,
                                message: "请输入受伤情况描述",
                                trigger: "blur",
                            },
                        ],
                    },
                    {
                        label: "报警次数",
                        prop: "alarmNum",
                        align: 'center',
                        type: "number",
                        labelWidth: 150,
                    },
                    {
                        label: "信息来源",
                        prop: "source",
                        labelWidth: 150,
                        align: 'center',
                        width: 156,
                        dataType: "number",
                        type: "select",
                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=disputeSource",
                        props: {
                            label: "dictValue",
                            value: "dictKey",
                        },
                        rules: [{
                            required: true,
                            message: "请选择信息来源",
                            trigger: "blur",
                        },],
                    }, {
                        label: "当事人1姓名",
                        prop: "nameOne",
                        align: 'center',
                        slot: true,
                        labelWidth: 150,
                        search: true,
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 100,
                        rules: [
                            {
                                required: true,
                                message: "请输入当事人1姓名",
                                trigger: "blur",
                            },
                        ],
                    },{
                        label: "当事人1性别",
                        prop: "genderOne",
                        align: 'center',
                        slot: true,
                        labelWidth: 150,
                        // search: true,
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        type:"select",
                        dicData:[
                            {
                                label:"男",
                                value: 1
                            },{
                                label:"女",
                                value: 2
                            }
                        ],
                        width: 100,
                        rules: [
                            {
                                required: true,
                                message: "请选择当事人1性别",
                                trigger: "blur",
                            },
                        ],
                    },  {
                        label: "当事人1电话",
                        prop: "phoneOne",
                        align: 'center',
                        slot: true,
                        labelWidth: 150,
                        search: true,
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 100,
                        rules: [
                            {
                                required: true,
                                message: "请输入当事人1电话",
                                trigger: "blur",
                            },
                            {
                                validator: validatorPhone,
                                trigger: 'blur'
                            }
                        ],
                    },
                    {
                        label: "当事人1身份证号",
                        prop: "idCardOne",
                        align: 'center',
                        slot: true,
                        labelWidth: 150,
                        // search: true,
                        searchLabelWidth: 150,
                        searchSpan: 5,
                        width: 150,
                        // row: true,
                        rules: [
                            {
                                required: true,
                                message: "请输入当事人1身份证号",
                                trigger: "blur",
                            }, {
                                validator: isCardId,
                                trigger: 'blur'
                            }
                        ],
                    },
                    {
                        label: "当事人2姓名",
                        prop: "nameTwo",
                        align: 'center',
                        slot: true,
                        hide: true,
                        labelWidth: 150,
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 120,
                        rules: [
                            {
                                required: true,
                                message: "请输入当事人2姓名",
                                trigger: "blur",
                            },
                        ],
                    }, {
                        label: "当事人2性别",
                        prop: "genderOne",
                        align: 'center',
                        slot: true,
                        labelWidth: 150,
                        // search: true,
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        type:"select",
                        dicData:[
                            {
                                label:"男",
                                value: 1
                            },{
                                label:"女",
                                value: 2
                            }
                        ],
                        width: 100,
                        rules: [
                            {
                                required: true,
                                message: "请选择当事人2性别",
                                trigger: "blur",
                            },
                        ],
                    }, {
                        label: "当事人2电话",
                        prop: "phoneTwo",
                        align: 'center',
                        slot: true,
                        hide: true,
                        labelWidth: 150,
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 120,
                        rules: [
                            {
                                required: true,
                                message: "请输入当事人2电话",
                                trigger: "blur",
                            },
                            {
                                validator: validatorPhone,
                                trigger: 'blur'
                            }
                        ],
                    },
                    {
                        label: "当事人2身份证号",
                        prop: "idCardTwo",
                        align: 'center',
                        slot: true,
                        hide: true,
                        labelWidth: 150,
                        searchLabelWidth: 110,
                        searchSpan: 4,
                        width: 120,
                        rules: [
                            {
                                required: true,
                                message: "请输入当事人2身份证号",
                                trigger: "blur",
                            }, {
                                validator: isCardId,
                                trigger: 'blur'
                            }
                        ],
                    },
                    {
                        label: "地区",
                        prop: "townName",
                        align: 'center',
                        search: true,
                        addDisplay: false,
                        editDisplay: false,
                        searchSpan: 3,
                        searchLabelWidth: 60,
                        labelWidth: 150,
                        width: 120,
                        searchPlaceholder: '请输入地区'
                    }, {
                        label: "辖区派出所",
                        prop: "pcsName",
                        align: 'center',
                        search: true,
                        addDisplay: false,
                        editDisplay: false,
                        searchSpan: 4,
                        labelWidth: 150,
                        width: 120,
                        searchLabelWidth: 96,
                        searchPlaceholder: '请输入辖区派出所'
                    }, {
                        label: "处理结果",
                        prop: "handleResult",
                        align: 'center',
                        search: true,
                        labelWidth: 150,
                        searchSpan: 4,
                        width: 110,
                        type: "select",
                        dicData: [
                            {
                                label: "已化解",
                                value: 1
                            },
                            {
                                label: "未化解",
                                value: 2
                            },
                            {
                                label: "移送e呼即办",
                                value: 3
                            }
                        ],
                        rules: [
                            {
                                required: true,
                                message: "请选择处理结果",
                                trigger: "blur",
                            },
                        ],
                    }],
            },
            data: []
        }
    },

    computed: {
        ...mapGetters(["permission", "userInfo"]),
        permissionList() {
            return {
                addBtn: this.vaildData(this.permission.dispute_record_add, true),
                viewBtn: this.vaildData(this.permission.dispute_record_view, true),
                delBtn: this.vaildData(this.permission.dispute_record_delete, true),
                editBtn: this.vaildData(this.permission.dispute_record_edit, true),
            }
        },
        ids() {
            let ids = []
            this.selectionList.forEach((ele) => {
                ids.push(ele.id)
            })
            return ids.join(",")
        },

        textDispose() {
            return (row, flag, type) => {
                if (row[flag] || row[type] == null) {
                    return row[type]
                } else {
                    if (type == 'principalIdCard') {
                        return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
                    } else {
                        return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
                    }
                }
            }
        }
    },
    watch: {
        "form.injuryFlag": {
            // form是表单或者表格绑定的数据集，v-model='form'
            handler(val) {
                let injuryDescColumn = this.findObject(
                    this.option.column,
                    'injuryDesc'
                )
                if (val == 1) {
                    injuryDescColumn.rules[0].required = true
                    injuryDescColumn.display = true
                } else {
                    injuryDescColumn.rules[0].required = false
                    injuryDescColumn.display = false
                }
            },
            immediate: true,
        },
    },
    methods: {
        locationDispose(data) {
            data = data.split(',')

            return {
                lng: data[0],
                lat: data[1],
                address: data[2]
            }
        },
        handleTemplate() {
            exportBlob(`/api/blade-disputeRecord/disputeRecord/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
                downloadXls(res.data, "矛盾纠纷事件数据模板.xlsx")
            })
        },
        handleImport() {
            this.excelBox = true
        },
        uploadAfter(res, done, loading, column) {
            this.excelBox = false
            this.refreshChange()
            done()
        },
        handleExport() {
            this.$confirm("是否导出矛盾纠纷事件数据?", "提示", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
            }).then(() => {
                NProgress.start()
                var data = {
                    ...this.query
                }
                data.isNine = 1
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-disputeRecord/disputeRecord/export-disputeRecord?${this.website.tokenHeader}=${getToken()}&` + data
                ).then(res => {
                    console.log('exportBlob', res)
                    downloadXls(res.data, `矛盾纠纷事件${dateNow()}.xlsx`)
                    NProgress.done()
                })
            })
        },

        showStringDispose(row, type) {
            row[type] = !row[type]
        },

        rowSave(row, done, loading) {
            add({
                ...row,
                ...this.locationDispose(row.location)
            }).then(
                () => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    done()
                },
                (error) => {
                    window.console.log(error)
                    loading()
                }
            )
        },
        rowUpdate(row, index, done, loading) {
            update({
                ...row,
                ...this.locationDispose(row.location)
            }).then(
                () => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    done()
                },
                (error) => {
                    window.console.log(error)
                    loading()
                }
            )
        },
        rowDel(row) {
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning",
            })
                .then(() => {
                    return remove(row.id)
                })
                .then(() => {
                    this.onLoad(this.page)

                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                })
        },

        searchReset() {
            this.query = {}
            this.onLoad(this.page)
        },

        searchChange(params, done) {
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
        },

        selectionChange(list) {
            this.selectionList = list
        },

        selectionClear() {
            this.selectionList = []
            this.$nextTick(() => {
                this.$refs.crud && this.$refs.crud.toggleSelection()
            })
        },

        handleDelete() {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据")
                return
            }
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning",
            })
                .then(() => {
                    return remove(this.ids)
                })
                .then(() => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    this.$refs.crud.toggleSelection()
                })
        },

        beforeOpen(done, type) {
            if (["edit", "view"].includes(type)) {
                getDetail(this.form.id).then(res => {
                    this.form = res.data.data
                    this.form.location = [this.form.lng, this.form.lat, this.form.address].join(',')
                })
                done()
            } else {
                done()
            }
        },
        currentChange(currentPage) {
            this.page.currentPage = currentPage
        },
        sizeChange(pageSize) {
            this.page.pageSize = pageSize
        },
        refreshChange() {
            this.onLoad(this.page, this.query)
        },
        onLoad(page, params = {}) {
            const {
                dateTime
            } = this.query
            if (dateTime) {
                params['startTime'] = dateTime[0]
                params['endTime'] = dateTime[1]
            }
            this.loading = true
            getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
                const data = res.data.data;
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    this.$set(item, 'phoneOneflag', false)
                    this.$set(item, 'idCardOneflag', false)
                })
                this.loading = false
                this.selectionClear()
            })
        }
    }
}
</script>

<style lang="scss" scoped>
.avue-upload__icon {
    line-height: 6;
}
</style>

 src/views/gzll/components/done.vue

@@ -39,6 +39,7 @@
export default {
    data () {
        return {
        datetime: "",
            form: {},
            selectionId: '',
            selectionList: [],
@@ -73,8 +74,7 @@
                dialogWidth: 900,
                dialogClickModal: false,
                header: false,
                column: [
                    {
          column: [{
                        label: "流程分类",
                        type: "select",
                        row: true,
@@ -89,6 +89,39 @@
                        // search: true,
                        hide: true,
                        width: 100,
            },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
                    },
                    {
                        width: 100,
@@ -212,10 +245,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/gzll/components/todo.vue

@@ -43,6 +43,7 @@
  export default {
    data() {
      return {
        datetime: "",
        typeStatus: 1,
        form: {},
        selectionId: '',
@@ -123,6 +124,32 @@
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
            },
            {
              width: 110,
@@ -137,11 +164,7 @@
              // search: true,
              slot: true
            },
            {
              label: '项目名称',
              prop: 'name',
              search: true,
            },

            {
              label: '当前步骤',
              prop: 'taskName',
@@ -239,10 +262,20 @@
        this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const query = {
        let query = {
          ...this.query,
          category: (params.category) ? flowCategory(params.category) : null
        }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
        this.loading = true
        todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
          const data = {

 src/views/gzll/ownersCommittee.vue

New file
@@ -0,0 +1,685 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
                </el-button>
            </template>

            <template slot-scope="{type,size,row }" slot="menu">
                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
                    @click.stop="updateFb(row)">
                    撤销
                </el-button>
                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>

            <template slot-scope="{ row, size }" slot="publish">
                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
                </el-tag>
            </template>

            <template slot-scope="{ row }" slot="iscomment">
                <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
                    :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
                </el-switch>
            </template>
        </avue-crud>

    </basic-container>
</template>

<script>
import {
    getList,
    remove,
    update,
    add,
    getNotice,
    upcomment
} from "@/api/article/article"

import {
    addPd,
} from "@/api/discuss/publicDiscuss"

import website from '@/config/website'


import {
    getDistrictTree
} from "@/api/district/index"

import {
    mapGetters
} from "vuex"

export default {
    data () {
        return {
            discussForm: {
                ontitle: '',
                title: '',
                openFlag: 0,
                numberRestrictions: 0,
                voteRestrictions: 0,
                userRestrictions: 0,
                endTime: '',
                articleId: '',
                createTime: '',
                updateTime: '',
                deleteFlag: '',
                repeatVote: 0,
                voteNumberPublic: 0,
                appointUser: '',
                userIds: '',
                eventType: 1,
            },
            dialogVisibles: false,
            form: {},
            query: {},
            loading: true,
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0,
            },
            datetime: "",
            selectionList: [],
            option: {
                labelWidth: 120,
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 450,

                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
                tip: false,
                border: true,
                //stripe:true,
                index: true,
                viewBtn: true,
                selection: true,
                excelBtn: true,
                dialogClickModal: false,
                column: [{
                    label: "标题",
                    prop: "title",
                    span: 24,
                    row: true,
                    searchSpan: 4,
                    search: true,
                    searchLabelWidth: 46,
                    rules: [{
                        required: true,
                        message: "请输入业主大会标题",
                        trigger: "blur",
                    },],
                },
                {
                    width: 110,
                    label: "封面",
                    prop: "url",
                    // align:'center',
                    type: "upload",
                    listType: "picture-img",
                    action: "/api/blade-resource/oss/endpoint/put-file",
                    propsHttp: {
                        res: "data",
                        url: "link",
                    },
                    // hide: true,
                    span: 24,
                },
                {
                    hide: true,
                    parent: false,
                    label: "公示范围",
                    prop: "articleList",
                    type: 'tree',
                    dicData: [],
                    props: {
                        label: "name",
                        value: 'id'
                    },
                    span: 12,
                    rules: [{
                        required: true,
                        message: "请选择公示范围",
                        trigger: "blur",
                    },],
                },
                {
                    width: 100,
                    label: "业主大会类型",
                    prop: "type",
                    value: 5,
                    slot: true,
                    searchSpan: 4,
                    // search: true,
                    type: "select",
                    rules: [{
                        required: true,
                        message: "请选择招标类型",
                        trigger: "blur",
                    },],
                    dicData: [{
                        label: "业主大会",
                        value: 5,
                    }],
                },
                {
                    label: "发布时间",
                    prop: "dateTime",
                    type: "daterange",
                    format: "yyyy-MM-dd",
                    valueFormat: "yyyy-MM-dd",
                    searchSpan: 6,
                    searchRange: true,
                    hide: true,
                    addDisplay: false,
                    editDisplay: false,
                    viewDisplay: false,
                    search: true,
                    rules: [{
                        required: true,
                        message: "请选择发布时间",
                        trigger: "blur",
                    },],
                },
                {
                    width: 144,
                    label: "发布时间",
                    prop: "createTime",
                    type: "date",
                    format: "yyyy-MM-dd",
                    valueFormat: "yyyy-MM-dd HH:mm:ss",
                },

                {
                    width: 110,
                    label: "所属街道",
                    addDisplay: false,
                    editDisplay: false,
                    viewDisplay: false,
                    prop: "streetName",
                    search: true,
                    searchSpan: 4
                },

                {
                    width: 156,
                    overHidden: true,
                    label: "所属社区",
                    addDisplay: false,
                    editDisplay: false,
                    viewDisplay: false,
                    prop: "communityName",
                    search: true,
                    searchSpan: 4
                },

                {
                    width: 100,
                    label: "发布状态",
                    prop: "publish",
                    value: "0",
                    slot: true,
                    searchSpan: 4,
                    search: true,
                    type: "select",
                    display: false,
                    rules: [{
                        required: true,
                        message: "请选择发布状态",
                        trigger: "blur",
                    },],
                    dicData: [{
                        label: "未发布",
                        value: "0",
                    },
                    {
                        label: "已发布",
                        value: "1",
                    }
                    ],
                },
                {
                    width: 100,
                    label: "评论区",
                    prop: "iscomment",
                    slot: true,
                    type: "switch",
                    activeColor: "#13ce66",
                    inactiveColor: "#ccc",
                    value: '1',
                    dicData: [{
                        label: "关闭",
                        value: "0",
                    },
                    {
                        label: "开启",
                        value: "1",
                    }
                    ],
                },
                {
                    label: "内容",
                    prop: "content",
                    component: "AvueUeditor",
                    options: {
                        action: "/api/blade-resource/oss/endpoint/put-file",
                        // customConfig: {
                        //   lineHeights: ['1', '1.15', '1.6', '2', '2.5', '3']
                        // },//wangEditor编辑的配置
                        props: {
                            res: "data",
                            url: "link",
                        },
                    },
                    hide: true,
                    minRows: 6,
                    span: 24,
                },
                ],
            },
            data: [],

            districtTree: [],
        }
    },
    watch: {
        "form.articleType": {
            handler (val) {
                if (val) {
                    var videoUrl = this.findObject(this.option.column, "videoUrl")
                    var content = this.findObject(this.option.column, "content")
                    if (val.indexOf('ksp') != -1) {
                        videoUrl.display = true
                        content.display = false
                        videoUrl.rules = [{
                            required: false,
                            message: "请选择视频",
                            trigger: "blur",
                        },]
                    } else {
                        videoUrl.display = false
                        content.display = true
                        videoUrl.rules = ""
                    }
                }
            },
            immediate: true,
        }
    },
    computed: {
        ...mapGetters(["permission", "userInfo"]),
        permissionList () {
            return {
                addBtn: this.vaildData(this.permission.article_add, true),
                viewBtn: this.vaildData(this.permission.article_view, true),
                delBtn: this.vaildData(this.permission.article_delete, true),
                editBtn: this.vaildData(this.permission.article_edit, true),
            }
        },
        ids () {
            let ids = []
            this.selectionList.forEach((ele) => {
                ids.push(ele.id)
            })
            return ids.join(",")
        },
        showStatus () {
            return (data, type) => {
                if (data == 0) {
                    return {
                        text: type == 1 ? '未发布' : '关闭',
                        type: 'info'
                    }
                } else if (data == 1) {
                    return {
                        text: type == 1 ? '已发布' : '开启',
                        type: 'success'
                    }
                }
            }
        }
    },
    methods: {
        iscommentInput (e, data) {
            upcomment(data.id, e).then(() => {
                this.$message({
                    type: "success",
                    message: "操作成功!",
                })
            })
        },

        openDilog (row, type) {
            this.dialogVisibles = true
            this.discussForm.eventType = type
            this.discussForm.articleId = row.id
            this.discussForm.title = row.title
            if (type == 0) {
                this.discussForm.ontitle = '公益报名'
            } else {
                this.discussForm.ontitle = '创建议题'
            }
        },

        handleSubmit (form, done) {
            done()
            addPd(form).then(
                () => {
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    this.dialogVisibles = false
                    done()
                },
                (error) => {
                    window.console.log(error)
                    // loading();
                }
            )
        },

        handleClose (done) {
            done()
            // this.$confirm('确认关闭？')
            //   .then(_ => {
            //     done();
            //   })
            //   .catch(_ => {});
        },
        rowSave (row, done, loading) {
            row['type'] = 5
            row.userid = this.userInfo.user_id
            row.articleRange = JSON.stringify(row.articleList)
            if (row.url.length > 0) {
                var urls = []
                var split = row.url.split(",")
                split.forEach(url => {
                    var names = url.split("jczz/")
                    urls.push(names[1])
                })
                row.url = urls.join(",")
            }
            add({
                ...row,
                districtId: row.articleList
            }).then(
                () => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    done()
                },
                (error) => {
                    window.console.log(error)
                    loading()
                }
            )
        },
        rowUpdate (row, index, done, loading) {
            row.articleRange = JSON.stringify(row.articleList)
            if (row.url.length > 0) {
                var urls = []
                var split = row.url.split(",")
                split.forEach(url => {
                    var names = url.split("jczz/")
                    urls.push(names[1])
                })
                row.url = urls.join(",")
            }

            update({
                ...row,
                district_id: row.articleList
            }).then(
                () => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    done()
                },
                (error) => {
                    window.console.log(error)
                    loading()
                }
            )
        },
        rowDel (row) {
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning",
            })
                .then(() => {
                    return remove(row.id)
                })
                .then(() => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                })
        },
        searchReset () {
            this.query = {}
            this.onLoad(this.page)
        },
        searchChange (params, done) {
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
        },
        selectionChange (list) {
            this.selectionList = list
        },
        selectionClear () {
            this.selectionList = []
            this.$refs.crud.toggleSelection()
        },
        handleDelete () {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据")
                return
            }
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning",
            })
                .then(() => {
                    return remove(this.ids)
                })
                .then(() => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    this.$refs.crud.toggleSelection()
                })
        },
        beforeOpen (done, type) {
            if (["edit", "view"].includes(type)) {
                getNotice(this.form.id).then((res) => {
                    let data = res.data.data
                    // data.forEach(item=>{
                    if (data.url.length > 0) {
                        var urls = []
                        var names = data.url.split(",")
                        names.forEach(name => {
                            urls.push(website.minioUrl + name)
                        })
                        data.url = urls.join(",")
                    }
                    data.articleList = JSON.parse(data.articleRange)
                    this.form = data
                })
            }
            // con
            done()
        },
        currentChange (currentPage) {
            this.page.currentPage = currentPage
        },
        sizeChange (pageSize) {
            this.page.pageSize = pageSize
        },
        refreshChange () {
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const {
                dateTime
            } = this.query
            let values = {
                ...params,
            }
            if (dateTime) {
                values = {
                    ...params,
                    startTime: dateTime[0] + ' 00:00:01',
                    endTime: dateTime[1] + ' 23:59:59',
                    ...this.query,
                }
                values.dateTime = null
            }
            values.type = 5
            this.loading = true
            console.log(values)
            getList(page.currentPage, page.pageSize, values).then((res) => {
                const data = res.data.data
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    if (item.url.length > 0) {
                        var urls = []
                        var names = item.url.split(",")
                        names.forEach(name => {
                            urls.push(website.minioUrl + name)
                        })
                        item.url = urls.join(",")
                    }
                })
                this.loading = false
                this.selectionClear()
            })
            getDistrictTree({
                filterFlag: 1
            }).then((res) => {
                const data = res.data.data
                this.districtTree = data
                const column = this.findObject(this.option.column, "articleList")
                column.dicData = res.data.data
                this.loading = false
            })
        },
        updateFb (row) {
            if (row.publish == "0") {
                row.publish = "1"
            } else {
                row.publish = "0"
            }
            if (row.url.length > 0) {
                var urls = []
                var split = row.url.split(",")
                split.forEach(url => {
                    var names = url.split("jczz/")
                    urls.push(names[1])
                })
                row.url = urls.join(",")
            }
            update(row).then(
                () => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    done()
                },
                (error) => {
                    window.console.log(error)
                    loading()
                }
            )
        },
        kqcomment () {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据")
                return
            }
            this.$confirm("确定将选择数据开启评论?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning",
            }).then(() => {
                return upcomment(this.ids, "1")
            })
                .then(() => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    this.$refs.crud.toggleSelection()
                })
        },
        gbcomment () {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据")
                return
            }
            this.$confirm("确定将选择数据开启评论?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning",
            }).then(() => {
                return upcomment(this.ids, "0")
            })
                .then(() => {
                    this.onLoad(this.page)
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    this.$refs.crud.toggleSelection()
                })
        }
    },
}
</script>

<style lang="scss" scoped>
.avue-upload__icon {
    line-height: 6;
}

:deep(.avue-form__menu--center) {
    text-align: left;
}

:deep(.avue-form__menu--center .el-button) {
    margin: 0 5px 0 0;
}</style>

 src/views/gzll/process/maintenanceFundApply/detail.vue

@@ -198,10 +198,10 @@
              disabled: true
            },
            {
              label: "项目分摊方式",
              prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
              labelWidth: 140,
              value: '按建筑面积分摊',
              value: '',
              span: 12,
              row: true,
              disabled: true
@@ -451,8 +451,6 @@


<style>


.workOrderStyle {
  font-weight: normal;
}

 src/views/gzll/process/maintenanceFundApply/form.vue

@@ -100,12 +100,13 @@
              }, ],
            },
            {
              label: "项目分摊方式",
              prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
              labelWidth: 140,
              value: '按建筑面积分摊',
              value: '',
              span: 12,
              row: true,
              disabled: true
            },
            {
              label: '联系人',

 src/views/gzll/process/maintenanceFundApply/handle.vue

@@ -207,10 +207,10 @@
          disabled: true
        },
        {
          label: "项目分摊方式",
          prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
          labelWidth: 140,
          value: '按建筑面积分摊',
              value: '',
          span: 12,
          row: true,
          disabled: true
@@ -542,6 +542,7 @@
  left: 50%;
  transform: translateX(-50%);
}

.workOrderStyle {
  font-weight: normal;
}

 src/views/monitor/log/api.vue

@@ -142,6 +142,7 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            params['type'] = '2'
            this.loading = true
            getApiList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
                const data = res.data.data

 src/views/patrol/addsubject.vue

New file
@@ -0,0 +1,255 @@
<template>
  <el-dialog :title="this.id ? '修改' : '新增'" width="60%" modal-append-to-body="false" append-to-body="true"
    :close-on-click-model="true" :visible.sync="visible" @close="closeDialog">
    <avue-form ref="form" :option="option" v-model="form" @submit="submit"></avue-form>
  </el-dialog>
</template>

<script>
  import {
    getList,
    addTwo
  } from "@/api/patrol/patrolGroup";

  export default {
    name: "add",
    data() {
      return {
        inputs: {
          input1: 1,
        },
        editFlag: false,
        optionContentAId: null,
        optionContentBId: null,
        optionContentCId: null,
        optionContentDId: null,
        optionContentEId: null,
        arrContent: ["1"],
        list: [{
            data: 1,
          },
          {
            data: 1,
          },
          {
            data: 1,
          },
        ],
        visible: false,
        choicesType: "0",
        loading: false,
        form: {},
        option: {
          height: "auto",
          calcHeight: 80,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true, //liu
          stripe: true,
          align: "center",
          index: true,
          selection: true,
          viewBtn: true,
          defaultExpandAll: true,
          dialogClickModal: false,
          column: [{
              label: "类型",
              prop: "type",
              type: "select",
              props: {
                label: "title",
                value: "key",
              },
              dicUrl: "/api/blade-system/dict-biz/tree?code=subject_max",
              rules: [{
                required: true,
                message: "请选择类型",
                trigger: "blur",
              }, ],
              span: 24,
            },
            {
              prop: "id",
              display: false,
              type: 'input',
            },
            {
              label: "题目名称",
              prop: "name",
              search: true,
              type: "textarea",
              rules: [{
                required: true,
                message: "请输入题目名称",
                trigger: "blur",
              }, ],
              span: 24,
            },
            {
              label: '选项内容',
              prop: 'patrolGroupItemList',
              type: 'dynamic',
              span: 24,
              children: {
                align: 'center',
                headerAlign: 'center',
                rowAdd: (done) => {
                  // this.$message.success('新增回调');
                  done({
                    input: '默认值'
                  });
                },
                rowDel: (row, done) => {
                  if (row.id) {
                    row.isDeleted = 1
                    this.deleteList.push(row)

                  }
                  // this.$message.success('删除回调' + JSON.stringify(row));
                  done();
                },
                column: [{
                  label: '选项标题',
                  prop: 'itemsName',
                  type: 'input',
                  rules: [{
                    required: true,
                    message: "请输入选项标题",
                    trigger: "blur",
                  }, ],
                }, {
                  label: '选项类型',
                  prop: 'type',
                  type: "select",
                  props: {
                    label: "title",
                    value: "key",
                  },
                  dicUrl: "/api/blade-system/dict-biz/tree?code=subject",
                  rules: [{
                    required: true,
                    message: "请输入选项类型",
                    trigger: "blur",
                  }, ],
                }]
              }
            },
          ],
        },
        formCheckbox: {},

        formJudge: {},
        formFill: {},
        deleteList: [],

        data: [{
          discussContent: '',
          optionContent: ''
        }, {
          discussContent: '',
          optionContent: ''
        }],
      };
    },
    computed: {
      // ...mapState({
      //   userInfo: (state) => state.user.userInfo,
      // }),
    },
    mounted() {},
    methods: {
      add() {
        this.editFlag = true
      },

      edit(row) {
        this.disCussFrom = row
        this.editFlag = true
      },
      //初始化
      inits(row) {
        // var formula = "2 + 3 * (4 - 1)"; // 要转换的字符串表达式
        // var result = eval(formula); // 调用eval()函数进行计算
        // console.log(result); // 输出结果：9
        // console.table(row); // 输出结果为 "2"
        // this.id = id || 0;
        this.visible = true;
        this.form = row
        // this.list = [{
        //   data: 1
        // }];
        // if (this.id) {
        //   //查询题目信息
        //   this.getSubjectInfo(id);
        // }
      },

      //加一行
      addRows() {
        //获取已有行的数据
        // debugger;
        if (this.index == 6) {
          return;
        }
        this.index++;
        this.list.push({
          data: this.index,
        });
        this.inputs[`input${this.index + 1}`] = "";
      },
      //减一行
      deleteRows(index) {
        if (this.index == 1) {
          return;
        }
        this.index--;
        this.list.splice(index, 1);
      },
      //单选题提交（新增）数据
      submit(row, done, loading) {
        var that = this;
        // console.table(this.deleteList)
        row.patrolGroupItemList = row.patrolGroupItemList.concat(this.deleteList)
        addTwo(row).then(
          () => {
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            that.visible = false;
            that.$refs.form.resetForm();
            this.$emit('refreshPage');
            done();
          },
          (error) => {
            window.console.log(error);
            loading();
          }
        );
      },
      //关闭窗口清除数据
      closeDialog() {
        this.$refs.form.resetForm();
      },
    },
  };
</script>
<style scoped>
  .optionContent-suffix {
    margin-top: 5px;
  }

  .optionContent-suffix span {
    margin-left: -20px;
  }

  .optionContent-suffix .optionContent-input {
    width: 90%;
    margin-left: 10px;
  }

  .optionContent-suffix .optionContent-botton {
    margin-left: 10px;
  }
</style>

 src/views/patrol/subject.vue

New file
@@ -0,0 +1,320 @@
/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
@Last Modified time: 2021-11-23 14:14:38 * menu-name 物业评定题库查询 */
<template>
  <basic-container :class="">
    <avue-crud class="company-box tablesss" :option="questionBankOption" :search.sync="questionBankSearch"
      :table-loading="questionBankLoading" :data="questionBankData" ref="questionBankCrud" :page.sync="questionBankPage"
      @selection-change="questionBankSelectionChange" @search-change="questionBankSearchChange"
      @search-reset="questionBankSearchReset" @current-change="questionBankCurrentChange"
      @size-change="questionBankSizeChange" @row-del="questionBankHandleDel" @on-load="questionBankOnLoad">
      <template slot="menuLeft">
        <el-button type="primary" size="small" icon="el-icon-plus" @click="questionBankHandleAdd">新 增
        </el-button>
      </template>

      <template slot-scope="{ row }" slot="menu">
        <el-button type="text" size="mini" icon="el-icon-edit" @click="questionBankHandleEdit(row)">编辑
        </el-button>
        <el-button type="text" size="mini" icon="el-icon-delete" @click="questionBankHandleDel(row)">删除
        </el-button>
      </template>
    </avue-crud>

    <!--  <el-dialog title="题库导入" append-to-body :visible.sync="excelBox" width="555px">
      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
        <template slot="excelTemplate">
          <el-button type="primary" @click="handleTemplate">
            点击下载<i class="el-icon-download el-icon--right"></i>
          </el-button>
        </template>
      </avue-form>
    </el-dialog> -->
    <addsubject ref="addsubject" v-on:refreshPage="refreshPage"></addsubject>
  </basic-container>
</template>

<script>
  import {
    getList,
    remove
  } from "@/api/patrol/patrolGroup";

  import addsubject from "./addsubject.vue";
  // import {
  //   mapGetters,
  //   mapState
  // } from "vuex";
  import Qs from "qs";
  import {
    getToken
  } from "@/util/auth";
  export default {
    components: {
      addsubject
    },
    data() {
      return {
        excelBox: false,
        excelForm: {},
        excelOption: {
          submitBtn: false,
          emptyBtn: false,
          column: [{
              label: "模板上传",
              prop: "excelFile",
              type: "upload",
              drag: true,
              loadText: "模板上传中，请稍等",
              span: 24,
              propsHttp: {
                res: "data"
              },
              tip: "请上传 .xls,.xlsx 标准格式文件",
              action: "/api/examSubjectChoices/import-examSubject"
            },
            {
              label: "模板下载",
              prop: "excelTemplate",
              formslot: true,
              span: 24
            }
          ]
        },
        questionBankOption: {
          // 操作栏多余按钮去除
          delBtn: false,
          editBtn: false,
          addBtn: false,
          selection: true,
          menu: true,
          // 导出按钮
          excelBtn: true,
          excelBtnText: "题库导出",
          // title: '题库',
          align: "center",
          height: "auto",
          calcHeight: 80,
          tip: false,
          searchShow: true,
          searchMenuSpan: 4,
          index: true,
          indexLabel: "序号",
          viewBtn: true,
          //dialogType: 'drawer',
          dialogClickModal: false,
          // 操作栏宽度
          menuWidth: 226,
          // ...this.$store.state.control.clearOtherBut,
          // ...this.$store.state.control.searchOpen,
          column: [{
              label: "题目类型",
              prop: "type",
              search: true,
              type: "select",
              searchSpan: 4,
              dicUrl: "/api/blade-system/dict-biz/tree?code=subject_max",
              props: {
                label: "title",
                value: "key",
              },
              slot: true,
              width: 96
            }, {
              label: "题目名称",
              prop: "name",
              searchSpan: 4,
              search: true,
              slot: true
            },
            {
              label: "创建时间",
              prop: "createDate",
              slot: true,
              width: 130
            },
            {
              label: "修改人",
              prop: "modifier",
              slot: true,
              width: 96
            },
            {
              label: "修改时间",
              prop: "modifyDate",
              slot: true,
              width: 130
            }
          ]
        },
        questionBankSearch: {},
        questionBankLoading: true,
        questionBankData: [],
        questionBankPage: {
          pageSize: 10,
          currentPage: 1,
          total: 16,
          // ...this.$store.state.control.changePageSize
        },
        questionBankQuery: {},
        questionBankSelectionList: []
      };
    },
    mounted() {
      this.$store.commit("setWindowSizeHeightAdd");
    },
    computed: {
      // ...mapGetters(["userInfo", "permission"]),
      permissionList() {
        return {
          // addBtn: this.vaildData(this.permission.subject_add, false),
          // viewBtn: this.vaildData(this.permission.subject_view, false),
          // delBtn: this.vaildData(this.permission.subject_delete, false),
          // editBtn: this.vaildData(this.permission.subject_edit, false),
          // excelBtn: this.vaildData(this.permission.subject_report, false)
        };
      },
      ids() {
        let ids = [];
        this.questionBankSelectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
      }
    },
    methods: {
      //触发页面刷新
      refreshPage() {
        this.questionBankOnLoad(this.questionBankPage);
      },
      questionBankHandleAdd() {
        this.$refs.addsubject.inits();
      },
      questionBankHandleEdit(row) {
        this.$refs.addsubject.inits(row);
      },
      questionBankOnLoad(page, params = {}) {
        params = this.questionBankSearch;
        this.questionBankLoading = false;
        getList(
          page.currentPage,
          page.pageSize,
          Object.assign(params, this.query)
        ).then(res => {
          const data = res.data.data;
          this.questionBankPage.total = data.total;
          this.questionBankData = data.records;
          for (var i = 0; i < this.questionBankData.length; i++) {
            this.questionBankData[i].type = this.questionBankData[i].type.toString()
            for (var j = 0; j < this.questionBankData[i].patrolGroupItemList.length; j++) {
              this.questionBankData[i].patrolGroupItemList[j].type = this.questionBankData[i].patrolGroupItemList[j]
                .type.toString()
            }
          }
          this.questionBankLoading = false;
          this.$store.commit("setWindowSizeHeightAdd");
          this.questionBankSelectionClear();
        });
      },
      questionBankSelectionClear() {
        this.questionBankSelectionList = [];
        this.$refs.questionBankCrud.toggleSelection();
      },
      questionBankSelectionChange(list) {
        this.questionBankSelectionList = list;
      },
      questionBankSearchChange(params, done) {
        this.questionBankQuery = params;
        this.questionBankPage.currentPage = 1;
        this.questionBankOnLoad(this.questionBankPage, params);
        done();
      },
      questionBankSearchReset() {
        this.questionBankQuery = {};
        this.questionBankOnLoad(this.questionBankPage);
      },
      questionBankCurrentChange(currentPage) {
        this.questionBankPage.currentPage = currentPage;
      },
      questionBankSizeChange(pageSize) {
        this.questionBankPage.pageSize = pageSize;
      },

      questionBankHandleDel(row) {
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning"
          })
          .then(() => {
            return remove(row.id);
          })
          .then(() => {
            this.questionBankOnLoad(this.questionBankPage);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
      },

      questionBankHandleDelete() {
        if (this.questionBankSelectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning"
          })
          .then(() => {
            return remove(this.ids);
          })
          .then(() => {
            this.questionBankOnLoad(this.questionBankPage);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.questionBankCrud.toggleSelection();
          });
      },

      //导出数据
      handleExport() {
        this.$confirm("是否导出清册数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          window.open(
            `/api/apply/export-apply?examId=${this.$route.query.id}&${
            this.website.tokenHeader
          }=${getToken()}`
          );
        });
      },
      handleImport() {
        this.excelBox = true;
      },
      handleTemplate() {
        window.open(
          `/api/examSubjectChoices/export-template?${
          this.website.tokenHeader
        }=${getToken()}`
        );
      },
      uploadAfter(res, done, loading, column) {
        window.console.log(column);
        this.excelBox = false;
        this.refreshChange();
        done();
      },
      refreshChange() {
        this.questionBankOnLoad(this.page, this.query);
      }
    }
  };
</script>

<style lang="scss" scoped></style>

 src/views/patrolList/patrolRecord.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot-scope="{type,size,row }" slot="menu">
                <el-button icon="el-icon-detail" :size="size" :type="type" @click.stop="getDetail(row)">
                    详情
@@ -371,7 +370,10 @@
                this.loading = false
                this.selectionClear()
            })
            getPatrolGroupTree({}).then((res) => {
        getPatrolGroupTree({
          type: 1,
          childType: 1
        }).then((res) => {
                const data = res.data.data
                this.patrolTree = data
                // const column = this.findObject(this.option.column, "articleList")

 src/views/place/components/baseAllInfo.vue

@@ -4,11 +4,19 @@
      <div class="content-box">
        <box-title class="m10" :classVal="9" :title="'基本信息'"></box-title>
        <avue-form v-if="baseShow" ref="baseForm" :option="option" v-model="form">
          <template slot-scope="{ row, size, index }" slot="houseCodeBinds">
            <el-select v-model="form.houseCodeBinds" filterable remote multiple :remote-method="onRemoteMethod"
              @change="onSelectChange" placeholder="请选择标准地址" reserve-keyword>
              <el-option v-for="item in standardAddressList" :key="item.addressCode" :label="item.addressName"
                :value="item.addressCode">
              </el-option>
            </el-select>
          </template>
        </avue-form>


        <box-title class="m10" :classVal="9" :title="'房东信息'"></box-title>
        <avue-form v-if="restShow" ref="restForm" :option="houseOwnerOption" v-model="form"></avue-form>
        <avue-form v-if="restShow" ref="restForm" :option="houseOwnerOption" v-model="placeForm"></avue-form>

        <box-title class="m10" :classVal="9" :title="'其他信息'"></box-title>
        <avue-form v-if="restShow" ref="restForm" :option="optionDetail" v-model="placeForm"></avue-form>
@@ -40,6 +48,7 @@
    getHoldList,
    update,
    updatePlaceExt,
    getPlaceAddressList
  } from "@/api/place/place"
  import {
    getPlaceList
@@ -78,6 +87,7 @@
              span: 12,
              label: "场所名称",
              prop: "placeName",
              labelWidth: 120,
              rules: [{
                required: true,
                message: "请输入场所名称",
@@ -90,6 +100,7 @@
            {
              label: "负责人",
              prop: "principal",
              labelWidth: 120,
              rules: [{
                required: false,
                message: "请输入负责人",
@@ -101,6 +112,7 @@
              width: 96,
              label: "手机号码",
              prop: "principalPhone",
              labelWidth: 120,
              search: true,
              searchSpan: 4,
              slot: true,
@@ -114,6 +126,7 @@
              width: 120,
              overHidden: true,
              label: "身份证号",
              labelWidth: 120,
              prop: "principalIdCard",
              search: true,
              searchSpan: 4,
@@ -129,6 +142,7 @@
              hide: true,
              parent: false,
              label: "所属社区",
              labelWidth: 120,
              prop: "neiCode",
              search: false,
              type: "tree",
@@ -152,6 +166,7 @@
              label: "所属网格",
              prop: "gridCode",
              type: "tree",
              labelWidth: 120,
              cell: true,
              props: {
                label: "gridName",
@@ -170,6 +185,7 @@
              span: 7,
              label: "场所标签",
              prop: "label",
              labelWidth: 120,
              type: "select",
              dicUrl: "/api/blade-category/category/getCategory?level=2",
              cascader: ["smallLabel"],
@@ -205,6 +221,7 @@
              label: "标签颜色",
              prop: "color",
              type: "select",
              labelWidth: 120,
              dicData: [{
                  label: "绿",
                  value: "green",
@@ -228,6 +245,7 @@
              span: 12,
              label: "九小场所",
              prop: "isNine",
              labelWidth: 120,
              type: "select",
              dicData: [{
                  label: "是",
@@ -249,6 +267,7 @@
              span: 12,
              label: "九小分类",
              prop: "nineType",
              labelWidth: 120,
              type: "select",
              display: false,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=nineType",
@@ -263,6 +282,7 @@
              span: 12,
              label: "阵地",
              prop: "isFront",
              labelWidth: 120,
              type: "select",
              dicData: [{
                  label: "是",
@@ -285,6 +305,7 @@
              label: "阵地类型",
              prop: "frontType",
              type: "select",
              labelWidth: 120,
              display: false,
              row: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=frontType",
@@ -296,10 +317,51 @@
              },
            },
            {
              span: 12,
              label: "三级消防单位",
              prop: "threeFireProtection",
              labelWidth: 120,
              type: "select",
              dicData: [{
                  label: "是",
                  value: 1,
                },
                {
                  label: "否",
                  value: 2,
                }
              ],
              hide: true,
              rules: [{
                required: false,
                message: "请选择三级消防单位",
                trigger: "blur",
              }],
            },

            {
              span: 12,
              label: "无炸类型",
              prop: "noExplosionCategory",
              type: "select",
              labelWidth: 120,
              display: true,
              row: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=noExplosionCategory",
              dataType: "number",
              hide: true,
              props: {
                label: "dictValue",
                value: "dictKey",
              },
            },

            {
              label: "场所照片",
              prop: "imageUrls",
              width: 80,
              type: "upload",
              labelWidth: 120,
              listType: "picture-card",
              dataType: "string",
              multiple: true,
@@ -309,7 +371,7 @@
                name: "name",
                url: "link",
              },
              span: 12,
              span: 24,
            },
            {
              width: 160,
@@ -319,7 +381,8 @@
              prop: "location",
              type: "map",
              dataType: "string",
              span: 12,
              labelWidth: 120,
              span: 24,
              value: [117.96646, 28.431002, ""],
              cascader: ['houseCodeBinds'],
              rules: [{
@@ -332,41 +395,55 @@
              width: 160,
              overHidden: true,
              display: false,
              labelWidth: 120,
              hide: true,
              label: "地址",
              prop: "addressName",
              span: 12
            },

            // {
            //   width: 160,
            //   overHidden: true,
            //   slot: true,
            //   label: "标准地址",
            //   prop: "houseCodeBinds",
            //   span: 24,
            //   type: 'select',
            //   labelWidth:120,
            //   dataType: "object",
            //   remote: true,
            //   multiple: true,
            //   hide: true,
            //   display: false,
            //   filterable:true,
            //   dicUrl: `/api/blade-doorplateAddress/doorplateAddress/getPlaceList`,
            //   props: {
            //     label: 'addressName',
            //     value: 'addressCode',
            //   },
            //   dicData: [],
            //   rules: [{
            //     required: false,
            //     message: "请选择标准地址",
            //     trigger: "blur",
            //   }, ]
            // },
            {
              width: 160,
              overHidden: true,
              span: 24,
              hide: true,
              prop: "houseCodeBinds",
              slot: true,
              label: "标准地址",
              prop: "houseCodeBinds",
              span: 24,
              type: 'tree',
              dataType: "object",
              remote: true,
              multiple: true,
              hide: true,
              display: false,
              dicUrl: `/api/blade-doorplateAddress/doorplateAddress/getPlaceList?addressName={{addressName}}`,
              props: {
                label: 'addressName',
                value: 'addressCode',
              labelWidth: 120,

              },
              dicData: [],
              rules: [{
                required: false,
                message: "请选择地址",
                trigger: "blur",
              }, ],
            },

            {
              label: "备注",
              prop: "remark",
              type: 'textarea',
              labelWidth: 120,
              hide: true,
              span: 24,
              rules: [{
@@ -460,35 +537,6 @@
              searchSpan: 4,
              search: true,
            },

            {
              labelWidth: 100,
              label: "电话号码",
              prop: "telephone",
              search: true,
              searchSpan: 4,
              slot: true,
              overHidden: true,
              rules: [{
                validator: validatorPhone,
                trigger: "blur",
              }, ],
            },

            {
              labelWidth: 100,
              label: "身份证号",
              prop: "idCard",
            },

            {
              labelWidth: 100,
              label: "现居住地",
              prop: "tempAddress",
              searchSpan: 4,
              search: true,
            },

            {
              labelWidth: 100,
              label: "性别",
@@ -508,7 +556,6 @@
                }
              ],
            },

            {
              labelWidth: 100,
              span: 12,
@@ -523,7 +570,33 @@
                value: "dictKey",
              },
            },
            {
              labelWidth: 100,
              label: "身份证号",
              prop: "idCard",
            },

            {
              labelWidth: 100,
              label: "电话号码",
              prop: "telephone",
              search: true,
              searchSpan: 4,
              slot: true,
              overHidden: true,
              rules: [{
                validator: validatorPhone,
                trigger: "blur",
              }, ],
            },

            {
              labelWidth: 100,
              label: "现居住地",
              prop: "tempAddress",
              searchSpan: 4,
              search: true,
            },
            {
              labelWidth: 100,
              label: "岗位",
@@ -532,11 +605,63 @@
            },

            {
              label: "从业人员照片",
              prop: "employerImg",
              labelWidth: 100,
              type: "upload",
              listType: "picture-card",
              dataType: "string",
              multiple: true,
              action: "/api/blade-resource/oss/endpoint/put-file",
              propsHttp: {
                res: "data",
                name: "name",
                url: "link",
              },
              span: 24,
              hide: true
            },
            {
              label: "入职时间",
              labelWidth: 100,
              hide: true,
              row: true,
              prop: "resignationTime",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              // format: "yyyy-MM-dd hh:mm:ss",
              // valueFormat: "yyyy-MM-dd hh:mm:ss",
              rules: [{
                required: false,
                message: "请选择入职时间",
                trigger: "blur",
              }]
            },
            {
              label: "离职时间",
              labelWidth: 100,
              hide: true,
              row: true,
              prop: "employmentTime",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              // format: "yyyy-MM-dd hh:mm:ss",
              // valueFormat: "yyyy-MM-dd hh:mm:ss",
              rules: [{
                required: false,
                message: "请选择离职时间",
                trigger: "blur",
              }]
            },
            {
              labelWidth: 100,
              label: "状态",
              prop: "resignationFlag",
              // hide: true
              type: "select",
              display: false,
              dicData: [{
                  label: "在职",
                  value: 1
@@ -579,7 +704,7 @@
              slot: true,
              overHidden: true,
              rules: [{
                validator: validatorPhone,
                // validator: validatorPhone,
                trigger: "blur",
              }, ],
            },
@@ -596,22 +721,6 @@
                trigger: "blur",
              }, ],
            },
            {
              width: 96,
              label: "微信号",
              prop: "legalTel",
              search: true,
              searchSpan: 4,
              slot: true,
              overHidden: true,
              rules: [{
                validator: validatorPhone,
                trigger: "blur",
              }, ],
            },



          ],
        },
        userOption: {
@@ -650,6 +759,10 @@

          ],
        },

        standardAddressList: [], //标准地址数据
        standardAddress: "",
        standardAddressSearchKey: ""
      }
    },

@@ -729,6 +842,7 @@
          }), getPlaceList()])
          .then(
            that.$axios.spread(function(baseInfo, restInfo) {
              console.log("houseCodeBinds===>", baseInfo.data.data.houseCodeBinds)
              that.form = baseInfo.data.data
              that.form.addressName = that.form.location;
              that.form.location = [
@@ -736,6 +850,10 @@
                that.form.lat,
                that.form.location,
              ].join(",")
              if (baseInfo.data.data.houseCodeBinds) {
                that.standardAddressList = baseInfo.data.data.houseBindList;
                that.form.houseCodeBinds = baseInfo.data.data.houseCodeBinds.split(",")
              }

              if (that.form.imageUrls && that.form.imageUrls.length) {
                that.form.imageUrls = that.form.imageUrls
@@ -765,6 +883,9 @@
              that.baseShow = true
              const data = restInfo.data.data




              if (data) {
                let imageUrls = data.imageUrls
                let planImageUrls = data.planImageUrls
@@ -789,12 +910,16 @@
                  ...data,
                  imageUrls,
                  planImageUrls,


                }
              }

              that.restShow = true
            })
          )

        that.getPlaceAddressListRequest()
      },

      locationDispose(data) {
@@ -936,7 +1061,7 @@
          this.form.houseCodeBinds = this.form.houseCodeBinds.join(",")
        }


        this.form.placeExtEntity = null
        this.$refs.baseForm.validate((valid, done, msg) => {
          if (valid) {
            that.$axios
@@ -988,6 +1113,27 @@
        this.restShow = false
        this.roleBox = false
      },

      getPlaceAddressListRequest(query) {
        getPlaceAddressList({
          addressName: query
        }).then(res => {
          this.standardAddressList = res.data.data;
        })
      },

      onSelectChange(e) {
        console.log("selectChange===>", e);
        // this.getPlaceAddressListRequest()
      },

      onRemoteMethod(query) {
        console.log("remote===>", query)
        this.getPlaceAddressListRequest(query)
      },



    },
  }
</script>

 src/views/place/index.vue

@@ -18,7 +18,8 @@
            </template>

            <template slot-scope="{row, size}" slot="confirmFlag">
                <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{ showConfirmFlag(row.confirmFlag).text
                <el-tag :size="size" :type="showConfirmFlag(row.confirmFlag).type">{{
            showConfirmFlag(row.confirmFlag).text
                }}</el-tag>
            </template>

@@ -28,7 +29,8 @@
            </template>

            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete" @click="handleDelete">删 除
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.place_delete"
                    @click="handleDelete">删 除
                </el-button>
            </template>

@@ -407,6 +409,28 @@
                        },
                    },
                    {
                        span: 12,
                        label: "三级消防单位",
                        prop: "threeFireProtection",
                        labelWidth: 120,
                        type: "select",
                        dicData: [{
                            label: "是",
                            value: 1,
                        },
                        {
                            label: "否",
                            value: 2,
                        }
                        ],
                        hide: true,
                        rules: [{
                            required: false,
                            message: "请选择三级消防单位",
                            trigger: "blur",
                        },],
                    },
                    {
                        width: 110,
                        label: "场所照片",
                        prop: "imageUrls",
@@ -420,7 +444,7 @@
                            name: 'name',
                            url: "link",
                        },
                        span: 12,
                        span: 24,
                    },
                    {
                        width: 156,
@@ -431,7 +455,7 @@
                        type: 'map',
                        dataType: "string",
                        minWidth: 250,
                        span: 12,
                        span: 24,
                        value: [117.966460, 28.431002, ""],
                        rules: [
                            {

 src/views/place/practitioner.vue

@@ -157,7 +157,7 @@
            },
            {
              label: "女",
              value: 2
              value: 0
            }
          ]
        },
@@ -387,7 +387,7 @@
            text: '男',
            type: 'primary'
          }
        } else if (data == 2) {
        } else if (data == 0) {
          tags = {
            text: '女',
            type: 'primary'

 src/views/place/residencePermitApply.vue

@@ -25,7 +25,7 @@

      <template slot-scope="{row, size}" slot="minors">
        <el-tag :size="size">{{
      row.minors == 2?'是':row.minors==1?'否':''
      row.minors == 2?'是':'否'
    }}</el-tag>
      </template>

@@ -153,7 +153,7 @@
          column: [{
              width: 110,
              span: 12,
              label: "名称",
              label: "姓名",
              prop: "name",
              searchSpan: 4,
              searchLabelWidth: 60,
@@ -241,8 +241,7 @@
              prop: "minors",
              type: "select",
              align:"center",
              dicData: [
              {
              dicData: [{
                  label: "全部",
                  value: ""
                },{
@@ -268,10 +267,10 @@
                value: 1
              }, {
                label: '通过',
                value: 3
                value: 2
              }, {
                label: '驳回',
                value: 4
                value: 3
              }],
              align: 'center',
              labelWidth: 110,
@@ -322,12 +321,12 @@
              type: 'warning',
              text: '待审核'
            }
          } else if (data == 3) {
          } else if (data == 2) {
            tags = {
              type: 'danger',
              text: '通过'
            }
          } else if (data == 4) {
          } else if (data == 3) {
            tags = {
              type: 'warning',
              text: '驳回'

 src/views/property/components/done.vue

@@ -39,6 +39,7 @@
export default {
    data () {
        return {
        datetime: "",
            form: {},
            selectionId: '',
            selectionList: [],
@@ -73,8 +74,7 @@
                dialogWidth: 900,
                dialogClickModal: false,
                header: false,
                column: [
                    {
          column: [{
                        label: "流程分类",
                        type: "select",
                        row: true,
@@ -110,6 +110,39 @@
                        },
                        defaultExpandedKeys: ["361102003"],
                        span: 12,
            },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
                    }, {
                        width: 110,
                        label: '联系人',
@@ -210,10 +243,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
       let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
       const {
         dateTime
       } = query

       if (dateTime) {
         query = {
           startTimes: dateTime[0],
           endTimes: dateTime[1],
         }
       }
            this.loading = true
            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/property/components/todo.vue

@@ -43,6 +43,7 @@
export default {
    data () {
        return {
        datetime: "",
            typeStatus: 1,
            form: {},
            selectionId: '',
@@ -94,6 +95,39 @@
                    // search: true,
                    hide: true,
                    width: 100,
            },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
                },
                {
                    width: 100,
@@ -231,10 +265,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/property/inviteTenders.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
@@ -12,12 +11,10 @@
            </template>

            <template slot-scope="{type,size,row }" slot="menu">
                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
                    撤销
                </el-button>
                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
@@ -119,7 +116,7 @@
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 450,

          dialogMenuPosition: 'center',
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -815,4 +812,5 @@

:deep(.avue-form__menu--center .el-button) {
    margin: 0 5px 0 0;
}</style>
  }
</style>

 src/views/property/oiae.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
@@ -22,12 +21,10 @@
        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,1)">
          创建议题
        </el-button> -->
                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
                    撤销
                </el-button>
                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
@@ -129,7 +126,7 @@
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 280,

          dialogMenuPosition: 'center',
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -822,4 +819,5 @@
<style>
.avue-upload__icon {
    line-height: 6;
}</style>
  }
</style>

 src/views/property/ownersCommittee.vue

@@ -1,37 +1,34 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
      <!--  <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
                </el-button>
            </template>
      </template> -->

            <template slot-scope="{type,size,row }" slot="menu">
                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
                    @click.stop="updateFb(row)">
      <!-- <template slot-scope="{type,size,row }" slot="menu">
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
                    撤销
                </el-button>
                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
      </template> -->

            <template slot-scope="{ row, size }" slot="publish">
      <!-- <template slot-scope="{ row, size }" slot="publish">
                <el-tag :size="size" :type="showStatus(row.publish, 1).type" v-text="showStatus(row.publish, 1).text">
                </el-tag>
            </template>
      </template> -->

            <template slot-scope="{ row }" slot="iscomment">
      <!-- <template slot-scope="{ row }" slot="iscomment">
                <el-switch @change="iscommentInput($event, row)" v-model="row.iscomment" :active-value="'1'"
                    :inactive-value="'0'" active-color="#13ce66" inactive-color="#ccc">
                </el-switch>
            </template>
      </template> -->
        </avue-crud>

    </basic-container>
@@ -100,7 +97,8 @@
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 450,

          addBtn: false,
          menu: false,
                height: "auto",
                calcHeight: 54,
                dialogWidth: 950,
@@ -108,9 +106,11 @@
                border: true,
                //stripe:true,
                index: true,
                viewBtn: true,
                selection: true,
                excelBtn: true,
          viewBtn: false,
          // selection: true,
          delBtn: false,
          editBtn: false,
          // excelBtn: true,
                dialogClickModal: false,
                column: [{
                    label: "标题",
@@ -198,14 +198,21 @@
                    },],
                },
                {
                    width: 144,
                    label: "发布时间",
                    prop: "createTime",
                    type: "date",
                    format: "yyyy-MM-dd",
                    valueFormat: "yyyy-MM-dd HH:mm:ss",
              // hide: true,
              parent: false,
              label: "小区名称",
              prop: "districtId",
              type: 'tree',
              dicUrl: `/api/blade-district/district/getDistrictTree`,
              props: {
                label: "name",
                value: "id"
                },

              defaultExpandedKeys: ["361102003"],
              span: 12,
              width: 220,
              overHidden: true,
            },
                {
                    width: 110,
                    label: "所属街道",
@@ -227,6 +234,14 @@
                    prop: "communityName",
                    search: true,
                    searchSpan: 4
            },
            {
              width: 144,
              label: "发布时间",
              prop: "createTime",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
                },

                {
@@ -682,4 +697,5 @@

:deep(.avue-form__menu--center .el-button) {
    margin: 0 5px 0 0;
}</style>
  }
</style>

 src/views/property/process/maintenanceFundApply/detail.vue

@@ -201,10 +201,10 @@
          disabled: true
        },
        {
          label: "项目分摊方式",
          prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
          labelWidth: 140,
          value: '按建筑面积分摊',
              value: '',
          span: 12,
          row: true,
          disabled: true
@@ -455,8 +455,6 @@


<style>


.workOrderStyle {
  font-weight: normal;
}

 src/views/property/process/maintenanceFundApply/edit.vue

@@ -206,12 +206,16 @@
          },],
        },
        {
          label: "项目分摊方式",
          prop: "allocationWay",
          labelWidth: 140,
          value: '按建筑面积分摊',
              label: "楼栋",
              prop: "buildingName",
              value: '',
          span: 12,
          row: true,
              rules: [{
                required: true,
                message: "请输入楼栋",
                trigger: "blur",
              }, ],
        },
        {
          label: '联系人',
@@ -542,8 +546,6 @@
</script>

<style>


.workOrderStyle {
  font-weight: normal;
}

 src/views/property/process/maintenanceFundApply/form.vue

@@ -100,12 +100,13 @@
              }, ],
            },
            {
              label: "项目分摊方式",
              prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
              labelWidth: 140,
              value: '按建筑面积分摊',
              value: '',
              span: 12,
              row: true,
              disabled: true
            },
            {
              label: '联系人',

 src/views/property/process/maintenanceFundApply/handle.vue

@@ -207,12 +207,12 @@
          disabled: true
        },
        {
          label: "项目分摊方式",
          prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
          labelWidth: 140,
          value: '按建筑面积分摊',
              value: '',
          span: 12,
          // row: true,
              row: true,
          disabled: true
        },
        {
@@ -535,6 +535,7 @@
  left: 50%;
  transform: translateX(-50%);
}

.workOrderStyle {
  font-weight: normal;
}

 src/views/property/propertyCapitalApply.vue

@@ -48,9 +48,9 @@
          v-text="textDispose(row, 'linkPhoneflag', 'linkPhone')">
        </el-button>
      </template>
      <template slot="constructionSchemeUrlsType" slot-scope="{file}">
      <!-- <template slot="constructionSchemeUrlsType" slot-scope="{file}">
        <span>{{ file }}</span>
      </template>
      </template> -->
    </avue-crud>


@@ -242,11 +242,16 @@
              }, ],
            },
            {
              label: "项目分摊方式",
              prop: "allocationWay",
              value: '按建筑面积分摊',
              label: "楼栋",
              prop: "buildingName",
              value: '',
              span: 12,
              row: true,
              rules: [{
                required: true,
                message: "请输入楼栋",
                trigger: "blur",
              }, ],
            },
            {
              width: 110,
@@ -407,26 +412,266 @@
              prop: "projectDescribe",
              type: "textarea"
            },
            // {
            //   label: '施工方案附件',
            //   prop: 'constructionSchemeUrls',
            //   type: 'upload',
            //   span: 24,
            //   hide: true,
            //   multiple: true,
            //   listType: "text",
            //   propsHttp: {
            //     res: 'data',
            //     name: "name",
            //     url: "link"
            //   },
            //   action: '/api/blade-resource/oss/endpoint/put-file-attach',
            //   rules: [{
            //     required: true,
            //     message: "请上传施工方案",
            //     trigger: "blur",
            //   }]
            // },
            {
              label: '施工方案附件',
              prop: 'constructionSchemeUrls',
              type: 'upload',

              label: "维修资金使用申请审批表",
              offset: 2,
              labelPosition: "top",
              prop: "file1",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              multiple: true,
              // showFileList: true,
              propsHttp: {
                res: 'data',
                name: "originalName",
                url: "link"
              },
              action: '/api/blade-resource/oss/endpoint/put-file-attach',
              rules: [{
                required: true,
                message: "请上传施工方案",
                message: "请上传文件",
                trigger: "blur",
              }, ],
            }
              }],
            },
            {

              label: "申请使用维修资金的报告、附维修部位彩色照片、业委会(物管会)会议纪要(社区意见)",
              offset: 2,
              labelPosition: "top",
              prop: "file2",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {

              label: "公示单，现场勘察图片、公示照片(公示期7天)",
              offset: 2,
              labelPosition: "top",
              prop: "file3",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {

              label: "维修单位出具的工程款发票(验收合格后以竣工决算审核报告审定金额开具)",
              offset: 2,
              labelPosition: "top",
              prop: "file4",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {
              label: "应急维修需提供专业机构出具的检验检测报告或(乡镇人民政府)街道办事处现场核实意见",
              offset: 2,
              labelPosition: "top",
              prop: "file5",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {

              label: "业主签名表或线上表决记录(应急情况不提供)",
              offset: 2,
              labelPosition: "top",
              prop: "file6",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {
              label: "政府采购资料",
              offset: 2,
              labelPosition: "top",
              prop: "file7",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {

              label: "维修和更新、改造方案、维修项目的协议或合同",
              offset: 2,
              labelPosition: "top",
              prop: "file8",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {

              label: "维修改造工程竣工验收单一式两份(维修完工需经申请人签字);维修项目签证单(超出预算清单内容的需出具签证单)",
              offset: 2,
              labelPosition: "top",
              prop: "file9",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {

              label: "维修项目决算、造价机构出具的决算审价报告",
              offset: 2,
              labelPosition: "top",
              prop: "file10",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
            {

              label: "业主委员会情况登记表;经办人或代理人证件(复印件)，复印件上签名、联系电话",
              offset: 2,
              labelPosition: "top",
              prop: "file11",
              type: "upload",
              listType: "text",
              action: "/api/blade-resource/oss/endpoint/put-file-attach",
              propsHttp: {
                res: "data",
                name: 'name',
                url: "link",
              },
              span: 24,
              hide: true,
              rules: [{
                required: true,
                message: "请上传文件",
                trigger: "blur",
              }],
            },
          ],
        },
        data: [],
@@ -469,7 +714,6 @@
      //   },
      //   deep: true,
      //     immediate: true

      // }

      'form.districtId': {
@@ -529,6 +773,7 @@
    },
    methods: {


      rowView() {
        this.showDialog = false;
      },
@@ -548,17 +793,63 @@
          path: `/property/process/maintenanceFundApply/detail/${row.processInstanceId}/${row.id}`
        })
      },
      rowSave(row, done, loading) {
        row.constructionSchemeUrls = func.join(row.constructionSchemeUrls)
        if (row.constructionSchemeUrls.length > 0) {

      setFile(fileObj) {
        for (let i in fileObj) {
          fileObj[i] = func.join(fileObj[i])
          if (fileObj[i].length > 0) {
          var urls = []
          var split = row.constructionSchemeUrls.split(",")
            var split = fileObj[i].split(",")
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.constructionSchemeUrls = urls.join(",")
            fileObj[i] = urls.join(",")
        }
        }
        return fileObj;
      },

      rowSave(row, done, loading) {
        // row.constructionSchemeUrls = func.join(row.constructionSchemeUrls)
        // if (row.constructionSchemeUrls.length > 0) {
        //   var urls = []
        //   var split = row.constructionSchemeUrls.split(",")
        //   split.forEach(url => {
        //     var names = url.split("jczz/")
        //     urls.push(names[1])
        //   })
        //   row.constructionSchemeUrls = urls.join(",")
        // }

        let keys = ["file1", "file2", "file3", "file4", "file5", "file6", "file7", "file8", "file9", "file10", "file11"]
        let files = {};
        for (let i in row) {
          if (keys.indexOf(i) != -1) {

            files[i] = row[i];
          }
        }
        for (let k in files) {
          files[k] = func.join(files[k])
          if (files[k].length) {
            let urls = [];
            let split = files[k].split(",");
            split.forEach(url => {
              let names = url.split("jczz/");
              urls.push(names[1]);
            })
            files[k] = urls.join(",")
          }
        }

        row.attachment = JSON.stringify(files);
        for (let j in row) {
          if (keys.indexOf(j) != -1) {
            delete row[j];
          }
        }
        console.log("提交===>", row);
        row.propertyFlag = 1
        add(row).then(
          () => {
@@ -707,14 +998,14 @@
          this.data = data.records
          this.data.forEach(item => {
            this.$set(item, 'linkPhoneflag', false)
            if (item.constructionSchemeUrls.length > 0) {
              var urls = []
              var names = item.constructionSchemeUrls.split(",")
              names.forEach(name => {
                urls.push(website.minioUrl + name)
              })
              item.constructionSchemeUrls = urls.join(",")
            }
            // if (item.constructionSchemeUrls.length > 0) {
            //   var urls = []
            //   var names = item.constructionSchemeUrls.split(",")
            //   names.forEach(name => {
            //     urls.push(website.minioUrl + name)
            //   })
            //   item.constructionSchemeUrls = urls.join(",")
            // }
          })
          this.loading = false
          this.selectionClear()

 src/views/property/propertyCharge.vue

@@ -9,11 +9,21 @@
</template>

<script>
import { mapGetters } from "vuex"
import { getDetail, getList, add, update, remove } from "@/api/property/propertyCharge"
  import {
    mapGetters
  } from "vuex"
  import {
    getDetail,
    getList,
    add,
    update,
    remove
  } from "@/api/property/propertyCharge"
import website from "@/config/website"
import func from "@/util/func"
import { validatePhone } from "@/util/validate"
  import {
    validatePhone
  } from "@/util/validate"
const searchSpan = 4
const labelWidth = 110
export default {
@@ -37,7 +47,7 @@
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 210,

          dialogMenuPosition: 'center',
                // menu: false,
                // addBtn: false,
                border: true,
@@ -51,8 +61,7 @@
                viewBtn: true,
                excelBtn: true,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        label: "物业公司",
                        labelWidth: labelWidth,
                        prop: "propertyId",

 src/views/property/propertyCompany.vue

@@ -243,7 +243,7 @@
              }, ],
            },
            {
              label: "mch-id",
              label: "商户号mch-id",
              labelWidth: labelWidth,
              prop: "mchId",
              span: 24,

 src/views/property/propertyCompanyDistrict.vue

@@ -64,7 +64,7 @@
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 210,

          dialogMenuPosition: 'center',
          height: "auto",
          calcHeight: 54,
          dialogWidth: 1150,

 src/views/propertySupervision/components/done.vue

@@ -40,6 +40,7 @@
    data () {
        return {
            form: {},
        datetime: "",
            selectionId: '',
            selectionList: [],
            query: {},
@@ -73,8 +74,7 @@
                dialogWidth: 900,
                dialogClickModal: false,
                header: false,
                column: [
                    {
          column: [{
                        label: "流程分类",
                        type: "select",
                        row: true,
@@ -89,6 +89,39 @@
                        // search: true,
                        hide: true,
                        width: 100,
            },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
                    },
                    {
                        width: 100,
@@ -210,10 +243,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/propertySupervision/components/todo.vue

@@ -43,6 +43,7 @@
export default {
    data () {
        return {
        datetime: "",
            typeStatus: 1,
            form: {},
            selectionId: '',
@@ -117,6 +118,41 @@
                    searchSpan: 5,
                    span: 12,
                },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            },
            // {
            //   label: '项目名称',
            //   prop: 'name',
            //   search: true,
            // },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
            },

                {
                    width: 110,
                    label: '联系人',
@@ -231,10 +267,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/propertySupervision/process/maintenanceFundApply/detail.vue

@@ -201,10 +201,10 @@
          disabled: true
        },
        {
          label: "项目分摊方式",
          prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
          labelWidth: 140,
          value: '按建筑面积分摊',
              value: '',
          span: 12,
          row: true,
          disabled: true
@@ -455,8 +455,6 @@


<style>


.workOrderStyle {
  font-weight: normal;
}

 src/views/propertySupervision/process/maintenanceFundApply/form.vue

@@ -100,12 +100,13 @@
              }, ],
            },
            {
              label: "项目分摊方式",
              prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
              labelWidth: 140,
              value: '按建筑面积分摊',
              value: '',
              span: 12,
              row: true,
              disabled: true
            },
            {
              label: '联系人',

 src/views/propertySupervision/process/maintenanceFundApply/handle.vue

@@ -207,12 +207,12 @@
              disabled: true
            },
            {
              label: "项目分摊方式",
              prop: "allocationWay",
              label: "楼栋",
              prop: "buildingName",
              labelWidth: 140,
              value: '按建筑面积分摊',
              value: '',
              span: 12,
              // row: true,
              row: true,
              disabled: true
            },
            {

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">

            <template slot-scope="{row, size}" slot="menu">
                <!-- <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
@@ -59,10 +58,10 @@
                    <div class="info-name">场所名称</div>
                    <div class="info-value">{{ rowDetail.placeName }}</div>
                </div>
                <div class="info-item">
                    <div class="info-name">场所类型</div>
        <!-- <div class="info-item">
          <div class="info-name">场所类别</div>
                    <div class="info-value">{{ rowDetail.nineTypeName }}</div>
                </div>
        </div> -->
                <div class="info-item">
                    <div class="info-name">检查人</div>
                    <div class="info-value">{{ rowDetail.name }}</div>
@@ -77,17 +76,15 @@
                检查记录
            </div>

            <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex'
                v-loading="drawerLoading">
      <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex' v-loading="drawerLoading">
                <div class="question-type" @click="flodQL(tIndex)">
                    <div class="type-name">
                        {{ CNNum[tIndex] }}、{{ tItem.questionName }}
                    </div>
                    <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i
                            class="el-icon-arrow-up" v-show="!tItem.isShowQList"></i></div>
          <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i class="el-icon-arrow-up"
              v-show="!tItem.isShowQList"></i></div>
                </div>
                <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index'
                    v-show="tItem.isShowQList">
        <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index' v-show="tItem.isShowQList">
                    <div class="question-name">
                        <div class="key">{{ index + 1 }}、{{ item.itemsNameTitle }}</div>
                        <div class="value"><el-radio v-model="radio" label="1" disabled>存在</el-radio>
@@ -152,7 +149,8 @@
    getTaskPlaceSelfCheckInfo
} from "@/api/publicSecurity/keynoteManage"
import {
    getPatrolGroupTree, getDictBizTree
    getPatrolGroupTree,
    getDictBizTree
} from "@/api/publicSecurity/ninePlaceManage"
import website from '@/config/website'
import NProgress from 'nprogress'
@@ -193,8 +191,14 @@
            refreshNum: 1,
            rowDetail: [],
            auditRules: {
                status: [{ required: true, message: "必填" }],
                remark: [{ required: true, message: "必填" }],
          status: [{
            required: true,
            message: "必填"
          }],
          remark: [{
            required: true,
            message: "必填"
          }],
            },
            visible: false,
            taskType: 0,
@@ -235,8 +239,7 @@
                searchShowBtn: false,
                columnBtn: false,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        label: "场所名称",
                        prop: "placeName",
                        span: 24,
@@ -457,19 +460,25 @@

        // 九小类型字典接口
        getDictBizTree () {
            getDictBizTree({ code: 'nineType' }).then(res => {
        getDictBizTree({
          code: 'nineType'
        }).then(res => {
                this.nineTypeList = res.data.data
            })
        },

        // 九小类型转换
        switchNineType (type) {
            return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type).title : ''
        return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type)
          .title : ''
        },

        // 获取问题类型
        getPatrolGroupTree () {
            getPatrolGroupTree().then(res => {
        getPatrolGroupTree({
          type: 1,
          childType: 1
        }).then(res => {
                this.questionTypeList = res.data.data
            })
        },
@@ -477,7 +486,9 @@
        getDetail (rowData) {
            this.drawerLoading = true
            this.isDetail = true
            getTaskPlaceSelfCheckInfo({ taskId: rowData.taskId }).then(res => {
        getTaskPlaceSelfCheckInfo({
          taskId: rowData.taskId
        }).then(res => {
                let row = res.data.data
                if (row.taskPlaceRecordVOList) {
                    row.taskPlaceRecordVOList.forEach(item => {
@@ -511,7 +522,11 @@
                    let arr = Object.entries(obj)
                    let newArr = []
                    arr.forEach(part => {
                        newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
              newArr.push({
                questionName: part[0],
                questionList: part[1],
                isShowQList: true
              })
                    })
                    row.qTypeList = newArr
                }
@@ -524,7 +539,7 @@
        },

        handleExport () {
            this.$confirm("是否导出场所检查数据?", "提示", {
        this.$confirm("是否导出消防自查数据?", "提示", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
@@ -536,7 +551,8 @@
                // data.isNine = 1
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-taskPlaceSelfCheck/taskPlaceSelfCheck/export-taskPlaceSelfCheck?${this.website.tokenHeader}=${getToken()}&` + data
            `/api/blade-taskPlaceSelfCheck/taskPlaceSelfCheck/export-taskPlaceSelfCheck?${this.website.tokenHeader}=${getToken()}&` +
            data
                ).then(res => {
                    console.log('exportBlob', res)
                    downloadXls(res.data, `消防自查${dateNow()}.xlsx`)
@@ -802,8 +818,7 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const {
            } = this.query
        const {} = this.query
            let values = {
                ...params,
            }

 src/views/publicSecurity/ninePlaceManage/patrolRecord.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot-scope="{row, size}" slot="principalPhone">
                <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
                    v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
@@ -55,11 +54,10 @@
                    <div class="type-name">
                        {{ CNNum[tIndex] }}、{{ tItem.questionName }}
                    </div>
                    <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i
                            class="el-icon-arrow-up" v-show="!tItem.isShowQList"></i></div>
          <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i class="el-icon-arrow-up"
              v-show="!tItem.isShowQList"></i></div>
                </div>
                <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index'
                    v-show="tItem.isShowQList">
        <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index' v-show="tItem.isShowQList">
                    <div class="question-name">
                        <div class="key">{{ index + 1 }}、{{ item.itemsNameTitle }}</div>
                        <div class="value"><el-radio v-model="radio" label="1" disabled>存在</el-radio>
@@ -120,7 +118,8 @@
} from "@/api/patrol/placeChek"

import {
    getPatrolGroupTree, getDictBizTree
    getPatrolGroupTree,
    getDictBizTree
} from "@/api/publicSecurity/ninePlaceManage"

import website from '@/config/website'
@@ -185,8 +184,7 @@
                searchShowBtn: false,
                columnBtn: false,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        label: "场所名称",
                        prop: "placeName",
                        span: 24,
@@ -404,19 +402,25 @@

        // 九小类型字典接口
        getDictBizTree () {
            getDictBizTree({ code: 'nineType' }).then(res => {
        getDictBizTree({
          code: 'nineType'
        }).then(res => {
                this.nineTypeList = res.data.data
            })
        },

        // 九小类型转换
        switchNineType (type) {
            return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type).title : ''
        return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type)
          .title : ''
        },

        // 获取问题类型
        getPatrolGroupTree () {
            getPatrolGroupTree().then(res => {
        getPatrolGroupTree({
          type: 1,
          childType: 1
        }).then(res => {
                this.questionTypeList = res.data.data
            })
        },
@@ -454,7 +458,11 @@
                let arr = Object.entries(obj)
                let newArr = []
                arr.forEach(part => {
                    newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
            newArr.push({
              questionName: part[0],
              questionList: part[1],
              isShowQList: true
            })
                })
                row.qTypeList = newArr
            }

 src/views/publicSecurity/ninePlaceManage/situationRectification.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <div class="tab-list">
                    <div :class="{ 'choose': typeStatus == 3 }" @click="changeType(3)">全部</div>
@@ -60,11 +59,10 @@
                    <div class="type-name">
                        {{ CNNum[tIndex] }}、{{ tItem.questionName }}
                    </div>
                    <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i
                            class="el-icon-arrow-up" v-show="!tItem.isShowQList"></i></div>
          <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i class="el-icon-arrow-up"
              v-show="!tItem.isShowQList"></i></div>
                </div>
                <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index'
                    v-show="tItem.isShowQList">
        <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index' v-show="tItem.isShowQList">
                    <div class="question-name">
                        <div class="key">{{ index + 1 }}、{{ item.itemsNameTitle }}</div>
                        <div class="value"><el-radio v-model="radio" label="1" disabled>存在</el-radio>
@@ -133,7 +131,9 @@
    mapGetters
} from "vuex"
import {
    getZGQKList, getPatrolGroupTree, applyRectification
    getZGQKList,
    getPatrolGroupTree,
    applyRectification
} from "@/api/publicSecurity/ninePlaceManage"
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
@@ -156,8 +156,14 @@
    data () {
        return {
            auditRules: {
                status: [{ required: true, message: "必填" }],
                reasonFailure: [{ required: true, message: "必填" }],
          status: [{
            required: true,
            message: "必填"
          }],
          reasonFailure: [{
            required: true,
            message: "必填"
          }],
            },
            visible: false,
            typeStatus: 1,
@@ -228,8 +234,7 @@
                    label: "是否下发《责令改正通知书》或是否处罚",
                    prop: "rectificationNoticeFlag",
                    align: 'center',
                    dicData: [
                        {
              dicData: [{
                            label: "否",
                            value: 1,
                        },
@@ -244,8 +249,7 @@
                    label: "是否整改完毕",
                    prop: "rectificationFlag",
                    align: 'center',
                    dicData: [
                        {
              dicData: [{
                            label: "否",
                            value: 1,
                        },
@@ -280,8 +284,7 @@
                    label: "审核状态",
                    prop: "status",
                    align: 'center',
                    dicData: [
                        {
              dicData: [{
                            label: "待审核",
                            value: 1,
                        },
@@ -315,7 +318,8 @@
                    hide: true,
                    searchSpan: 5,
                    searchLabelWidth: 76,
                }],
            }
          ],
            },
            data: [],
            refreshNum: 1,
@@ -438,7 +442,10 @@

        // 获取问题类型
        getPatrolGroupTree () {
            getPatrolGroupTree().then(res => {
        getPatrolGroupTree({
          type: 1,
          childType: 1
        }).then(res => {
                this.questionTypeList = res.data.data
            })
        },
@@ -475,7 +482,11 @@
            let arr = Object.entries(obj)
            let newArr = []
            arr.forEach(part => {
                newArr.push({ questionName: part[0], questionList: part[1], isShowQList: true })
          newArr.push({
            questionName: part[0],
            questionList: part[1],
            isShowQList: true
          })
            })
            row.qTypeList = newArr
            row.remarkNo = newArr.length
@@ -503,7 +514,8 @@
                }
                data = Qs.stringify(data)
                exportBlob(
                    `/api/blade-taskPlaceRectification/taskPlaceRectification/exportRectificationStatistics?${this.website.tokenHeader}=${getToken()}&` + data
            `/api/blade-taskPlaceRectification/taskPlaceRectification/exportRectificationStatistics?${this.website.tokenHeader}=${getToken()}&` +
            data
                ).then(res => {
                    downloadXls(res.data, `整改情况${dateNow()}.xlsx`)
                    NProgress.done()

 src/views/publicSecurity/noExplosionManage.vue

New file
@@ -0,0 +1,985 @@
<template>
  <basic-container>
    <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">

      <template slot-scope="{row, size}" slot="menu">
        <el-button type="text" :size="size" plain @click.stop="getDetail(row)">
          详情
        </el-button>
        <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check"
          :disabled="row.status != 1" plain @click=" goAudit(row)">审 核
        </el-button>
      </template>

      <template slot="status" slot-scope="{row, size}">
        <el-tag :size="size" :type="showStatus(row.status).type">
          {{ showStatus(row.status).text }}
        </el-tag>
      </template>

      <template slot-scope="{row, size}" slot="principalPhone">
        <el-button :size="size" type="text" @click="showStringDispose(row, 'principalPhoneflag')"
          v-text="textDispose(row, 'principalPhoneflag', 'principalPhone')">
        </el-button>
      </template>
      <template slot="menuLeft">
        <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
        </el-button>
      </template>
    </avue-crud>


    <el-dialog title="" append-to-body :visible.sync="auditBasePopup" width="60%">
      <campusReporting @colseDetail="colseDetail" v-if="taskType == 6" ref="campusReporting"></campusReporting>
      <hotelReporting @colseDetail="colseDetail" v-if="taskType == 2" ref="hotelReporting"></hotelReporting>
      <labelReporting @colseDetail="colseDetail" v-if="taskType == 3" ref="labelReporting"></labelReporting>
    </el-dialog>

    <el-dialog :visible.sync="visible" append-to-body destroy-on-close title="审核" width="30%"
      custom-class="flow-design-dialog" :before-close="handleClose">
      <audit-base @handleSubmit="submitAudit"></audit-base>
    </el-dialog>
    <el-drawer title="无诈申请" :visible.sync="isDetail" :append-to-body="true" size="40%" direction="rtl">
      <div class="title">
        <div class="icon">{{ refreshNum }}</div>
        基础信息
      </div>
      <div class="basic-info" v-loading="drawerLoading">
        <div class="info-item">
          <div class="info-name">场所名称</div>
          <div class="info-value">{{ rowDetail.placeName }}</div>
        </div>
        <!-- <div class="info-item">
          <div class="info-name">场所类别</div>
          <div class="info-value">{{ rowDetail.noExplosionCategoryName }}</div>
        </div> -->
        <div class="info-item">
          <div class="info-name">上报人</div>
          <div class="info-value">{{ rowDetail.name }}</div>
        </div>
        <div class="info-item">
          <div class="info-name">上报时间</div>
          <div class="info-value">{{ rowDetail.createTime }}</div>
        </div>
      </div>
      <div class="title">
        <div class="icon"></div>
        上报记录
      </div>

      <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex' v-loading="drawerLoading">
        <div class="question-type" @click="flodQL(tIndex)">
          <div class="type-name">
            {{ CNNum[tIndex] }}、{{ tItem.questionName }}
          </div>
          <div class="icon-box"><i class="el-icon-arrow-down" v-show="tItem.isShowQList"></i><i class="el-icon-arrow-up"
              v-show="!tItem.isShowQList"></i></div>
        </div>
        <div class="question-item" v-for="(item, index) in tItem.questionList" :key='index' v-show="tItem.isShowQList">
          <div class="question-name">
            <div class="key">{{ index + 1 }}、{{ item.itemsNameTitle }}</div>
            <!-- <div class="value"><el-radio v-model="radio" label="1" disabled>存在</el-radio>
              <el-radio v-model="radio" label="2" disabled>不存在</el-radio>
            </div> -->
          </div>
          <div class="yh-pic-box">
            <div class="yh-pic-name">
              上报图片
            </div>
            <div class="yh-pic-list">
              <div class="pic-item" v-for="pic in item.imageUrlsList">
                <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"    :preview-src-list="item.imageUrlsList"></el-image>
              </div>
            </div>
          </div>
        </div>
      </div>
    </el-drawer>
  </basic-container>
</template>

<script>
  import {
    getTaskNoFraudReportingList,
    removeTask,
    update,
    add,
    applyTaskExamine
  } from "@/api/task/task"

  import {
    mapGetters
  } from "vuex"
  import {
    getTaskNoFraudReportingInfo
  } from "@/api/publicSecurity/taskNoFraudReporting"
  import {
    getPatrolGroupTree,
    getDictBizTree
  } from "@/api/publicSecurity/ninePlaceManage"
  import website from '@/config/website'
  import NProgress from 'nprogress'
  import 'nprogress/nprogress.css'
  import Qs from "qs"
  import {
    exportBlob
  } from "@/api/common"
  import {
    getToken
  } from '@/util/auth'
  import {
    downloadXls
  } from "@/util/util"
  import {
    dateNow
  } from "@/util/date"
  import campusReporting from './components/campusReporting'
  import hotelReporting from './components/hotelReporting'
  import labelReporting from './components/labelReporting'

  export default {
    data() {
      //手机号格式校验
      let validatorPhone = function(rule, value, callback) {
        if (value) {
          if (!/^1[3456789]\d{9}$/.test(value)) {
            callback(new Error('手机号格式有误！'))
          } else {
            callback()
          }
        }
        callback()
      }

      return {
        isDetail: false,
        refreshNum: 1,
        rowDetail: [],
        auditRules: {
          status: [{
            required: true,
            message: "必填"
          }],
          remark: [{
            required: true,
            message: "必填"
          }],
        },
        visible: false,
        taskType: 0,
        curRow: {},
        roleBox: false,

        form: {},
        query: {},
        loading: true,
        drawerLoading: false,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0,
        },
        selectionList: [],
        option: {
          labelWidth: 120,
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 200,
          // menu: false,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          border: true,
          addBtn: false,
          delBtn: false,
          //stripe:true,
          index: true,
          editBtn: false,
          viewBtn: false,
          // selection: true,
          excelBtn: false,
          refreshBtn: false,
          searchShowBtn: false,
          columnBtn: false,
          dialogClickModal: false,
          column: [{
              label: "场所名称",
              prop: "placeName",
              span: 24,
              row: true,
              searchSpan: 4,
              search: true,
              align: 'center'
            },
            {
              label: "场所地址",
              prop: "location",
              span: 24,
              row: true,
              searchSpan: 4,
              searchLabelWidth: 46,
              overHidden: true,
              align: 'center'
            }, {
              label: "无诈类别",
              prop: "noExplosionCategory",
              align: 'center',
              dicUrl: "/api/blade-system/dict-biz/tree?code=noExplosionCategory",
              props: {
                label: "title",
                value: "key",
              },
              type: 'select',
              search: true,
              searchSpan: 4,
              searchLabelWidth: 96,
              align: 'center'
            }, {
              label: "所属街道",
              prop: "streetName",
              span: 24,
              row: true,
              searchSpan: 4,
              search: true,
              align: 'center'
            },
            {
              label: "所属社区",
              prop: "communityName",
              span: 24,
              row: true,
              searchSpan: 4,
              search: true,
              width: 160,
              overHidden: true,
              align: 'center'
            },
            {
              label: "派出所",
              prop: "pcsName",
              span: 24,
              row: true,
              searchSpan: 4,
              search: true,
              align: 'center'
            },

            {
              label: "场所负责人",
              prop: "principal",
              span: 24,
              row: true,
              searchSpan: 4,
              search: true,
              align: 'center'
            },
            {
              label: "场所负责人电话",
              prop: "principalPhone",
              span: 24,
              row: true,
              slot: true,
              searchSpan: 4,
              align: 'center'
            },
            // {
            //   label: "无诈上报数量",
            //   prop: "number",
            //   span: 24,
            //   row: true,
            //   slot: true,
            //   searchSpan: 4,
            //   align: 'center'
            // },
            {
              width: 110,
              label: "审核状态",
              prop: "status",
              span: 24,
              align: 'center',
              slot: true,
            },
            {
              label: "创建时间",
              prop: "createTime",
              span: 24,
              row: true,
              searchSpan: 4,
              searchLabelWidth: 46,
              align: 'center'
            },
          ],
        },
        data: [],

        auditBasePopup: false,
        questionTypeList: [],
        CNNum: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二', '十三', '十四', '十五'],
        nineTypeList: [],
        radio: '1',
      }
    },

    provide() {
      return {
        placeElement: this,
      }
    },

    components: {
      campusReporting,
      hotelReporting,
      labelReporting,
    },

    watch: {},

    created() {
      this.getDictBizTree()
    },

    computed: {
      ...mapGetters(["permission", "userInfo"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.place_add, false),
          viewBtn: this.vaildData(this.permission.place_view, true),
          delBtn: this.vaildData(this.permission.place_del, true),
          // editBtn: this.vaildData(this.permission.place_edit, true),
        }
      },
      ids() {
        let ids = []
        this.selectionList.forEach((ele) => {
          ids.push(ele.id)
        })
        return ids.join(",")
      },
      showStatus() {
        return (data) => {
          let tags = {}
          if (data == 1) {
            tags = {
              type: 'warning',
              text: '待审核'
            }
          } else if (data == 2) {
            tags = {
              type: 'success',
              text: '已审核'
            }
          } else if (data == 3) {
            tags = {
              type: 'danger',
              text: '未通过'
            }
          } else if (data == 4) {
            tags = {
              type: 'warning',
              text: '待完成'
            }
          }

          return tags
        }
      },

      textDispose() {
        return (row, flag, type) => {
          if (row[flag] || row[type] == null) {
            return row[type]
          } else {
            if (type == 'principalIdCard') {
              return row[type].replace(/^(.{6})(?:\d+)(.{4})$/, "$1******$2")
            } else {
              return row[type].replace(/^(.{3})(?:\d+)(.{4})$/, "$1****$2")
            }
          }
        }
      }
    },
    methods: {
      // 点击展开收缩
      flodQL(index) {
        this.rowDetail.qTypeList[index].isShowQList = !this.rowDetail.qTypeList[index].isShowQList
        this.refreshNum += 1
      },

      // 对数组按属性分组
      groupBy(arr, key) {
        return arr.reduce((acc, curr) => {
          (acc[curr[key]] = acc[curr[key]] || []).push(curr)
          return acc
        }, {})
      },

      // 九小类型字典接口
      getDictBizTree() {
        getDictBizTree({
          code: 'nineType'
        }).then(res => {
          this.nineTypeList = res.data.data
        })
      },

      // 九小类型转换
      switchNineType(type) {
        return this.nineTypeList.find(item => item.key === type) ? this.nineTypeList.find(item => item.key === type)
          .title : ''
      },

      // 获取问题类型
      getPatrolGroupTree(param) {
        getPatrolGroupTree(param).then(res => {
          this.questionTypeList = res.data.data
        })
      },

      getDetail(rowData) {
        this.getPatrolGroupTree({
          type: 2,
          childType: rowData.noExplosionCategory
        })
        this.drawerLoading = true
        this.isDetail = true
        getTaskNoFraudReportingInfo({
          taskId: rowData.taskId
        }).then(res => {
          let row = res.data.data
          if (row.taskPlaceRecordVOList) {
            row.taskPlaceRecordVOList.forEach(item => {
              item.imageUrlsList = []
              item.rectificationImageUrlsList = []
              if (item.imageUrls) {
                item.imageUrlsList = item.imageUrls.split(',').map(ele => {
                  return website.minioUrl + ele
                })
              }
              if (item.rectificationImageUrls) {
                item.rectificationImageUrlsList = item.rectificationImageUrls.split(',').map(ele => {
                  return website.minioUrl + ele
                })
              }
              // 查询问题类型
              this.questionTypeList.forEach(qItem => {
                qItem.children.forEach(qChild => {
                  if (qChild.id == item.itemId) {
                    item.qType = qItem.title
                    item.itemsNameTitle = qChild.title
                  }
                })
              })
            })
          }
          if (row.taskPlaceRecordVOList) {
            // 把相同类型问题分组
            let obj = this.groupBy(row.taskPlaceRecordVOList, 'qType')
            let arr = Object.entries(obj)
            let newArr = []
            arr.forEach(part => {
              newArr.push({
                questionName: part[0],
                questionList: part[1],
                isShowQList: true
              })
            })
            row.qTypeList = newArr
          }
          // 九小类型转换
          row.nineTypeName = this.switchNineType(row.nineType)
          this.rowDetail = row
          this.drawerLoading = false
        })

      },

      handleExport() {
        this.$confirm("是否导出无诈记录数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          NProgress.start()
          var data = {
            ...this.query
          }
          // data.isNine = 1
          data = Qs.stringify(data)
          exportBlob(
            `/api/blade-taskNoFraudReporting/taskNoFraudReporting/export-taskNoFraudReporting?${this.website.tokenHeader}=${getToken()}&` +
            data
          ).then(res => {
            console.log('exportBlob', res)
            downloadXls(res.data, `无诈记录${dateNow()}.xlsx`)
            NProgress.done()
          })
        })
      },

      showStringDispose(row, type) {
        row[type] = !row[type]
      },

      // 弹窗关闭回调
      handleClose() {
        this.cancelAudit()
      },

      // 取消审核
      cancelAudit() {
        this.visible = false
      },

      // 确认提交审核
      submitAudit(form) {
        let auditForm = {
          status: form.status == '1' ? '2' : '3',
          remark: form.confirmNotion,
          reportType: 6
        }

        applyTaskExamine(Object.assign(this.auditParams, auditForm)).then(res => {
          if (res.data.code == 200) {
            this.$message.warning("审核成功")
            this.onLoad(this.page)
            this.cancelAudit()
          }
        })
      },

      // 审核按钮
      goAudit(row) {
        this.auditParams = {
          id: row.taskId,
          reportType: row.reportType
        }
        this.visible = true
      },

      colseDetail() {
        this.auditBasePopup = false
        this.onLoad(this.page)
      },

      lookDetail(row, applyType) {
        this.auditBasePopup = true
        var that = this
        if (row.reportType == 6) {
          this.taskType = 6
          this.$nextTick(() => {
            that.$refs.campusReporting.init(row, applyType)
          })
        }
        if (row.reportType == 2) {
          this.taskType = 2
          this.$nextTick(() => {
            that.$refs.hotelReporting.init(row, applyType)
          })
        }
        if (row.reportType == 3 || row.reportType == 4 || row.reportType == 5) {
          this.taskType = 3
          this.$nextTick(() => {
            that.$refs.labelReporting.init(row, applyType)
          })
        }
      },
      auditCur(row) {
        this.curAuditRow = row
        this.auditBasePopup = true
      },

      roleBoxClose() {
        this.curRow = {}
      },

      ManageTenants(item) {
        this.curRow = item
        this.roleBox = true
      },

      rowSave(row, done, loading) {
        if (row.imageUrls && row.imageUrls.length > 0) {
          var urls = []
          var split = row.imageUrls.split(",").filter(item => item != '')
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.imageUrls = urls.join(",")
        }

        let label = row.label

        if (row.smallLabel != '') {
          label = label + ',' + row.smallLabel
        }

        delete row.smallLabel

        add({
          ...row,
          label
        }).then(
          () => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },

      rowUpdate(row, index, done, loading) {
        if (row.imageUrls.length > 0) {
          var urls = []
          var split = row.imageUrls.split(",").filter(item => item != '')
          split.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          row.imageUrls = urls.join(",")
        }

        let label = row.label

        if (row.smallLabel != '') {
          label = label + ',' + row.smallLabel
        }

        delete row.smallLabel

        update({
          ...row,
          label
        }).then(
          () => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            done()
          },
          (error) => {
            window.console.log(error)
            loading()
          }
        )
      },

      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          })
          .then(() => {
            row.isDeleted = 1
            return removeTask(row)
          })
          .then(() => {
            this.onLoad(this.page)

            this.$message({
              type: "success",
              message: "操作成功!",
            })
          })
      },
      searchReset() {
        this.query = {}
        this.page.currentPage = 1
        this.onLoad(this.page)
      },
      searchChange(params, done) {
        this.query = params
        this.page.currentPage = 1
        this.onLoad(this.page, params)
        done()
      },
      selectionChange(list) {
        this.selectionList = list
      },
      selectionClear() {
        this.selectionList = []
        this.$nextTick(() => {
          this.$refs.crud && this.$refs.crud.toggleSelection()
        })
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据")
          return
        }
        this.$confirm("确定将选择数据删除?", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
            type: "warning",
          })
          .then(() => {
            return remove(this.ids)
          })
          .then(() => {
            this.onLoad(this.page)
            this.$message({
              type: "success",
              message: "操作成功!",
            })
            this.$refs.crud.toggleSelection()
          })
      },

      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          // getPlace(this.form.id).then((res) => {
          //   this.form = res.data.data
          //   if (this.form.imageUrls.length) {
          //     this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
          //       .minioUrl + item).join(',')
          //   }
          //   if (this.form.placePoiLabelVOList.length) {
          //     let lebelTwo = this.form.placePoiLabelVOList.find(item => {
          //       return item.type == 2
          //     })
          //     if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
          //     let lebelThree = this.form.placePoiLabelVOList.find(item => {
          //       return item.type == 3
          //     })
          //     if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
          //   }
          //   done()
          // })
        } else {
          done()
        }
      },

      currentChange(currentPage) {
        this.page.currentPage = currentPage
        this.onLoad(this.page, this.query)
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize
        this.onLoad(this.page, this.query)
      },
      refreshChange() {
        this.page.currentPage = 1
        this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const {} = this.query
        let values = {
          ...params,
        }

        this.loading = true
        getTaskNoFraudReportingList(page.currentPage, page.pageSize, values).then((res) => {
          const data = {
            ...res.data.data,
            records: res.data.data.records.map(item => {
              return {
                ...item,
                'createTime': item.createTime.slice(0, 16),
                'principalPhoneflag': false,
              }
            })
          }
          data.records.forEach(item => {})
          this.page.total = data.total
          this.data = data.records
          this.loading = false
          this.selectionClear()
        })
      }
    }
  }
</script>

<style lang="scss" scoped>
  :deep(.cur-container-box) {
    padding: 0;
  }

  :deep(.el-button--text) {
    border: 0;
    background: transparent !important;
  }

  :deep(.el-radio__input.is-disabled+span.el-radio__label) {
    color: #000;
  }

  :deep(.el-radio__input.is-checked+.el-radio__label) {
    color: #409EFF !important;
  }

  :deep(.el-radio__input.is-checked .el-radio__inner::after) {
    background-color: #FFF;
  }

  :deep(.el-radio__input.is-checked .el-radio__inner) {
    background-color: #409EFF;
  }

  :deep(.avue-crud__img) {
    height: 30px !important;
  }

  :deep(.el-radio) {
    margin-right: 20px;
  }

  .avue-upload__icon {
    line-height: 6;
  }

  .cur-container-box {
    display: flex;
    flex-direction: column;
    width: 100%;
    height: 100%;
    overflow: hidden;

    .content-box {
      margin: 0 4px;
      padding: 0 16px;
      height: 0;
      flex: 1;
      overflow: hidden;
      overflow-y: auto;
    }

    .footer-btn-box {
      margin-top: 10px;
      display: flex;
      justify-content: center;
    }
  }

  .title {
    margin: 10px;
    height: 40px;
    background-color: #eee;
    display: flex;
    align-items: center;

    .icon {
      width: 4px;
      height: 18px;
      background-color: #409dfe;
      margin: 0 10px;
      color: transparent;
    }
  }

  .basic-info {
    padding: 0 20px;
    font-size: 14px;

    .info-item {
      display: flex;
      padding: 10px;

      .info-name {
        width: 100px;
        display: flex;
        align-items: center;
      }

      .info-value {
        display: flex;
        align-items: center;
      }
    }
  }

  .question-list {
    padding: 0 20px;
    font-size: 14px;

    .question-type {
      height: 60px;
      display: flex;
      align-items: center;
      cursor: pointer;
      justify-content: space-between;
      padding-right: 20px;

      .type-name {}

      .icon-box {}
    }

    .question-item {
      margin-bottom: 20px;
      padding: 10px;
      background: #f5f7fa;
      border-radius: 8px;

      &>div {
        margin: 14px 0;
      }

      .question-name {
        display: flex;

        .key {
          width: 80%;
          padding-right: 20px;
          word-break: break-all;
        }

        .value {
          width: 20%;
          display: flex;
          align-items: center;
          justify-content: center;
        }
      }

      .yh-pic-box {
        display: flex;
        height: 100px;

        .yh-pic-name {
          width: 100px;
          display: flex;
          align-items: center;
          justify-content: left;
        }

        .yh-pic-list {
          width: 0;
          flex: 1;
          display: flex;
        }
      }

      .yh-remark {
        display: flex;

        .yh-remark-name {
          width: 100px;
          display: flex;
          align-items: center;
          justify-content: left;
        }

        .yh-remark-value {
          word-break: break-all;
        }
      }
    }
  }
</style>

 src/views/resource/distapch.vue

@@ -1,22 +1,22 @@
<template>
    <basic-container v-if="false">
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
            v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.oss_delete"
                <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.job_del"
                    @click="handleDelete">删 除
                </el-button>
            </template>

            <template slot-scope="{ row, size, index }" slot="menu">
                <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
                    @click="handleDebug(row)">执行一次
                <el-button :size="size" type="text" icon="el-icon-video-pause" v-if="permission.job_enable && row.triggerStatus==1"
                    @click="handleEnable(row,0)">停止
                </el-button>
                <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.oss_enable"
                    @click.stop="handleEnable(row)">启用
                <el-button :size="size" type="text" icon="el-icon-video-play" v-if="permission.job_enable && row.triggerStatus==0"
                    @click.stop="handleEnable(row,1)">启用
                </el-button>
            </template>

@@ -38,14 +38,6 @@


        </avue-crud>

        <el-dialog title="对象存储上传调试" append-to-body :visible.sync="box" width="550px">
            <avue-form ref="form" :option="debugOption" v-model="debugForm" @submit="handleSubmit" />
        </el-dialog>




        <el-dialog title="Cron" append-to-body :visible.sync="cronPopover" width="550px">
            <!-- <el-popover v-model="cronPopover"> -->

@@ -64,7 +56,7 @@
</template>

<script>
import { getList, getDetail, add, update, remove, enable } from "@/api/resource/oss"
import { getList, add, update, remove, start,stop } from "@/api/xxljob/xxljob"
import { mapGetters } from "vuex"
import func from "@/util/func"
import vueCron from 'vue-cron'
@@ -90,8 +82,7 @@
                searchLabelWidth: 96,
                searchShow: true,
                searchMenuSpan: 3,
                menuWidth: 350,

                menuWidth: 280,
                height: 'auto',
                calcHeight: 30,
                tip: false,
@@ -102,253 +93,205 @@
                dialogWidth: 880,
                dialogClickModal: false,
                dialogDirection: 'rtl',
                dialogType: 'drawer',
                dialogType: 'dialog',
                column: [
                    {
                        label: "分类",
                        type: "radio",
                        value: 1,
                        span: 24,
                        width: 120,
                        searchLabelWidth: 50,
                        row: true,
                        dicUrl: "/api/blade-system/dict/dictionary?code=oss",
                        props: {
                            label: "dictValue",
                            value: "dictKey"
                        },
                        dataType: "number",
                        slot: true,
                        prop: "category",
                        label: "任务描述",
                        searchLabelWidth: 76,
                        prop: "jobDesc",
                        labelWidth:150,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择分类",
                            message: "请输入任务描述",
                            trigger: "blur"
                        }],
                        display: false
                    },
                    // {
                    //     label: "调度类型",
                    //     width: 120,
                    //     searchLabelWidth: 76,
                    //     labelWidth:150,
                    //     prop: "scheduleType",
                    //     rules: [{
                    //         required: true,
                    //         message: "请选择调度类型",
                    //         trigger: "blur"
                    //     }],
                    //     display: false
                    // },
                    {
                        label: "表达式",
                        prop: "scheduleConf",
                        // width: 120,
                        labelWidth:150,
                        rules: [{
                            required: true,
                            message: "请输入表达式",
                            trigger: "blur"
                        }],
                    },
                    {
                        label: "资源编号",
                        prop: "ossCode",
                        span: 24,
                        label: "执行器任务handler",
                        prop: "executorHandler",
                        labelWidth:150,
                        width: 160,
                        rules: [{
                            required: true,
                            message: "请输入执行器任务handler",
                            trigger: "blur"
                        }],
                    },
                    {
                        label: "负责人",
                        prop: "author",
                        width: 120,
                        search: true,
                        labelWidth:150,
                        rules: [{
                            required: true,
                            message: "请输入资源编号",
                            message: "请输入负责人",
                            trigger: "blur"
                        }],
                        display: false
                    },
                    
                    {
                        label: "资源地址",
                        prop: "endpoint",
                        span: 24,
                        rules: [{
                            required: true,
                            message: "请输入资源地址",
                            trigger: "blur"
                        }],
                        display: false
                    },
                    {
                        label: "空间名",
                        prop: "bucketName",
                        span: 24,
                        width: 120,
                        rules: [{
                            required: true,
                            message: "请输入空间名",
                            trigger: "blur"
                        }],
                        display: false
                    },
                    {
                        label: "accessKey",
                        prop: "accessKey",
                        span: 24,
                        search: true,
                        width: 200,
                        label: "报警邮件",
                        prop: "alarmEmail",
                        width: 150,
                        labelWidth:150,
                        overHidden: true,
                        rules: [{
                            required: true,
                            message: "请输入accessKey",
                            message: "请输入报警邮件",
                            trigger: "blur"
                        }],
                        display: false
                    },
                    {
                        label: "secretKey",
                        prop: "secretKey",
                        span: 24,
                        width: 200,
                        overHidden: true,
                        rules: [{
                            required: true,
                            message: "请输入secretKey",
                            trigger: "blur"
                        }],
                        display: false
                    },
                    {
                        label: "appId",
                        prop: "appId",
                        span: 24,
                        hide: true,
                        display: false,
                    },
                    {
                        label: "region",
                        prop: "region",
                        span: 24,
                        hide: true,
                        display: false,
                    },
                    {
                        width: 100,
                        label: "是否启用",
                        prop: "status",
                        span: 24,
                    },{
                        label: "状态",
                        prop: "triggerStatus",
                        search: true,
                        searchSpan:4,
                        type:"select",
                        align: "center",
                        slot: true,
                        labelWidth:150,
                        width: 120,
                        searchLabelWidth: 66,
                        viewDisplay:true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        dataType:"number",
                        dicData:[
                            {
                                label:"运行",
                                value: 1
                    },
                    {
                        label: "备注",
                        prop: "remark",
                        span: 24,
                        hide: true,
                        display: false
                                label:"停止",
                                value: 0
                            }
                        ],
                    },
                ],
                group: [
                    {
                        label: '基础配置',
                        prop: 'jbxx',
                        column: [
                            {
                                label: '执行器',
                                prop: '',
                                type: 'select',
                            },
                            {
                                label: '任务描述',
                                prop: ''
                            },
                            {
                                label: '负责人',
                                prop: '',
            //     group: [
            //         {
            //             label: '基础配置',
            //             prop: 'jbxx',
            //             column: [
            //                 {
            //                     label: '执行器',
            //                     prop: '',
            //                     type: 'select',
            //                 },
            //                 {
            //                     label: '任务描述',
            //                     prop: ''
            //                 },
            //                 {
            //                     label: '负责人',
            //                     prop: '',

                            },
                            {
                                label: '报警邮件',
                                prop: ''
                            }
                        ]
                    },
                    {
                        label: '调度配置',
                        prop: 'jbxx',
                        column: [
                            {
                                label: '调度类型',
                                prop: '',
                                type: 'select',
                            },
                            {
                                label: 'Cron',
                                prop: 'cron',
                                formslot: true,
                            }
                        ]
                    },
                    {
                        label: '任务配置',
                        prop: 'jbxx',
                        column: [
                            {
                                label: '运行模式',
                                prop: '',
                                type: 'select',
                            },
                            {
                                label: 'JobHandler',
                                prop: ''
                            },
                            {
                                label: '任务参数',
                                prop: '',
                                type: 'textarea',
                                span: 24
                            }
                        ]
                    },
                    {
                        label: '高级配置',
                        prop: 'jbxx',
                        column: [
                            {
                                label: '调度类型',
                                prop: '',
                                type: 'select',
                            },
                            {
                                label: '子任务ID',
                                prop: ''
                            },
                            {
                                label: '调度类型',
                                prop: '',
                                type: 'select',
                            },
                            {
                                label: '任务参数',
                                prop: '',
                                type: 'select',
                            },
                            {
                                label: '任务超时时间',
                                prop: '',
                            },
                            {
                                label: '失败重试次数',
                                prop: '',
                            }
                        ]
                    },
                ]
            //                 },
            //                 {
            //                     label: '报警邮件',
            //                     prop: ''
            //                 }
            //             ]
            //         },
            //         {
            //             label: '调度配置',
            //             prop: 'jbxx',
            //             column: [
            //                 {
            //                     label: '调度类型',
            //                     prop: '',
            //                     type: 'select',
            //                 },
            //                 {
            //                     label: 'Cron',
            //                     prop: 'cron',
            //                     formslot: true,
            //                 }
            //             ]
            //         },
            //         {
            //             label: '任务配置',
            //             prop: 'jbxx',
            //             column: [
            //                 {
            //                     label: '运行模式',
            //                     prop: '',
            //                     type: 'select',
            //                 },
            //                 {
            //                     label: 'JobHandler',
            //                     prop: ''
            //                 },
            //                 {
            //                     label: '任务参数',
            //                     prop: '',
            //                     type: 'textarea',
            //                     span: 24
            //                 }
            //             ]
            //         },
            //         {
            //             label: '高级配置',
            //             prop: 'jbxx',
            //             column: [
            //                 {
            //                     label: '调度类型',
            //                     prop: '',
            //                     type: 'select',
            //                 },
            //                 {
            //                     label: '子任务ID',
            //                     prop: ''
            //                 },
            //                 {
            //                     label: '调度类型',
            //                     prop: '',
            //                     type: 'select',
            //                 },
            //                 {
            //                     label: '任务参数',
            //                     prop: '',
            //                     type: 'select',
            //                 },
            //                 {
            //                     label: '任务超时时间',
            //                     prop: '',
            //                 },
            //                 {
            //                     label: '失败重试次数',
            //                     prop: '',
            //                 }
            //             ]
            //         },
            //     ]
            },
            data: [],
            debugForm: {
                code: '',
            },
            debugOption: {
                submitText: "保存",
                column: [
                    {
                        label: "资源编号",
                        prop: "code",
                        disabled: true,
                        span: 24,
                    },
                    {
                        label: "上传背景",
                        prop: "backgroundUrl",
                        type: 'upload',
                        listType: 'picture-img',
                        dataType: 'string',
                        action: '/api/blade-resource/oss/endpoint/put-file',
                        propsHttp: {
                            res: 'data',
                            url: 'link',
                        },
                        span: 24,
                    },
                ]
            }
        }
    },
    watch: {
@@ -372,10 +315,10 @@
        ...mapGetters(["userInfo", "permission"]),
        permissionList () {
            return {
                addBtn: this.vaildData(this.permission.oss_add),
                addBtn: this.vaildData(this.permission.job_add),
                viewBtn: this.vaildData(this.permission.oss_view),
                delBtn: this.vaildData(this.permission.oss_delete),
                editBtn: this.vaildData(this.permission.oss_edit)
                delBtn: this.vaildData(this.permission.job_del),
                editBtn: this.vaildData(this.permission.job_update)
            }
        },
        ids () {
@@ -393,6 +336,16 @@
        },

        rowSave (row, done, loading) {
            row['jobGroup'] = 1;
            row['glueType'] = 'bean';
            row['scheduleType'] = 'CRON';
            row['executorParam'] = '';
            row['executorRouteStrategy'] = 'FIRST';
            row['misfireStrategy'] = 'DO_NOTHING';
            row['executorBlockStrategy'] = 'SERIAL_EXECUTION';
            row['executorTimeout'] = 0;
            row['executorFailRetryCount'] = 0;
            row['glueRemark'] = 'GLUE代码初始化';
            add(row).then(() => {
                this.onLoad(this.page)
                this.$message({
@@ -452,14 +405,26 @@
            this.selectionList = []
            this.$refs.crud.toggleSelection()
        },
        handleEnable (row) {
            this.$confirm("是否确定启用这条配置?", {
        handleEnable (row,status) {
            var temstr = ""
            if(status == 1){
                temstr = "启动"
            }else{
                temstr = "停止"
            }
            this.$confirm("是否确定" + temstr + "当前任务?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
            })
                .then(() => {
                    return enable(row.id)
                    if(status==1){
                        row.triggerStatus = 1
                        return start(row)
                    }else{
                        row.triggerStatus = 0
                        return stop(row)
                    }
                })
                .then(() => {
                    this.onLoad(this.page)
@@ -469,11 +434,6 @@
                    })
                    this.$refs.crud.toggleSelection()
                })
        },
        handleDebug (row) {
            this.box = true
            this.debugForm.code = row.ossCode
            this.debugForm.backgroundUrl = ''
        },
        handleSubmit (form, done) {
            this.$message({
@@ -505,11 +465,11 @@
                })
        },
        beforeOpen (done, type) {
            if (["edit", "view"].includes(type)) {
                getDetail(this.form.id).then(res => {
                    this.form = res.data.data
                })
            }
            // if (["edit", "view"].includes(type)) {
            //     getDetail(this.form.id).then(res => {
            //         this.form = res.data.data
            //     })
            // }
            done()
        },
        currentChange (currentPage) {

 src/views/sms/sms.vue

File was renamed from src/views/resource/sms.vue
@@ -11,9 +11,9 @@
      </template>

      <template slot-scope="{ row, size, index }" slot="menu">
        <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
        <!--    <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
          @click="handleDebug(row)">调试
        </el-button>
        </el-button> -->
        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.sms_enable"
          @click.stop="handleEnable(row)">启用
        </el-button>

 src/views/sms/smsRecord.vue

copy from src/views/resource/sms.vue
copy to src/views/sms/smsRecord.vue
File was copied from src/views/resource/sms.vue
@@ -4,31 +4,9 @@
      :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
      <template slot="menuLeft">
        <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.sms_delete"
          @click="handleDelete">删 除
        </el-button>
      </template>

      <template slot-scope="{ row, size, index }" slot="menu">
        <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
          @click="handleDebug(row)">调试
        </el-button>
        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.sms_enable"
          @click.stop="handleEnable(row)">启用
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="status">
        <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
      </template>
      <template slot-scope="{row, size}" slot="category">
        <el-tag :size="size">{{ row.categoryName }}</el-tag>
      </template>
    </avue-crud>
    <el-dialog title="手机短信发送调试" append-to-body :visible.sync="box" width="550px">
      <avue-form :option="debugOption" v-model="debugForm" @submit="handleSend" />
    </el-dialog>

  </basic-container>
</template>

@@ -38,10 +16,8 @@
    getDetail,
    add,
    update,
    remove,
    enable,
    send
  } from "@/api/resource/sms"
    remove
  } from "@/api/resource/smsRecord"
  import {
    mapGetters
  } from "vuex"
@@ -66,115 +42,46 @@
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 350,

          menu: false,
          height: 'auto',
          calcHeight: 30,
          tip: false,
          border: true,
          addBtn: false,
          index: true,
          viewBtn: true,
          selection: true,
          dialogWidth: 880,
          dialogClickModal: false,
          column: [
            // {
            //     label: "分类",
            //     type: "radio",
            //     value: 1,
            //     span: 24,
          column: [{
            //     width: 100,
            //     searchLabelWidth: 46,
            //     row: true,
            //     dicUrl: "/api/blade-system/dict/dictionary?code=sms",
            //     props: {
            //         label: "dictValue",
            //         value: "dictKey"
            //     },
            //     dataType: "number",
            //     slot: true,
            //     prop: "category",
            //     searchSpan: 4,
            //     search: true,
            //     rules: [{
            //         required: true,
            //         message: "请选择分类",
            //         trigger: "blur"
            //     }]
            // },
            {
              label: "资源编号",
              prop: "smsCode",
              label: "电话号码",
              prop: "phone",
              search: true,
              span: 24,
              width: 200,
              align: "center",
              slot: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
            }, {
              label: "短信内容",
              prop: "content",
              span: 24,
              width: 800,
              searchSpan: 4,
              align: "center",
              search: true,
              rules: [{
                required: true,
                message: "请输入资源编号",
                message: "请输入模版内容",
                trigger: "blur"
              }]
            },
            {
              // width: 100,
              label: "模版ID",
              prop: "templateId",
              span: 24,
              width: 200,
              searchSpan: 4,
              searchLabelWidth: 80,
              search: true,
              rules: [{
                required: true,
                message: "请输入模版ID",
                trigger: "blur"
              }]
            },
            {
              label: "accessKey",
              prop: "accessKey",
              span: 24,
              overHidden: true,
              rules: [{
                required: true,
                message: "请输入accessKey",
                trigger: "blur"
              }],
            },
            {
              label: "secretKey",
              prop: "secretKey",
              span: 24,
              overHidden: true,
              display: true,
              hide: true,
              rules: [{
                required: true,
                message: "请输入secretKey",
                trigger: "blur"
              }],
            },
            {
              label: "regionId",
              prop: "regionId",
              span: 24,
              value: "cn-hangzhou",
              hide: true,
              display: false
            },
            {
              label: "短信签名",
              prop: "signName",
              span: 24,
              width: 200,
              rules: [{
                required: true,
                message: "请输入短信签名",
                trigger: "blur"
              }],
            },
            {
              width: 100,
              label: "是否启用",
              prop: "status",
              span: 24,
              align: "center",
              slot: true,
@@ -183,11 +90,19 @@
              viewDisplay: false,
            },
            {
              label: "备注",
              prop: "remark",
              label: "发送时间",
              prop: "createTime",
              span: 24,
              hide: true
              // width: 200,
              align: "center",
              addDisplay: false,
              rules: [{
                required: true,
                message: "请输入短信签名",
                trigger: "blur"
              }],
            },

          ]
        },
        data: [],
@@ -412,6 +327,7 @@
      },
      onLoad(page, params = {}) {
        this.loading = true
        this.query.isDeleted = 0
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data
          this.page.total = data.total

 src/views/sms/smsTemplate.vue

copy from src/views/resource/sms.vue
copy to src/views/sms/smsTemplate.vue
File was copied from src/views/resource/sms.vue
@@ -11,16 +11,19 @@
      </template>

      <template slot-scope="{ row, size, index }" slot="menu">
        <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
        <!--  <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
          @click="handleDebug(row)">调试
        </el-button>
        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.sms_enable"
        </el-button> -->
        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="row.status == 1"
          @click.stop="handleEnable(row)">启用
        </el-button>
        <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="row.status == 2"
          @click.stop="handleEnable(row)">禁用
        </el-button>
      </template>

      <template slot-scope="{row, size}" slot="status">
        <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
        <el-tag :size="size" :type="row.status == 1 ? 'info' : 'success'">{{ row.status == 1 ?'否':'是' }}</el-tag>
      </template>
      <template slot-scope="{row, size}" slot="category">
        <el-tag :size="size">{{ row.categoryName }}</el-tag>
@@ -38,10 +41,8 @@
    getDetail,
    add,
    update,
    remove,
    enable,
    send
  } from "@/api/resource/sms"
    remove
  } from "@/api/resource/smsTemplate"
  import {
    mapGetters
  } from "vuex"
@@ -65,8 +66,7 @@
          searchLabelWidth: 96,
          searchShow: true,
          searchMenuSpan: 3,
          menuWidth: 350,

          menuWidth: 300,
          height: 'auto',
          calcHeight: 30,
          tip: false,
@@ -76,117 +76,66 @@
          selection: true,
          dialogWidth: 880,
          dialogClickModal: false,
          column: [
            // {
            //     label: "分类",
            //     type: "radio",
            //     value: 1,
            //     span: 24,
            //     width: 100,
            //     searchLabelWidth: 46,
            //     row: true,
            //     dicUrl: "/api/blade-system/dict/dictionary?code=sms",
            //     props: {
            //         label: "dictValue",
            //         value: "dictKey"
            //     },
            //     dataType: "number",
            //     slot: true,
            //     prop: "category",
            //     searchSpan: 4,
            //     search: true,
            //     rules: [{
            //         required: true,
            //         message: "请选择分类",
            //         trigger: "blur"
            //     }]
            // },
            {
              label: "资源编号",
              prop: "smsCode",
              span: 24,
          column: [{
              width: 200,
              searchSpan: 4,
              search: true,
              rules: [{
                required: true,
                message: "请输入资源编号",
                trigger: "blur"
              }]
            },
            {
              label: "模版ID",
              prop: "templateId",
              span: 24,
              width: 200,
              searchSpan: 4,
              searchLabelWidth: 80,
              search: true,
              rules: [{
                required: true,
                message: "请输入模版ID",
                trigger: "blur"
              }]
            },
            {
              label: "accessKey",
              prop: "accessKey",
              span: 24,
              overHidden: true,
              rules: [{
                required: true,
                message: "请输入accessKey",
                trigger: "blur"
              }],
            },
            {
              label: "secretKey",
              prop: "secretKey",
              span: 24,
              overHidden: true,
              display: true,
              hide: true,
              rules: [{
                required: true,
                message: "请输入secretKey",
                trigger: "blur"
              }],
            },
            {
              label: "regionId",
              prop: "regionId",
              span: 24,
              value: "cn-hangzhou",
              hide: true,
              display: false
            },
            {
              label: "短信签名",
              prop: "signName",
              span: 24,
              width: 200,
              rules: [{
                required: true,
                message: "请输入短信签名",
                trigger: "blur"
              }],
            },
            {
              width: 100,
              label: "是否启用",
              prop: "status",
              label: "模板id",
              prop: "id",
              span: 24,
              align: "center",
              slot: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
            }, {
              width: 100,
              label: "标题",
              prop: "title",
              span: 24,
              align: "center",
              slot: true,
              rules: [{
                required: true,
                message: "请输入标题",
                trigger: "blur"
              }],
            }, {
              label: "模版内容",
              prop: "content",
              type: 'textarea',
              slot: true,
              span: 24,
              // width: 400,
              searchSpan: 4,
              align: "center",
              search: true,
              rules: [{
                required: true,
                message: "请输入模版内容",
                trigger: "blur"
              }]
            },
            {
              label: "创建时间",
              prop: "createTime",
              span: 24,
              width: 200,
              align: "center",
              addDisplay: false,
              editDisplay: false,
              rules: [{
                required: true,
                message: "请输入短信签名",
                trigger: "blur"
              }],
            },

            {
              width: 100,
              label: "备注",
              prop: "remark",
              span: 24,
              hide: true
              align: "center",
              slot: true,
            },
          ]
        },
@@ -325,7 +274,8 @@
            type: "warning"
          })
          .then(() => {
            return enable(row.id)
            row.status = row.status == 1 ? 2 : 1
            return update(row)
          })
          .then(() => {
            this.onLoad(this.page)

 src/views/system/auth.vue

New file
@@ -0,0 +1,166 @@
<template>
  <basic-container>
      <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
          :permission="permissionList" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
          @search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange"
          @refresh-change="refreshChange" @on-load="onLoad">
      </avue-crud>
  </basic-container>
</template>

<script>
import { getApiList, getApiLogs } from "@/api/logs"
import { mapGetters } from "vuex"

export default {
  data () {
      return {
          form: {},
          selectionList: [],
          query: {},
          loading: true,
          page: {
              pageSize: 10,
              currentPage: 1,
              total: 0
          },
          option: {
              labelWidth: 96,
              searchLabelWidth: 72,
              searchShow: true,
              searchMenuSpan: 3,
              menuWidth: 80,

              height: 'auto',
              calcHeight: 30,
              tip: false,
              border: true,
              index: true,
              viewBtn: true,
              editBtn: false,
              addBtn: false,
              delBtn: false,
              dialogType: 'drawer',
              column: [
                  {
                      label: "应用id",
                      prop: "applicationId",
                      width: '120',
                      searchSpan: 4,
                      search: true,
                      searchLabelWidth: 60,
                  },
                  {
                      label: "服务id",
                      prop: "serviceId",
                      width: '120',
                      searchSpan: 4,
                      search: true,
                      searchLabelWidth: 60,
                  },
                  {
                      label: "服务host",
                      prop: "serverHost",
                      searchSpan: 4,
                      searchLabelWidth: 86,
                      search: true
                  },
                  {
                      label: "服务ip",
                      prop: "serverIp",
                      width: '160'
                  },
                  {
                      label: "软件环境",
                      prop: "env",
                      width: '80',
                  },
                  {
                      label: "名称",
                      prop: "title"
                  },
                  {
                      label: "请求方法",
                      prop: "method",
                      width: '80'
                  },
                  {
                      label: "认证接口",
                      prop: "requestUri"
                  },
                  {
                      label: "时间",
                      prop: "createTime",
                      width: '180'
                  },
                  {
                      label: "用户代理",
                      prop: "userAgent",
                      span: 24,
                      hide: true
                  },
                  {
                      label: "请求数据",
                      prop: "params",
                      type: "textarea",
                      span: 24,
                      minRows: 2,
                      hide: true
                  }
              ]
          },
          data: []
      }
  },

  computed: {
      ...mapGetters(["permission"]),
      permissionList () {
          return {
              viewBtn: this.vaildData(this.permission.log_api_view, false)
          }
      }
  },
  methods: {
      searchReset () {
          this.query = {}
          this.onLoad(this.page)
      },
      searchChange (params, done) {
          this.query = params
          this.page.currentPage = 1
          this.onLoad(this.page, params)
          done()
      },
      beforeOpen (done, type) {
          if (["edit", "view"].includes(type)) {
              getApiLogs(this.form.id).then(res => {
                  this.form = res.data.data
              })
          }
          done()
      },
      currentChange (currentPage) {
          this.page.currentPage = currentPage
      },
      sizeChange (pageSize) {
          this.page.pageSize = pageSize
      },
      refreshChange () {
          this.onLoad(this.page, this.query)
      },
      onLoad (page, params = {}) {
        params['type'] = 1;
          this.loading = true
          getApiList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
              const data = res.data.data
              this.page.total = data.total
              this.data = data.records
              this.loading = false
          })
      }
  }
}
</script>

<style></style>

 src/views/system/user.vue

@@ -12,10 +12,10 @@
        <el-col :span="19">
            <basic-container>
                <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
                    v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate"
                    @row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
                    @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
                    @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
          v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
          :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
          @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
          @refresh-change="refreshChange" @on-load="onLoad">
                    <template slot="menuLeft">
                        <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
                            @click="handleDelete">删 除
@@ -58,8 +58,8 @@
                </avue-crud>
                <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">

                    <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id"
                        ref="treeRole" :default-checked-keys="roleTreeObj" :props="props">
          <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
            :default-checked-keys="roleTreeObj" :props="props">
                    </el-tree>

                    <span slot="footer" class="dialog-footer">
@@ -880,6 +880,7 @@
        handleExport () {
            const account = func.toStr(this.search.account)
            const realName = func.toStr(this.search.realName)
        const deptId = this.treeDeptId
            this.$confirm("是否导出用户数据?", "提示", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
@@ -887,7 +888,7 @@
            }).then(() => {
                NProgress.start()
                exportBlob(
                    `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`
            `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}&deptId=${deptId}`
                ).then(res => {
                    downloadXls(res.data, `用户数据表${dateNow()}.xlsx`)
                    NProgress.done()

 src/views/userHouse/houseHoldList.vue

@@ -58,7 +58,21 @@
            </div>
          </el-col>
        </el-row>
        <div class="grid-container2" v-if="item.children">

        <el-collapse accordion @change="handleChange" v-if="item.children[0].children.length">
          <el-collapse-item :title="item2.name" :name="index2" v-for="(item2, index2) in item.children" :key="index2">
            <div class="grid-container2">
              <div class="grid-item" :style="{ backgroundColor: getColor(i.color) }" v-for="(i, k) in item2.children"
                @click="changLabel(i)" :key="k">
                {{ i.name }}
              </div>
            </div>
          </el-collapse-item>
        </el-collapse>



        <div class="grid-container2" v-else>
          <div class="grid-item" :style="{ backgroundColor: getColor(item2.color) }"
            v-for="(item2, index2) in item.children" @click="changLabel(item2)" :key="index2">
            {{ item2.name }}
@@ -919,10 +933,21 @@
          // 查询详情
          getDetatils(item.id).then(res => {
            this.householdLabelList = res.data.data.householdLabelList
          console.log("===>", this.householdLabelList);
            // 将细类放到一起
            data.forEach(e => {
              e.children.forEach(f => {
                if (this.householdLabelList.length > 0) {
                if (f.children.length) {
                  f.children.forEach(k => {
                    this.householdLabelList.forEach(h => {
                      if (Number(k.id) == h.labelId) {
                        k['color'] = h.color
                        k['remark'] = h.remark
                      }
                    })
                  })
                } else {
                  this.householdLabelList.forEach(h => {
                    if (Number(f.id) == h.labelId) {
                      f['color'] = h.color
@@ -930,6 +955,8 @@
                    }
                  })
                }

              }
              })
            })
            this.labelData = data

 vue.config.js

@@ -38,7 +38,7 @@
        proxy: {
            "/api": {
                //本地服务接口地址
                target:"http://192.168.2.140:9528",
                target:"http://192.168.2.111:9528",
                // target: "https://srgdjczzxtpt.com:2080/api",
                // target: "https://kt39592615.goho.co",
                // target: "http://z4042833u6.wicp.vip",