From fd08342ac7b11db592ed04b2cbc51eac748d7535 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 27 五月 2024 16:15:00 +0800
Subject: [PATCH] 修改到293
---
ruoyi-ui/package.json | 8 +-
ruoyi-ui/src/views/contacts/index.vue | 2
ruoyi-ui/src/views/pet/petInfo.vue | 57 +++++++++++++++----
ruoyi-ui/src/views/pet/index.vue | 12 ++--
ruoyi-ui/src/views/meeting/meetingInfo.vue | 89 ++++++++++++++++++++++-------
5 files changed, 124 insertions(+), 44 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 17cdd09..17c25db 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -36,13 +36,11 @@
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
},
"dependencies": {
- "core-js": "3.25.3",
- "aegis-web-sdk": "^1.35.26",
- "trtc-js-sdk": "latest",
- "vue-i18n": "^8.26.3",
"@riophae/vue-treeselect": "0.4.0",
+ "aegis-web-sdk": "^1.39.1",
"axios": "0.24.0",
"clipboard": "2.0.8",
+ "core-js": "3.25.3",
"d3": "^7.8.5",
"echarts": "^5.5.0",
"element-ui": "2.15.12",
@@ -58,9 +56,11 @@
"quill": "1.3.7",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
+ "trtc-js-sdk": "^4.15.21",
"vue": "2.6.12",
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
+ "vue-i18n": "^8.28.2",
"vue-meta": "2.4.0",
"vue-print-nb": "^1.7.5",
"vue-router": "3.4.9",
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 3ea83a5..a29c603 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -546,7 +546,7 @@
trigger: 'blur'
}],
isAlways: [{
- // required: true,
+ required: true,
message: '鏄惁甯歌仈绯�',
trigger: 'blur'
}],
diff --git a/ruoyi-ui/src/views/meeting/meetingInfo.vue b/ruoyi-ui/src/views/meeting/meetingInfo.vue
index 3fd0e09..4938380 100644
--- a/ruoyi-ui/src/views/meeting/meetingInfo.vue
+++ b/ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -59,20 +59,20 @@
</el-form-item>
</el-cow> -->
<el-cow>
- <el-form-item label="鍙绾充汉鏁�" prop="conPeople" label-width="90px"
+ <el-form-item label="鍙绾充汉鏁�" prop="conPeople" label-width="100px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-if="!dsb" v-model="formData.conPeople" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-if="!dsb" type="number" v-model="formData.conPeople" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
- <el-input v-if="dsb" v-model="formData.conPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-if="dsb" type="number" v-model="formData.conPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
<el-cow>
<el-form-item label="鍙備笌浜烘暟" prop="partPeople" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-if="!dsb" v-model="formData.partPeople" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-if="!dsb" type="number" v-model="formData.partPeople" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
- <el-input v-if="dsb" v-model="formData.partPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-input v-if="dsb" type="number" v-model="formData.partPeople" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
@@ -86,7 +86,7 @@
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="瀹跺涵鎴栭儴闂�" prop="applyApart" label-width="90px"
+ <el-form-item label="瀹跺涵鎴栭儴闂�" prop="applyApart" label-width="100px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-if="!dsb" v-model="formData.applyApart" placeholder="璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
@@ -197,22 +197,69 @@
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
+ // 琛ㄥ崟鏍￠獙
rules: {
- // title: [{
- // required: true,
- // message: '璇疯緭鍏ヤ細璁爣棰�',
- // trigger: 'blur'
- // }],
- // startTime: [{
- // required: true,
- // message: '璇烽�夋嫨寮�濮嬫椂闂�',
- // trigger: 'blur'
- // }],
- // endTime: [{
- // required: true,
- // message: '璇烽�夋嫨缁撴潫鏃堕棿',
- // trigger: 'blur'
- // }]
+ startTime: [{
+ required: true,
+ message: '璇疯緭鍏ュ紑濮嬫椂闂�',
+ trigger: 'blur'
+ }],
+ endTime: [{
+ required: true,
+ message: '璇疯緭鍏ョ粨鏉熸椂闂�',
+ trigger: 'blur'
+ }],
+ title: [{
+ required: true,
+ message: '璇疯緭鍏ユ爣棰�',
+ trigger: 'blur'
+ }],
+ place: [{
+ required: true,
+ message: '璇疯緭鍏ュ湴鐐�',
+ trigger: 'blur'
+ }],
+ conPeople: [{
+ required: true,
+ message: '璇疯緭鍏ュ彲瀹圭撼浜烘暟',
+ trigger: 'blur'
+ }],
+ partPeople: [{
+ required: true,
+ message: '璇疯緭鍏ュ弬涓庝汉鏁�',
+ trigger: 'blur'
+ }],
+ applyPerson: [{
+ required: true,
+ message: '璇疯緭鍏ョ敵璇蜂汉',
+ trigger: 'blur'
+ }],
+ applyApart: [{
+ required: true,
+ message: '璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬',
+ trigger: 'blur'
+ }],
+ isPlacebrand: [{
+ required: true,
+ message: '璇烽�夋嫨鏄惁鎷滆姘寸墝',
+ trigger: 'blur'
+ }],
+ connPerson: [{
+ required: true,
+ message: '璇疯緭鍏ヨ仈绯讳汉',
+ trigger: 'blur'
+ }],
+ connPhone: [{
+ required: true,
+ message: '璇疯緭鍏ヨ仈绯荤數璇�',
+ trigger: 'blur'
+ }],
+ statu: [{
+ required: true,
+ message: '璇烽�夋嫨鐘舵��',
+ trigger: 'blur'
+ }],
+
},
typeOptions: [
{
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index b622638..07c53ad 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -452,22 +452,22 @@
animal: [{
required: true,
message: '璇疯緭鍏ョ绫�',
- trigger: 'blue'
+ trigger: 'blur'
}],
idNum: [{
required: true,
message: '璇疯緭鍏ヨ瘉浠跺彿鐮�',
- trigger: 'blue'
+ trigger: 'blur'
}],
securityCode: [{
// required: true,
message: '璇疯緭鍏ラ槻浼爜',
- trigger: 'blue'
+ trigger: 'blur'
}],
name: [{
required: true,
message: '璇疯緭鍏ュ悕瀛�',
- trigger: 'blue'
+ trigger: 'blur'
}],
birth: [{
required: true,
@@ -477,12 +477,12 @@
color: [{
required: true,
message: '璇疯緭鍏ラ鑹�',
- trigger: 'blue'
+ trigger: 'blur'
}],
properties: [{
// required: true,
message: '璇疯緭鍏ユ�ц川',
- trigger: 'blue'
+ trigger: 'blur'
}],
sex: [{
required: true,
diff --git a/ruoyi-ui/src/views/pet/petInfo.vue b/ruoyi-ui/src/views/pet/petInfo.vue
index 00d936b..1db0969 100644
--- a/ruoyi-ui/src/views/pet/petInfo.vue
+++ b/ruoyi-ui/src/views/pet/petInfo.vue
@@ -615,21 +615,23 @@
);
},
- requestUpload2(params)
- {
- var file = params.file;
- var formData = new FormData();
+ // requestUpload2(params)
+ // {
+ // var file = params.file;
+ // var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
+ // formData.append('uploadFile', file);
+ // let _this = this
- uploadPic1(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
- _this.fileList2.push({name:response.data.fileName, url:response.data.url})
- console("ok")
- })
- },
+ // uploadPic1(formData).then(response => {
+ // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ // _this.fileList2.push({name:response.data.fileName, url:response.data.url})
+ // console("ok")
+ // })
+
+
+ // },
submitForm() {
// let ul = this.fileList1.map(function (elem){
@@ -645,13 +647,25 @@
if (valid) {
if (this.petList.id != undefined) {
+ if(this.petList.sex=='闆勬��')
+ this.petList.sex = 1
+ else
+ this.petList.sex = 0
updatePet(this.petList).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
+ if(this.petList.sex==1)
+ this.petList.sex = '闆勬��'
+ else
+ this.petList.sex = '闆屾��'
this.btn=false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
+ if(this.petList.sex==1)
+ this.petList.sex = '闆勬��'
+ else
+ this.petList.sex = '闆屾��'
}
}
@@ -764,18 +778,28 @@
// console("ok")
// alert(90)
// alert(response.data.url)
+ if(this.petList.sex=='闆勬��')
+ this.petList.sex = 1
+ else
+ this.petList.sex = 0
_this.petList.fullPicture = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
updatePet(_this.petList).then(response => {
_this.$modal.msgSuccess("鍥惧儚淇敼鎴愬姛");
+ if(this.petList.sex==1)
+ this.petList.sex = '闆勬��'
+ else
+ this.petList.sex = '闆屾��'
// this.open = false;
_this.btn=false
});
// alert(100)
})
+
//alert(90)
},
requestUpload1(params)
{
+
var file = params.file;
var formData = new FormData();
formData.append('uploadFile', file);
@@ -791,14 +815,23 @@
// console("ok")
// alert(90)
// alert(response.data.url)
+ if(this.petList.sex=='闆勬��')
+ this.petList.sex = 1
+ else
+ this.petList.sex = 0
_this.petList.headPicture = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
updatePet(_this.petList).then(response => {
_this.$modal.msgSuccess("淇敼鎴愬姛");
// this.open = false;
+ if(this.petList.sex==1)
+ this.petList.sex = '闆勬��'
+ else
+ this.petList.sex = '闆屾��'
_this.btn=false
});
// alert(100)
})
+
//alert(90)
},
--
Gitblit v1.9.1