Merge branch 'hotfix0509' into 'release'

Hotfix0509

See merge request com.pica.cloud.education.frontend/pica.cloud.web-admin-discuss!10

src/views/topicManage/index.vue

@@ -55,7 +55,7 @@
                 <el-table-column type="index" prop="topOrder" label="排序" min-width="50" align="center"></el-table-column>
                 <el-table-column prop="id" label="Id" min-width="50" align="center"></el-table-column>
 				<el-table-column prop="subject" label="话题名称" min-width="100" align="center"></el-table-column>
-                <el-table-column prop="content" label="话题内容" min-width="100" align="center"></el-table-column>
+                <!-- <el-table-column prop="content" label="话题内容" min-width="100" align="center"></el-table-column> -->
 				<el-table-column prop="createdName" label="创建人" min-width="50" align="center"></el-table-column>
 				<el-table-column prop="createdtime" label="创建日期" min-width="100" align="center"></el-table-column>
 				<el-table-column prop="modifiedName" label="最后修改人" min-width="100" align="center"></el-table-column>
@@ -73,6 +73,7 @@
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" align="center" min-width="200">
                     <template slot-scope="scope">
+                        <el-button type="text" size="small" @click="info(scope.row)">查看</el-button>
                         <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
                         <!-- <el-button type="primary"   size="small" @click="optFun(scope.row)" disabled>下线</el-button> -->
                         <el-button type="text" size="small" @click="optFun(scope.row,1)" >下架</el-button>
@@ -102,6 +103,16 @@
                 </el-pagination>
             </div>
         </div>
+        <el-dialog
+            title="查看详情"
+            :visible.sync="dialogVisible"
+            width="70%"
+            :before-close="handleClose">
+            <div v-html="currentRow.content"></div>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            </span>
+            </el-dialog>
 		<AddEdit :isShow="isShow" v-on:setFun="getFun" v-if="isShow" :editInfo="editInfo" :discussId="discussId"></AddEdit>
     </div>
 </template>
@@ -120,6 +131,8 @@ export default {
     },
     data() {
         return {
+            dialogVisible: false,
+            currentRow:{},
             curmbFirst: '组件',
             curmbSecond: '讨论组件',
             searchParam: {
@@ -172,7 +185,15 @@ export default {
     mounted: function() {
         commonUtil.resizeHeight()
     },
-    methods: {
+  methods: {
+        handleClose() {
+          this.dialogVisible = false;
+        },
+        info(row) {
+            console.log(row);
+            this.currentRow = row;
+            this.dialogVisible = true;
+        },
         // 列表查询
         search() {
             this.getData()
@@ -231,8 +252,6 @@ export default {
             this.isShow = true;
         },
 		edit(item){
-			///topic/getTopicDetailsById
-
 			this.GET('/interaction/topic/getTopicDetailsById',{topicId: item.id}).then((res) => {
 			    if(res.code == "000000") {