话题通知和话题内容

6 years ago · ccfd8075ce
6 changed files with 149 additions and 59 deletions
--- a/src/views/modules/master/mastertopic.vue
+++ b/src/views/modules/master/mastertopic.vue
@ -78,7 +78,7 @@
        <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="totalParticipation" 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="createdTime" label="发布时间" header-align="center" align="center" width="200"></el-table-column>
        <el-table-column prop="state" label="状态" header-align="center" align="center" :formatter="stateFormat"></el-table-column>
        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
          <template slot-scope="scope">
--- a/src/views/modules/master/mastertopiccomment.vue
+++ b/src/views/modules/master/mastertopiccomment.vue
@ -35,12 +35,6 @@
        <el-form-item>
          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission(':mastertopiccomment:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission(':mastertopiccomment:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
      </el-form>
      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
        <el-table-column label="序号" header-align="center" align="center" width="50px">
--- a/src/views/modules/master/mastertopicdetail.vue
+++ b/src/views/modules/master/mastertopicdetail.vue
@ -28,10 +28,10 @@
                    prop="totalParticipation">
        <span>{{dataForm.totalParticipation}}</span>
      </el-form-item>
-      <el-button type="success" round>浏览数：{{dataForm.browseNum}}</el-button>
-      <el-button type="success" round @click="manageHandle(dataForm.id)">评论数：{{dataForm.commentNum}}</el-button>
-      <el-button type="success" round>点赞数：{{dataForm.approveNum}}</el-button>
-      <el-button type="success" round>点踩数：{{dataForm.opposeNum}}</el-button>
+      <el-button type="success" round @click="manageHandle(dataForm.id,0)">浏览数：{{dataForm.browseNum}}</el-button>
+      <el-button type="success" round @click="manageHandle(dataForm.id,1)">评论数：{{dataForm.commentNum}}</el-button>
+      <el-button type="success" round @click="manageHandle(dataForm.id,2)">点赞数：{{dataForm.approveNum}}</el-button>
+      <el-button type="success" round @click="manageHandle(dataForm.id,3)">点踩数：{{dataForm.opposeNum}}</el-button>
    </el-form>
    </div>
  </el-card>
@ -97,9 +97,20 @@ export default {
      this.$parent.selectComponent = 'Mastertopic'
      this.$router.push({ path: '/master-mastertopicroute' })
    },
-    manageHandle (topicId) {
-      this.$parent.selectComponent = 'Mastertopiccomment'
-      this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } })
+    manageHandle (topicId, flag) {
+      if (flag === 0) {
+        this.$parent.selectComponent = 'Mastertopicuserbrowse'
+        this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } })
+      } else if (flag === 1) {
+        this.$parent.selectComponent = 'Mastertopiccomment'
+        this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } })
+      } else if (flag === 2) {
+        this.$parent.selectComponent = 'Mastertopicuserattitude'
+        this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId, flag: 0 } })
+      } else if (flag === 3) {
+        this.$parent.selectComponent = 'Mastertopicuserattitude'
+        this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId, flag: 1 } })
+      }
    }
  }
 }
--- a/src/views/modules/master/mastertopicroute.vue
+++ b/src/views/modules/master/mastertopicroute.vue
@ -7,6 +7,8 @@
 import Mastertopic from './mastertopic'
 import Mastertopicdetail from './mastertopicdetail'
 import Mastertopiccomment from './mastertopiccomment'
+import Mastertopicuserattitude from './mastertopicuserattitude'
+import Mastertopicuserbrowse from './mastertopicuserbrowse'

 export default {
  data () {
@ -17,7 +19,9 @@ export default {
  components: {
    Mastertopic,
    Mastertopicdetail,
-    Mastertopiccomment
+    Mastertopiccomment,
+    Mastertopicuserattitude,
+    Mastertopicuserbrowse
  },
  methods: {
    init () {
--- a/src/views/modules/master/mastertopicuserattitude.vue
+++ b/src/views/modules/master/mastertopicuserattitude.vue
@ -2,37 +2,50 @@
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-__mastertopicuserattitude}">
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <div>
+          <el-form-item>
+            <el-button type="primary" @click="backToDeptList(dataForm.id)">返回</el-button>
+          </el-form-item>
+        </div>
+        <el-form-item label="用户名" prop="nickName">
+          <el-input v-model="dataForm.nickName" placeholder="用户名" clearable></el-input>
        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <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>
-          <el-button v-if="$hasPermission(':mastertopicuserattitude:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        <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(':mastertopicuserattitude: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="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="topicId" 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="attitudeFlag" label="用户点赞点踩标识 0：点赞，1：踩" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
          <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':mastertopicuserattitude:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':mastertopicuserattitude:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            {{scope.$index+1}}
          </template>
        </el-table-column>
+        <el-table-column prop="nickName" label="点赞人-用户名" header-align="center" align="center" v-if="dataForm.flag === 0"></el-table-column>
+        <el-table-column prop="nickName" label="点踩人-用户名" header-align="center" align="center" v-if="dataForm.flag === 1"></el-table-column>
+        <el-table-column prop="createdTime" label="点赞时间" header-align="center" align="center" v-if="dataForm.flag === 0"></el-table-column>
+        <el-table-column prop="createdTime" label="点踩时间" header-align="center" align="center" v-if="dataForm.flag === 1"></el-table-column>
      </el-table>
      <el-pagination
        :current-page="page"
@ -57,18 +70,46 @@ export default {
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: '//mastertopicuserattitude/page',
+        getDataListURL: '/cloudAnalysis/mastertopicuserattitude/page',
        getDataListIsPage: true,
-        deleteURL: '//mastertopicuserattitude',
+        deleteURL: '/cloudAnalysis/mastertopicuserattitude',
        deleteIsBatch: true
      },
      dataForm: {
-        id: ''
+        id: '',
+        flag: ''
+      },
+      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
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.topicId
+    this.dataForm.flag = this.$route.query.flag
+    this.getDataList()
+  },
+  methods: {
+    backToDeptList (topicId) {
+      this.$parent.selectComponent = 'Mastertopicdetail'
+      this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } })
+    }
  }
 }
 </script>
--- a/src/views/modules/master/mastertopicuserbrowse.vue
+++ b/src/views/modules/master/mastertopicuserbrowse.vue
@ -2,34 +2,48 @@
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-__mastertopicuserbrowse}">
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <div>
+          <el-form-item>
+            <el-button type="primary" @click="backToDeptList(dataForm.id)">返回</el-button>
+          </el-form-item>
+        </div>
+        <el-form-item label="用户名" prop="nickName">
+          <el-input v-model="dataForm.nickName" placeholder="用户名" clearable></el-input>
        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <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>
-          <el-button v-if="$hasPermission(':mastertopicuserbrowse:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        <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(':mastertopicuserbrowse: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="id" label="主键" 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="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
          <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':mastertopicuserbrowse:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':mastertopicuserbrowse:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            {{scope.$index+1}}
          </template>
        </el-table-column>
+        <el-table-column prop="nickName" 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>
      <el-pagination
        :current-page="page"
@ -54,18 +68,44 @@ export default {
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: '//mastertopicuserbrowse/page',
+        getDataListURL: '/cloudAnalysis/mastertopicuserbrowse/page',
        getDataListIsPage: true,
-        deleteURL: '//mastertopicuserbrowse',
+        deleteURL: '/cloudAnalysis/mastertopicuserbrowse',
        deleteIsBatch: true
      },
      dataForm: {
        id: ''
+      },
+      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
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.topicId
+    this.getDataList()
+  },
+  methods: {
+    backToDeptList (topicId) {
+      this.$parent.selectComponent = 'Mastertopicdetail'
+      this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } })
+    }
  }
 }
 </script>