Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_0814

public/index.html

@@ -29,7 +29,7 @@
 
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
-    <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080';</script>
+    <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:9094';</script>
   <% } %>
   <!-- 集成测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>

src/views/modules/events/item-close.vue

@@ -0,0 +1,167 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-item__item}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="街道">
+          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
+            <el-option
+              v-for="item in streetOptions"
+              :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" placeholder="请选择" @change="getGridList">
+            <el-option
+              v-for="item in communityOptions"
+              :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" placeholder="请选择">
+            <el-option
+              v-for="item in gridOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="startTime">
+          <el-date-picker
+                  v-model="dataForm.startTime"
+                  type="date"
+                  :picker-options="pickerBeginDateBefore"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" label-width = "25px" prop="endTime">
+          <el-date-picker
+                  v-model="dataForm.endTime"
+                  type="date"
+                  :picker-options="pickerBeginDateAfter"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('events:item:look')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('look') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './item-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        id: '',
+        itemState: '5',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => {})
+    },
+    getCommunityList () {
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => {})
+    },
+    getGridList () {
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => {})
+    }
+  }
+}
+</script>

src/views/modules/events/item-end.vue

@@ -0,0 +1,167 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-item__item}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="街道">
+          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
+            <el-option
+              v-for="item in streetOptions"
+              :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" placeholder="请选择" @change="getGridList">
+            <el-option
+              v-for="item in communityOptions"
+              :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" placeholder="请选择">
+            <el-option
+              v-for="item in gridOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="startTime">
+          <el-date-picker
+                  v-model="dataForm.startTime"
+                  type="date"
+                  :picker-options="pickerBeginDateBefore"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" label-width = "25px" prop="endTime">
+          <el-date-picker
+                  v-model="dataForm.endTime"
+                  type="date"
+                  :picker-options="pickerBeginDateAfter"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('events:item:deal')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('deal') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './item-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        id: '',
+        itemState: '10',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => {})
+    },
+    getCommunityList () {
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => {})
+    },
+    getGridList () {
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => {})
+    }
+  }
+}
+</script>

src/views/modules/events/item.vue

@@ -2,38 +2,73 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-item__item}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="街道">
+          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
+            <el-option
+              v-for="item in streetOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
+            <el-option
+              v-for="item in communityOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('events:item:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" placeholder="请选择">
+            <el-option
+              v-for="item in gridOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="startTime">
+          <el-date-picker
+                  v-model="dataForm.startTime"
+                  type="date"
+                  :picker-options="pickerBeginDateBefore"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" label-width = "25px" prop="endTime">
+          <el-date-picker
+                  v-model="dataForm.endTime"
+                  type="date"
+                  :picker-options="pickerBeginDateAfter"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('events:item:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="eventId" label="事件ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueId" label="议题ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="用户昵称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userFace" label="用户头像" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueAddress" label="议题位置地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueCategoryId" label="议题分类ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issusLatitude" label="议题位置纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueLongitude" label="议题位置经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="friendlyCommunityId" label="友邻社区ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueScore" label="评价打分" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="itemState" label="项目状态 0-待网格长处理，5-待社区处理，10-待街道党建办处理，15-待街道处理，20-待区直部门党建办处理，25-待区直部门处理，30-处理，35-关闭，40-结束议题" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:item:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('events:item:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('events:item:deal')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('deal') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -61,17 +96,72 @@ export default {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/events/item/page',
-        getDataListIsPage: true,
-        deleteURL: '/events/item',
-        deleteIsBatch: true
+        getDataListIsPage: true
       },
       dataForm: {
-        id: ''
+        id: '',
+        itemState: '0',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: ''
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
       }
     }
   },
   components: {
     AddOrUpdate
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => {})
+    },
+    getCommunityList () {
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => {})
+    },
+    getGridList () {
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => {})
+    }
   }
 }
 </script>

src/views/modules/news/news-publish.vue

@@ -48,7 +48,7 @@
                         prop="newsCateroryId">
             <el-select v-model="dataForm.newsCateroryId"
                        @change="changeCaterory"
-                       placeholder="所属网格">
+                       placeholder="请选择类别">
               <el-option v-for="item in categorys"
                          :key="item.id"
                          :label="item.name"
@@ -61,6 +61,8 @@
           <el-form-item label="新闻标题"
                         prop="newsTitle">
             <el-input v-model="dataForm.newsTitle"
+                      type="text"
+                      maxlength="30"
                       placeholder="请输入标题"
                       clearable
                       style="width:500px">

src/views/modules/user/user-add-or-update.vue

@@ -51,12 +51,15 @@
       </el-form-item>
       <el-form-item label="是否通过审核"
                     prop="pass">
-        <el-radio v-model="dataForm.pass"
-                  label="1">是</el-radio>
-        <el-radio v-model="dataForm.pass"
-                  label="0">否</el-radio>
+        <template>
+          <el-radio v-model="dataForm.pass"
+                    label="1">是</el-radio>
+          <el-radio v-model="dataForm.pass"
+                    label="0">否</el-radio>
+        </template>
       </el-form-item>
-      <el-form-item label="用户角色"
+      <p></p>
+      <el-form-item label="用户标签"
                     prop="tagIds">
         <el-checkbox-group v-model="dataForm.tagIds">
           <el-checkbox v-for="item in tagOptions"
@@ -118,6 +121,9 @@ export default {
         ],
         gridId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        pass: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }