From 87032f4c2c0f3fcc63455e4b7b03c1f5ee06a0b9 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 15 Dec 2023 17:38:20 +0800
Subject: [PATCH] 管理优化

---
 src/views/article/article.vue        |   12 
 src/views/property/inviteTenders.vue |  763 ++++++++++++++++++
 src/views/property/oiae.vue          |  762 ++++++++++++++++++
 src/views/task/eCall/index.vue       |  961 +++++++++++-----------
 4 files changed, 2,017 insertions(+), 481 deletions(-)

diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index 39d5a97..abbdc13 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -653,6 +653,7 @@
           };
           values.dateTime = null;
         }
+        values.type = 0
         this.loading = true;
         getList(page.currentPage, page.pageSize, values).then((res) => {
           const data = res.data.data;
@@ -685,6 +686,17 @@
         } 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);
diff --git a/src/views/property/inviteTenders.vue b/src/views/property/inviteTenders.vue
new file mode 100644
index 0000000..3b14249
--- /dev/null
+++ b/src/views/property/inviteTenders.vue
@@ -0,0 +1,763 @@
+<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>
+        <!--  <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
+        </el-button>
+        <el-button size="small" icon="el-icon-s-release" plain @click="gbcomment">关闭评论
+        </el-button> -->
+      </template>
+
+      <template slot-scope="{type,size,row }" slot="menu">
+        <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,0)">
+          公益报名
+        </el-button>
+        <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>
+        <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 }" slot="publish">
+        <el-tag>{{
+          row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
+          }}
+        </el-tag>
+      </template>
+
+      <template slot-scope="{ row }" slot="iscomment">
+        <el-tag>{{
+          row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
+          }}
+        </el-tag>
+      </template>
+    </avue-crud>
+
+
+
+    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
+      <span slot="title" class="dialog-footer">
+        {{discussForm.ontitle}}
+      </span>
+      <div id="" v-if="discussForm.eventType == 1">
+        <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
+      </div>
+
+      <div id="" v-else>
+        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
+        </avue-form>
+      </div>
+    </el-dialog>
+
+
+
+
+  </basic-container>
+</template>
+
+<script>
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getNotice,
+    upcomment
+  } from "@/api/article/article";
+
+  import {
+    getListPd,
+    removePd,
+    updatePd,
+    addPd,
+    getNoticePd,
+    upcommentPd
+  } 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: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 450,
+          border: false,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "资讯标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入资讯标题",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "资讯封面",
+              prop: "url",
+              // align:'center',
+              width: 80,
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
+            },
+            // {
+            //   label: "资讯来源",
+            //   prop: "sourceName",
+            //   search: true,
+            //   searchSpan: 4,
+            //   span: 24,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入资讯类型",
+            //     trigger: "blur",
+            //   }, ],
+            // },
+            {
+              label: "资讯范围",
+              prop: "articleList",
+              span: 12,
+              minRows: 2,
+              type: "cascader",
+              multiple: true,
+              tags: true,
+              dicData: [],
+              props: {
+                label: "name",
+                value: 'id'
+              },
+              hide: true,
+            },
+            {
+              label: "资讯类型",
+              prop: "type",
+              searchSpan: 3,
+              width: 80,
+              value: 2,
+              slot: true,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择资讯类型",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                label: "物业招标",
+                value: 2,
+              }],
+            },
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              label: "发布状态",
+              prop: "publish",
+              searchSpan: 3,
+              width: 80,
+              value: "0",
+              slot: true,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择发布状态",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                  label: "未发布",
+                  value: "0",
+                },
+                {
+                  label: "已发布",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              label: "评论区",
+              prop: "iscomment",
+              width: 80,
+              slot: true,
+              type: "select",
+              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: [],
+        optionEnroll: {
+          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
+              }]
+            },
+
+            {
+              label: "截止时间",
+              row: true,
+              offset: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "timestamp",
+            },
+          ]
+        },
+        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
+              }]
+            }, {
+              labelWidth: 100,
+              label: '开启签名',
+              prop: 'signatureFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }]
+            },
+            {
+              label: "截止时间",
+              row: true,
+              offset: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "timestamp",
+            },
+          ]
+        },
+        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(",");
+      },
+    },
+    methods: {
+
+      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) {
+        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(",")
+        }
+        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;
+          });
+        }
+        // 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 = 2
+        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(params = {}).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>
\ No newline at end of file
diff --git a/src/views/property/oiae.vue b/src/views/property/oiae.vue
new file mode 100644
index 0000000..dfd9614
--- /dev/null
+++ b/src/views/property/oiae.vue
@@ -0,0 +1,762 @@
+<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>
+        <el-button size="small" icon="el-icon-s-order" plain @click="kqcomment">开启评论
+        </el-button>
+        <el-button size="small" icon="el-icon-s-release" plain @click="gbcomment">关闭评论
+        </el-button>
+      </template>
+
+      <template slot-scope="{type,size,row }" slot="menu">
+        <!-- <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row,0)">
+          公益报名
+        </el-button>
+        <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>
+        <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 }" slot="publish">
+        <el-tag>{{
+          row.publish == "1" ? "已发布" : row.publish == "0" ? "未发布" : "未发布"
+          }}
+        </el-tag>
+      </template>
+
+      <template slot-scope="{ row }" slot="iscomment">
+        <el-tag>{{
+          row.iscomment == "1" ? "开启" : row.iscomment == "0" ? "关闭" : "关闭"
+          }}
+        </el-tag>
+      </template>
+    </avue-crud>
+
+
+
+    <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="50%" :before-close="handleClose">
+      <span slot="title" class="dialog-footer">
+        {{discussForm.ontitle}}
+      </span>
+      <div id="" v-if="discussForm.eventType == 1">
+        <avue-form @submit="handleSubmit" :option="optionDiscuss" v-model="discussForm"></avue-form>
+      </div>
+
+      <div id="" v-else>
+        <avue-form @submit="handleSubmit" :option="optionEnroll" v-model="discussForm">
+        </avue-form>
+      </div>
+    </el-dialog>
+
+
+
+
+  </basic-container>
+</template>
+
+<script>
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getNotice,
+    upcomment
+  } from "@/api/article/article";
+
+  import {
+    getListPd,
+    removePd,
+    updatePd,
+    addPd,
+    getNoticePd,
+    upcommentPd
+  } 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: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 450,
+          border: false,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "资讯标题",
+              prop: "title",
+              span: 24,
+              row: true,
+              searchSpan: 4,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入资讯标题",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "资讯封面",
+              prop: "url",
+              // align:'center',
+              width: 80,
+              type: "upload",
+              listType: "picture-img",
+              action: "/api/blade-resource/oss/endpoint/put-file",
+              propsHttp: {
+                res: "data",
+                url: "link",
+              },
+              // hide: true,
+              span: 24,
+            },
+            // {
+            //   label: "资讯来源",
+            //   prop: "sourceName",
+            //   search: true,
+            //   searchSpan: 4,
+            //   span: 24,
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入资讯类型",
+            //     trigger: "blur",
+            //   }, ],
+            // },
+            {
+              label: "资讯范围",
+              prop: "articleList",
+              span: 12,
+              minRows: 2,
+              type: "cascader",
+              multiple: true,
+              tags: true,
+              dicData: [],
+              props: {
+                label: "name",
+                value: 'id'
+              },
+              hide: true,
+            },
+            {
+              label: "资讯类型",
+              prop: "type",
+              searchSpan: 3,
+              width: 80,
+              value: 1,
+              slot: true,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择资讯类型",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                label: "经营性收支",
+                value: 1,
+              }],
+            },
+            {
+              label: "发布时间",
+              prop: "dateTime",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchSpan: 5,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择发布时间",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "发布时间",
+              prop: "createTime",
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+            },
+            {
+              label: "发布状态",
+              prop: "publish",
+              searchSpan: 3,
+              width: 80,
+              value: "0",
+              slot: true,
+              search: true,
+              type: "select",
+              rules: [{
+                required: true,
+                message: "请选择发布状态",
+                trigger: "blur",
+              }, ],
+              dicData: [{
+                  label: "未发布",
+                  value: "0",
+                },
+                {
+                  label: "已发布",
+                  value: "1",
+                }
+              ],
+            },
+            {
+              label: "评论区",
+              prop: "iscomment",
+              width: 80,
+              slot: true,
+              type: "select",
+              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: [],
+        optionEnroll: {
+          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
+              }]
+            },
+
+            {
+              label: "截止时间",
+              row: true,
+              offset: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "timestamp",
+            },
+          ]
+        },
+        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
+              }]
+            }, {
+              labelWidth: 100,
+              label: '开启签名',
+              prop: 'signatureFlag',
+              type: 'radio',
+              button: true,
+              row: true,
+              offset: 6,
+              dicData: [{
+                label: '开启',
+                value: 0
+              }, {
+                label: '不开启',
+                value: 1
+              }]
+            },
+            {
+              label: "截止时间",
+              row: true,
+              offset: 6,
+              prop: "endTime",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "timestamp",
+            },
+          ]
+        },
+        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(",");
+      },
+    },
+    methods: {
+
+      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) {
+        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(",")
+        }
+        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;
+          });
+        }
+        // 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 = 1
+        this.loading = true;
+        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(params = {}).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>
\ No newline at end of file
diff --git a/src/views/task/eCall/index.vue b/src/views/task/eCall/index.vue
index f8f9aa3..ddce688 100644
--- a/src/views/task/eCall/index.vue
+++ b/src/views/task/eCall/index.vue
@@ -14,527 +14,526 @@
 </template>
 
 <script>
-import { getList, remove, update, add, getECallEvent } from "@/api/task/eCall";
-import {
-  getList as getHouseList,
-  getDetatil as getHouseDetail
-} from "@/api/doorplateAddress/doorplateAddress.js";
-import { mapGetters } from "vuex";
-import website from '@/config/website';
-import AvueMap from "avue-plugin-map";
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      datetime: "",
-      selectionList: [],
-      option: {
-        height: "auto",
-        calcHeight: 54,
-        dialogWidth: 950,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 3,
-        menuWidth: 220,
-        border: true,
-        //stripe:true,
-        index: true,
-        viewBtn: true,
-        selection: true,
-        // excelBtn: true,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "事件名称",
-            prop: "name",
-            span: 12,
-            searchSpan: 4,
-            width: 100,
-            search: true,
-            rules: [
-              {
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getECallEvent
+  } from "@/api/task/eCall";
+  import {
+    getList as getHouseList,
+    getDetatil as getHouseDetail
+  } from "@/api/doorplateAddress/doorplateAddress.js";
+  import {
+    mapGetters
+  } from "vuex";
+  import website from '@/config/website';
+  import AvueMap from "avue-plugin-map";
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0,
+        },
+        datetime: "",
+        selectionList: [],
+        option: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 950,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 220,
+          border: true,
+          //stripe:true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          // excelBtn: true,
+          dialogClickModal: false,
+          column: [{
+              label: "事件名称",
+              prop: "name",
+              span: 12,
+              searchSpan: 4,
+              width: 100,
+              search: true,
+              rules: [{
                 required: true,
                 message: "请输入事件名称",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "事件类型",
-            prop: "type",
-            span: 12,
-            searchSpan: 4,
-            dataType: "number",
-            type: "select",
-            width: 100,
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=eCallEventType",
-            props: {
-              label: "dictValue",
-              value: "dictKey",
+              }, ],
             },
-            rules: [
-              {
+            {
+              label: "事件类型",
+              prop: "type",
+              span: 12,
+              searchSpan: 4,
+              dataType: "number",
+              type: "select",
+              width: 100,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=eCallEventType",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
+              rules: [{
                 required: true,
                 message: "请选择事件类型",
                 trigger: "blur",
-              },
-            ],
-            // search: true,
-          },
-          {
-            label: "所属社区",
-            prop: "communityCode",
-            // search: true,
-            // searchSpan: 4,
-            width: 150,
-            type: "tree",
-            dicUrl: "/api/blade-system/region/tree?parentCode=361102005",
-            props: {
-              label: "name",
-              value: "id"
+              }, ],
+              // search: true,
             },
-            rules: [
-              {
+            {
+              label: "所属社区",
+              prop: "communityCode",
+              // search: true,
+              // searchSpan: 4,
+              width: 150,
+              type: "tree",
+              dicUrl: "/api/blade-system/region/tree?parentCode=361102005",
+              props: {
+                label: "name",
+                value: "id"
+              },
+              rules: [{
                 required: true,
                 message: "请选择所属社区",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "数据来源",
-            prop: "source",
-            span: 12,
-            searchSpan: 4,
-            width: 100,
-            hide: true,
-            // search: true,
-          },
-          {
-            label: "姓名",
-            prop: "realName",
-            span: 12,
-            searchSpan: 4,
-            width: 100,
-            search: true,
-            rules: [
-              {
+              }, ],
+            },
+            {
+              label: "数据来源",
+              prop: "source",
+              span: 12,
+              searchSpan: 4,
+              width: 100,
+              hide: true,
+              // search: true,
+            },
+            {
+              label: "姓名",
+              prop: "realName",
+              span: 12,
+              searchSpan: 4,
+              width: 100,
+              search: true,
+              rules: [{
                 required: false,
                 message: "请输入姓名",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "联系方式",
-            prop: "phone",
-            span: 12,
-            width: 100,
-            searchSpan: 4,
-            search: true,
-            rules: [
-              {
+              }, ],
+            },
+            {
+              label: "联系方式",
+              prop: "phone",
+              span: 12,
+              width: 100,
+              searchSpan: 4,
+              search: true,
+              rules: [{
                 required: false,
                 message: "请输入联系方式",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "事发地点",
-            prop: "scene",
-            overHidden: true,
-            rules: [
-              {
+              }, ],
+            },
+            {
+              label: "事发地点",
+              prop: "scene",
+              overHidden: true,
+              rules: [{
                 required: true,
                 message: "请输入事发地点",
                 trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "事发时间",
-            prop: "occurrenceTime",
-            width: 100,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd",
-            rules: [
-              {
+              }, ],
+            },
+            {
+              label: "事发时间",
+              prop: "occurrenceTime",
+              width: 100,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
                 required: true,
                 message: "请选择事发时间",
                 trigger: "blur",
+              }, ],
+            },
+            {
+              label: "事发位置",
+              prop: "location",
+              submitBtn: "提交",
+              hide: true,
+              type: 'map',
+              dataType: "string",
+              span: 24,
+              value: [117.966460, 28.431002, ""]
+            },
+            {
+              label: "标准地址",
+              prop: "addressCode",
+              hide: true,
+              type: "table",
+              span: 24,
+              row: true,
+              children: {
+                border: true,
+                height: 400,
+                searchShow: true,
+                searchMenuSpan: 6,
+                submitText: "确定",
+                column: [
+                  // {
+                  //   label: "小区",
+                  //   prop: "aoiName",
+                  //   search: true,
+                  //   searchSpan: 4,
+                  //   rules: [
+                  //     {
+                  //       required: true,
+                  //       message: "请选择小区",
+                  //       trigger: "blur",
+                  //     },
+                  //   ],
+                  // },
+                  {
+                    label: "标准地址",
+                    search: true,
+                    searchSpan: 8,
+                    prop: "addressName",
+                    display: false
+                  },
+                ],
               },
-            ],
-          },
-          {
-            label: "事发位置",
-            prop: "location",
-            submitBtn:"提交",
-            hide: true,
-            type: 'map',
-            dataType: "string",
-            span: 24,
-            value: [117.966460, 28.431002, ""]
-          },
-          {
-            label: "标准地址",
-            prop: "addressCode",
-            hide: true,
-            type: "table",
-            span: 24,
-            row: true,
-            children: {
-              border: true,
-              height: 400,
-              searchShow: true,
-              searchMenuSpan: 6,
-              submitText: "确定",
-              column: [
-                // {
-                //   label: "小区",
-                //   prop: "aoiName",
-                //   search: true,
-                //   searchSpan: 4,
-                //   rules: [
-                //     {
-                //       required: true,
-                //       message: "请选择小区",
-                //       trigger: "blur",
-                //     },
-                //   ],
-                // },
-                {
-                  label: "标准地址",
-                  search: true,
-                  searchSpan: 8,
-                  prop: "addressName",
-                  display: false
-                },
-              ],
-            },
-            page: {
-              pageSize: 10,
-              currentPage: 1,
-              total: 0
-            },
-            formatter: (row) => {
-              return row.addressName
-              // if (!row.districtName) return ''
-              // return row.districtName + '-' + row.unit  + row.building  + row.room
-            },
-            onLoad: ({ page, value, data }, callback) => {
-              //首次加载去查询对应的值
-              if (value) {
-                getHouseDetail({
-                  addressCode: value
-                }).then(res => {
-                  var resData = res.data.data;
-                  // 查询对应行数据
-                  callback(resData)
-                  return
-                });
-              }
-              if (page) {
-                this.loading = true;
-                var params = {
-                  ...data,
-                  townStreetCode: "361102005"
+              page: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0
+              },
+              formatter: (row) => {
+                return row.addressName
+                // if (!row.districtName) return ''
+                // return row.districtName + '-' + row.unit  + row.building  + row.room
+              },
+              onLoad: ({
+                page,
+                value,
+                data
+              }, callback) => {
+                //首次加载去查询对应的值
+                if (value) {
+                  getHouseDetail({
+                    addressCode: value
+                  }).then(res => {
+                    var resData = res.data.data;
+                    // 查询对应行数据
+                    callback(resData)
+                    return
+                  });
                 }
-                getHouseList(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
-                  const resData = res.data.data;
-                  var total = resData.total;
-                  var data = resData.records;
-                  this.loading = false;
-                  this.selectionClear();
-                  //分页查询信息
-                  callback({
-                    total: total,
-                    data: data
-                  })
-                });
+                if (page) {
+                  this.loading = true;
+                  var params = {
+                    ...data,
+                    townStreetCode: "361102005"
+                  }
+                  getHouseList(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
+                    const resData = res.data.data;
+                    var total = resData.total;
+                    var data = resData.records;
+                    this.loading = false;
+                    this.selectionClear();
+                    //分页查询信息
+                    callback({
+                      total: total,
+                      data: data
+                    })
+                  });
+                }
+              },
+              props: {
+                label: 'addressName',
+                value: 'addressCode'
               }
             },
-            props: {
-              label: 'addressName',
-              value: 'addressCode'
-            }
-          },
 
-          {
-            label: "现场图片",
-            prop: "imageUrls",
-            width: 80,
-            type: "upload",
-            listType: "picture-card",
-            dataType: "string",
-            multiple: true,
-            row: true,
-            action: "/api/blade-resource/oss/endpoint/put-file-attach",
-            propsHttp: {
-              res: "data",
-              name: 'name',
-              url: "link",
+            {
+              label: "现场图片",
+              prop: "imageUrls",
+              width: 80,
+              type: "upload",
+              listType: "picture-card",
+              dataType: "string",
+              multiple: true,
+              row: true,
+              action: "/api/blade-resource/oss/endpoint/put-file-attach",
+              propsHttp: {
+                res: "data",
+                name: 'name',
+                url: "link",
+              },
+              span: 24,
             },
-            span: 24,
-          },
 
-          {
-            label: "事件简述",
-            prop: "remark",
-            type: "textarea",
-            span: 24,
-          },
-          // {
-          //   label: "处置情况",
-          //   prop: "disSit",
-          //   type:"textarea",
-          //   hide:true,
-          //   span: 24,
-          // },
-          {
-            label: "处理结果",
-            prop: "disRes",
-            type: "textarea",
-            hide: true,
-            span: 24,
-          },
-          {
-            label: "回访情况",
-            prop: "retVis",
-            type: "textarea",
-            hide: true,
-            span: 24,
-          },
-          // {
-          //   label: "处置状态",
-          //   prop: "dis_status",
-          //   type:"select",
-          //   hide:true,
-          // }
-        ],
-      },
-      data: [],
-    };
-  },
-  watch: {
-    "form.location": {
-      // form是表单或者表格绑定的数据集,v-model='form'
-      handler(val) {
-
-        var that = this;
-        if (typeof val == "string") {
-          console.log(val,7777)
-          var arr = val.split(",");
-          console.log(val,88888)
-          //经纬度替换
-          this.form.lat = arr[1];
-          this.form.lng = arr[0];
-          // this.form.location = arr[2];
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    ...mapGetters(["permission", "userInfo"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.eCallEvent_add, true),
-        viewBtn: this.vaildData(this.permission.eCallEvent_view, true),
-        delBtn: this.vaildData(this.permission.eCallEvent_delete, true),
-        editBtn: this.vaildData(this.permission.eCallEvent_edit, true),
+            {
+              label: "事件简述",
+              prop: "remark",
+              type: "textarea",
+              span: 24,
+            },
+            // {
+            //   label: "处置情况",
+            //   prop: "disSit",
+            //   type:"textarea",
+            //   hide:true,
+            //   span: 24,
+            // },
+            {
+              label: "处理结果",
+              prop: "disRes",
+              type: "textarea",
+              hide: true,
+              span: 24,
+            },
+            {
+              label: "回访情况",
+              prop: "retVis",
+              type: "textarea",
+              hide: true,
+              span: 24,
+            },
+            // {
+            //   label: "处置状态",
+            //   prop: "dis_status",
+            //   type:"select",
+            //   hide:true,
+            // }
+          ],
+        },
+        data: [],
       };
     },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach((ele) => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    },
-  },
-  methods: {
-    rowSave(row, done, loading) {
-      if (row.imageUrls.length > 0) {
-        var urls = []
-        var split = row.imageUrls.split(",");
-        split.forEach(url => {
-          var names = url.split("jczz/");
-          urls.push(names[1])
-        })
-        row.imageUrls = urls.join(",")
-      }
-      add(row).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(",");
-        split.forEach(url => {
-          var names = url.split("jczz/");
-          urls.push(names[1])
-        })
-        row.imageUrls = 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)) {
-        getECallEvent(this.form.id).then((res) => {
-          this.form = res.data.data;
-          if (this.form.imageUrls.length > 0) {
-            var urls = []
-            var names = this.form.imageUrls.split(",");
-            names.forEach(name => {
-              urls.push(website.minioUrl + name)
-            })
-            this.form.imageUrls = urls.join(",")
+    watch: {
+      "form.location": {
+        // form是表单或者表格绑定的数据集,v-model='form'
+        handler(val) {
+
+          var that = this;
+          if (typeof val == "string") {
+            console.log(val, 7777)
+            var arr = val.split(",");
+            console.log(val, 88888)
+            //经纬度替换
+            this.form.lat = arr[1];
+            this.form.lng = arr[0];
+            // this.form.location = arr[2];
           }
-        });
-      }
-      // con
-      done();
+        },
+        immediate: true,
+      },
     },
-    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,
+    computed: {
+      ...mapGetters(["permission", "userInfo"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.eCallEvent_add, true),
+          viewBtn: this.vaildData(this.permission.eCallEvent_view, true),
+          delBtn: this.vaildData(this.permission.eCallEvent_delete, true),
+          editBtn: this.vaildData(this.permission.eCallEvent_edit, true),
         };
-        values.dateTime = null;
-      }
-      this.loading = true;
-      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.imageUrls) {
-            if (item.imageUrls.length > 0) {
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach((ele) => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      },
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        if (row.imageUrls.length > 0) {
+          var urls = []
+          var split = row.imageUrls.split(",");
+          split.forEach(url => {
+            var names = url.split("jczz/");
+            urls.push(names[1])
+          })
+          row.imageUrls = urls.join(",")
+        }
+        add(row).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(",");
+          split.forEach(url => {
+            var names = url.split("jczz/");
+            urls.push(names[1])
+          })
+          row.imageUrls = 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)) {
+          getECallEvent(this.form.id).then((res) => {
+            this.form = res.data.data;
+            if (this.form.imageUrls.length > 0) {
               var urls = []
-              var names = item.imageUrls.split(",");
+              var names = this.form.imageUrls.split(",");
               names.forEach(name => {
                 urls.push(website.minioUrl + name)
               })
-              item.imageUrls = urls.join(",")
+              this.form.imageUrls = urls.join(",")
             }
-          }
-        })
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  },
-};
+          });
+        }
+        // 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;
+        }
+        this.loading = true;
+        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.imageUrls) {
+              if (item.imageUrls.length > 0) {
+                var urls = []
+                var names = item.imageUrls.split(",");
+                names.forEach(name => {
+                  urls.push(website.minioUrl + name)
+                })
+                item.imageUrls = urls.join(",")
+              }
+            }
+          })
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    },
+  };
 </script>
 
 <style>
-.avue-upload__icon {
-  line-height: 6;
-}
-</style>
+  .avue-upload__icon {
+    line-height: 6;
+  }
+</style>
\ No newline at end of file

--
Gitblit v1.9.3