diff --git a/src/views/modules/master/mastertopic.vue b/src/views/modules/master/mastertopic.vue
index ee57d5ef..001d3079 100755
--- a/src/views/modules/master/mastertopic.vue
+++ b/src/views/modules/master/mastertopic.vue
@@ -78,7 +78,7 @@
-
+
diff --git a/src/views/modules/master/mastertopiccomment.vue b/src/views/modules/master/mastertopiccomment.vue
index 30826c12..801445fc 100755
--- a/src/views/modules/master/mastertopiccomment.vue
+++ b/src/views/modules/master/mastertopiccomment.vue
@@ -35,12 +35,6 @@
{{ $t('query') }}
-
- {{ $t('add') }}
-
-
- {{ $t('deleteBatch') }}
-
diff --git a/src/views/modules/master/mastertopicdetail.vue b/src/views/modules/master/mastertopicdetail.vue
index 459e5553..0a88ab26 100755
--- a/src/views/modules/master/mastertopicdetail.vue
+++ b/src/views/modules/master/mastertopicdetail.vue
@@ -28,10 +28,10 @@
prop="totalParticipation">
{{dataForm.totalParticipation}}
- 浏览数：{{dataForm.browseNum}}
- 评论数：{{dataForm.commentNum}}
- 点赞数：{{dataForm.approveNum}}
- 点踩数：{{dataForm.opposeNum}}
+ 浏览数：{{dataForm.browseNum}}
+ 评论数：{{dataForm.commentNum}}
+ 点赞数：{{dataForm.approveNum}}
+ 点踩数：{{dataForm.opposeNum}}
@@ -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 } })
+ }
}
}
}
diff --git a/src/views/modules/master/mastertopicroute.vue b/src/views/modules/master/mastertopicroute.vue
index b27879a7..c2f606ef 100644
--- 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 () {
diff --git a/src/views/modules/master/mastertopicuserattitude.vue b/src/views/modules/master/mastertopicuserattitude.vue
index 3c67cadd..201ed504 100755
--- a/src/views/modules/master/mastertopicuserattitude.vue
+++ b/src/views/modules/master/mastertopicuserattitude.vue
@@ -2,37 +2,50 @@
-
-
+
+
+ 返回
+
+
+
+
-
- {{ $t('query') }}
+
+
+
-
- {{ $t('add') }}
+
+
+
- {{ $t('deleteBatch') }}
+ {{ $t('query') }}
-
-
-
-
-
-
-
-
-
-
-
-
+
- {{ $t('update') }}
- {{ $t('delete') }}
+ {{scope.$index+1}}
+
+
+
+
{
+ 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 } })
+ }
}
}
diff --git a/src/views/modules/master/mastertopicuserbrowse.vue b/src/views/modules/master/mastertopicuserbrowse.vue
index fc45fd4d..3ab1430c 100755
--- a/src/views/modules/master/mastertopicuserbrowse.vue
+++ b/src/views/modules/master/mastertopicuserbrowse.vue
@@ -2,34 +2,48 @@
-
-
+
+
+ 返回
+
+
+
+
-
- {{ $t('query') }}
+
+
+
-
- {{ $t('add') }}
+
+
+
- {{ $t('deleteBatch') }}
+ {{ $t('query') }}
-
-
-
-
-
-
-
-
-
+
- {{ $t('update') }}
- {{ $t('delete') }}
+ {{scope.$index+1}}
+
+
{
+ 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 } })
+ }
}
}