广场管理和活动管理开发

src/utils/filter.js

@@ -563,6 +563,16 @@ const vueFilter = {
     }
   },
 
+  tagsFilter: (value) => {
+      let text = "";
+      if(value != null && value.length > 0){
+        for (let i = 0; i < value.length; i++) {
+          text = text + value[i].name;
+        }
+      }
+      return text;
+  }
+
 
 }
 export default vueFilter

src/utils/plaza/plazaApi.js

@@ -63,12 +63,14 @@ export const delPlaza = (params) => {
 };
 
 
-export const getPlaza = () => {
+export const getPlaza = (params) => {
   return fetch({
     headers,
-    url: getBaseUrl(`circle/sso/square/info`),
+    url: getBaseUrl(`circle/sso/square/info?id=${params.id}`),
     method: 'get',
+    data: params,
     description: '后台管理--广场内专区信息（查看）',
+    withCredentials: true
   })
 };
 

src/views/activitymanagement/activity-member.vue

 <template>
-  <div class="organization">
+  <div class="yqrange-index-wrapper">
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :jumPathFirst="jumPathFirst"></bread-crumb>
+    <div class="yqrange-index-content screenSet" id="screenSet">
     <el-row type="flex" class="row-bg">
       <el-col class="add-organization" v-if="showImportFlag">
         <!--<el-upload-->
@@ -47,7 +49,7 @@
       </el-table-column>
       <div slot="empty">
         <div class="table-empty">
-          <img src="../../../assets/image/no-content1.png">
+          <img src="../../assets/image/no-content1.png">
           <p>没有人员信息</p>
         </div>
       </div>
@@ -179,20 +181,19 @@
       </div>
     </el-dialog>
 
+    </div>
   </div>
 </template>
 
 <script>
-  import * as operationData from "@/utils/operation";
+  import BreadCrumb from "@/components/breadcrumb.vue";
   import { openLoading, closeLoading } from "@/utils/utils";
   import { doUpload, getFilePath } from "@/utils/qiniu-util";
-  import { mpRelSearch, mprDeleteOrg } from '@/utils/yqrange/memberApi';
-  import { uploadDoc } from '@/utils/yqrange/yqrangeApi';
-  import addMember from './addMember.vue'
+  import { getActivityDocList, removeDoc, importDoc } from '@/utils/activitymanagement/activitymanagementApi';
   let vm = null;
   export default {
     components: {
-      addMember
+      BreadCrumb
     },
     props: {
       circleId: {
@@ -237,6 +238,10 @@
             }
           }
         },
+        curmbFirst: '活动管理',
+        // curmbSecond: '直播管理',
+        curmbThird: '新建直播',// /live-manage?id=
+        jumPathFirst: '/activity-management',
         administrativeValue: "",
         optionsRegion: [],
         sourceList: [
@@ -279,8 +284,13 @@
     },
     created() {
       vm = this;
+
+      this.id = this.$route.query.id;
+      this.name = this.$route.query.name;
+      this.curmbSecond = "活动成员管理-" + this.name;
       //Idtype:1,内部 2.外部
       vm.idType = localStorage.getItem("storageIdType");
+
       this.initRange();
       if(vm.idType == 1){
         this.showImportFlag = true;
@@ -345,7 +355,7 @@
           source: this.formOrganization.source,
         };
         openLoading(vm);
-        mpRelSearch(req).then(res => {
+        getActivityDocList(req).then(res => {
           if (!first) {
             closeLoading(vm);
           }
@@ -545,7 +555,7 @@
     .add-organization {
       margin-left: 20px;
       line-height: 20px;
-      width: 120px;
+      width: 60px;
       cursor: pointer;
       padding-top: 10px;
       i {

src/views/plaza/plaza-list.vue

@@ -92,20 +92,24 @@
         </el-table-column>
         <el-table-column prop="diseaseTags" label="疾病标签" min-width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.streamType | streamTypeFilter }}</span>
+            <span>{{ scope.row.diseaseTags | tagsFilter }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="deptTags" label="科室标签" min-width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.streamType | streamTypeFilter }}</span>
+            <span>{{ scope.row.deptTags | tagsFilter }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="subjectTags" label="学科标签" min-width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.streamType | streamTypeFilter }}</span>
+            <span>{{ scope.row.subjectTags | tagsFilter }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createdTime" label="添加时间" min-width="100" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createdTime | liveDateFilter }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createdTime" label="添加时间" min-width="100" align="center"></el-table-column>
         <el-table-column label="操作" min-width="300" align="center">
           <template slot-scope="scope">
             <el-button @click="editPlaza(scope.row)" type="text" size="small">编辑</el-button>
@@ -565,8 +569,14 @@
 
 
       savePlaza(){
-        let params = vm.plazaForm;
-
+        let params = {
+          id: vm.plazaForm.id,
+          businessId: vm.plazaForm.businessId,
+          diseaseIdList: vm.plazaForm.diseaseIdList,
+          deptIdList: vm.plazaForm.deptIdList,
+          subjectIdList: vm.plazaForm.subjectIdList
+        };
+        openLoading(this);
         savePlaza(params).then((res) => {
           closeLoading(this);
           if(res.code == "000000") {
@@ -581,9 +591,32 @@
         })
       },
 
+      cancle(){
+        vm.dialogVisible = false;
+      },
 
       //编辑专区
       editPlaza(row) {
+        vm.plazaForm.id = row.id;
+        vm.plazaForm.businessId = row.businessId;
+        if(vm.selectPlazaList.length == 0){
+          vm.getSelectPlazaList();
+        }
+        let params = {
+          id:row.id
+        }
+        openLoading(this);
+        getPlaza(params).then((res) => {
+          closeLoading(this);
+          if(res.code == "000000") {
+            vm.dialogVisible = true;
+            vm.plazaForm = res.data;
+          } else {
+            this.$message.error("添加失败，请重试");
+          }
+        }).catch((error) => {
+          this.$message.error("请重试");
+        })
 
       },
       //删除专区
@@ -663,7 +696,7 @@
           if (res.code == "000000") {
           // console.log(res);
           let listData = [];
-          if (res.data.pageContents == null) {
+          if (res.data.list == null) {
             return;
           }
           // for (let i = 0; i < res.data.pageContents.length; i++) {
@@ -682,9 +715,9 @@
           //   };
           //   listData.push(obj);
           // }
-          this.tableData = res.data.pageContents;
+          this.tableData = res.data.list;
 
-          this.totalRows = res.data.totalRows;
+          this.totalRows = res.data.total;
         } else {
           this.tableData = [];
         }