Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/education/informationEvalution.vue

@@ -2,21 +2,21 @@
   <div class="informationEvalution">
     <div class="head-title">
       资讯评价
-      <el-button style="float:right;margin-left:10px" @click="CommonJump('addZixunPj')" size="small"
-        type="primary">新增评价</el-button>
+      <!-- <el-button style="float:right;margin-left:10px" @click="CommonJump('addZixunPj')" size="small" type="primary">新增评价
+      </el-button> -->
     </div>
     <div class="content">
       <div style="margin-bottom:20px">
         <span>评价类型</span>
-        <el-select style="margin:0 10px" class="w100" @change="msg.pageIndex=1,getList()" v-model="msg.CommentGrade" size="small"
-          placeholder="请选择">
+        <el-select style="margin:0 10px" class="w100" @change="msg.pageIndex=1,getList()" v-model="msg.CommentGrade"
+          size="small" placeholder="请选择">
           <el-option label="全部评价" :value="0"></el-option>
           <el-option v-for="item in templateList" :key="item.Id" :label="item.Name" :value="item.Id">
           </el-option>
         </el-select>
         <span>所属平台</span>
-        <el-select class="w100" @change="msg.pageIndex=1,getList()" style="margin-right: 10px;" v-model="msg.PlatformSource" size="small"
-          placeholder="请选择">
+        <el-select class="w100" @change="msg.pageIndex=1,getList()" style="margin-right: 10px;"
+          v-model="msg.PlatformSource" size="small" placeholder="请选择">
           <el-option label="全平台" :value="0"></el-option>
           <el-option v-for="item in platList" :key="item.Id" :label="item.Name" :value="item.Id">
           </el-option>
@@ -55,21 +55,21 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="Name" label="详情" width="200">
+        <el-table-column prop="Name" label="详情">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" :content="scope.row.Content" placement="top">
               <span>{{scope.row.Content}}</span>
             </el-tooltip>
-            <!-- <div>
-              <div v-for="(item,index) in scope.row.CommentImgList" :key="index" @click="OpenImg(scope.row)"
+            <div>
+            <div v-for="(item,index) in scope.row.CommentImgList" :key="index" @click="OpenImg(item)"
             style="margin: 10px; display: inline-block; cursor: pointer;">
             <div class="backImg"
                 :style="{backgroundImage:'url(' + domainManager().ImageUrl+item + ')',backgroundSize:'cover'}"></div>
             </div>
-            </div> -->
+            </div>
           </template>
         </el-table-column>
-        <el-table-column prop="CommentGradeName" label="评价回复">
+        <!-- <el-table-column prop="CommentGradeName" label="评价回复">
           <template slot-scope="scope">
             <span>{{scope.row.Reply}}</span>
           </template>
@@ -86,32 +86,39 @@
             <el-tag v-if="scope.row.Is_Show==1" size="mini" type="success">显示</el-tag>
             <el-tag v-if="scope.row.Is_Show==2" size="mini" type="warning">隐藏</el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column width="220" prop="address" label="操作">
           <template slot-scope="scope">
-            <el-tooltip class="item" effect="dark" content="评价回复" placement="top">
+            <!-- <el-tooltip class="item" effect="dark" content="评价回复" placement="top">
               <img @click="EditTemplate(scope.row)" style="margin-right:10px" src="../../assets/img/userman/reply.png"
                 alt="">
-            </el-tooltip>
+            </el-tooltip> -->
             <el-tooltip class="item" effect="dark" content="删除" placement="top">
               <img @click="setBatch(scope.row,6)" style="margin-right:10px" src="../../assets/img/userman/del.png"
                 alt="">
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="隐藏" placement="top">
+            <!-- <el-tooltip class="item" effect="dark" content="隐藏" placement="top">
               <img @click="setBatch(scope.row,2)" v-if="scope.row.Is_Show==1" style="margin-right:10px"
                 src="../../assets/img/userman/icon-hidden.png" alt="">
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="显示" placement="top">
               <img @click="setBatch(scope.row,3)" v-if="scope.row.Is_Show==2" style="margin-right:10px"
                 src="../../assets/img/userman/icon-show.png" alt="">
-            </el-tooltip>
+            </el-tooltip> -->
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" :current-page.sync="msg.pageIndex"
-        layout="prev, pager, next" :total="total">
+      <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
+        :current-page.sync="msg.pageIndex" layout="prev, pager, next" :total="total">
       </el-pagination>
     </div>
+        <!-- 查看图片 -->
+    <el-dialog :visible.sync="seeimgDig" width="45%">
+      <div>
+        <img :src="imgSrc" style="width:100%;max-width:100%;" alt="">
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -119,25 +126,25 @@
   export default {
     data() {
       return {
-        loading:false,
+        loading: false,
         msgVal: '',
         msgId: '',
         msg: {
           pageIndex: 1,
-          pageSize  : 15,
+          pageSize: 15,
           CommentGrade: 0,
           PlatformSource: 0,
-          ArticleName:'', //咨询标题
-          Content:'', //评价内容
-          StartTime:'', //评价时间	
-          EndTime:'', //评价时间	
-          UserName:'', //用户昵称
-          ArticleId:0 //资讯id
+          ArticleName: '', //咨询标题
+          Content: '', //评价内容
+          StartTime: '', //评价时间	
+          EndTime: '', //评价时间	
+          UserName: '', //用户昵称
+          ArticleId: 0 //资讯id
         },
         templateList: [], //评价类型
-        platList:[], //所属平台
+        platList: [], //所属平台
         total: 0,
-        tableData:[],
+        tableData: [],
         addMsg: {
           Id: 0,
           Name: '',
@@ -161,6 +168,8 @@
         //日期
         dateList: [],
         SelectList: [],
+        seeimgDig:false,
+        imgSrc:'',
       }
     },
     created() {
@@ -195,8 +204,8 @@
         });
       },
       OpenImg(item) {
-        // this.imgSrc = 'https://cdnimg.iotweixin.com/uploads/mall1285/20200316/586d61c616082de7c3a7d1d778104785.jpg';
-        // this.seeimgDig = true;
+        this.imgSrc = item
+        this.seeimgDig = true;
       },
       TableSelectChange(val) {
         this.SelectList = val;
@@ -251,11 +260,11 @@
           this.msg.StartTime = '';
           this.msg.EndTime = '';
         }
-        this.loading=true;
+        this.loading = true;
         this.apipost("/api/Education/GetArticleCommentPageList", this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
-              console.log(res,'数据');
+            console.log(res, '数据');
             this.total = res.data.data.count;
             let pageData = res.data.data.pageData;
             this.tableData = pageData;
@@ -306,13 +315,38 @@
           }
         })
       },
-      EditTemplate(){
+      EditTemplate() {
 
       },
-      setBatch(){
-
+      setBatch(item, index) {
+        let msg = {
+          CommentIds: item.ID,
+          Type: index,
         }
+        if (index == 6) {
+          this.delComent(msg);
+        }
+      },
+      delComent(msg) {
+        let that = this;
+        that.$confirm("确认删除？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.apipost("/api/Education/SetArticleCommentBatch", msg, res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message)
+              this.getList();
+            } else {
+              this.Error(res.data.message)
+            }
+          })
+        }).catch(() => {
 
+        });
+      },
     },
   };
 

src/components/education/informationManage.vue

@@ -53,7 +53,10 @@
               <p v-if="scope.row.IsComment==1">是</p>
             </template>
           </el-table-column>
-          <el-table-column prop="CommentNum" label="留言数">
+          <el-table-column label="留言数">
+            <template slot-scope="scope">
+              <span style="color:#409EFF;text-decoration:underline;cursor:pointer;" @click="CommonJump('informationEvalution')">{{scope.row.CommentNum}}</span>
+            </template>
           </el-table-column>
           <el-table-column prop="BrowseNum" label="实际浏览数">
           </el-table-column>