yz3456
2024-07-01 9c376c3c54702b872ad690055c7bac16b64e817c
完成了直播roomId的添加,完成了家庭小医生分享模块
6个文件已修改
465 ■■■■■ 已修改文件
ruoyi-ui/src/api/doctor/index.js 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 362 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/Home.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/webcast.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/index.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/doctor/index.js
@@ -78,3 +78,51 @@
    data: data
  })
}
// -------------------------------
// 分享
export function share(data) {
  return request({
    url: '/ZfDoctorShare/share',
    method: 'post',
    data: data
  })
}
// 查看分享给谁了什么数据
export function shareToWho(data) {
  return request({
    url: '/ZfDoctorShare/getInfoByUserId',
    method: 'post',
    data: data
  })
}
// 查看谁分享了数据
export function getWhoShare() {
  return request({
    url: '/ZfDoctorShare/getInfoByShareId',
    method: 'get',
  })
}
// 下载分享的数据
export function downShareData(data) {
  return request({
    url: '/ZfDoctorShare/downloadDate',
    method: 'post',
    data: data
  })
}
// 收回分享数据
export function deleteShareData(data) {
  return request({
    url: '/ZfDoctorShare/deleteInfoByUserId',
    method: 'post',
    data: data
  })
}
// 展示下载的数据
export function showShareData() {
  return request({
    url: '/ZfDoctorShare/all',
    method: 'get'
  })
}
ruoyi-ui/src/router/index.js
@@ -206,8 +206,8 @@
    permissions: ['meetingModel:webcast:list'],
    children: [
      {
        path: 'Home/',
        // path: 'webcastInfo/:id(\\d+)',
        // path: 'Home/',
        path: 'Home/:id(\\d+)',
        component: () => import('@/views/meeting/Home'),
        name: 'Home',
        meta: { title: '直播详情',activeMenu: '/meeting/Home'}
ruoyi-ui/src/views/doctor/index.vue
@@ -132,6 +132,53 @@
          </el-upload>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-top"
            size="mini"
            :disabled="multiple"
            @click="handleShare"
          >分享</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-top"
            size="mini"
            @click="handleWho"
          >分享给谁了什么数据</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-top"
            size="mini"
            @click="whoShare"
          >分享给我的数据</el-button>
        </el-col>
        <el-col :span="1.5">
          <el-button
            type="primary"
            plain
            icon="el-icon-top"
            size="mini"
            @click="showData"
          >展示下载的分享数据</el-button>
        </el-col>
        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
    </div>
@@ -218,6 +265,12 @@
             icon="el-icon-d-arrow-right"
              @click="handleCheck(scope.row)">
            <span style="font-size: 14px;">查看详情</span></el-button>
            <el-button
               size="mini"
                type="text"
               icon="el-icon-d-arrow-right"
                @click="handleShare(scope.row)">
              <span style="font-size: 14px;">分享</span></el-button>
          </div>
        </template>
      </el-table-column>
@@ -400,6 +453,130 @@
    </el-dialog>
    <!-- 分享对话框1 -->
    <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">
    <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
          <el-table-column type="selection" width="55"  align="center" />
          <el-table-column fixed label="序号" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
          <el-table-column label="身份" prop="identity" sortable width="130" >
            <template slot-scope="scope" >
              <span v-if="scope.row.isMyFamily==1">第{{scope.row.identity}}代</span>
              <span v-else>——</span>
            </template>
          </el-table-column>
          <el-table-column label="姓名" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
        </el-table>
                <div slot="footer" class="dialog-footer">
                  <el-button type="primary" @click="subShare">分 享</el-button>
                </div>
    </el-dialog>
    <!-- 分享对话框2 -->
    <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
      <div>
      <el-select v-if="ifNum == 1"
                v-model="user" id="userSelect"
                placeholder="请选择分享的对象" clearable
                 style="width: 240px;
                 height: 35px;
                 border-radius: 16px 16px 16px 16px;
                 margin-bottom: 5px;
                 opacity: 0.5;" filterable allow-create
                 @change="selectValue">
        <el-option v-for="item in userOptions"
          :key="item.value" :label="item.label" :value="item.value"/>
      </el-select>
            </div>
      <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId2" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
            <!-- <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" /> -->
            <!-- <el-table-column fixed label="序号" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/> -->
            <el-table-column label="类别" prop="type" sortable :show-overflow-tooltip="true" width="80" align="center">
              <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
            </el-table-column>
            <el-table-column  label="症状" prop="symptom" sortable :show-overflow-tooltip="true" width="120" align="center" >
              <template slot-scope="scope">{{scope.row.symptom? scope.row.symptom: '————'}}</template>
            </el-table-column>
            <el-table-column label="持续时间" prop="duration" sortable :show-overflow-tooltip="true" width="160" align="center" >
              <template slot-scope="scope">{{scope.row.duration? scope.row.duration: '————'}}</template>
            </el-table-column>
            <el-table-column label="中医处方" prop="cmedical" sortable :show-overflow-tooltip="true" width="160" align="center" >
              <template slot-scope="scope">{{scope.row.cmedical? scope.row.cmedical: '————'}}</template>
            </el-table-column>
            <el-table-column label="西医处方" prop="wmedical" sortable :show-overflow-tooltip="true" width="160" align="center">
              <template slot-scope="scope">{{scope.row.wmedical? scope.row.wmedical: '————'}}</template>
            </el-table-column>
            <el-table-column label="功效" prop="effect" sortable :show-overflow-tooltip="true" width="120" align="center" >
              <template slot-scope="scope">{{scope.row.effect? scope.row.effect: '————'}}</template>
            </el-table-column>
            <el-table-column label="适用人" prop="suitable" sortable :show-overflow-tooltip="true" width="140" align="center" >
              <template slot-scope="scope">{{scope.row.suitable? scope.row.suitable: '————'}}</template>
            </el-table-column>
            <el-table-column label="是否是本家庭记录" prop="ownData" sortable :show-overflow-tooltip="true" width="150px" align="center" >
              <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
            </el-table-column>
            <el-table-column label="备注" prop="remark" sortable :show-overflow-tooltip="true" width="120" align="center">
                <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
                </el-table-column>
              <el-table-column label="电子文件" prop="url" width="160" align="center">
                   <template slot-scope="scope" >
                     <div>
                       <img
                         class="el-upload-list__item-thumbnail"
                         src="../../assets/images/deviceLis.png"
                         alt=""
                         style="width: 35px; height: 35px;"
                         fit="cover"
                         v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
                       >
                       <img
                         v-else
                         class="el-upload-list__item-thumbnail"
                         src="../../assets/images/deviceA.png"
                         alt=""
                         style="width: 35px; height: 35px;"
                         fit="cover"
                       ></div>
                   </template>
                </el-table-column>
            <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
              <template slot-scope="scope" v-if="scope.row.roleId !== 1">
                <div class="button-container">
                <el-button
                  v-if="ifNum == 2"
                  size="mini"
                  type="text"
                  icon="el-icon-d-arrow-right"
                  @click="handleDown(scope.row)">
                  <span style="font-size: 14px;">下载</span></el-button>
                  <el-button
                    v-if="ifNum == 1"
                    size="mini"
                    type="text"
                    icon="el-icon-d-arrow-right"
                    @click="handleBack(scope.row)">
                    <span style="font-size: 14px;">收回</span></el-button>
                <el-button
                  size="mini"
                  type="text"
                  icon="el-icon-d-arrow-right"
                  @click="handleCheck(scope.row)">
                  <span style="font-size: 14px;">查看详情</span></el-button>
                </div>
              </template>
            </el-table-column>
          </el-table>
    </el-dialog>
  </div>
</template>
@@ -410,26 +587,45 @@
//导入接口函数
import {listDoctor,enload,getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic,listType} from "@/api/doctor/index";
import {listDoctor,enload,getDoctor, addDoctor,updateDoctor, delDoctor,uploadPic,listType,
        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
        } from "@/api/doctor/index";
import {listUserAll} from "@/api/root/index";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
export default {
  name: "index",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 分享给谁的list
      listRoot: [],
      open1:false,
      open2:false,
      id1: undefined,
      shareList1: [],
      // shareList2: [],
      userOptions:[],
      user:undefined,
      ifNum:undefined,
      selectWho:undefined,
      userId: undefined,
      // 遮罩层
      disabled: false,
      loading: true,
      loading1: false,
      loading2: false,
      formData:[],
      // 选中数组
      ids: [],
      ids1: [],
      // 非单个禁用
      single: true,
      single1: true,
      // 非多个禁用
      multiple: true,
      multiple1: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
@@ -439,6 +635,8 @@
      typeList:[],
      // 弹出层标题
      title: "",
      title1: "",
      title2: "",
      // 是否显示弹出层
      open: false,
      // 是否显示弹出层(数据权限)
@@ -449,6 +647,7 @@
      deptNodeAll: false,
      // 日期范围
      dateRange: [],
      dateRange1: [],
      // 数据范围选项
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
@@ -490,6 +689,15 @@
        suitable:undefined,
        effect:undefined,
      },
      // 查询参数1
      queryParams1: {
        pageNum: 1,
        pageSize: 10,
        identity:undefined,
        nickName:undefined,
        sex:undefined,
        birth:undefined,
      },
      // searchVal:"",
@@ -552,9 +760,147 @@
  created() {
    this.getList();
    this.getTypeOptions();
    this.getInfo()
    this.getInfo();
    this.getList1();
  },
  methods: {
    // 关闭弹窗后
    handleClose(){
      this.user = ''
    },
    handleClose2(){
      this.$refs.table1.clearSelection()
    },
    // 下载他人给我分享的数据
    handleDown(row){
      const a = {"downloadContent" : row.id}
      downShareData(a).then(() => {
        Message({ message: "下载成功", type: 'success' })
      })
    },
    // 收回分享给别人的数据
    handleBack(row){
      // 分享给谁的:this.selectWho
      const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
      deleteShareData(list).then(()=>{
        Message({ message: "收回成功", type: 'success' })
        const list2 = {"shareIds": [this.selectWho]}
        shareToWho(list2).then(response => {
          this.shareList1 = response.data
        })
      })
    },
    // 展示下载的分享数据
    showData(){
      this.shareList1 = []
      this.ifNum = 3
      this.open2 = true
      this.title2 = "下载的分享数据";
      showShareData().then(response => {
        this.shareList1 = response
        // console.log(this.shareList1,'showShareDatashowShareData')
      })
    },
    // 展示分享给我的数据
    whoShare(){
      this.shareList1 = []
      this.ifNum = 2
      this.open2 = true
      this.title2 = "分享给我的数据";
      getWhoShare().then(response => {
        const data = response.data
        for(let i in data){
          this.shareList1.push(data[i])
        }
      })
    },
    // 分享给谁了什么数据
    selectValue(value){
      this.selectWho = value
      this.shareList1 = []
      const list = {"shareIds": [value]}
      shareToWho(list).then(response => {
        this.loading2 = true;
        this.shareList1 = response.data
        this.loading2 = false;
        console.log(this.shareList1,'分享给谁了什么数据分享给谁了什么数据')
      })
      // console.log(value)
    },
    handleWho(){
      this.ifNum = 1
      this.open2 = true
      this.title2 = "分享给谁了什么数据";
      this.shareList1 = []
    },
    /** 分享操作 */
    handleShare(row) {
      // this.getList1();
      this.id1 = row.id
      this.open1 = true;
      this.title1 = "分享";
    },
    // 多选框选中数据
    handleSelectionChange1(selection) {
      this.ids1 = selection.map(item => item.userId)
      // console.log(selection)
      // console.log(this.ids1,'ids1ids1ids1ids1')
      this.single1 = selection.length!=1
      this.multiple1 = !selection.length
    },
    // 多选框选中数据
    handleSelectionChange2(selection) {
      // this.ids1 = selection.map(item => item.userId)
      // // console.log(selection)
      // console.log(this.ids1,'ids1ids1ids1ids1')
      // this.single1 = selection.length!=1
      // this.multiple1 = !selection.length
    },
    getList1() {
          this.loading1 = true;
          this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
          this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
          listUserAll(this.queryParams1).then(response => {
              this.listRoot = response.data.data;
              // console.log(this.listRoot,'listrootlistroot')
              // this.total1 = response.data.total;
              const kon = {}
              this.listRoot.forEach(element => {
                kon[element['nickName']] = element['userId']
              })
              for(let i in kon){
                this.userOptions.push({label: i,value: kon[i]})
              }
              // console.log(this.userOptions,'userListuserListuserListuserListuserList')
              this.loading1 = false;
            }
          );
        },
    // 确认分享
    subShare(row) {
      const shareList = {}
      shareList.shareContents = this.id1 || this.ids;
      shareList.shareIds = this.ids1
      console.log(shareList,'sharelistsharelist')
      this.$modal.confirm('是否确认分享?').then(function() {
        return share(shareList);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("分享成功");
        this.open1 = false;
      }).catch(() => {});
    },
    getInfo(){
          console.log('-----------------')
          getInfo().then(response=>{
@@ -584,6 +930,7 @@
        this.$set(this.formDat, 'type', newOption); // 更新formDat.type的值为新的选项
      }
    },
    /** 查询记录列表 */
    getList() {
@@ -675,6 +1022,14 @@
    {
      return row.id
    },
    getRowId1(row)
    {
      return row.id
    },
    getRowId2(row)
    {
      return row.id
    },
    // 取消按钮(数据权限)
    cancelDataScope() {
      this.openDataScope = false;
@@ -721,6 +1076,7 @@
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
    // //每次改变input框值时就改变this.myTableData的值
    // inputChange() { //循环每一项 只要content的值含有输入的searchVal值,就加进newList;反之,就无东西加进newList
    //   let newlist = this.formDat.filter(
ruoyi-ui/src/views/meeting/Home.vue
@@ -65,6 +65,8 @@
import { getIndividualList } from "@/api/self";
import { Loading } from 'element-ui'
  //导入接口函数  --接好了
  import { getWebcastInfo } from "@/api/meeting/index";
export default {
  name: '6666',
  components: {
@@ -83,16 +85,23 @@
      sdkAppId: 1600032250,
      secretKey: 'abedcf588654e18888eff65dfdfde240a882c611710c6ed10e1044fb44818a89',
      userId: '',
      roomId: 123,
      roomId: '',
      cameraId: '',
      microphoneId: '',
    };
  },
  created() {
    this.getUser();
    this.getRoomId();
  },
  methods: {
    // 获取房间号
    getRoomId(){
      const id = this.$route.params && this.$route.params.id;
      getWebcastInfo(id).then(response => {
        this.roomId = response.data.roomId
      })
    },
    // 获取用户名
    getUser(id) {
      getIndividualList().then(response => {
ruoyi-ui/src/views/meeting/webcast.vue
@@ -58,7 +58,7 @@
    <el-row :gutter="0" v-loading="loading">
      <el-col :span="4" v-for="(item,i) in webcastList">
        <div class="module" @click="toLook">
        <div class="module" @click="toLook(item.id)">
          <div class="video">
            66666666
          </div>
@@ -107,6 +107,11 @@
          <el-input v-model="formDat.meetingTitle" placeholder="请输入会议标题" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item> -->
        <el-form-item label="房间号" prop="roomId">
          <el-input v-model="formDat.roomId" placeholder="请输入房间号" clearable :style="{width: '100%'}">
          </el-input>
        </el-form-item>
        <el-form-item label="会议标题" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入会议标题" clearable :style="{width: '100%'}">
@@ -199,7 +204,8 @@
          applyPerson: undefined,
          contactPerson: undefined,
          contactPhone: undefined,
          createTime: undefined
          createTime: undefined,
          roomId:undefined
        },
      }
@@ -256,15 +262,15 @@
        this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
        listWebcast(this.queryParams).then(response => {
            this.webcastList = response.data.data;
            // console.log(this.webcastList,'webcastListwebcastListwebcastList')
            console.log(this.webcastList,'webcastListwebcastListwebcastList')
            this.total = response.data.total;
            this.loading = false;
          }
        );
      },
      toLook() {
        this.$router.push('/meeting/webcast/Home/')
      toLook(id) {
        this.$router.push('/meeting/webcast/Home/' + id)
      }
    }
ruoyi-ui/src/views/system/user/index.vue
@@ -199,7 +199,7 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="用户性别">
              <el-select v-model="form.sex" placeholder="请选择性别">
              <el-select v-model="form.sex" placeholder="请选择性别" @change="getSex">
                <el-option
                  v-for="dict in dict.type.sys_user_sex"
                  :key="dict.value"
@@ -292,10 +292,10 @@
        </el-row>
        <el-row v-if="form.role != 2  && form.isMyFamily == 0">
        <el-row v-if="form.role == 102  && form.isMyFamily == 0">
          <el-col :span="12" >
             <el-form-item label="配偶信息" prop="spouseId" >
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息">
              <el-select v-model="form.spouseId"   placeholder="请选择配偶信息" @change="handleSpouse">
                <el-option
                  v-for="item in allInfo"
                  :key="item.userId"
@@ -512,15 +512,11 @@
    });
  },
  methods: {
    handleChange()
    {
   //   alert(this.fid)
    handleChange(){
      if(this.fid=="无")
        this.fid = "-1"
      if(this.fid!="-1")
      {
      if(this.fid!="-1"){
        //查询不是本家的时候,可以选择的配偶信息
       getInfoByFid(this.fid).then(response=>{
         console.log("--------------------")
         console.log(response.data)
@@ -533,6 +529,14 @@
      }
    },
    handleSpouse(value){
    },
    // 获取性别
    getSex(){
    },
    hanldeLoop(){
        let fid = this.form.fid
        let _this = this