From 698cea29defc47aab373cd8a7188fce87f748530 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Wed, 27 May 2020 14:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=8F=8A?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/news/allnews-add-or-update.vue    |   2 +-
 .../modules/news/allnotice-add-or-update.vue  |   2 +-
 src/views/modules/news/news-add-or-update.vue |   2 +-
 .../modules/news/notice-add-or-update.vue     |   2 +-
 .../modules/police/police-add-or-update.vue   | 305 ++++++++----------
 src/views/modules/police/police.vue           | 176 +++++-----
 src/views/modules/police/topic-detail.vue     |  24 +-
 7 files changed, 237 insertions(+), 276 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/allnotice-add-or-update.vue b/src/views/modules/news/allnotice-add-or-update.vue
index 9cdb480..31260c3 100644
--- a/src/views/modules/news/allnotice-add-or-update.vue
+++ b/src/views/modules/news/allnotice-add-or-update.vue
@@ -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/news-add-or-update.vue b/src/views/modules/news/news-add-or-update.vue
index f911a74..d586013 100644
--- a/src/views/modules/news/news-add-or-update.vue
+++ b/src/views/modules/news/news-add-or-update.vue
@@ -74,7 +74,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/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
index c19885c..9a28be3 100644
--- a/src/views/modules/news/notice-add-or-update.vue
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -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 88d1230..95271e6 100644
--- a/src/views/modules/police/police-add-or-update.vue
+++ b/src/views/modules/police/police-add-or-update.vue
@@ -47,179 +47,140 @@
 </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',
+        delFlag: ''
+      },
+      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 scope>
     .avatar-uploader .el-upload {
@@ -248,4 +209,4 @@
         height: 178px;
         display: block;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/police/police.vue b/src/views/modules/police/police.vue
index 5c90a6a..8e07c3b 100644
--- a/src/views/modules/police/police.vue
+++ b/src/views/modules/police/police.vue
@@ -87,96 +87,96 @@
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    import AddOrUpdate from './police-add-or-update'
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './police-add-or-update'
 
-    export default {
-        mixins: [mixinViewModule],
-        data() {
-            return {
-                mixinViewModuleOptions: {
-                    getDataListURL: '/property/police/page',
-                    getDataListIsPage: true,
-                    deleteURL: '/property/police',
-                    deleteIsBatch: true
-                },
-                dataForm: {
-                    id: ''
-                },
-                options: [],
-            }
-        },
-        components: {
-            AddOrUpdate
-        },
-        mounted() {
-            // 获取下拉菜单
-            this.getByLoginUser()
-        },
-        methods: {
-            getByLoginUser() {
-                this.$http
-                    .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        }
-                        this.options = res.data.options
-                    })
-                    .catch(() => {
-                    })
-            },
-            handleChange(value) {
-                this.dataForm.deptId = value.slice(-1).shift()
-            },
-            beforeDeleteHandle(id) {
-                // this.$confirm('删除民警将会解散全部警民群，是否继续操作?', this.$t('prompt.title'), {
-                //     confirmButtonText: this.$t('confirm'),
-                //     cancelButtonText: this.$t('cancel'),
-                //     type: 'warning'
-                // }).then(() => {
-                this.deleteHandle(id);
-                // })
-            },
-            supplementHandle(data) {
-                if (!data && this.dataListSelections.length <= 0) {
-                    return this.$message({
-                        message: '请选择需要补建的社区',
-                        type: 'warning',
-                        duration: 500
-                    })
-                }
-                if (!data && this.dataListSelections.length > 1) {
-                    return this.$message({
-                        message: '只能选择一个社区',
-                        type: 'warning',
-                        duration: 500
-                    })
-                }
-                this.$confirm(this.$t('prompt.info', {'handle': '补建群'}), this.$t('prompt.title'), {
-                    confirmButtonText: this.$t('confirm'),
-                    cancelButtonText: this.$t('cancel'),
-                    type: 'warning'
-                }).then(() => {
-                    this.$http.put('/property/police/supplement', data ? data : this.dataListSelections[0]).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.getDataList()
-                            }
-                        })
-                    }).catch(() => {
-                    })
-                }).catch(() => {
-                })
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/property/police/page',
+        getDataListIsPage: true,
+        deleteURL: '/property/police',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      options: []
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  mounted () {
+    // 获取下拉菜单
+    this.getByLoginUser()
+  },
+  methods: {
+    getByLoginUser () {
+      this.$http
+        .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {
+        })
+    },
+    handleChange (value) {
+      this.dataForm.deptId = value.slice(-1).shift()
+    },
+    beforeDeleteHandle (id) {
+      // this.$confirm('删除民警将会解散全部警民群，是否继续操作?', this.$t('prompt.title'), {
+      //     confirmButtonText: this.$t('confirm'),
+      //     cancelButtonText: this.$t('cancel'),
+      //     type: 'warning'
+      // }).then(() => {
+      this.deleteHandle(id)
+      // })
+    },
+    supplementHandle (data) {
+      if (!data && this.dataListSelections.length <= 0) {
+        return this.$message({
+          message: '请选择需要补建的社区',
+          type: 'warning',
+          duration: 500
+        })
+      }
+      if (!data && this.dataListSelections.length > 1) {
+        return this.$message({
+          message: '只能选择一个社区',
+          type: 'warning',
+          duration: 500
+        })
+      }
+      this.$confirm(this.$t('prompt.info', { 'handle': '补建群' }), this.$t('prompt.title'), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$http.put('/property/police/supplement', data || this.dataListSelections[0]).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.getDataList()
             }
-        }
+          })
+        }).catch(() => {
+        })
+      }).catch(() => {
+      })
     }
+  }
+}
 </script>
 
 <style scoped>
@@ -184,4 +184,4 @@
         width: 300px;
         height: 300px;
     }
-</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(() => { })
     }
   }
 }