From d80a5794d029c8a5fe58a80464ab0e1ae097c87c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 05 十二月 2023 21:52:03 +0800
Subject: [PATCH] 增加图像查看功能
---
ruoyi-ui/src/views/healthy/Examination.vue | 5
ruoyi-ui/src/views/travel/edit.vue | 5
ruoyi-ui/src/views/contacts/index.vue | 17 +
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 27 +-
ruoyi-ui/src/views/system/user/index.vue | 85 ++-----
ruoyi-ui/src/views/device/memo.vue | 5
ruoyi-ui/src/views/economy/index.vue | 5
ruoyi-ui/src/views/self/edit.vue | 5
ruoyi-ui/src/views/wish/index.vue | 5
ruoyi-ui/src/views/register.vue | 6
ruoyi-ui/src/views/pet/petnote.vue | 19 +
ruoyi-ui/.env.production | 2
ruoyi-ui/src/views/marry/edit.vue | 5
ruoyi-ui/src/views/pet/petInfo.vue | 5
ruoyi-ui/src/views/healthy/healthYear.vue | 5
ruoyi-ui/src/views/honor/honorInfo.vue | 5
ruoyi-ui/src/router/index.js | 10
ruoyi-ui/src/views/travel/travelInfo.vue | 5
ruoyi-ui/src/views/economy/economyInfo.vue | 19 +
ruoyi-ui/src/views/secret/secretInfo.vue | 19 +
ruoyi-ui/vue.config.js | 5
ruoyi-ui/src/utils/permission.js | 1
ruoyi-ui/src/views/pet/index.vue | 5
ruoyi-ui/src/views/collection/index.vue | 14
ruoyi-ui/src/views/wish/wishInfo.vue | 5
ruoyi-ui/.env.development | 2
ruoyi-ui/src/views/clean/index.vue | 17 +
ruoyi-ui/src/views/selfeconomy/index.vue | 5
ruoyi-ui/src/views/note/index.vue | 18 +
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 5
ruoyi-ui/src/views/travel/Info.vue | 5
ruoyi-ui/src/views/collection/collectionInfo.vue | 5
ruoyi-ui/src/views/travel/index.vue | 5
ruoyi-ui/src/views/self/memoInfo.vue | 5
ruoyi-ui/src/views/doctor/doctorInfo.vue | 5
ruoyi-ui/src/views/clean/cleanInfo.vue | 5
ruoyi-ui/src/views/contacts/contactsInfo.vue | 5
ruoyi-ui/src/views/secret/index.vue | 5
ruoyi-ui/src/views/pet/noteInfo.vue | 37 ++
ruoyi-ui/src/views/doctor/index.vue | 13
ruoyi-ui/src/views/self/show.vue | 5
ruoyi-ui/src/api/login.js | 2
ruoyi-ui/src/views/healthy/healthyInfo.vue | 65 +++++
ruoyi-ui/src/permission.js | 4
ruoyi-ui/src/views/marry/index.vue | 5
ruoyi-ui/src/views/note/memo.vue | 5
ruoyi-ui/src/views/bignote/index.vue | 15
ruoyi-ui/src/views/healthy/index.vue | 30 +-
ruoyi-ui/src/views/login.vue | 4
ruoyi-ui/src/views/device/equipmentInfo.vue | 19 +
ruoyi-ui/src/views/note/propertyInfo.vue | 19 +
ruoyi-ui/src/views/device/index.vue | 17 +
ruoyi-ui/src/views/healthy/ExaminationInfo.vue | 19 +
53 files changed, 472 insertions(+), 163 deletions(-)
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index af73f7e..6c3fd88 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -6,7 +6,7 @@
# 鑻ヤ緷绠＄悊绯荤粺/寮�鍙戠幆澧�
VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_TRUE_API = 'https://47.93.189.255:8080/'
+VUE_APP_BASE_TRUE_API = 'https://www.bendudu.com:8080/'
VUE_APP_BASE_OTHER_API = 'https://www.bendudu.com:8085/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index 76a00c0..8e4974b 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -6,5 +6,5 @@
# 鑻ヤ緷绠＄悊绯荤粺/鐢熶骇鐜
VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_TRUE_API = 'https://47.93.189.255:8080/'
+VUE_APP_BASE_TRUE_API = 'https://www.bendudu.com:8080/'
VUE_APP_BASE_OTHER_API = 'https://www.bendudu.com:8085/'
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 4086507..a08507b 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -50,7 +50,7 @@
// 鑾峰彇楠岃瘉鐮�
export function getCodeImg() {
- console.log("-----")
+
return request({
url: '/captchaImage',
headers: {
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index 97b88b2..93a20bd 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -24,11 +24,13 @@
// 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
store.dispatch('GetInfo').then(() => {
isRelogin.show = false
+ // alert(12)
store.dispatch('GenerateRoutes').then(accessRoutes => {
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
+ // alert(90)
console.log(accessRoutes)
router.addRoutes(accessRoutes) // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
- console.log(router)
+ // console.log(router)
next({ ...to, replace: true }) // hack鏂规硶 纭繚addRoutes宸插畬鎴�
})
}).catch(err => {
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 76f3836..32a1cf8 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -122,7 +122,7 @@
{
path: '/system/user-auth',
component: Layout,
- hidden: true,
+ hidden: false,
permissions: ['system:user:edit'],
children: [
{
@@ -664,7 +664,7 @@
{
path: '/system/role-auth',
component: Layout,
- hidden: true,
+ hidden: false,
permissions: ['system:role:edit'],
children: [
{
@@ -678,7 +678,7 @@
{
path: '/system/dict-data',
component: Layout,
- hidden: true,
+ hidden: false,
permissions: ['system:dict:list'],
children: [
{
@@ -692,7 +692,7 @@
{
path: '/monitor/job-log',
component: Layout,
- hidden: true,
+ hidden: false,
permissions: ['monitor:job:list'],
children: [
{
@@ -706,7 +706,7 @@
{
path: '/tool/gen-edit',
component: Layout,
- hidden: true,
+ hidden: false,
permissions: ['tool:gen:edit'],
children: [
{
diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js
index 1730e33..30d20f5 100644
--- a/ruoyi-ui/src/utils/permission.js
+++ b/ruoyi-ui/src/utils/permission.js
@@ -6,6 +6,7 @@
* @returns {Boolean}
*/
export function checkPermi(value) {
+ alert(value)
if (value && value instanceof Array && value.length > 0) {
const permissions = store.getters && store.getters.permissions
const permissionDatas = value
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 8063655..04ef621 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -407,22 +407,23 @@
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- this.uploading1= false;
+ _this.uploading1= false;
console.log(_this.fot.includes(pth))
// debugger
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
- let ul = this.fileList.map(function (elem){
+ 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){
+ let uls = _this.fileListOther.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
- this.formData.url = ul+","+uls
- console.log(this.formData.url)
- updateFamilyevent(this.formData).then(response => {
- this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ _this.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updateFamilyevent(_this.formData).then(response => {
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
// this.open = false;
});
@@ -443,7 +444,7 @@
this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- this.uploading = false;
+ _this.uploading = false;
// this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
@@ -453,15 +454,15 @@
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
- let ul = this.fileList.map(function (elem){
+ 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){
+ let uls = _this.fileListOther.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
- this.formData.url = ul+","+uls
- console.log(this.formData.url)
- updateFamilyevent(this.formData).then(response => {
+ _this.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ updateFamilyevent(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 502aa01..fc2402d 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -478,16 +478,21 @@
console.log(this.queryParams)
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
+ let _this = this
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listFamilyevent(this.queryParams).then(response => {
// alert(123)
- // console.log(response.data.data)
// alert(response.data.data[1].url)
- this.familyList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.familyList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
diff --git a/ruoyi-ui/src/views/clean/cleanInfo.vue b/ruoyi-ui/src/views/clean/cleanInfo.vue
index 2ceabbe..ce46f00 100644
--- a/ruoyi-ui/src/views/clean/cleanInfo.vue
+++ b/ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -192,7 +192,10 @@
return {
cdi:"璧勪骇璇︾粏淇℃伅",
udi:"璧勪骇淇℃伅淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 3d86bc6..6949e12 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -363,7 +363,9 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -487,14 +489,21 @@
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
+ let _this = this
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listClean(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.cleanList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.cleanList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index aa0e416..bf5f70c 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -219,7 +219,10 @@
return {
cdi:"鏀惰棌涓庤崳瑾夎缁嗕俊鎭�",
udi:"鏀惰棌涓庤崳瑾変俊鎭鎯�",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index f0d07ee..bb2b6ff 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -582,14 +582,20 @@
// console.log(this.queryParams)
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
+ let _this = this
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listCollection(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.collectionList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.collectionList = response.data.data;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
listType(this.queryParams).then(response => {
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 5df5f6b..a4ad996 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -213,7 +213,10 @@
return {
cdi:"閫氳褰曡缁嗕俊鎭�",
udi:"閫氳褰曚俊鎭鎯�",
- fot:[".jpg",".jif","png"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index fe9ea72..ec75261 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -416,7 +416,9 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -570,15 +572,22 @@
/** 鏌ヨ閫氳褰曞垪琛� */
getList() {
this.loading = true;
+ let _this = this
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
getContactList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.contactList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.contactList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 0ea9816..6cbc6cc 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -190,7 +190,10 @@
return {
cdi:"瀹跺涵璁惧淇℃伅",
udi:"瀹跺涵璁惧淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -444,6 +447,20 @@
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
}
+ 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.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updateEquipment(_this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
}
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index de2d743..cf06588 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -377,7 +377,9 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -508,13 +510,20 @@
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ let _this = this
listEquipment(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.equipmentList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.equipmentList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
diff --git a/ruoyi-ui/src/views/device/memo.vue b/ruoyi-ui/src/views/device/memo.vue
index 719c3ca..3b38ebc 100644
--- a/ruoyi-ui/src/views/device/memo.vue
+++ b/ruoyi-ui/src/views/device/memo.vue
@@ -122,7 +122,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index 92e5df0..e19a174 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -217,7 +217,10 @@
return {
cdi:"灏卞尰璁板綍璇︾粏淇℃伅",
udi:"灏卞尰璁板綍淇℃伅璇︽儏",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 540b65c..c7e50e6 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -520,14 +520,21 @@
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
+ let _this = this;
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listDoctor(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.doctorList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.doctorList = response.data.data;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
listType(this.queryParams).then(response => {
diff --git a/ruoyi-ui/src/views/economy/economyInfo.vue b/ruoyi-ui/src/views/economy/economyInfo.vue
index f8f6d3f..8770f7b 100644
--- a/ruoyi-ui/src/views/economy/economyInfo.vue
+++ b/ruoyi-ui/src/views/economy/economyInfo.vue
@@ -183,7 +183,10 @@
return {
cdi:"璧勪骇璇︾粏淇℃伅",
udi:"璧勪骇淇℃伅淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -425,6 +428,20 @@
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
}
+ 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.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updateEconomy(_this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
},
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 85ba0c9..c372b50 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -347,7 +347,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/healthy/Examination.vue b/ruoyi-ui/src/views/healthy/Examination.vue
index bece790..76774a5 100644
--- a/ruoyi-ui/src/views/healthy/Examination.vue
+++ b/ruoyi-ui/src/views/healthy/Examination.vue
@@ -302,7 +302,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[ ],
diff --git a/ruoyi-ui/src/views/healthy/ExaminationInfo.vue b/ruoyi-ui/src/views/healthy/ExaminationInfo.vue
index 98c8246..13775d0 100644
--- a/ruoyi-ui/src/views/healthy/ExaminationInfo.vue
+++ b/ruoyi-ui/src/views/healthy/ExaminationInfo.vue
@@ -159,7 +159,10 @@
return {
cdi:"鍋ュ悍璇︾粏淇℃伅",
udi:"鍋ュ悍淇℃伅淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -393,6 +396,20 @@
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
}
+ 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.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updateExamination(_this.formData).then(response => {
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
},
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index 801ab09..51378c3 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -938,7 +938,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index 155e626..3124fd9 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -100,7 +100,7 @@
list-type="picture-card"
:on-preview="handleFileCardPreview"
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
+ :http-request="requestUpload1"
:show-file-list="true"
:disabled="!btn"
:class="{ hide: !btn }"
@@ -177,7 +177,10 @@
return {
cdi:"鍋ュ悍璇︾粏淇℃伅",
udi:"鍋ュ悍淇℃伅淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -406,6 +409,48 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
+
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
+
+ if(_this.fot.includes(pth) === true)
+ {
+ _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ 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.formData.url = ul+","+uls
+
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ console.log(_this.formData.url)
+ alert(12)
+ updateHealth(_this.formData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ this.btn=false
+ });
+ }
+
+ else{
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+
+ })
+
+ }, requestUpload1(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
@@ -419,8 +464,24 @@
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ 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.formData.url = ul+","+uls
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ console.log(_this.formData.url)
+ updateHealth(_this.formData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ this.btn=false
+ });
}
+
})
},
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index 96f3d57..f714dc4 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -44,17 +44,7 @@
/>
</el-form-item>
- <el-button size="mini" type="text" @click="toYearhealthy" v-hasPermi="['person:healthy:healthYear']">
- <div class="form1" ><el-icon style="padding-right:100px;"></el-icon>
- <span class="text" style="width: 69px;height: 26px;font-size: 16px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鍋ュ悍鎯呭喌</span></div>
- </el-button>
- <el-button size="mini" type="text" @click="toExamination" v-hasPermi="['person:healthy:healthYear']">
- <div class="form2" ><el-icon style="padding-right:50px;"></el-icon>
- <span class="text" style="width: 69px;height: 26px;font-size: 16px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鍘嗗勾浣撴鎯呭喌</span></div>
- </el-button>
<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>
@@ -117,8 +107,23 @@
icon="el-icon-top">瀵煎叆</el-button>
</el-upload>
+
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <el-col></el-col>
+ <el-col>
+<el-button size="mini" type="text" @click="toYearhealthy" v-hasPermi="['person:healthy:healthYear']">
+ <div class="form1" ><el-icon style="padding-right:100px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鍋ュ悍鎯呭喌</span></div>
+ </el-button>
+
+ <el-button size="mini" type="text" @click="toExamination" v-hasPermi="['person:healthy:healthYear']">
+ <div class="form2" ><el-icon style="padding-right:50px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;margin-right: 20px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鍘嗗勾浣撴鎯呭喌</span></div>
+ </el-button>
+ </el-col>
</el-row>
<el-table v-loading="loading" :data="healthList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
@@ -343,7 +348,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[ ],
diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index 79d5644..d9dbf29 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -222,7 +222,10 @@
return {
cdi:"鑽ｈ獕璇佷功璇︾粏淇℃伅",
udi:"鑽ｈ獕璇佷功淇℃伅璇︽儏",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 30ca632..16f5071 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -183,7 +183,9 @@
},
methods: {
getCode() {
+
getCodeImg().then(res => {
+
this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.captchaEnabled;
if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.data.img;
@@ -247,7 +249,7 @@
align-items: center;
height: 100%;
width: 100%;
- background: no-repeat center/40% url("../assets/images/Group 221.png");
+ background: no-repeat center/40% url("../assets/images/login_logo.png");
background-color: #FEF7FC;
background-position: 183px 145px;
diff --git a/ruoyi-ui/src/views/marry/edit.vue b/ruoyi-ui/src/views/marry/edit.vue
index f809bdd..0bfc041 100644
--- a/ruoyi-ui/src/views/marry/edit.vue
+++ b/ruoyi-ui/src/views/marry/edit.vue
@@ -287,7 +287,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 5a69ee0..0721a19 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -619,7 +619,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index a678ddd..fde3f82 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -377,7 +377,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -487,14 +490,21 @@
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
+ let _this = this
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listProperty(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.propertyList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.propertyList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index 5dd578a..7199237 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -130,7 +130,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/note/propertyInfo.vue b/ruoyi-ui/src/views/note/propertyInfo.vue
index 87369b8..0f23d60 100644
--- a/ruoyi-ui/src/views/note/propertyInfo.vue
+++ b/ruoyi-ui/src/views/note/propertyInfo.vue
@@ -187,7 +187,10 @@
return {
cdi:"璧勪骇璇︾粏淇℃伅",
udi:"璧勪骇淇℃伅淇敼",
- fot:[".jpg",".jif",".png"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -424,6 +427,20 @@
else{
_this.fileListOther.push({"name":response.data.fileName, "url":response.data.url})
}
+ 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.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updateProperty(_this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
}
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 24f8d11..5926caf 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -364,7 +364,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList1:[ ],
fileList2:[ ],
fileListOther:[ ],
diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index 47102e2..9d53ee6 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/ruoyi-ui/src/views/pet/noteInfo.vue
@@ -33,6 +33,8 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -84,6 +86,8 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
>
<div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading" slot="default" class="el-icon-plus"></i>
@@ -156,7 +160,10 @@
return {
cdi:"榄呭疇澶囧繕鏈缁嗕俊鎭�",
udi:"榄呭疇澶囧繕鏈俊鎭慨鏀�",
- fot:[".jpg",".jif",".png"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -224,13 +231,14 @@
this.btn= jd
this.dsb = !jd
this.isShow=true
- document.title = "淇敼璧勪骇璇︾粏淇℃伅";
- this.$route.meta.title = "淇敼璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "淇敼榄呭疇澶囧繕褰曡缁嗕俊鎭�";
+ this.$route.meta.title = "淇敼榄呭疇澶囧繕褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "瀹跺涵璧勪骇璇︾粏淇℃伅";
- this.$route.meta.title = "瀹跺涵璧勪骇璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ document.title = "榄呭疇澶囧繕褰曡缁嗕俊鎭�";
+ this.$route.meta.title = "榄呭疇澶囧繕褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
this.isShow=false
+ this.btn = false;
}
let _this = this
@@ -372,6 +380,20 @@
else{
_this.fileListOther.push({"name":response.data.fileName, "url":response.data.url})
}
+ 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.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updatenotePet(_this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
}
@@ -380,7 +402,7 @@
}
</script>
-<style>
+<style scoped>
.mt
{
position: relative;
@@ -389,6 +411,9 @@
display: block;
}
+.hide /deep/ .el-upload--picture-card {
+ display: none;
+}
.form{
background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index d632131..3170d8d 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -394,7 +394,10 @@
return {
cdi:"榄呭疇璇︾粏淇℃伅",
udi:"榄呭疇淇℃伅淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index 4b826d0..9de585f 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -277,7 +277,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -515,6 +518,20 @@
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
}
+ 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.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updatenotePet(_this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
},
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 35d3730..267e6dd 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -115,8 +115,8 @@
getCodeImg().then(res => {
this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
if (this.captchaEnabled) {
- this.codeUrl = "data:image/gif;base64," + res.img;
- this.registerForm.uuid = res.uuid;
+ this.codeUrl = "data:image/gif;base64," + res.data.img;
+ this.registerForm.uuid = res.data.uuid;
}
});
},
@@ -145,7 +145,7 @@
};
</script>
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" scoped>
.register {
display: flex;
justify-content: center;
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 348add2..4cb6a08 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -385,7 +385,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/secret/secretInfo.vue b/ruoyi-ui/src/views/secret/secretInfo.vue
index cae9dbb..7f26f74 100644
--- a/ruoyi-ui/src/views/secret/secretInfo.vue
+++ b/ruoyi-ui/src/views/secret/secretInfo.vue
@@ -188,7 +188,10 @@
return {
cdi:"闅愮璇︾粏淇℃伅",
udi:"闅愮淇℃伅淇敼",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -448,6 +451,20 @@
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
}
+ 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.formData.url = ul+","+uls
+ console.log(_this.formData.url)
+ // alert(87)
+ updateSecret(_this.formData).then(response => {
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
})
},
diff --git a/ruoyi-ui/src/views/self/edit.vue b/ruoyi-ui/src/views/self/edit.vue
index bcad2bf..73f6c97 100644
--- a/ruoyi-ui/src/views/self/edit.vue
+++ b/ruoyi-ui/src/views/self/edit.vue
@@ -284,7 +284,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index 3721f4c..4a95f02 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -192,7 +192,10 @@
return {
cdi:"涓汉璁颁簨鏈鎯�",
udi:"涓汉璁颁簨鏈鎯�",
- fot:[".jpg",".jif","png"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 3a91ab7..fa51a96 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -821,7 +821,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 08133c8..b02569d 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -408,7 +408,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 3a194fa..313c675 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -225,7 +225,10 @@
return {
cdi:"涓汉璐骇璇︾粏淇℃伅",
udi:"涓汉璐骇淇℃伅璇︽儏",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index e47f663..a00c67d 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -2,31 +2,7 @@
<div class="app-container">
<el-row :gutter="20">
<!--閮ㄩ棬鏁版嵁-->
- <el-col :span="4" :xs="24">
- <div class="head-container">
- <el-input
- v-model="deptName"
- placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
- clearable
- size="small"
- prefix-icon="el-icon-search"
- style="margin-bottom: 20px"
- />
- </div>
- <div class="head-container">
- <el-tree
- :data="deptOptions"
- :props="defaultProps"
- :expand-on-click-node="false"
- :filter-node-method="filterNode"
- ref="tree"
- node-key="id"
- default-expand-all
- highlight-current
- @node-click="handleNodeClick"
- />
- </div>
- </el-col>
+
<!--鐢ㄦ埛鏁版嵁-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -141,7 +117,7 @@
<el-table-column label="鐢ㄦ埛缂栧彿" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="鐢ㄦ埛鍚嶇О" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="鐢ㄦ埛鏄电О" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
- <el-table-column label="閮ㄩ棬" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+
<el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="鐘舵��" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope">
@@ -212,17 +188,28 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
- <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
+ <el-form-item label="瑙掕壊" prop="roleIds">
+ <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊">
+ <el-option
+ v-for="item in roleOptions"
+ :key="item.roleId"
+ :label="item.roleName"
+ :value="item.roleId"
+ :disabled="item.status == 1"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-col>
+
</el-row>
<el-row>
- <el-col :span="12">
- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input v-model="form.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" />
- </el-form-item>
- </el-col>
+
+ <el-col :span="12">
+ <el-form-item label="瀹跺涵鍙�">
+ <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="璇烽�夋嫨瀹跺涵鍙�" />
+ </el-form-item>
+ </el-col>
+
<el-col :span="12">
<el-form-item label="閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" maxlength="50" />
@@ -268,29 +255,8 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="宀椾綅">
- <el-select v-model="form.postIds" multiple placeholder="璇烽�夋嫨宀椾綅">
- <el-option
- v-for="item in postOptions"
- :key="item.postId"
- :label="item.postName"
- :value="item.postId"
- :disabled="item.status == 1"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="瑙掕壊">
- <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊">
- <el-option
- v-for="item in roleOptions"
- :key="item.roleId"
- :label="item.roleName"
- :value="item.roleId"
- :disabled="item.status == 1"
- ></el-option>
- </el-select>
+ <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
+ <el-input v-model="form.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" />
</el-form-item>
</el-col>
</el-row>
@@ -431,6 +397,13 @@
nickName: [
{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }
],
+ roleIds: [
+ { required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ deptId: [
+ { required: true, message: "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+
password: [
{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
{ min: 5, max: 20, message: '鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿', trigger: 'blur' }
diff --git a/ruoyi-ui/src/views/travel/Info.vue b/ruoyi-ui/src/views/travel/Info.vue
index b11bfdf..e07b9a8 100644
--- a/ruoyi-ui/src/views/travel/Info.vue
+++ b/ruoyi-ui/src/views/travel/Info.vue
@@ -354,7 +354,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/travel/edit.vue b/ruoyi-ui/src/views/travel/edit.vue
index 2db2d43..3733627 100644
--- a/ruoyi-ui/src/views/travel/edit.vue
+++ b/ruoyi-ui/src/views/travel/edit.vue
@@ -65,7 +65,10 @@
return {
cdi:"鏃呮父璐圭敤淇℃伅",
udi:"鏃呮父璐圭敤淇敼",
- fot:[".jpg",".jif","png"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index a33bfc4..15fe14c 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -508,7 +508,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue
index 19fbbda..f2b90d6 100644
--- a/ruoyi-ui/src/views/travel/travelInfo.vue
+++ b/ruoyi-ui/src/views/travel/travelInfo.vue
@@ -205,7 +205,10 @@
return {
cdi:"瀹跺涵澶т簨璁颁俊鎭�",
udi:"瀹跺涵澶т簨璁颁慨鏀�",
- fot:[".jpg",".jif","png"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 777ca5a..83d3902 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -409,7 +409,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
diff --git a/ruoyi-ui/src/views/wish/wishInfo.vue b/ruoyi-ui/src/views/wish/wishInfo.vue
index 078c91c..b2ac220 100644
--- a/ruoyi-ui/src/views/wish/wishInfo.vue
+++ b/ruoyi-ui/src/views/wish/wishInfo.vue
@@ -215,7 +215,10 @@
return {
cdi:"鐧惧勾蹇冩効璇︾粏淇℃伅",
udi:"鐧惧勾蹇冩効淇℃伅璇︽儏",
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[],
fileListOther:[],
dsb:true,
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 69186eb..1407625 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -33,9 +33,10 @@
port: port,
open: true,
proxy: {
- // detail: https://cli.vuejs.org/config/#devserver-proxy
+ // detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `https://47.93.189.255:8080/`,
+ //target: `https://10.39.18.174:8080/`,
+ target: `https://www.bendudu.com:8080/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.1