From abe57dcea2a93c3b5435eb27bc5bbf438c6df4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 12 Feb 2020 21:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/user/gridopening.vue     | 47 +++++++++----------
 src/views/modules/analysis/user/party.vue     | 42 +++++++++++------
 src/views/modules/analysis/user/register.vue  | 36 +++++++++-----
 3 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/src/views/modules/analysis/user/gridopening.vue b/src/views/modules/analysis/user/gridopening.vue
index e00e1c04..d91af26e 100644
--- a/src/views/modules/analysis/user/gridopening.vue
+++ b/src/views/modules/analysis/user/gridopening.vue
@@ -21,14 +21,14 @@
                         start-placeholder="开始日期"
                         end-placeholder="结束日期">
         </el-date-picker> &nbsp; &nbsp;
-        <el-form-item label="类别">
+        <el-form-item label="排序规则">
           <el-select v-model="dataForm.category"
                      clearable
-                     placeholder="所属类别">
+                     placeholder="排序规则">
             <el-option v-for="item in categorys"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
@@ -156,18 +156,7 @@ export default {
         exportURL: '/analysis/user/export/grid0pining'
       },
       dataForm: {
-        allDeptName: '',
-        communityCount: '',
-        communityMemberCount: '',
-        communityTopicCount: '',
-        eventCount: '',
-        ewmCount: '',
-        itemCloseCount: '',
-        itemCount: '',
-        newsCount: '',
-        noticeCount: '',
-        partyCount: '',
-        registerCount: ''
+        category: '1'
       },
       time: '',
       options: [],
@@ -175,7 +164,13 @@ export default {
       streetList: [],
       communityList: [],
       gridList: [],
-      categorys: [],
+      categorys: [{
+          value: '0',
+          label: '未开通网格'
+        }, {
+          value: '1',
+          label: '已开通网格'
+        }],
       onLine: {
         id: '',
         onLineState: ''
@@ -274,14 +269,14 @@ export default {
       this.dataForm.startTime = this.time[0]
       this.dataForm.endTime = this.time[1]
     },
-    getListCategory () {
-      this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.categorys = res.data
-      }).catch(() => { })
-    },
+    // getListCategory () {
+    //   this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
+    //     if (res.code !== 0) {
+    //       return this.$message.error(res.msg)
+    //     }
+    //     this.categorys = res.data
+    //   }).catch(() => { })
+    // },
     modifyOnLine (row) {
       this.$confirm(this.$t('prompt.info', { 'handle': '下线' }), this.$t('下线'), {
         confirmButtonText: this.$t('confirm'),
diff --git a/src/views/modules/analysis/user/party.vue b/src/views/modules/analysis/user/party.vue
index 5e2e28eb..6c8ff176 100644
--- a/src/views/modules/analysis/user/party.vue
+++ b/src/views/modules/analysis/user/party.vue
@@ -21,14 +21,14 @@
                         start-placeholder="开始日期"
                         end-placeholder="结束日期">
         </el-date-picker> &nbsp; &nbsp;
-        <el-form-item label="类别">
+        <el-form-item label="年龄排序">
           <el-select v-model="dataForm.category"
                      clearable
-                     placeholder="所属类别">
+                     placeholder="年龄排序">
             <el-option v-for="item in categorys"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
@@ -149,7 +149,21 @@ export default {
       streetList: [],
       communityList: [],
       gridList: [],
-      categorys: [],
+      categorys: [
+        {
+          value: '0',
+          label: '超过50岁最多人数'
+        }, {
+          value: '1',
+          label: '50岁以下最多人数'
+        },{
+          value: '2',
+          label: '超过50岁最少人数'
+        }, {
+          value: '3',
+          label: '50岁以下最少人数'
+        }
+      ],
       onLine: {
         id: '',
         onLineState: ''
@@ -248,14 +262,14 @@ export default {
       this.dataForm.startTime = this.time[0]
       this.dataForm.endTime = this.time[1]
     },
-    getListCategory () {
-      this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.categorys = res.data
-      }).catch(() => { })
-    },
+    // getListCategory () {
+    //   this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
+    //     if (res.code !== 0) {
+    //       return this.$message.error(res.msg)
+    //     }
+    //     this.categorys = res.data
+    //   }).catch(() => { })
+    // },
     modifyOnLine (row) {
       this.$confirm(this.$t('prompt.info', { 'handle': '下线' }), this.$t('下线'), {
         confirmButtonText: this.$t('confirm'),
diff --git a/src/views/modules/analysis/user/register.vue b/src/views/modules/analysis/user/register.vue
index 9bce60bf..b4f9cf15 100644
--- a/src/views/modules/analysis/user/register.vue
+++ b/src/views/modules/analysis/user/register.vue
@@ -26,9 +26,9 @@
                      clearable
                      placeholder="所属类别">
             <el-option v-for="item in categorys"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
@@ -164,7 +164,19 @@ export default {
       streetList: [],
       communityList: [],
       gridList: [],
-      categorys: [],
+      categorys: [{
+          value: '0',
+          label: '超过50岁最多人数'
+        }, {
+          value: '1',
+          label: '50岁以下最多人数'
+        },{
+          value: '2',
+          label: '超过50岁最少人数'
+        }, {
+          value: '3',
+          label: '50岁以下最少人数'
+        }],
       onLine: {
         id: '',
         onLineState: ''
@@ -263,14 +275,14 @@ export default {
       this.dataForm.startTime = this.time[0]
       this.dataForm.endTime = this.time[1]
     },
-    getListCategory () {
-      this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.categorys = res.data
-      }).catch(() => { })
-    },
+    // getListCategory () {
+    //   this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
+    //     if (res.code !== 0) {
+    //       return this.$message.error(res.msg)
+    //     }
+    //     this.categorys = res.data
+    //   }).catch(() => { })
+    // },
     modifyOnLine (row) {
       this.$confirm(this.$t('prompt.info', { 'handle': '下线' }), this.$t('下线'), {
         confirmButtonText: this.$t('confirm'),