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/plaza/plazaApi.js

@@ -71,3 +71,12 @@ export const getPlaza = () => {
     description: '后台管理--广场内专区信息（查看）',
   })
 };
+
+export const getSelectPlazaList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/square/circle/list`),
+    method: 'get',
+    description: '后台管理--待选专区列表',
+  })
+};

src/views/plaza/plaza-list.vue

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item label="疾病标签">
-              <el-select
+              <el-select multiple :multiple-limit="5"
                 v-model="searchForm.diseaseIdList"
                 id="statusSelector"
                 placeholder="请选择发布状态"
@@ -38,8 +38,8 @@
         <el-row :gutter="30" type="flex" style="margin-top: 10px">
           <el-col :span="9">
             <el-form-item label="科室标签">
-              <el-select
-                v-model="searchForm.liveStatus"
+              <el-select multiple :multiple-limit="5"
+                v-model="searchForm.deptIdList"
                 id="statusSelector"
                 placeholder="请选择发布状态"
                 clearable
@@ -56,8 +56,8 @@
           </el-col>
           <el-col :span="9">
             <el-form-item label="学科标签">
-              <el-select
-                v-model="searchForm.liveStatus"
+              <el-select multiple :multiple-limit="5"
+                v-model="searchForm.subjectIdList"
                 id="statusSelector"
                 placeholder="请选择发布状态"
                 clearable
@@ -128,10 +128,10 @@
 
       <el-dialog
         title="添加专区"
-        :visible.sync="dialogLivelinkVisible"
+        :visible.sync="dialogVisible"
         width="700px"
         :close-on-click-modal="false"
-        @close="handleLivelinkClose"
+        @close="handleClose"
         center
       >
 
@@ -148,10 +148,10 @@
                   style="margin-left:20px;height: 32px;line-height: 32px;"
                 >
                   <el-option
-                    v-for="item in statusList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
+                    v-for="item in selectPlazaList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
                   ></el-option>
                 </el-select>
                 </el-col>
@@ -161,7 +161,7 @@
 
               <el-form-item label="疾病标签">
                 <el-col :span="20">
-                <el-select multiple multiple-limit="5"
+                <el-select multiple :multiple-limit="5"
                   v-model="plazaForm.diseaseIdList"
                   id="statusSelector"
                   placeholder="请选择发布状态"
@@ -182,7 +182,7 @@
 
               <el-form-item label="科室标签">
                 <el-col :span="20">
-                <el-select multiple multiple-limit="5"
+                <el-select multiple :multiple-limit="5"
                   v-model="plazaForm.deptIdList"
                   id="statusSelector"
                   placeholder="请选择发布状态"
@@ -202,7 +202,7 @@
 
               <el-form-item label="学科标签">
                 <el-col :span="25">
-                <el-select multiple multiple-limit="5"
+                <el-select multiple :multiple-limit="5"
                   v-model="plazaForm.subjectIdList"
                   id="statusSelector"
                   placeholder="请选择发布状态"
@@ -238,7 +238,7 @@
 
   let vm = null;
   import BreadCrumb from "@/components/breadcrumb.vue";
-  import { getDiseaseList, getDeptList, getSubjectList, getPlazaList, savePlaza, delPlaza, getPlaza } from "../../utils/plaza/plazaApi";
+  import { getDiseaseList, getDeptList, getSubjectList, getPlazaList, savePlaza, delPlaza, getPlaza, getSelectPlazaList} from "../../utils/plaza/plazaApi";
   import { doUpload, getFilePath, unsubscribe } from "../../utils/qiniu-util";
   import QRCode  from "qrcodejs2"
   import ElLink from "element-ui/packages/link/src/main";
@@ -299,7 +299,7 @@
         audienceUrl: "",
         plazaForm: {
           id:'',
-          businessId: 0,
+          businessId: "",
           deptIdList: [],
           diseaseIdList: [],
           subjectIdList: []
@@ -338,7 +338,8 @@
 
         diseaseList: [],
         deptList: [],
-        subjectList: []
+        subjectList: [],
+        selectPlazaList: []
       };
     },
     props:{
@@ -389,6 +390,15 @@
         });
       },
 
+
+      getSelectPlazaList(){
+        getSelectPlazaList().then(res => {
+          if (res.code == "000000") {
+            vm.selectPlazaList = res.data;
+          }
+        });
+      },
+
       searchList() {
         console.log("查询");
         this.getPlazaList("", "");
@@ -405,8 +415,12 @@
       //添加专区
       createPlaza() {
 
-        this.dialogLivelinkVisible = true;
+        this.dialogVisible = true;
+
+        this.getSelectPlazaList();
       },
+
+
       //弹出直播链接弹窗
       liveLink(row) {
         this.dialogLivelinkVisible = true;
@@ -432,8 +446,8 @@
       });
       },
       //关闭直播链接弹窗
-      handleLivelinkClose() {
-        vm.dialogLivelinkVisible = false;
+      handleClose() {
+        vm.dialogVisible = false;
       },
 
       // // 查询回放信息
@@ -557,6 +571,8 @@
           closeLoading(this);
           if(res.code == "000000") {
             this.$message.success("添加成功");
+            vm.dialogVisible = false;
+            vm.getPlazaList("", "");
           } else {
             this.$message.error("添加失败，请重试");
           }