修改

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/utils/request.js

@@ -16,7 +16,6 @@ import router from '../router/index.js'
 const instance = axios.create({
     baseURL: process.env.VUE_APP_BASE_API
 })
-
 //请求拦截器
 instance.interceptors.request.use((r) => {
     if (sessionStorage['utoken']) {

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/ImpressionNanan.vue

@@ -222,7 +222,7 @@
             </div>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" size="mini" @click="saveWorkAdd">提交</el-button>
-                <el-button @click="goBackyynn('addWorkForm')" size="mini">返回</el-button>
+                <el-button @click="goBackyynn" size="mini">返回</el-button>
             </div>
         </el-dialog>
 
@@ -340,22 +340,22 @@
             </div>
             <div style="height:65vh;overflow: auto;padding-right: 20px">
 
-                <el-form :model="impressionNanan" label-width="110px" ref="modifyWorkForm" :rules="modifyWorkFormRules">
+                <el-form :model="modifyWorkData" label-width="110px" ref="modifyWorkForm" :rules="modifyWorkFormRules">
                     <el-row>
                         <el-col :span="16">
                             <el-form-item label="作品名称" prop="pictureTitle">
-                                <el-input v-model="impressionNanan.pictureTitle" placeholder="请输入作品名称" clearable>
+                                <el-input v-model="modifyWorkData.pictureTitle" placeholder="请输入作品名称" clearable>
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <div style="display: flex;">
-                                <div v-if="impressionNanan.isAlbum > 0">
+                                <div v-if="modifyWorkData.isAlbum > 0">
                                     <el-checkbox v-model="isAlbum" @change="choices"
                                         style="margin-left:20px;height: 40px;margin-right: 30px;line-height: 40px">专辑
                                     </el-checkbox>
                                     <el-select style="width: 149px;" @change="handleSelectChange"
-                                        v-model="impressionNanan.albumPeople" v-if="impressionNanan.isAlbum > 0"
+                                        v-model="modifyWorkData.albumPeople" v-if="modifyWorkData.isAlbum > 0"
                                         placeholder="请选择">
                                         <el-option v-for="item in albumPeople" :key="item.value" :label="item.name"
                                             :value="item.id">
@@ -363,7 +363,7 @@
                                     </el-select>
                                 </div>
                                 <div v-else>
-                                    <el-checkbox v-model="impressionNanan.isAlbum"
+                                    <el-checkbox v-model="modifyWorkData.isAlbum"
                                         style="margin-left:20px;height: 40px;margin-right: 30px;line-height: 40px">专辑
                                     </el-checkbox>
                                 </div>
@@ -374,12 +374,12 @@
                     <el-row>
                         <el-col :span="16">
                             <el-form-item label="作品作者" prop="pictureAuthor">
-                                <el-input v-model="impressionNanan.pictureAuthor" placeholder="请输入作品作者" clearable>
+                                <el-input v-model="modifyWorkData.pictureAuthor" placeholder="请输入作品作者" clearable>
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
-                            <el-radio-group v-model="impressionNanan.isAnonymous"
+                            <el-radio-group v-model="modifyWorkData.isAnonymous"
                                 style="margin-left:20px;height: 40px;line-height: 40px">
                                 <el-radio :label="1">匿名</el-radio>
                                 <el-radio :label="0">不匿名</el-radio>
@@ -389,12 +389,12 @@
                     <el-row>
                         <el-col :span="16">
                             <el-form-item label="作者电话" prop="uploaderPhone">
-                                <el-input v-model="impressionNanan.uploaderPhone" placeholder="请输入作者电话" maxlength="11"
+                                <el-input v-model="modifyWorkData.uploaderPhone" placeholder="请输入作者电话" maxlength="11"
                                     minlength="11" show-word-limit clearable></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
-                            <el-radio-group v-model="impressionNanan.isPublic"
+                            <el-radio-group v-model="modifyWorkData.isPublic"
                                 style="margin-left:20px;height: 40px;line-height: 40px">
                                 <el-radio :label="1">公开</el-radio>
                                 <el-radio :label="0">不公开</el-radio>
@@ -404,14 +404,14 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="归属日期" prop="vestingDate">
-                                <el-date-picker v-model="impressionNanan.vestingDate" type="datetime"
+                                <el-date-picker v-model="modifyWorkData.vestingDate" type="datetime"
                                     placeholder="请选择归属日期" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="作品年代" prop="workYear">
-                                <el-select v-model="impressionNanan.pictureType" placeholder="请选择作品年代"
+                                <el-select v-model="modifyWorkData.pictureType" placeholder="请选择作品年代"
                                     style="width: 100%">
                                     <el-option v-for="(el, index) in workYearSelectData" :key="index" :label="el.label"
                                         :value="el.value"></el-option>
@@ -420,7 +420,7 @@
                         </el-col>
                     </el-row>
                     <el-form-item label="审核状态">
-                        <el-select disabled v-model="impressionNanan.examineState" placeholder="请选择审核状态"
+                        <el-select disabled v-model="modifyWorkData.examineState" placeholder="请选择审核状态"
                             style="width: 100%">
                             <el-option label="未审核" :value=0></el-option>
                             <el-option label="已通过" :value=1></el-option>
@@ -432,7 +432,7 @@
                             show-word-limit></el-form-item>
                         <div class="formTempBox"></div>
                     </div>
-                    <el-input type="textarea" v-model="impressionNanan.pictureDescription" placeholder="请输入作品描述"
+                    <el-input type="textarea" v-model="modifyWorkData.pictureDescription" placeholder="请输入作品描述"
                         maxlength="200" show-word-limit clearable></el-input>
                     <div style="display: flex;margin-top: 23px">
                         <el-form-item label="作品信息" style="margin-bottom: 0"></el-form-item>
@@ -450,13 +450,13 @@
                         <img :src="fileList[0].url" alt="" style="margin-top: 20px">
                     </div>
                     <div class="imgBox" v-if="fileList.length === 0" style="margin-top: 10px">
-                        <img :src="`/` + impressionNanan.urlAddress" alt="未捕获到地址" style="max-width: 100%;">
+                        <img :src="`/` + modifyWorkData.urlAddress" alt="未捕获到地址" style="max-width: 100%;">
                     </div>
                 </el-form>
             </div>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" size="mini" @click="saveModifyWork">修改</el-button>
-                <el-button @click="goBackyynn('addWorkForm')" size="mini">返回</el-button>
+                <el-button @click="goBackyynn" size="mini">返回</el-button>
             </div>
         </el-dialog>
 
@@ -1117,18 +1117,19 @@ export default {
         modifybeforeUpload(file) {
             let fd = new FormData();
             fd.append('file', file);//传文件
-            fd.append('pictureTitle', this.impressionNanan.pictureTitle);//传其他参数
-            fd.append('pictureAuthor', this.impressionNanan.pictureAuthor);//传其他参数
-            fd.append('examineState', this.impressionNanan.examineState);//传其他参数
-            fd.append('isAnonymous', this.impressionNanan.isAnonymous);//传其他参数
-            fd.append('uploaderPhone', this.impressionNanan.uploaderPhone);//传其他参数
-            fd.append('vestingDate', this.impressionNanan.vestingDate);//传其他参数
-            fd.append('pictureType', this.impressionNanan.pictureType);//传其他参数
-            fd.append('urlAddress', this.impressionNanan.urlAddress);//传其他参数
-            fd.append('id', this.impressionNanan.id);//传其他参数
-            fd.append('isPublic', this.impressionNanan.isPublic);//传其他参数
-            fd.append('pictureDescription', this.impressionNanan.pictureDescription);//传其他参数
-            fd.append('isAlbum', this.impressionNanan.albumPeople);
+            fd.append('pictureTitle', this.modifyWorkData.pictureTitle);//传其他参数
+            fd.append('pictureAuthor', this.modifyWorkData.pictureAuthor);//传其他参数
+            fd.append('examineState', this.modifyWorkData.examineState);//传其他参数
+            fd.append('isAnonymous', this.modifyWorkData.isAnonymous);//传其他参数
+            fd.append('uploaderPhone', this.modifyWorkData.uploaderPhone);//传其他参数
+            fd.append('vestingDate', this.modifyWorkData.vestingDate);//传其他参数
+            fd.append('pictureType', this.modifyWorkData.pictureType);//传其他参数
+            fd.append('urlAddress', this.modifyWorkData.urlAddress);//传其他参数
+            fd.append('id', this.modifyWorkData.id);//传其他参数
+            fd.append('isPublic', this.modifyWorkData.isPublic);//传其他参数
+            fd.append('pictureDescription', this.modifyWorkData.pictureDescription);//传其他参数
+            fd.append('isAlbum', this.modifyWorkData.albumPeople);
+            fd.append('uploadTime', this.modifyWorkData.uploadTime);
             api.modifyYxnaFile(fd).then((r) => {
                 if (r.data.result) {
                     this.$message.success('修改成功')
@@ -1187,7 +1188,7 @@ export default {
                 this.$refs[addWorkForm].resetFields();
             })
             this.fileList = []
-            
+
             api.queryAlbum().then(res => {
                 if (res.data.result) {
                     this.albumPeople = res.data.data;
@@ -1256,22 +1257,20 @@ export default {
         },
         choices() {
             if (!this.isAlbum) {
-                this.impressionNanan.isAlbum = 0;
+                this.modifyWorkData.isAlbum = 0;
                 this.isAlbum = true;
             }
         },
         //打开修改弹出框
         openModifyWorkDialog(data) {
             let obj = { ...data }//避免数据缓存
-            this.impressionNanan = obj
+            // this.impressionNanan = obj
+            this.modifyWorkData = obj
             // if (this.impressionNanan.isAlbum > 0) {
             //     this.impressionNanan.isAlbum = true
             // } else {
             //     this.impressionNanan.isAlbum = 0
             // }
-            if (this.$refs.addWorkForm) {
-                this.$refs.addWorkForm.clearValidate();
-            }
             this.modifyWorkDialog = true
             if (data.isAlbum == 0) {
                 api.queryAlbum().then(res => {
@@ -1283,7 +1282,7 @@ export default {
                 api.queryAlbum().then(res => {
                     if (res.data.result) {
                         this.albumPeople = res.data.data;
-                        this.impressionNanan.albumPeople = data.isAlbum;
+                        this.modifyWorkData.albumPeople = data.isAlbum;
                     }
                 })
             }
@@ -1299,14 +1298,46 @@ export default {
                     }
                 })
             } else {
-                if (this.impressionNanan.isAlbum > 0) {
-                    this.impressionNanan.isAlbum = this.impressionNanan.albumPeople
+                if (this.modifyWorkData.isAlbum > 0) {
+                    this.modifyWorkData.isAlbum = this.modifyWorkData.albumPeople
                 }
-                if (!this.impressionNanan.pictureDescription) {
+                if (!this.modifyWorkData.pictureTitle) {
+                    this.$message.error('请输入作品名称！');
+                    return;
+                }
+                if (!this.modifyWorkData.pictureAuthor) {
+                    this.$message.error('请输入作品作者！');
+                    return;
+                }
+                if (!this.modifyWorkData.vestingDate) {
+                    this.$message.error('请选择归属日期！');
+                    return;
+                }
+                if(this.modifyWorkData.uploaderPhone.length != 11){
+                    this.$message.error('请输入11位作者电话');
+                    return;
+                }
+                if (!this.modifyWorkData.uploaderPhone) {
+                    this.$message.error('请输入作者电话！');
+                    return;
+                }
+                if (!this.modifyWorkData.pictureDescription) {
                     this.$message.error('请输入作品描述！');
                     return;
                 }
-                api.modifyYxna(this.impressionNanan).then(() => {
+                if (this.modifyWorkData.isAnonymous == null) {
+                    this.$message.error('请选择作者是否匿名！');
+                    return;
+                }
+                if (this.modifyWorkData.isPublic == null) {
+                    this.$message.error('请选择作者电话是否公开！');
+                    return;
+                }
+                if (this.modifyWorkData.pictureType == null) {
+                    this.$message.error('请选择作品年代！');
+                    return;
+                }
+                api.modifyYxna(this.modifyWorkData).then(() => {
                     this.modifyWorkDialog = false
                     this.getData()
                     this.$message.success('修改成功')

nngkxxdp/src/main/resources/static/yxnaht/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="css/app.b2991432.css" rel="preload" as="style"><link href="css/chunk-vendors.6438a5d4.css" rel="preload" as="style"><link href="js/app.fb04153b.js" rel="preload" as="script"><link href="js/chunk-vendors.2b17d3ff.js" rel="preload" as="script"><link href="css/chunk-vendors.6438a5d4.css" rel="stylesheet"><link href="css/app.b2991432.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.2b17d3ff.js"></script><script src="js/app.fb04153b.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="css/app.55b833a3.css" rel="preload" as="style"><link href="css/chunk-vendors.058a81fe.css" rel="preload" as="style"><link href="js/app.f04a6c41.js" rel="preload" as="script"><link href="js/chunk-vendors.889b0e9e.js" rel="preload" as="script"><link href="css/chunk-vendors.058a81fe.css" rel="stylesheet"><link href="css/app.55b833a3.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.889b0e9e.js"></script><script src="js/app.f04a6c41.js"></script></body></html>