| ruoyi-ui/src/api/meeting/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/meeting/webcast.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/pet/petnote.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/secret/secretInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/self/show.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/system/user/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-ui/src/api/meeting/index.js
@@ -15,7 +15,6 @@ return request({ url: '/zMeeting/' + id, method: 'get', }) } @@ -120,6 +119,32 @@ params: query }) } // ------------------------------------------------ // 直播 // 直播申请新增 export function addWebcast(data) { return request({ url: '/zLiveStreaming', method: 'post', data: data }) } // 查询所有直播 export function listWebcast(query) { return request({ url: '/zLiveStreaming/all', method: 'get', params: query }) } // 根据id进入直播 export function getWebcastInfo(id) { return request({ url: '/zLiveStreaming/' + id, method: 'get', }) }
@@ -22,161 +22,94 @@ <hr> <!-- 搜索 --> <el-form :model="queryParams1"> <el-row> <el-form-item label="" prop="people"> <el-input v-model="queryParams1.people" placeholder="请输入搜索内容" clearable style="width: 300px; <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="直播标题" prop="title"> <el-input v-model="queryParams.title" placeholder="请输入直播标题" clearable style="width: 200px; height: 35px; text-align: left; border-radius: 16px 16px 16px 16px; opacity: 0.5;" @keyup.enter.native="handleQuery"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input> </el-form-item> </el-row> opacity: 0.5;" @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item> <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3; border-radius: 6px 6px 6px 6px;opacity:1;">搜索</el-button> <el-button size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius: 6px 6px 6px 6px; opacity: 1;">重置</el-button> </el-form-item> </el-form> <el-row :gutter="0"> <el-col :span="4"> <el-row :gutter="0" v-loading="loading"> <el-col :span="4" v-for="(item,i) in webcastList"> <div class="module" @click="toLook"> <div class="video"> 66666666 </div> <span class="span1">中秋家庭会议</span> <span class="span1">{{ item.title }}</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> <p class="author">{{ item.applyPerson }}</p> </div> </el-col> <el-col :span="4"> <div class="module"> <div class="video"> 66666666 </div> <span class="span1">中秋家庭会议</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> </div> </el-col> <el-col :span="4"> <div class="module"> <div class="video"> 66666666 </div> <span class="span1">中秋家庭会议</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> </div> </el-col> <el-col :span="4"> <div class="module"> <div class="video"> 66666666 </div> <span class="span1">中秋家庭会议</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> </div> </el-col> <el-col :span="4"> <div class="module"> <div class="video"> </div> <span class="span1">中秋家庭会议</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> </div> </el-col> <el-col :span="4"> <div class="module"> <div class="video"> 66666666 </div> <span class="span1">中秋家庭会议</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> </div> </el-col> <el-col :span="4"> <div class="module"> <div class="video"> 66666666 </div> <span class="span1">中秋家庭会议</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> </div> </el-col> <el-col :span="4"> <div class="module"> <div class="video"> 66666666 </div> <span class="span1">中秋家庭会议</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> </div> </el-col> <el-col :span="4"> <div class="module"> <div class="video"> 66666666 </div> <span class="span1">中秋家庭会议</span> <div class="tubiao"><i class="el-icon-view">10000</i></div> <p class="author">发起者</p> </div> </el-col> </el-row> <pagination v-show="total>0" :total="total" :page-sizes="pageSizes" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" style="background: #FEF7FC;" /> <!-- 直播申请对话框 --> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> <!-- <el-form-item label="获得时间" prop="happenTime">--> <!-- <el-input v-model="formDat.happenTime" placeholder="请输入获得时间" clearable :style="{width: '100%'}" ></el-input>--> <!-- </el-form-item>--> <!-- <el-form-item label="开始时间" prop="happenTime"> </el-form-item> --> <el-form-item label="时间" prop="timeSpan"> <el-date-picker v-model="formDat.timeSpan" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"> <el-form-item label="开始时间" prop="startTime"> <el-date-picker v-model="formDat.startTime" type="datetime" placeholder="选择开始时间" value-format="yyyy-MM-dd HH:mm:ss"> </el-date-picker> </el-form-item> <el-form-item label="会议标题" prop="meetingTitle"> <el-form-item label="结束时间" prop="endTime"> <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="选择开始时间" value-format="yyyy-MM-dd HH:mm:ss"> </el-date-picker> </el-form-item> <!-- <el-form-item label="开始时间" prop="startTime"> <el-date-picker v-model="formDat.startTime" type="datetime" placeholder="选择开始时间" value-format="yyyy-MM-dd HH:mm:ss"> </el-date-picker> </el-form-item> <el-form-item label="持续时间" prop="meetingTitle"> <el-input v-model="formDat.meetingTitle" placeholder="请输入会议标题" clearable :style="{width: '100%'}"> </el-input> </el-form-item> <!-- <el-form-item label="会议地点" prop="address"> <el-input v-model="formDat.address" placeholder="请输入会议地点" clearable :style="{width: '100%'}"> </el-input> </el-form-item> --> <!-- <el-form-item label="会议室代码" prop="meetingID"> <el-input v-model="formDat.meetingID" placeholder="请输入会议室代码" clearable :style="{width: '100%'}"> </el-input> </el-form-item> --> <!-- <el-form-item label="可容纳人数" prop="capacity"> <el-input v-model="formDat.capacity" placeholder="请输入可容纳人数" clearable :style="{width: '100%'}"> </el-input> </el-form-item> --> <!-- <el-form-item label="参与人数" prop="attendance"> <el-input v-model="formDat.attendance" placeholder="请输入参与人数" clearable :style="{width: '100%'}"> </el-input> </el-form-item> --> <el-form-item label="申请人" prop="applicant"> <el-input v-model="formDat.applicant" placeholder="请输入申请人" clearable :style="{width: '100%'}"> <el-form-item label="会议标题" prop="title"> <el-input v-model="formDat.title" placeholder="请输入会议标题" clearable :style="{width: '100%'}"> </el-input> </el-form-item> <!-- <el-form-item label="申请家庭或部门" prop="familyName"> <el-input v-model="formDat.familyName" placeholder="请输入申请家庭或部门" clearable :style="{width: '100%'}"> </el-input> </el-form-item> --> <el-form-item label="联系人" prop="name"> <el-input v-model="formDat.name" placeholder="请输入联系人" clearable :style="{width: '100%'}"> <el-form-item label="申请人" prop="applyPerson"> <el-input v-model="formDat.applyPerson" placeholder="请输入申请人" clearable :style="{width: '100%'}"> </el-input> </el-form-item> <el-form-item label="联系电话" prop="phone"> <el-input v-model="formDat.phone" placeholder="请输入联系电话" clearable :style="{width: '100%'}"></el-input> <el-form-item label="联系人" prop="contactPerson"> <el-input v-model="formDat.contactPerson" placeholder="请输入联系人" clearable :style="{width: '100%'}"> </el-input> </el-form-item> <el-form-item label="联系电话" prop="contactPhone"> <el-input v-model="formDat.contactPhone" placeholder="请输入联系电话" clearable :style="{width: '100%'}"></el-input> </el-form-item> </el-form> @@ -190,31 +123,78 @@ </div> </template> <script> import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"; import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"; import { Notification, MessageBox, Message, Loading } from 'element-ui' //导入接口函数 --接好了 import { addWebcast, listWebcast, getWebcastInfo } from "@/api/meeting/index"; export default { /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; this.getList(); }, /** 重置按钮操作 */ resetQuery() { this.dateRange = []; this.resetForm("queryForm"); this.handleQuery(); }, created() { this.getList(); }, data() { return { queryParams1: [], pageSizes: [12, 24, 36], webcastList:[], // 总条数 total: 0, loading: true, dateRange: [], queryParams: { pageNum: 1, pageSize: 12, title: undefined, applyPerson: undefined, contactPerson: undefined, happenStartTime: undefined, happenEndTime: undefined }, // 弹出层标题 title: "", // 是否显示弹出层 open: false, formDat: { id: undefined, happenTime: undefined, startTime: undefined, endTime: undefined, timeSpan: undefined, meetingTitle: undefined, address: undefined, meetingID: undefined, capacity: undefined, attendance: undefined, applicant: undefined, familyName: undefined, name: undefined, phone: undefined, url: "", title: undefined, applyPerson: undefined, contactPerson: undefined, contactPhone: undefined, createTime: undefined }, } @@ -229,10 +209,45 @@ this.open = false; // this.reset(); }, submitDataScope() { console.log(this.formDat.timeSpan) submitDataScope: function() { this.$refs["elForm"].validate(valid => { if (valid) { addWebcast(this.formDat).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; // 清空formDat对象的数据 Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); // for(let i = 0; i <= this.fileList.length; i++) // { // this.handleRemove(this.fileList[0]); // } // for(let i = 0; i < this.fileListOther.length; i++){ // this.handleRemoveFile(this.fileListOther[0]); // } this.getList(); }); } }); }, toLook(){ getList() { this.loading = true; // console.log(this.queryParams) // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0] 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') this.total = response.data.total; this.loading = false; } ); }, toLook() { this.$router.push('/meeting/webcast/webcastInfo/') }
@@ -181,12 +181,12 @@ :preview-src-list="[file.url]" > <span class="el-upload-list__item-actions"> <span <!-- <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)" > <i class="el-icon-zoom-in"></i> </span> </span> --> <span v-if="!disabled" @@ -220,11 +220,54 @@ list-type="picture-card" :http-request="requestUpload1" > <el-button type="primary">点击上传</el-button> <!-- <el-button type="primary">点击上传</el-button> --> <template #tip> <div class="el-upload__tip"> </div> </template> <i v-if="true" slot="default" class="el-icon-plus"></i> <div slot="file" slot-scope="{file}"> <!-- 添加video元素用于显示视频 --> <video v-if="file.url.includes('.mp4')" class="el-upload-list__item-thumbnail" :src="file.url" style="width: 147px; height: 147px" fit="cover" ></video> <img v-else class="el-upload-list__item-thumbnail" src="../../assets/images/deviceLis.png" alt="" style="width: 100%; height: 100%" fit="cover"> <span class="el-upload-list__item-actions"> <span class="el-upload-list__item-name">{{ file.name }}</span> <!-- <span class="el-upload-list__item-preview" @click="handleFileCardPreview(file)" > <i class="el-icon-zoom-in"></i> </span> <span class="el-upload-list__item-delete" @click="handleDownload(file.url)" > <i class="el-icon-download"></i> </span> --> <span class="el-upload-list__item-delete" @click="handleRemoveFile2(file)" > <i class="el-icon-delete"></i> </span> </span> </div> </el-upload> <el-button @@ -389,7 +432,59 @@ return "statistics-warning-row"; } }, handleRemoveFile2(file) { this.formData=this.formDat //判读是否是之前的图片 let res = false for(let i = 0; i < this.fileListOther.length; i++) { if(this.fileListOther[i].url==file.url) { if(this.fileListOther[i].res==false) res = true else { this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1)) } this.$delete(this.fileListOther,i); } } let ul = "" this.fileList.map(function (elem){ if(elem.res==false) ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }) let uls = "" this.fileListOther.map(function (elem){ if(elem.res==false) uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") }) this.formData.url = ul+","+uls; // alert(this.formData.url) if(res==true){ updateNote(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); // this.open = false; }); } }, // 下载按钮 handleDownload(url) { var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")}; let lens = formData.path.split(".") let suffix = lens[lens.length-1] download(formData).then(async (response) => { const isLogin = await blobValidate(response); let nt = new Date().getTime() let filename = 'familyevent_'+nt+'.'+suffix const blob = new Blob([response]) saveAs(blob, filename) }) }, /** 查询角色列表 */ getList() { @@ -471,7 +566,7 @@ deptCheckStrictly: true, remark: undefined }; this.resetForm("form"); this.resetForm("elForm"); }, // 多选框选中数据 @@ -500,6 +595,17 @@ } }); }, // 查看文件 handleFileCardPreview(file){ this.dialogFileUrl = file.url; if(this.dialogFileUrl.includes("47.93.189.255")==true) this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com") //alert(this.dialogFileUrl) const Base64 = require('js-base64').Base64 this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl)); let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300'); }, /** 查看详细信息 */ handleCheck(row){ const id = row.id; @@ -514,12 +620,7 @@ /** 提交按钮（数据权限） */ submitDataScope: function() { const pid = this.$route.params && this.$route.params.id; // let ul = this.fileList.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") // }).join(",") // let uls = this.fileListOther.map(function (elem){ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") // }).join(",") this.formDat.pid = pid; // console.log(this.formDat,'formDatformDatformDatformDat') // this.formDat.url = ul+","+uls @@ -537,6 +638,13 @@ Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); for(let i = 0; i <= this.fileList.length; i++) { this.handleRemove(this.fileList[0]); } for(let i = 0; i < this.fileListOther.length; i++){ this.handleRemoveFile(this.fileListOther[0]); } }, handleChange(file, fileList1) { //定义一个全局数组uploadFileList来做存储 @@ -607,7 +715,7 @@ uploadPic(formData).then(response => { // alert("dds") _this.formDat.url = _this.formDat.url+","+response.fileNames alert(_this.formDat.url) // alert(_this.formDat.url) _this.uploadFileList = [] _this.$modal.msgSuccess("图片上传成功");
@@ -355,6 +355,7 @@ this.loading = true; getSecretInfo({id}).then((response) => { _this.formData = response.data; console.log(_this.formData,'123') if(_this.formData.isFinger==1) _this.formData.isFinger = '是' else @@ -546,17 +547,17 @@ }); } else { if(this.formData.isFinger==1) this.formData.isFinger = '是' else this.formData.isFinger = '否' this.formData.isFinger = '是' else this.formData.isFinger = '否' if(this.formData.isFace==1) this.formData.isFace = '是' else this.formData.isFace = '否' if(this.formData.isPrivate==0) this.formData.isPrivate = '公有' else this.formData.isPrivate = '私有' this.formData.isFace = '是' else this.formData.isFace = '否' if(this.formData.isPrivate==0) this.formData.isPrivate = '公有' else this.formData.isPrivate = '私有' this.$modal.msgSuccess("修改失败"); } @@ -624,6 +625,18 @@ updateSecret(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); // this.open = false; if(this.formData.isFinger==1) this.formData.isFinger = '是' else this.formData.isFinger = '否' if(this.formData.isFace==1) this.formData.isFace = '是' else this.formData.isFace = '否' if(this.formData.isPrivate==0) this.formData.isPrivate = '公有' else this.formData.isPrivate = '私有' }); } @@ -680,6 +693,18 @@ this.formData.isPrivate = 1 updateSecret(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); if(this.formData.isFinger==1) this.formData.isFinger = '是' else this.formData.isFinger = '否' if(this.formData.isFace==1) this.formData.isFace = '是' else this.formData.isFace = '否' if(this.formData.isPrivate==0) this.formData.isPrivate = '公有' else this.formData.isPrivate = '私有' }); } @@ -778,6 +803,18 @@ _this.formData.isPrivate = 1 updateSecret(_this.formData).then(response => { this.$modal.msgSuccess("文档上传成功"); if(this.formData.isFinger==1) this.formData.isFinger = '是' else this.formData.isFinger = '否' if(this.formData.isFace==1) this.formData.isFace = '是' else this.formData.isFace = '否' if(this.formData.isPrivate==0) this.formData.isPrivate = '公有' else this.formData.isPrivate = '私有' // this.open = false; this.getData() this.fileListOther1=[] @@ -840,6 +877,18 @@ updateSecret(_this.formData).then(response => { _this.$modal.msgSuccess("图片上传成功"); // this.open = false; if(this.formData.isFinger==1) this.formData.isFinger = '是' else this.formData.isFinger = '否' if(this.formData.isFace==1) this.formData.isFace = '是' else this.formData.isFace = '否' if(this.formData.isPrivate==0) this.formData.isPrivate = '公有' else this.formData.isPrivate = '私有' }); // } ruoyi-ui/src/views/self/show.vue
@@ -1916,6 +1916,7 @@ } }); // 清空formDat对象的数据 this.newOption=undefined Object.keys(this.formDat).forEach(key => { this.formDat[key] = ''; }); ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -581,7 +581,10 @@ updateSelfEconomy(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); // this.open = false; if(this.formData.status==1) this.formData.status = '是' else this.formData.status = '否' }); } }, @@ -626,6 +629,10 @@ this.formData.status = 0 updateSelfEconomy(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); if(this.formData.status==1) this.formData.status = '是' else this.formData.status = '否' }); } }, ruoyi-ui/src/views/system/user/index.vue
@@ -87,7 +87,7 @@ :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']" >删除</el-button> >停用</el-button> </el-col> <el-col :span="1.5"> <el-button @@ -154,7 +154,7 @@ icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']" >删除</el-button> >停用</el-button> <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']"> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-dropdown-menu slot="dropdown"> @@ -563,6 +563,7 @@ this.loading = true; listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.userList = response.rows; console.log(this.userList,'userList') this.total = response.total; this.loading = false; }
