From 3ead8a7d00a469687609afed01d4d2b9be56e584 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Thu, 28 May 2020 10:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=9C=AC=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=8C=E6=96=87=E6=9C=AC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=9B=E5=85=B6=E4=BB=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/news/allnews-add-or-update.vue    |   2 +-
 src/views/modules/news/allnews.vue            |  37 ---
 .../modules/news/allnotice-add-or-update.vue  |   4 +-
 src/views/modules/news/allnotice.vue          |  14 +-
 .../modules/news/banner-add-or-update.vue     |  34 --
 src/views/modules/news/news-publish.vue       |  36 +--
 src/views/modules/news/newsdraft.vue          |  37 ---
 .../modules/news/notice-add-or-update.vue     |   4 +-
 .../modules/police/police-add-or-update.vue   | 304 ++++++++----------
 src/views/modules/police/topic-detail.vue     |  24 +-
 10 files changed, 152 insertions(+), 344 deletions(-)

diff --git a/src/views/modules/news/allnews-add-or-update.vue b/src/views/modules/news/allnews-add-or-update.vue
index bbf3e98..224c098 100644
--- a/src/views/modules/news/allnews-add-or-update.vue
+++ b/src/views/modules/news/allnews-add-or-update.vue
@@ -28,7 +28,7 @@
       <el-form-item prop="newsContent"
                     label="正文编辑">
         <!-- 富文本编辑器, 容器 -->
-        <div id="J_quillEditor"></div>
+        <div id="J_quillEditor" class="ql-editor"></div>
         <!-- 自定义上传图片功能 (使用element upload组件) -->
         <el-upload :action="uploadUrl"
                    :show-file-list="false"
diff --git a/src/views/modules/news/allnews.vue b/src/views/modules/news/allnews.vue
index 46e04e1..e46dbb2 100644
--- a/src/views/modules/news/allnews.vue
+++ b/src/views/modules/news/allnews.vue
@@ -11,43 +11,6 @@
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
         </el-form-item>
-        <!--<el-form-item label="所属街道"
-                      prop="deptId">
-          <el-select v-model="dataForm.streetId"
-                     @change="changeStreet"
-                     clearable
-                     placeholder="所属街道">
-            <el-option v-for="item in streetList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属社区">
-          <el-select v-model="dataForm.communityId"
-                     @change="changeCommunity"
-                     clearable
-                     placeholder="所属社区">
-            <el-option v-for="item in communityList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属网格">
-          <el-select v-model="dataForm.gridId"
-                     @change="changeGrid"
-                     clearable
-                     placeholder="所属网格">
-            <el-option v-for="item in gridList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>-->
         <br>
         <span class="demonstration">提交时间</span>&nbsp;&nbsp;
         <el-date-picker @change='setRegistTime'
diff --git a/src/views/modules/news/allnotice-add-or-update.vue b/src/views/modules/news/allnotice-add-or-update.vue
index 9cdb480..eeead2d 100644
--- a/src/views/modules/news/allnotice-add-or-update.vue
+++ b/src/views/modules/news/allnotice-add-or-update.vue
@@ -7,7 +7,7 @@
              :rules="dataRule"
              ref="dataForm"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="所属机构"
+      <el-form-item label="发布部门"
                     prop="allDeptIdsShow">
         <el-form-item>
           {{dataForm.allDeptNames}}
@@ -23,7 +23,7 @@
                     label="通知内容">
         <el-row style="height: 550px;">
           <!-- 富文本编辑器, 容器 -->
-          <div id="J_quillEditor"
+          <div id="J_quillEditor" class="ql-editor"
                style="height: 500px;"></div>
         </el-row>
         <!-- 自定义上传图片功能 (使用element upload组件) -->
diff --git a/src/views/modules/news/allnotice.vue b/src/views/modules/news/allnotice.vue
index 9dc2c1a..7cf7cf6 100644
--- a/src/views/modules/news/allnotice.vue
+++ b/src/views/modules/news/allnotice.vue
@@ -10,7 +10,7 @@
                        :options="options"
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
-        </el-form-item>       
+        </el-form-item>
         <el-form-item>
           <el-input v-model="dataForm.noticeTitle"
                     placeholder="通知标题"
@@ -19,16 +19,6 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
-        <!-- <el-form-item>
-          <el-button v-if="$hasPermission('news:notice:save')"
-                     type="primary"
-                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:notice:delete')"
-                     type="danger"
-                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item> -->
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -44,7 +34,7 @@
                          align="center"
                          width="350"></el-table-column>
         <el-table-column prop="deptName"
-                         label="通知所属部门"
+                         label="发布部门"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="readingAmount"
diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 408f6f0..1ed9b11 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -30,40 +30,6 @@
                      clearable
                      collapse-tags></el-cascader>
       </el-form-item>
-      <!--<el-form-item label="所属街道"
-                    prop="streetId">
-        <el-select v-model="dataForm.streetId"
-                   @change="changeStreet"
-                   placeholder="所属街道">
-          <el-option v-for="item in streetList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属社区">
-        <el-select v-model="dataForm.communityId"
-                   @change="changeCommunity"
-                   placeholder="所属社区">
-          <el-option v-for="item in communityList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属网格">
-        <el-select v-model="dataForm.gridId"
-                   @change="changeGrid"
-                   placeholder="所属网格">
-          <el-option v-for="item in gridList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>-->
       <el-form-item label="banner类型"
                     prop="bannerType">
         <el-select v-model="dataForm.bannerType"
diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue
index 84493ad..72143ec 100644
--- a/src/views/modules/news/news-publish.vue
+++ b/src/views/modules/news/news-publish.vue
@@ -15,40 +15,6 @@
                          clearable
                          collapse-tags></el-cascader>
           </el-form-item>
-          <!--<el-form-item label="所属街道"
-                        prop="streetId">
-            <el-select v-model="dataForm.streetId"
-                       @change="changeStreet"
-                       placeholder="所属街道">
-              <el-option v-for="item in streetList"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="所属社区">
-            <el-select v-model="dataForm.communityId"
-                       @change="changeCommunity"
-                       placeholder="所属社区">
-              <el-option v-for="item in communityList"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="所属网格">
-            <el-select v-model="dataForm.gridId"
-                       @change="changeGrid"
-                       placeholder="所属网格">
-              <el-option v-for="item in gridList"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>-->
         </el-row>
         <el-row>
           <el-form-item label="类别"
@@ -81,7 +47,7 @@
           <el-form-item prop="newsContent"
                         label="正文编辑">
             <!-- 富文本编辑器, 容器 -->
-            <div id="J_quillEditor"></div>
+            <div id="J_quillEditor" class="ql-editor"></div>
             <!-- 自定义上传图片功能 (使用element upload组件) -->
             <el-upload :action="uploadUrl"
                        :show-file-list="false"
diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue
index fed1490..de9dbed 100644
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@@ -11,43 +11,6 @@
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
         </el-form-item>
-        <!--<el-form-item label="所属街道"
-                      prop="deptId">
-          <el-select v-model="dataForm.streetId"
-                     clearable
-                     @change="changeStreet"
-                     placeholder="所属街道">
-            <el-option v-for="item in streetList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属社区">
-          <el-select v-model="dataForm.communityId"
-                     @change="changeCommunity"
-                     clearable
-                     placeholder="所属社区">
-            <el-option v-for="item in communityList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属网格">
-          <el-select v-model="dataForm.gridId"
-                     @change="changeGrid"
-                     clearable
-                     placeholder="所属网格">
-            <el-option v-for="item in gridList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>-->
         <br>
         <span class="demonstration">提交时间</span>&nbsp;&nbsp;
         <el-date-picker @change='setRegistTime'
diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
index c19885c..2b34ace 100644
--- a/src/views/modules/news/notice-add-or-update.vue
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -7,7 +7,7 @@
              :rules="dataRule"
              ref="dataForm"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="所属机构"
+      <el-form-item label="所属部门"
                     prop="allDeptIdsShow">
         <el-cascader v-model="dataForm.allDeptIdsShow"
                      :options="options"
@@ -26,7 +26,7 @@
                     label="内容">
         <el-row style="height: 550px;">
           <!-- 富文本编辑器, 容器 -->
-          <div id="J_quillEditor"
+          <div id="J_quillEditor" class="ql-editor"
                style="height: 500px;"></div>
         </el-row>
         <!-- 自定义上传图片功能 (使用element upload组件) -->
diff --git a/src/views/modules/police/police-add-or-update.vue b/src/views/modules/police/police-add-or-update.vue
index 099724e..2b65a9f 100644
--- a/src/views/modules/police/police-add-or-update.vue
+++ b/src/views/modules/police/police-add-or-update.vue
@@ -47,179 +47,139 @@
 </template>
 
 <script>
-    import debounce from 'lodash/debounce'
-    import Cookies from "js-cookie";
+import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
 
-    export default {
-        data() {
-            return {
-                visible: false,
-                dataForm: {
-                    id: '',
-                    policeName: '',
-                    policeAvatar: '',
-                    policeTel: '',
-                    policeNo: '',
-                    deptName: '',
-                    deptId: '',
-                    displayFlag: '1',
-                    delFlag: '',
-                    revision: '',
-                    createdBy: '',
-                    createdTime: '',
-                    updatedBy: '',
-                    updatedTime: '',
-                    allDeptIds: '',
-                    allDeptNames: '',
-                    parentDeptIds: '',
-                    parentDeptNames: ''
-                },
-                options: [],
-                loading: false,
-                uploadUrl: '',
-            }
-        },
-        created() {
-            this.$nextTick(() => {
-                this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
-            })
-        },
-        computed: {
-            dataRule() {
-                return {
-                    policeName: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    policeAvatar: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    policeTel: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    policeNo: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    deptName: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    deptId: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    displayFlag: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    delFlag: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    revision: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    createdBy: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    createdTime: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    updatedBy: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    updatedTime: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    allDeptIds: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    allDeptNames: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    parentDeptIds: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    parentDeptNames: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ]
-                }
-            }
-        },
-        methods: {
-            init() {
-                // 获取下拉菜单
-                this.getByLoginUser();
-                this.visible = true;
-                this.$nextTick(() => {
-                    this.$refs['dataForm'].resetFields()
-                    if (this.dataForm.id) {
-                        this.getInfo()
-                    }
-                })
-            },
-            // 获取部门
-            getByLoginUser() {
-                this.$http
-                    .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        }
-                        this.loading = false
-                        this.options = res.data.options
-                    })
-                    .catch(() => {
-                        this.loading = false
-                    })
-            },
-            // 获取信息
-            getInfo() {
-                this.$http.get(`/property/police/${this.dataForm.id}`).then(({data: res}) => {
-                    if (res.code !== 0) {
-                        return this.$message.error(res.msg)
-                    }
-                    this.dataForm = {
-                        ...this.dataForm,
-                        ...res.data
-                    }
-                }).catch(() => {
-                })
-            },
-            deptHandleChange(value) {
-                this.dataForm.deptId = value.slice(-1).shift();
-            },
-            handleAvatarActSuccess(res, file) {
-                this.loading = false
-                this.dataForm.policeAvatar = res.data.url
-            },
-            beforeAvatarUpload(file) {
-                this.loading = true
-            },
-            handelError() {
-                this.loading = false
-            },
-            // 表单提交
-            dataFormSubmitHandle: debounce(function () {
-                this.dataForm.deptName = this.$refs['grid'].inputValue;
-                this.$refs['dataForm'].validate((valid) => {
-                    if (!valid) {
-                        return false
-                    }
-                    this.$http[!this.dataForm.id ? 'post' : 'put']('/property/police/', this.dataForm).then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        }
-                        this.$message({
-                            message: this.$t('prompt.success'),
-                            type: 'success',
-                            duration: 500,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refreshDataList')
-                            }
-                        })
-                    }).catch(() => {
-                    })
-                })
-            }, 1000, {'leading': true, 'trailing': false})
-        }
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        policeName: '',
+        policeAvatar: '',
+        policeTel: '',
+        policeNo: '',
+        deptName: '',
+        deptId: '',
+        displayFlag: '1'
+      },
+      options: [],
+      loading: false,
+      uploadUrl: ''
     }
+  },
+  created () {
+    this.$nextTick(() => {
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    })
+  },
+  computed: {
+    dataRule () {
+      return {
+        policeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        policeAvatar: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        policeTel: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        policeNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        displayFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      // 获取下拉菜单
+      this.getByLoginUser()
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取部门
+    getByLoginUser () {
+      this.$http
+        .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.loading = false
+          this.options = res.data.options
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/property/police/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {
+      })
+    },
+    deptHandleChange (value) {
+      this.dataForm.deptId = value.slice(-1).shift()
+    },
+    handleAvatarActSuccess (res, file) {
+      this.loading = false
+      this.dataForm.policeAvatar = res.data.url
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
+    handelError () {
+      this.loading = false
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.dataForm.deptName = this.$refs['grid'].inputValue
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/property/police/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {
+        })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
 </script>
 <style scoped>
     .avatar-uploader .el-upload {
@@ -248,4 +208,4 @@
         height: 178px;
         display: block;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/police/topic-detail.vue b/src/views/modules/police/topic-detail.vue
index c2fbbca..1a34e43 100644
--- a/src/views/modules/police/topic-detail.vue
+++ b/src/views/modules/police/topic-detail.vue
@@ -174,7 +174,7 @@ export default {
       this.getCommentList()
     },
     getCommentList () {
-      this.$http.get('/property/topiccomment/comments', {        params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
+      this.$http.get('/property/topiccomment/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
       }).then(({ data: res }) => {
         if (res.code !== 0) {
           this.commentsDTOs = []
@@ -188,18 +188,18 @@ export default {
     deleteComment (val) {
       this.$http['post'](
         '/property/topiccomment/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.getCommentList()
           }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.getCommentList()
-            }
-          })
-        }).catch(() => { })
+        })
+      }).catch(() => { })
     }
   }
 }