From b6929a606c64d1b6063521ed8a183da88463a5e1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 12:11:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/api/meeting/index.js | 27 ++
ruoyi-ui/src/views/self/show.vue | 1
ruoyi-ui/src/views/pet/petnote.vue | 130 +++++++++++-
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 9
ruoyi-ui/src/views/meeting/webcast.vue | 309 ++++++++++++++++--------------
ruoyi-ui/src/views/secret/secretInfo.vue | 69 +++++-
ruoyi-ui/src/views/system/user/index.vue | 5
7 files changed, 378 insertions(+), 172 deletions(-)
diff --git a/ruoyi-ui/src/api/meeting/index.js b/ruoyi-ui/src/api/meeting/index.js
index 3e1ae4b..d6d4b42 100644
--- a/ruoyi-ui/src/api/meeting/index.js
+++ b/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',
+ })
+}
diff --git a/ruoyi-ui/src/views/meeting/webcast.vue b/ruoyi-ui/src/views/meeting/webcast.vue
index 4809e3d..109725a 100644
--- a/ruoyi-ui/src/views/meeting/webcast.vue
+++ b/ruoyi-ui/src/views/meeting/webcast.vue
@@ -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/')
}
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index b3f80f4..9ecd134 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -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("鍥剧墖涓婁紶鎴愬姛");
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index c3d9a85..eb150cb 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -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 = '绉佹湁'
});
// }
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index f09916a..3fcf0ce 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1916,6 +1916,7 @@
}
});
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ this.newOption=undefined
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 360cd77..d2337a7 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/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 = '鍚�'
});
}
},
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 86c97b2..83b2fbc 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/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">
@@ -560,6 +560,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;
}
--
Gitblit v1.9.1