03/20 15:53

111

src/api/buildTeam.js

@@ -1067,3 +1067,12 @@ export function updateReviewInfo(data) {
   })
 }
 
+// 获取老师和学生的评价 courseReview/getStuAndTeaReview
+export function getStuAndTeaReview(data) { 
+  return request({
+    url: api + '/courseReview/getStuAndTeaReview',
+    method: 'get',
+    params: data
+  })
+}
+

src/views/contentManager/components/activity.vue

@@ -1,75 +1,59 @@
 <template>
   <div>
     <!-- 搜索标题 -->
-    <div @click="openTeaching('create')"
-         class='newBand'>新建</div>
+    <div @click="openTeaching('create')" class="newBand">新建</div>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data='tableList'
-                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align='center'
-                         label="轮播图">
+      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center" label="轮播图">
           <template slot-scope="scope">
-            <img class="bannerImg"
-                 :src="scope.row.coverImage"
-                 alt="">
+            <img class="bannerImg" :src="scope.row.coverImage" alt />
           </template>
         </el-table-column>
-        <el-table-column align='center'
-                         prop="title"
-                         label="标题">
+        <el-table-column align="center" prop="title" label="标题"></el-table-column>
+        <el-table-column align="center" label="跳转连接">
+          <template slot-scope="scope">{{ scope.row.linkUrl + '/' + scope.row.id }}</template>
         </el-table-column>
-        <el-table-column align='center'
-                         label="跳转连接">
-          <template slot-scope="scope">
-            {{ scope.row.linkUrl + '/' + scope.row.id }}
-          </template>
+        <el-table-column align="center" prop="remark" label="是否使用">
+          <template slot-scope="scope">{{ scope.row.status == 1 ? '是' : '否' }}</template>
         </el-table-column>
-        <el-table-column align='center'
-                         prop="remark"
-                         label="是否使用">
+        
+        <el-table-column align="center" prop="order" label="排序"></el-table-column>
+        <el-table-column align="center" prop="remark" label="适用范围">
           <template slot-scope="scope">
-            {{ scope.row.status == 1 ? '是' : '否' }}
+            <p v-if=" scope.row.tenantId == 1">对内</p>
+            <p v-if=" scope.row.tenantId == 2">对外</p> 
           </template>
         </el-table-column>
-        <el-table-column align='center'
-                         prop="order"
-                         label="排序">
-        </el-table-column>
-        <el-table-column align='center'
-                         label="操作">
+        <el-table-column align="center" label="操作">
           <template slot-scope="scope">
-            <el-button @click="openTeaching('update', scope.row)"
-                       type="text">修改</el-button>
-            <el-button v-if="scope.row.status == 1"
-                       @click="onStop(scope.row, 0)"
-                       type="text">停用</el-button>
-            <el-button v-else
-                       @click="onStop(scope.row, 1)"
-                       type="text">启用</el-button>
-            <el-button @click="onDel(scope.row)"
-                       type="text">删除</el-button>
+            <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)" type="text">停用</el-button>
+            <el-button v-else @click="onStop(scope.row, 1)" type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)" type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination :total="pageInfo.total"
-                  :page.sync="pageInfo.page"
-                  :limit.sync="pageInfo.limit"
-                  :page-sizes="pageInfo.page_size"
-                  @pagination="getList" />
+      <pagination
+        :total="pageInfo.total"
+        :page.sync="pageInfo.page"
+        :limit.sync="pageInfo.limit"
+        :page-sizes="pageInfo.page_size"
+        @pagination="getList"
+      />
     </div>
   </div>
 </template>
 <script>
-import { newsList, newsUpdate, newsDel } from '@/api/contentManager'
-import pagination from '@/components/Pagination/index'
-import store from '@/store'
+import { newsList, newsUpdate, newsDel } from "@/api/contentManager";
+import pagination from "@/components/Pagination/index";
+import store from "@/store";
 export default {
-  name: 'activity',
+  name: "activity",
   components: {
     pagination
   },
-  data () {
+  data() {
     return {
       tableList: [],
       organId: null,
@@ -81,75 +65,77 @@ export default {
         total: 1, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       }
-    }
+    };
   },
-  activated () {
-    this.getList()
+  activated() {
+    this.getList();
   },
-  mounted () {
-    this.getList()
+  mounted() {
+    this.getList();
   },
   methods: {
-    getList () {
+    getList() {
       let params = {
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
         type: 1
-      }
+      };
       newsList(params).then(res => {
         if (res.code == 200) {
-          this.tableList = res.data.rows
-          this.pageInfo.total = res.data.total
+          this.tableList = res.data.rows;
+          this.pageInfo.total = res.data.total;
         }
-      })
+      });
     },
-    openTeaching (type, rows) {
-      let params = {}
-      if (type == 'update') {
-        params.id = rows.id
+    openTeaching(type, rows) {
+      let params = {};
+      if (type == "update") {
+        params.id = rows.id;
       }
-      params.type = 1
-      params.pageType = type
+      params.type = 1;
+      params.pageType = type;
       this.$router.push({
-        path: '/contentManager/contentOperation',
+        path: "/contentManager/contentOperation",
         query: params
-      })
+      });
     },
-    onDel (row) { // 删除
-      this.$confirm('确定是否删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        newsDel({ id: row.id }).then(res => {
-          if (res.code == 200) {
-            this.$message.success('删除成功')
-            this.getList()
-          } else {
-            this.$message.error(res.msg)
-          }
-        })
-      }).catch(() => {
+    onDel(row) {
+      // 删除
+      this.$confirm("确定是否删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       })
-
+        .then(() => {
+          newsDel({ id: row.id }).then(res => {
+            if (res.code == 200) {
+              this.$message.success("删除成功");
+              this.getList();
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        })
+        .catch(() => {});
     },
-    onStop (row, status) { // 停止
+    onStop(row, status) {
+      // 停止
       // newsUpdate
-      let tempStr = ['停用', '启用']
+      let tempStr = ["停用", "启用"];
       newsUpdate({
         id: row.id,
         status: status
       }).then(res => {
         if (res.code == 200) {
-          this.$message.success(tempStr[status] + '成功')
-          this.getList()
+          this.$message.success(tempStr[status] + "成功");
+          this.getList();
         } else {
-          this.$message.error(res.msg)
+          this.$message.error(res.msg);
         }
-      })
+      });
     }
   }
-}
+};
 </script>
 <style lang="scss" scoped>
 .bannerImg {

src/views/contentManager/components/appPage.vue

@@ -43,6 +43,12 @@
                          prop="order"
                          label="排序">
         </el-table-column>
+             <el-table-column align="center" prop="remark" label="适用范围">
+          <template slot-scope="scope">
+            <p v-if=" scope.row.tenantId == 1">对内</p>
+            <p v-if=" scope.row.tenantId == 2">对外</p>
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          label="操作">
           <template slot-scope="scope">

src/views/contentManager/components/banner.vue

@@ -43,6 +43,12 @@
                          prop="order"
                          label="排序">
         </el-table-column>
+             <el-table-column align="center" prop="remark" label="适用范围">
+          <template slot-scope="scope">
+            <p v-if=" scope.row.tenantId == 1">对内</p>
+            <p v-if=" scope.row.tenantId == 2">对外</p>
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          label="操作">
           <template slot-scope="scope">

src/views/contentManager/components/flashPage.vue

@@ -36,6 +36,12 @@
                          prop="order"
                          label="排序">
         </el-table-column>
+             <el-table-column align="center" prop="remark" label="适用范围">
+          <template slot-scope="scope">
+            <p v-if=" scope.row.tenantId == 1">对内</p>
+            <p v-if=" scope.row.tenantId == 2">对外</p>
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          label="操作">
           <template slot-scope="scope">

src/views/contentManager/components/information.vue

@@ -36,6 +36,12 @@
                          prop="order"
                          label="排序">
         </el-table-column>
+             <el-table-column align="center" prop="remark" label="适用范围">
+          <template slot-scope="scope">
+            <p v-if=" scope.row.tenantId == 1">对内</p>
+            <p v-if=" scope.row.tenantId == 2">对外</p>
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          label="操作">
           <template slot-scope="scope">

src/views/contentManager/components/training.vue

@@ -36,6 +36,12 @@
                          prop="order"
                          label="排序">
         </el-table-column>
+             <el-table-column align="center" prop="remark" label="适用范围">
+          <template slot-scope="scope">
+            <p v-if=" scope.row.tenantId == 1">对内</p>
+            <p v-if=" scope.row.tenantId == 2">对外</p>
+          </template>
+        </el-table-column>
         <el-table-column align='center'
                          label="操作">
           <template slot-scope="scope">

src/views/contentManager/contentOperation.vue

@@ -15,6 +15,12 @@
         <el-form-item label="排序值">
           <el-input v-model.trim="form.order"></el-input>
         </el-form-item>
+          <el-form-item label="适用范围" prop="tenantId">
+          <el-select v-model="form.tenantId">
+            <el-option label="对内" value="1"></el-option>
+             <el-option label="对外" value="2"></el-option>
+          </el-select>
+        </el-form-item>
         <!-- banner图 && app按钮管理，才需要添加版本号 -->
         <el-form-item label="版本号" v-if="type == 3 || type == 6">
           <el-input v-model="form.memo"></el-input>
@@ -213,7 +219,8 @@ export default {
         linkUrl: vaildStudentUrl() + "/#/specialdetail",
         type: this.$route.query.type,
         status: 1,
-        content: null
+        content: null,
+        tenantId:null,
       },
       rules: {
         title: [
@@ -226,7 +233,8 @@ export default {
         coverImage: [
           { required: true, message: "请选择封面图", trigger: "blur" }
         ],
-        content: [{ required: true, message: "请编辑内容", trigger: "blur" }]
+        content: [{ required: true, message: "请编辑内容", trigger: "blur" }],
+        tenantId: [{ required: true, message: "请选择适用范围", trigger: "blur" }]
       },
       imageSize: null
     };
@@ -244,7 +252,8 @@ export default {
         linkUrl: vaildStudentUrl() + "/#/specialdetail",
         type: this.$route.query.type,
         status: 1,
-        content: null
+        content: null,
+        tenantId:null
       };
       this.$refs["form"].resetFields();
     }
@@ -385,7 +394,8 @@ export default {
               type: result.type,
               status: result.status,
               memo: result.memo,
-              content: result.content
+              content: result.content,
+              tenantId:result.tenantId.toString()
             };
           }
         });

src/views/evaluateManager/networkList.vue

@@ -131,7 +131,7 @@
           <!-- v-permission="'evaluateList/look'" -->
           <template slot-scope="scope">
             <div>
-              <el-button type="text" @click="lookDetail(scope.row)">查看</el-button>
+              <el-button type="text" v-if="scope.row.reviewId" @click="lookDetail(scope.row)">查看</el-button>
             </div>
           </template>
         </el-table-column>

src/views/teamDetail/componentCourse/courseEvaluate.vue

@@ -0,0 +1,64 @@
+<!--  -->
+<template>
+  <div class>
+    <div class="tableWrap">
+      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center" width="100" prop="username" label="学生姓名"></el-table-column>
+        <el-table-column align="center" width="100" prop="score" label="星级">
+            <template slot-scope="scope">
+                <div>
+                    {{ scope.row.score?scope.row.score+'星':'' }}
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column  prop="reason" label="评价内容"></el-table-column>
+      </el-table>
+      <!-- <pagination
+        :total="rules.total"
+        :page.sync="rules.page"
+        :limit.sync="rules.limit"
+        @pagination="getList"
+      /> -->
+    </div>
+  </div>
+</template>
+
+<script>
+// import pagination from '@/components/Pagination/index'
+import {getStuAndTeaReview} from '@/api/buildTeam'
+export default {
+    props: ['courseScheduleId'],
+  data() {
+    return {
+      tableList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      }
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    this.getList()
+  },
+  activated(){
+      this.getList()
+  },
+  methods: {
+    getList() {
+         getStuAndTeaReview({courseId:this.courseScheduleId}).then(res=>{
+          if(res.code == 200){
+              this.tableList = res.data.courseScheduleComplaints
+          }
+      })
+    }
+  }
+};
+</script>
+<style lang='scss' scoped>
+</style>

src/views/teamDetail/teamCourseList.vue

@@ -244,6 +244,11 @@
             <studentWork :courseScheduleId="maskForm.id"></studentWork>
           </div>
         </el-tab-pane>
+          <el-tab-pane label="评论" v-if="maskForm.type == 'VIP' || maskForm.type == 'PRACTICE'" name="four">
+          <div v-if="activeName == 'four'">
+            <courseEvaluate :courseScheduleId="maskForm.id"></courseEvaluate>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </el-dialog>
   </div>
@@ -261,6 +266,7 @@ import { courseType } from "@/utils/searchArray";
 import studentRollCall from "./componentCourse/studentRollCall";
 import gpsLoction from "./componentCourse/gpsLocation";
 import studentWork from "./componentCourse/studentWork";
+import courseEvaluate from "./componentCourse/courseEvaluate";
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 let nowTime = new Date();
@@ -308,7 +314,8 @@ export default {
     pagination,
     studentRollCall,
     gpsLoction,
-    studentWork
+    studentWork,
+    courseEvaluate
   },
   activated() {
     this.init();