Merge branch 'dev-circle-nine-20201231' of...

Merge branch 'dev-circle-nine-20201231' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-circle-nine-20201231

src/utils/activitymanagement/activitymanagementApi.js

@@ -70,6 +70,7 @@ export const removeDoc = (params) => {
     method: 'post',
     data: params,
     description: '后台管理--专区活动成员移除',
+    withCredentials: true
   })
 };
 

src/utils/plaza/plazaApi.js

@@ -57,8 +57,9 @@ export const delPlaza = (params) => {
     headers,
     url: getBaseUrl(`circle/sso/square/remove`),
     method: 'delete',
-    data: params,
+    params: params,
     description: '后台管理--广场内专区移除',
+    withCredentials: true
   })
 };
 
@@ -74,10 +75,10 @@ export const getPlaza = (params) => {
   })
 };
 
-export const getSelectPlazaList = () => {
+export const getSelectPlazaList = (params) => {
   return fetch({
     headers,
-    url: getBaseUrl(`circle/sso/square/circle/list`),
+    url: getBaseUrl(`circle/sso/square/circle/list/${params.businessId}`),
     method: 'get',
     description: '后台管理--待选专区列表',
   })

src/views/plaza/plaza-list.vue

@@ -21,7 +21,7 @@
               <el-select multiple :multiple-limit="5"
                 v-model="searchForm.diseaseIdList"
                 id="statusSelector"
-                placeholder="请选择发布状态"
+                placeholder="请选择疾病标签"
                 clearable
                 style="margin-left:20px;height: 32px;line-height: 32px;"
               >
@@ -41,7 +41,7 @@
               <el-select multiple :multiple-limit="5"
                 v-model="searchForm.deptIdList"
                 id="statusSelector"
-                placeholder="请选择发布状态"
+                placeholder="请选择科室标签"
                 clearable
                 style="margin-left:20px;height: 32px;line-height: 32px;"
               >
@@ -59,7 +59,7 @@
               <el-select multiple :multiple-limit="5"
                 v-model="searchForm.subjectIdList"
                 id="statusSelector"
-                placeholder="请选择发布状态"
+                placeholder="请选择学科标签"
                 clearable
                 style="margin-left:20px;height: 32px;line-height: 32px;"
               >
@@ -131,7 +131,7 @@
       </div>
 
       <el-dialog
-        title="添加专区"
+        :title="title"
         :visible.sync="dialogVisible"
         width="700px"
         :close-on-click-modal="false"
@@ -305,9 +305,9 @@
         plazaForm: {
           id:'',
           businessId: "",
-          deptIdList: [],
-          diseaseIdList: [],
-          subjectIdList: []
+          diseaseTagIds: [],
+          deptTagIds: [],
+          subjectTagIds: []
         },
         disabledOpenFlag: false, // 开启回放是否可点
         downloadVideoFlag: true,// 拉流直播不显示下载
@@ -345,7 +345,8 @@
         deptList: [],
         subjectList: [],
         selectPlazaList: [],
-        editFlag: false
+        editFlag: false,
+        title: "",
       };
     },
     props:{
@@ -397,8 +398,11 @@
       },
 
 
-      getSelectPlazaList(){
-        getSelectPlazaList().then(res => {
+      getSelectPlazaList(businessId){
+        let params = {
+          businessId: businessId
+        };
+        getSelectPlazaList(params).then(res => {
           if (res.code == "000000") {
             vm.selectPlazaList = res.data;
           }
@@ -410,20 +414,19 @@
         this.getPlazaList("", "");
       },
       resetForm() {
-        console.log("重置alex");
-        // this.$router.push({
-        //   path: '/role-manage',
-        // })
-        this.searchForm.liveName = "";
-        this.searchForm.liveStatus = "";
+        vm.searchForm.squareName = "";
+        vm.searchForm.deptIdList = [];
+        vm.searchForm.diseaseIdList = [];
+        vm.searchForm.subjectIdList = [];
         this.search();
       },
       //添加专区
       createPlaza() {
         vm.plazaForm.businessId = "";
         vm.dialogVisible = true;
+        vm.title = "添加专区";
         vm.editFlag = false;
-        vm.getSelectPlazaList();
+        vm.getSelectPlazaList(0);
       },
 
 
@@ -601,10 +604,6 @@
       editPlaza(row) {
         vm.editFlag = true;
         vm.plazaForm.id = row.id;
-        // vm.plazaForm.businessId = row.businessId;
-        if(vm.selectPlazaList.length == 0){
-          vm.getSelectPlazaList();
-        }
         let params = {
           id:row.id
         }
@@ -614,7 +613,8 @@
           if(res.code == "000000") {
             vm.dialogVisible = true;
             vm.plazaForm = res.data;
-            vm.plazaForm.diseaseIdList = [780,781];
+            vm.title = "编辑专区";
+            vm.getSelectPlazaList(vm.plazaForm.businessId);
           } else {
             this.$message.error("添加失败，请重试");
           }
@@ -625,32 +625,24 @@
       },
       //删除专区
       delPlaza(row) {
-
-        // 直播中
-        if(row.liveStatus == 2){
-          vm.$message({
-            type: "warning",
-            message: "直播中无法删除，请直播结束后重试"
-          });
-        }
-        // 1:直播预告；4:直播结束后，可以删除
-        else if(row.liveStatus == 1 || row.liveStatus == 4){
-
-          this.$confirm(`确定删除“${row.name}”吗？`, "", {
+          this.$confirm(`移除专区后，用户将无法在广场中看到，但不会删除专区本身，确定移除？`, "", {
             confirmButtonText: "删除",
             cancelButtonText: "取消",
             type: "warning"
             // customClass: 'range-make-box',
           })
             .then(() => {
+              let params = {
+                id: row.id
+              }
             //  confirm
-            vm.DELETE("rtc/liveAdmin/" + row.id, {}).then(res => {
+              delPlaza(params).then(res => {
             if (res.code == "000000") {
             vm.$message({
               type: "success",
               message: "删除成功"
             });
-            this.getLiveList("", "");
+            this.getPlazaList("", "");
           } else {
             vm.$message({
               type: "warning",
@@ -660,10 +652,6 @@
         });
         })
         .catch(() => {});
-        }
-
-
-
 
       },
       // //编辑直播