印象南岸初次修改完成

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/api/index.js

@@ -11,7 +11,7 @@ export default {
   },
   //查询印象南岸
   queryWork(data){
-    return request.post('yxnn/getDocumentPage',data)
+    return request.get('yxnn/getDocumentPage',data)
   },
 //  登录
   login(data){

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/components/TopMenu.vue

@@ -10,13 +10,13 @@
                     <el-dropdown trigger="click">
                         <div style="height:100%;">
                             <i class="el-icon-user"></i>
-                            <span style="color:#fff">超级管理员</span>
+                            <span style="color:#fff">{{username}}</span>
                             <i class="el-icon-caret-bottom"/>
                         </div>
                         <el-dropdown-menu>
-                            <el-dropdown-item @click.native="resetPass">
-                                <span style="display:block;">修改密码</span>
-                            </el-dropdown-item>
+<!--                            <el-dropdown-item @click.native="resetPass">-->
+<!--                                <span style="display:block;">修改密码</span>-->
+<!--                            </el-dropdown-item>-->
                             <el-dropdown-item @click.native="logout">
                                 <span style="display:block;">退出系统</span>
                             </el-dropdown-item>
@@ -33,9 +33,13 @@
         name: "TopMenu",
         data() {
             return {
+                username:'',
                 systemName: '南岸区网站数据统计',
             }
         },
+        created(){
+            this.username = sessionStorage['username']
+        },
         methods: {
             logout() {
                 this.$confirm('您确定要退出吗', {

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

@@ -20,7 +20,7 @@ const instance = axios.create({
 instance.interceptors.request.use((r) => {
     if (sessionStorage['utoken']) {
         r.headers = {
-            utoken: sessionStorage['utoken']
+            utoken: JSON.parse(sessionStorage['utoken'])
         }
     } else {
         // router.push('/LoginPage')

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

@@ -3,7 +3,7 @@
         <TopTitle :label="label"/>
         <diV style="display: flex; align-items: center; justify-content: space-between; width: 600px;">
             <el-button type="primary" class="add" @click="addData()">导入</el-button>
-            <el-form ref="form" :model="form" style="display: flex; justify-content: flex-start; margin-top: 22px; ">
+            <!--<el-form ref="form" :model="form" style="display: flex; justify-content: flex-start; margin-top: 22px; ">
                 <el-form-item>
                     <el-select v-model="form.region" placeholder="请选择搜索方式">
                         <el-option label="请选择搜索方式" value="请选择搜索方式" :disabled="true"></el-option>
@@ -16,7 +16,7 @@
                     <el-input v-model="form.name" style="width: 200px;"></el-input>
                 </el-form-item>
                 <el-button type="primary" class="search" @click="search">搜索</el-button>
-            </el-form>
+            </el-form>-->
         </diV>
         <el-table :data="tableData" style="width: 100%" :header-cell-style="{background:'#e5e8ed',color:'#666'}">
             <el-table-column prop="deptname" label="所属单位" width="180">

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

@@ -1,7 +1,7 @@
 <template>
     <div>
         <TopTitle :label="label"/>
-        <el-button type="primary" style="margin-left: -93.8%;margin-top: 23px; width: 66px; height: 38px;">导入
+        <el-button type="primary" style="margin-left: -93.8%;margin-top: 23px; width: 66px; height: 38px;" @click="importFile">导入
         </el-button>
         <div class="detailData">
             <div class="item">
@@ -55,7 +55,10 @@
         methods: {
             goBack() {
                 this.$router.push('/history')
-            }
+            },
+            importFile(){
+                this.$router.push('/informationEntry')
+            },
         }
     }
 </script>

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

@@ -205,7 +205,7 @@
                     </el-col>
                 </el-row>
                 <div style="display: flex;">
-                    <el-form-item label="作品描述" style="margin-bottom: 0" prop="pictureDescription"></el-form-item>
+                    <el-form-item label="作品描述" style="margin-bottom: 0;" prop="pictureDescription"></el-form-item>
                     <div class="formTempBox"></div>
                 </div>
                 <el-input type="textarea" v-model="impressionNanan.pictureDescription" placeholder="请输入作品描述"
@@ -231,7 +231,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" size="mini" @click="saveWorkAdd">保存</el-button>
-                <el-button @click="addWorkDialog = false" size="mini">返回</el-button>
+                <el-button @click="goBackyynn" size="mini">返回</el-button>
             </div>
         </el-dialog>
 
@@ -320,7 +320,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" size="mini" @click="saveModifyWork">保存</el-button>
-                <el-button @click="modifyWorkDialog = false" size="mini">返回</el-button>
+                <el-button @click="goBackyynn" size="mini">返回</el-button>
             </div>
         </el-dialog>
 
@@ -436,6 +436,11 @@
                             trigger: 'blur'
                         },
                         {
+                            pattern: /^1[3][5][7][8][9]\d{9}$/,
+                            message: '格式不正确',
+                            trigger: 'change'
+                        },
+                        {
                             validator: requiredValidator
                         }
                     ],//电话验证
@@ -449,6 +454,46 @@
                         }
                     ],//日期验证
                 },//添加作品表单验证规则
+                modifyWorkFormRules: {
+                    pictureTitle: [
+                        {
+                            message: '请输入作品名称',
+                            trigger: 'blur'
+                        },
+                        {
+                            validator: requiredValidator
+                        }
+                    ],//名称验证
+                    pictureAuthor: [
+                        {
+                            message: '请输入作品作者',
+                            trigger: 'blur'
+                        },
+                        {
+                            validator: requiredValidator
+                        }
+                    ],//作者验证
+                    uploaderPhone: [
+                        {
+                            message: '请输入11位作者电话',
+                            trigger: 'blur'
+                        },
+                        {
+                            pattern: /^1[3][5][7][8][9]\d{9}$/,
+                            message: '格式不正确',
+                            trigger: 'change'
+                        },
+                    ],//电话验证
+                    vestingDate: [
+                        {
+                            message: '请选择归属日期',
+                            trigger: 'blur'
+                        },
+                        {
+                            validator: requiredValidator
+                        }
+                    ],//日期验证
+                },//修改作品表单验证规则
                 updateWorkUrl: '',//修改作品的地址
                 modifyWorkData: {},//修改作品参数
                 workYearSelectData: [
@@ -497,6 +542,13 @@
             submit() {
             },
 
+            //返回印象南岸
+            goBackyynn() {
+                this.addWorkDialog = false
+                this.modifyWorkDialog = false
+                this.impressionNanan = {}
+            },
+
             openAddWork() {
                 this.addWorkDialog = true
                 this.impressionNanan = {
@@ -512,6 +564,7 @@
                     isPublic: 1,//作者电话是否公开
                     pictureDescription: ''//作品描述
                 }
+                this.$refs.addWorkForm.resetFields()//重置验证
             },
 
             //保存印象南岸
@@ -531,10 +584,10 @@
                 let obj = {...data}//避免数据缓存
                 this.impressionNanan = obj
                 this.impressionNanan.vestingDate = obj.vestingDate.input
-                this.impressionNanan.examineState = 0
-                this.impressionNanan.isAnonymous = 0
-                this.impressionNanan.isPublic = 0
-                this.impressionNanan.pictureType = 1
+                this.impressionNanan.examineState = obj.examineState === '未审核' ? 0 : obj.examineState === '已通过' ? 1 : 2 // 审核状态
+                this.impressionNanan.isAnonymous = obj.isAnonymous === '不匿名' ? 0 : obj.isAnonymous === '匿名' ? 1 : 1//是否匿名
+                this.impressionNanan.isPublic = obj.isPublic === '不公开' ? 0 : obj.isPublic === '公开' ? 1 : 0//是否公开
+                this.impressionNanan.pictureType = obj.pictureType === '1949年' ? 0 : obj.pictureType === '1949年-1980年' ? 1 : obj.pictureType === '1980年-2000年' ? 2 : obj.pictureType === '2000年-至今' ? 3:3//年代
                 this.modifyWorkDialog = true
             },
 

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

@@ -101,6 +101,7 @@
         created() {
             getDeptList().then(res => {
                 this.deptList = res.data.data;
+                this.ruleForm.deptId = this.deptList[0].deptId
                 console.log(res);
             })
         },

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

@@ -90,7 +90,9 @@
                         api.login(data).then(r => {
                             // console.log(r.data.data)
                             sessionStorage['utoken']=JSON.stringify(r.data.data.utoken)
+                            // localStorage.setItem('utoken',)
                             sessionStorage['pid']=JSON.stringify(r.data.data.pid)
+                            sessionStorage['username']=JSON.stringify(r.data.data.username)
                             this.$router.push('/')
                         }).catch(()=>{
                             this.$message.error('登录失败')