代码优化

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

@@ -1,53 +0,0 @@
-<template>
-    <div style="width: 100vw">
-        <TopMenu></TopMenu>
-        <div style="display: flex">
-            <LeftMenu></LeftMenu>
-            <el-main
-                    style="margin: 0 ;padding: 0;background-color:#F0F2F5;width: calc(100% - 210px); height: calc(100vh - 40px);">
-                <div class="homeContent">
-                    <router-view v-if="isRouterAlive"/>
-                </div>
-            </el-main>
-        </div>
-    </div>
-</template>
-
-
-<script>
-    import LeftMenu from "./LeftMenu.vue";
-    import TopMenu from "./TopMenu.vue";
-
-    export default {
-        name: "LayoutPage",
-        provide () {
-            return {
-                reload: this.reload
-            }
-        },
-        components: {
-            LeftMenu,
-            TopMenu
-        },
-        data () {
-            return {
-                isRouterAlive: true
-            }
-        },
-        methods: {
-            reload () {
-                this.isRouterAlive = false
-                this.$nextTick(function () {
-                    this.isRouterAlive = true
-                })
-            }
-        },
-    }
-</script>
-<style scoped>
-    .homeContent {
-        height: calc(100vh - 60px);
-        margin: 10px;
-        background-color: white;
-    }
-</style>

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

@@ -1,71 +0,0 @@
-<template>
-    <div style="width: 200px">
-        <el-menu
-                @open="openPage"
-                :default-active="onRoutes"
-                active-text-color="#ffd04b"
-                background-color="#545c64"
-                class="el-menu-vertical-demo"
-                text-color="#FBFBFB"
-                @select="handleSelect"
-                router>
-            <el-menu-item index="/history"><i class="el-icon-time"></i>历史记录</el-menu-item>
-            <el-menu-item index="/impressionNanan"><i class="el-icon-star-off"></i>印象南岸</el-menu-item>
-            <el-menu-item index="/HuaLongData"><i class="el-icon-s-data"></i>华龙网数据</el-menu-item>
-            <el-menu-item index="/administration"><i class="el-icon-s-data"></i>印象南岸专辑管理</el-menu-item>
-			<el-menu-item index="/MapEditList"><i class="el-icon-s-data"></i>地图纠错</el-menu-item>
-			<el-menu-item index="/DecisionMatters"><i class="el-icon-s-data"></i>决策事项管理</el-menu-item>
-        </el-menu>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "LeftMenu",
-        inject: ['reload'],
-        data() {
-            return {}
-        },
-		computed: {
-		    onRoutes() {
-		      const route = this.$route
-		      const { meta, path } = route
-		      // 可以在路由配置⽂件中设置⾃定义的路由路径到meta.activeMenu属性中，来控制菜单⾃定义⾼亮显⽰
-		      // meta中有activeMenu 字段的⼦页⾯，都会显⽰⾼亮
-		      if (meta.activeMenu) {
-		        return meta.activeMenu
-		      }
-		      return path
-		    }
-		},
-        methods: {
-            openPage(index) {
-                this.$router.push(index)
-            },
-            pageReload() {
-                // location.reload()
-            },
-            handleSelect(index) {
-                if (index === this.$route.path) {
-                    this.reload()
-                }
-            },
-        }
-    }
-</script>
-
-<style scoped>
-     .el-submenu__title {
-        width: 200px;
-    }
-
-     .el-menu-item-group__title {
-        width: 200px;
-    }
-
-    .el-menu-vertical-demo:not(.el-menu--collapse) {
-        width: 200px;
-        height: calc(100vh - 40px);
-        float: left;
-    }
-</style>

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

@@ -1,70 +0,0 @@
-<!-- <template>
-	<div>
-		<el-tabs v-model="activeName">
-		    <el-tab-pane :label="label" name="first"></el-tab-pane>
-		</el-tabs>
-		<el-tabs v-model="editableTabsValue" type="card" editable>
-			<el-tab-pane :key="item.name" v-for="(item, index) in editableTabs" :label="item.title" :name="item.name">
-				{{item.content}}
-			</el-tab-pane>
-		</el-tabs>
-	</div>
-</template>
-
-<script>
-// 	export default {
-// 		props:['label'],
-// 		data() {
-// 			return {
-// 				activeName:'first',
-// 				editableTabsValue: '2',
-// 				editableTabs: [
-// 					{
-// 						title: 'Tab 1',
-// 						name: '1',
-// 						content: 'Tab 1 content'
-// 					}, 
-// 					{
-// 						title: 'Tab 2',
-// 						name: '2',
-// 						content: 'Tab 2 content'
-// 					},
-// 				],
-// 				tabIndex: 2
-// 			}
-// 		}
-// 		    methods: {
-// 		      handleTabsEdit(targetName, action) {
-// 		        if (action === 'add') {
-// 		          let newTabName = ++this.tabIndex + '';
-// 		          this.editableTabs.push({
-// 		            title: 'New Tab',
-// 		            name: newTabName,
-// 		            content: 'New Tab content'
-// 		          });
-// 		          this.editableTabsValue = newTabName;
-// 		        }
-// 		        if (action === 'remove') {
-// 		          let tabs = this.editableTabs;
-// 		          let activeName = this.editableTabsValue;
-// 		          if (activeName === targetName) {
-// 		            tabs.forEach((tab, index) => {
-// 		              if (tab.name === targetName) {
-// 		                let nextTab = tabs[index + 1] || tabs[index - 1];
-// 		                if (nextTab) {
-// 		                  activeName = nextTab.name;
-// 		                }
-// 		              }
-// 		            });
-// 		          }
-
-// 		          this.editableTabsValue = activeName;
-// 		          this.editableTabs = tabs.filter(tab => tab.name !== targetName);
-// 		        }
-// 		      }
-// 		    }
-// 	}
-</script>
-
-<style>
-</style> -->

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

@@ -1,247 +0,0 @@
-<template>
-    <div class="content-box">
-        <div class="head-title">{{systemName}}</div>
-        <div style="margin-right: 10px">
-            <div style="height:40px;line-height: 40px;display: flex">
-                <div>
-                        <span style="display: inline-block;border-radius: 50%;border: 1px solid;width: 23px;height: 23px;text-align: center;line-height: 23px">
-                            <i class="el-icon-user" style="font-size: 20px"></i>
-                        </span>
-                    <span style="cursor: default;font-size: 16px">&nbsp;&nbsp;{{username}}</span>
-                </div>
-                <div class="seting-inline" @click="seting('modifypwd')">
-                    <i class="el-icon-edit-outline" style="font-size: 20px"></i>
-                    <span class="seting">修改密码</span>
-                </div>
-                <div>
-                        <span style="display: inline-block;margin-left: 20px;cursor: pointer" @click="logout">退出
-                            <i class="el-icon-right" style="font-size: 20px"></i>
-                        </span>
-                </div>
-            </div>
-        </div>
-
-        <!--        修改密码-->
-        <el-dialog width="80%" :visible.sync="modifyPwdDialog">
-            <div slot="title">
-                <div class="addTitle">修改密码</div>
-            </div>
-            <div>
-                <el-form label-width="110px" ref="modifypwd" :model="modifyPwdForm" :rules="modifypwdRules">
-                    <el-form-item label="原密码" prop="pwd">
-                        <el-input v-model.trim="modifyPwdForm.pwd" show-password type="password"
-                                  placeholder="请输入原密码"></el-input>
-                    </el-form-item>
-                    <el-form-item label="新密码" prop="newPwd">
-                        <el-input v-model.trim="modifyPwdForm.newPwd" show-password type="password"
-                                  placeholder="请输入新密码"></el-input>
-                    </el-form-item>
-                    <el-form-item label="确认新密码" prop="sureNewPwd">
-                        <el-input v-model.trim="modifyPwdForm.sureNewPwd" show-password type="password"
-                                  placeholder="请确认新密码"></el-input>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <div slot="footer">
-                <el-button type="primary" @click="confirmBtn">确认</el-button>
-                <el-button @click="modifyPwdDialog=false">取消</el-button>
-            </div>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-    import api from '../api/index'
-
-    const requiredValidator = (rule, value, callback) => {
-        if (typeof value === 'string' && value.trim() !== '') {
-            callback()
-        } else {
-            // 验证失败
-            if (rule.field === 'pwd') callback(new Error('请输入原密码'))
-            if (rule.field === 'newPwd') callback(new Error('请输入新密码'))
-            if (rule.field === 'sureNewPwd') callback(new Error('请确认新密码'))
-
-        }
-    }
-
-    export default {
-        name: "TopMenu",
-        data() {
-            return {
-                username: '',
-                systemName: '南岸区网站数据统计',
-                modifyPwdDialog: false,
-                modifyPwdForm: {
-                    pwd: '',
-                    newPwd: '',
-                    sureNewPwd: '',
-                },
-                modifypwdRules: {
-                    pwd: [
-                        {
-                            message: '请输入原密码',
-                            trigger: 'blur'
-                        },
-                        {
-                            validator: requiredValidator
-                        }
-                    ],
-                    newPwd: [
-                        {
-                            message: '请输入新密码',
-                            trigger: 'blur'
-                        },
-                        {
-                            validator: requiredValidator
-                        }
-                    ],
-                    sureNewPwd: [
-                        {
-                            message: '请确认新密码',
-                            trigger: 'blur'
-                        },
-                        {
-                            validator: requiredValidator
-                        }
-                    ],
-                }
-            }
-        },
-        created() {
-            this.username = JSON.parse(sessionStorage['username'])
-        },
-        methods: {
-            //退出
-            logout() {
-                this.$confirm('您确定要退出吗', {
-                    cancelButtonClass: "btn-custom-cancel",
-                    confirmButtonText: '确定',
-                    closeOnClickModal: false,
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    this.$router.push('/LoginPage')
-                    sessionStorage.removeItem('utoken')
-                    this.$message({
-                        type: 'success',
-                        message: '安全退出'
-                    });
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '取消退出'
-                    });
-                })
-            },
-
-            //    修改密码
-            seting(modifypwd) {
-                this.modifyPwdDialog = true
-                this.modifyPwdForm = {}
-                if (this.$refs[modifypwd]==undefined){
-                    return
-                }else{
-                    this.$refs[modifypwd].resetFields()
-                }
-                /*this.$prompt('请输入新密码', '修改密码', {
-                    cancelButtonClass: "btn-custom-cancel",
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                }).then(({value}) => {
-                    let data = {
-                        pid: 5,
-                        password: value
-                    }
-                    api.updateUser(data).then(() => {
-                        this.$message({
-                            type: 'success',
-                            message: '你的新密码是: ' + value
-                        });
-                    }).catch(() => {
-                        this.$message.error('修改密码失败')
-                    })
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '取消修改'
-                    });
-                });*/
-            },
-
-            confirmBtn() {
-                this.$refs.modifypwd.validate(valid => {
-                    if (valid) {
-                        if (this.modifyPwdForm.newPwd !== this.modifyPwdForm.sureNewPwd) {
-                            this.$message.error('请再次确认密码')
-                            return
-                        }
-                        // let data = `pid=${JSON.parse(localStorage.getItem('user')).pid}&originalPassword=${this.modifyPwdForm.pwd}&newPassword=${this.modifyPwdForm.newPwd}`
-                        let fd = new FormData()
-                        fd.append('pid', JSON.parse(localStorage.getItem('user')).pid);//传文件
-                        fd.append('originalPassword', this.modifyPwdForm.pwd);//传其他参数
-                        fd.append('newPassword', this.modifyPwdForm.newPwd);//传其他参数
-                        // let params = {
-                        //     pid:JSON.parse(localStorage.getItem('user')).pid,
-                        //     originalPassword: this.modifyPwdForm.pwd,
-                        //     newPassword: this.modifyPwdForm.newPwd,
-                        // }
-                        api.updatePwd(fd).then((r) => {
-                            if (r.data.result&&this.modifyPwdForm.newPwd!=this.modifyPwdForm.pwd) {
-                                this.$message.success('密码修改成功')
-                            } else {
-                                this.$message.error('密码修改失败')
-                            }
-
-                            this.modifyPwdDialog = false
-                        }).catch(() => {
-                            this.$message.error('密码修改失败')
-                        })
-                    }
-                })
-            },
-
-
-        }
-
-    }
-</script>
-
-<style>
-    .content-box {
-        width: 100%;
-        height: 40px;
-        display: flex;
-        justify-content: space-between;
-        /*background-color: gray;*/
-    }
-
-    .head-title {
-        margin-left: 20px;
-        font-size: 25px;
-        font-weight: bold;
-        color: cornflowerblue;
-    }
-
-    .seting-inline {
-        margin: 0 0 0 10px;
-        cursor: pointer;
-    }
-
-    .seting {
-        display: inline-block;
-        margin: 0 0 0 5px;
-        color: #66B1FF;
-    }
-
-    .btn-custom-cancel {
-        float: right;
-        margin-left: 10px;
-    }
-
-    .addTitle {
-        font-size: 18px;
-        font-weight: bold;
-        margin-bottom: 10px;
-    }
-</style>

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

@@ -1,22 +0,0 @@
-<template>
-    <div>
-        <el-tabs v-model="activeName">
-            <el-tab-pane :label="label" name="first"></el-tab-pane>
-        </el-tabs>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: 'ToTitle',
-        props: ['label'],
-        data() {
-            return {
-                activeName: 'first',
-            }
-        }
-    }
-</script>
-
-<style>
-</style>

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/layout/components/Navbar.vue

@@ -1,21 +1,19 @@
 <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
-
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
-
-      </template>
-
+      <!-- <template v-if="device!=='mobile'"></template> -->
+      <div class="right-menu-item">{{ this.username }}</div>
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <i class="el-icon-user"></i>
+          <div style="font-size: 30px">
+            <i class="el-icon-user"></i>
+          </div>
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item divided @click.native="seting('modifypwd')">
+          <el-dropdown-item @click.native="seting('modifypwd')">
             <span style="display:block;">修改密码</span>
           </el-dropdown-item>
           <router-link to="/">
@@ -28,31 +26,31 @@
       </el-dropdown>
     </div>
     <!-- 修改密码 -->
-        <el-dialog width="80%" :visible.sync="modifyPwdDialog">
-            <div slot="title">
-                <div class="addTitle">修改密码</div>
-            </div>
-            <div>
-                <el-form label-width="110px" ref="modifypwd" :model="modifyPwdForm" :rules="modifypwdRules">
-                    <el-form-item label="原密码" prop="pwd">
-                        <el-input v-model.trim="modifyPwdForm.pwd" show-password type="password"
-                                  placeholder="请输入原密码"></el-input>
-                    </el-form-item>
-                    <el-form-item label="新密码" prop="newPwd">
-                        <el-input v-model.trim="modifyPwdForm.newPwd" show-password type="password"
-                                  placeholder="请输入新密码"></el-input>
-                    </el-form-item>
-                    <el-form-item label="确认新密码" prop="sureNewPwd">
-                        <el-input v-model.trim="modifyPwdForm.sureNewPwd" show-password type="password"
-                                  placeholder="请确认新密码"></el-input>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <div slot="footer">
-                <el-button type="primary" @click="confirmBtn">确认</el-button>
-                <el-button @click="modifyPwdDialog=false">取消</el-button>
-            </div>
-        </el-dialog>
+    <el-dialog width="80%" :visible.sync="modifyPwdDialog">
+        <div slot="title">
+            <div class="addTitle">修改密码</div>
+        </div>
+        <div>
+            <el-form label-width="110px" ref="modifypwd" :model="modifyPwdForm" :rules="modifypwdRules">
+                <el-form-item label="原密码" prop="pwd">
+                    <el-input v-model.trim="modifyPwdForm.pwd" show-password type="password"
+                                placeholder="请输入原密码"></el-input>
+                </el-form-item>
+                <el-form-item label="新密码" prop="newPwd">
+                    <el-input v-model.trim="modifyPwdForm.newPwd" show-password type="password"
+                                placeholder="请输入新密码"></el-input>
+                </el-form-item>
+                <el-form-item label="确认新密码" prop="sureNewPwd">
+                    <el-input v-model.trim="modifyPwdForm.sureNewPwd" show-password type="password"
+                                placeholder="请确认新密码"></el-input>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div slot="footer">
+            <el-button type="primary" @click="confirmBtn">确认</el-button>
+            <el-button @click="modifyPwdDialog=false">取消</el-button>
+        </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -62,17 +60,15 @@ import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import api from '../../api/index'
 
-    const requiredValidator = (rule, value, callback) => {
-        if (typeof value === 'string' && value.trim() !== '') {
-            callback()
-        } else {
-            // 验证失败
-            if (rule.field === 'pwd') callback(new Error('请输入原密码'))
-            if (rule.field === 'newPwd') callback(new Error('请输入新密码'))
-            if (rule.field === 'sureNewPwd') callback(new Error('请确认新密码'))
-
-        }
-    }
+const requiredValidator = (rule, value, callback) => {
+if (typeof value === 'string' && value.trim() !== '') {
+	callback()
+} else {
+    // 验证失败
+    if (rule.field === 'pwd') callback(new Error('请输入原密码'))
+    if (rule.field === 'newPwd') callback(new Error('请输入新密码'))
+    if (rule.field === 'sureNewPwd') callback(new Error('请确认新密码'))
+}}
 
 export default {
   components: {
@@ -82,52 +78,49 @@ export default {
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar',
       'device'
     ])
   },
   data() {
-    return { 
+    return {
       gitUrl: '#',
       username: '',
       modifyPwdDialog: false,
-                modifyPwdForm: {
-                    pwd: '',
-                    newPwd: '',
-                    sureNewPwd: '',
-                },
+	    modifyPwdForm: {
+        pwd: '',
+        newPwd: '',
+        sureNewPwd: '',
+      },
       modifypwdRules: {
-                    pwd: [
-                        {
-                            message: '请输入原密码',
-                            trigger: 'blur'
-                        },
-                        {
-                            validator: requiredValidator
-                        }
-                    ],
-                    newPwd: [
-                        {
-                            message: '请输入新密码',
-                            trigger: 'blur'
-                        },
-                        {
-                            validator: requiredValidator
-                        }
-                    ],
-                    sureNewPwd: [
-                        {
-                            message: '请确认新密码',
-                            trigger: 'blur'
-                        },
-                        {
-                            validator: requiredValidator
-                        }
-                    ],
-                }
-      
-     }
-     
+        pwd: [
+          {
+            message: '请输入原密码',
+            trigger: 'blur'
+          },
+          {
+            validator: requiredValidator
+          }
+        ],
+        newPwd: [
+          {
+            message: '请输入新密码',
+            trigger: 'blur'
+          },
+          {
+            validator: requiredValidator
+          }
+        ],
+        sureNewPwd: [
+          {
+            message: '请确认新密码',
+            trigger: 'blur'
+          },
+          {
+            validator: requiredValidator
+          }
+        ],
+      }
+    }
   },
   created() {
     this.username = JSON.parse(sessionStorage['username'])
@@ -158,70 +151,69 @@ export default {
         });
       })
     },
-    //    修改密码
-            seting(modifypwd) {
-                this.modifyPwdDialog = true
-                this.modifyPwdForm = {}
-                if (this.$refs[modifypwd]==undefined){
-                    return
-                }else{
-                    this.$refs[modifypwd].resetFields()
-                }
-                /*this.$prompt('请输入新密码', '修改密码', {
-                    cancelButtonClass: "btn-custom-cancel",
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                }).then(({value}) => {
-                    let data = {
-                        pid: 5,
-                        password: value
-                    }
-                    api.updateUser(data).then(() => {
-                        this.$message({
-                            type: 'success',
-                            message: '你的新密码是: ' + value
-                        });
-                    }).catch(() => {
-                        this.$message.error('修改密码失败')
-                    })
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '取消修改'
-                    });
-                });*/
-            },
-            confirmBtn() {
-                this.$refs.modifypwd.validate(valid => {
-                    if (valid) {
-                        if (this.modifyPwdForm.newPwd !== this.modifyPwdForm.sureNewPwd) {
-                            this.$message.error('请再次确认密码')
-                            return
-                        }
-                        // let data = `pid=${JSON.parse(localStorage.getItem('user')).pid}&originalPassword=${this.modifyPwdForm.pwd}&newPassword=${this.modifyPwdForm.newPwd}`
-                        let fd = new FormData()
-                        fd.append('pid', JSON.parse(localStorage.getItem('user')).pid);//传文件
-                        fd.append('originalPassword', this.modifyPwdForm.pwd);//传其他参数
-                        fd.append('newPassword', this.modifyPwdForm.newPwd);//传其他参数
-                        // let params = {
-                        //     pid:JSON.parse(localStorage.getItem('user')).pid,
-                        //     originalPassword: this.modifyPwdForm.pwd,
-                        //     newPassword: this.modifyPwdForm.newPwd,
-                        // }
-                        api.updatePwd(fd).then((r) => {
-                            if (r.data.result&&this.modifyPwdForm.newPwd!=this.modifyPwdForm.pwd) {
-                                this.$message.success('密码修改成功')
-                            } else {
-                                this.$message.error('密码修改失败')
-                            }
-
-                            this.modifyPwdDialog = false
-                        }).catch(() => {
-                            this.$message.error('密码修改失败')
-                        })
-                    }
-                })
-            },
+    // 修改密码
+    seting(modifypwd) {
+      this.modifyPwdDialog = true
+      this.modifyPwdForm = {}
+      if (this.$refs[modifypwd]==undefined){
+        return
+      }else{
+        this.$refs[modifypwd].resetFields()
+      }
+      /*this.$prompt('请输入新密码', '修改密码', {
+          cancelButtonClass: "btn-custom-cancel",
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+      }).then(({value}) => {
+          let data = {
+              pid: 5,
+              password: value
+          }
+          api.updateUser(data).then(() => {
+              this.$message({
+                  type: 'success',
+                  message: '你的新密码是: ' + value
+              });
+          }).catch(() => {
+              this.$message.error('修改密码失败')
+          })
+      }).catch(() => {
+          this.$message({
+              type: 'info',
+              message: '取消修改'
+          });
+      });*/
+    },
+    confirmBtn() {
+      this.$refs.modifypwd.validate(valid => {
+        if (valid) {
+          if (this.modifyPwdForm.newPwd !== this.modifyPwdForm.sureNewPwd) {
+          this.$message.error('请再次确认密码')
+          return
+          }
+          // let data = `pid=${JSON.parse(localStorage.getItem('user')).pid}&originalPassword=${this.modifyPwdForm.pwd}&newPassword=${this.modifyPwdForm.newPwd}`
+          let fd = new FormData()
+          fd.append('pid', JSON.parse(localStorage.getItem('user')).pid);//传文件
+          fd.append('originalPassword', this.modifyPwdForm.pwd);//传其他参数
+          fd.append('newPassword', this.modifyPwdForm.newPwd);//传其他参数
+          // let params = {
+          //     pid:JSON.parse(localStorage.getItem('user')).pid,
+          //     originalPassword: this.modifyPwdForm.pwd,
+          //     newPassword: this.modifyPwdForm.newPwd,
+          // }
+          api.updatePwd(fd).then((r) => {
+            if (r.data.result&&this.modifyPwdForm.newPwd!=this.modifyPwdForm.pwd) {
+              this.$message.success('密码修改成功')
+            } else {
+              this.$message.error('密码修改失败')
+              this.modifyPwdDialog = false
+            }}
+		  ).catch(() => {
+              this.$message.error('密码修改失败')
+          })
+        }
+      })
+    }
   }
 }
 </script>

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

@@ -7,7 +7,6 @@ Vue.use(Router)
 import Layout from '@/layout'
 
 /* Router Modules */
-import HomePage from '../views/HomePage'
 import History from '../views/history/History'//历史信息
 import ImpressionNanan from '../views/impressionNanan/ImpressionNanan'//印象南岸
 import InformationEntry from '../views/history/InformationEntry'//信息录入
@@ -34,13 +33,8 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    component: 'LoginPage',
-    name: LoginPage,
-    hidden: true
-  },
-  {
-    path: '/404',
     component: LoginPage,
+    name: 'LoginPage',
     hidden: true
   },
   {

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/store/getters.js

@@ -1,9 +1,6 @@
 const getters = {
   sidebar: state => state.app.sidebar,
   device: state => state.app.device,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   permission_routes: state => state.permission.routes

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/store/modules/settings.js

@@ -1,4 +1,3 @@
-
 const state = {
   showSettings: false,
   tagsView: true,

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/store/modules/user.js

@@ -1,98 +0,0 @@
-// import { login, logout, getInfo } from '@/api/user'
-// import { getToken, setToken, removeToken } from '@/utils/auth'
-import { resetRouter } from '@/router'
-
-const getDefaultState = () => {
-  return {
-    // token: getToken(),
-    token: '',
-    name: '',
-    avatar: ''
-  }
-}
-
-const state = getDefaultState()
-
-const mutations = {
-  RESET_STATE: (state) => {
-    Object.assign(state, getDefaultState())
-  },
-  SET_TOKEN: (state, token) => {
-    state.token = token
-  },
-  SET_NAME: (state, name) => {
-    state.name = name
-  },
-  SET_AVATAR: (state, avatar) => {
-    state.avatar = avatar
-  }
-}
-
-const actions = {
-  // // user login
-  // login({ commit }, userInfo) {
-  //   const { username, password } = userInfo
-  //   return new Promise((resolve, reject) => {
-  //     login({ username: username.trim(), password: password }).then(response => {
-  //       const { data } = response
-  //       commit('SET_TOKEN', data.token)
-  //       setToken(data.token)
-  //       resolve()
-  //     }).catch(error => {
-  //       reject(error)
-  //     })
-  //   })
-  // },
-
-  // // get user info
-  // getInfo({ commit, state }) {
-  //   return new Promise((resolve, reject) => {
-  //     getInfo(state.token).then(response => {
-  //       const { data } = response
-
-  //       if (!data) {
-  //         return reject('Verification failed, please Login again.')
-  //       }
-
-  //       const { name, avatar } = data
-
-  //       commit('SET_NAME', name)
-  //       commit('SET_AVATAR', avatar)
-  //       resolve(data)
-  //     }).catch(error => {
-  //       reject(error)
-  //     })
-  //   })
-  // },
-
-  // // user logout
-  // logout({ commit, state }) {
-  //   return new Promise((resolve, reject) => {
-  //     logout(state.token).then(() => {
-  //       removeToken() // must remove  token  first
-  //       resetRouter()
-  //       commit('RESET_STATE')
-  //       resolve()
-  //     }).catch(error => {
-  //       reject(error)
-  //     })
-  //   })
-  // },
-
-  // // remove token
-  // resetToken({ commit }) {
-  //   return new Promise(resolve => {
-  //     removeToken() // must remove  token  first
-  //     commit('RESET_STATE')
-  //     resolve()
-  //   })
-  // }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
-

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/utils/get-page-title.js

@@ -1,4 +1,4 @@
-const title = 'Vue Element Admin'
+const title = '后台管理系统'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {

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

@@ -1,890 +0,0 @@
-<template>
-    <div class="yxnaContent">
-        <!--        标题-->
-        <TopTitle :label="label" />
-        <!--        操作栏-->
-        <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
-            <el-button type="primary" class="add" @click="openAddWork">新增</el-button>
-            <!-- <div style="display: flex">
-                <el-select ref="querySelect" style="width: 200px" clearable v-model="form.region" placeholder="请选择搜索方式"
-                    @change="selectRegion">
-                    <el-option label="作品电话" value="uploaderPhone"></el-option>
-                    <el-option label="作品名称" value="pictureTitle"></el-option>
-                    <el-option label="作品作者" value="pictureAuthor"></el-option>
-                </el-select>
-                <el-input v-model.trim="form.name" clearable @clear="clearreset" style="margin: 0 10px;width: 200px">
-                </el-input>
-                <el-button type="primary" class="search" @click="serachWork">搜索</el-button>
-                <el-button type="primary" class="search" @click="reset" style="margin-left: 5px">重置</el-button>
-            </div> -->
-        </div>
-        <!--表格-->
-        <el-table :data="tableData" border ref='multipleTable' :height="tableH" stripe
-            :header-cell-style="{ background: '#e5e8ed', color: '#666', textAlign: 'center' }" :cell-style="tableStyle"
-            style="cursor: default">
-            <el-table-column width="50" label="序号">
-                <template slot-scope="scope">
-                    {{ (sorts.page - 1) * sorts.limit + scope.$index + 1 }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="postTitle" label="发文标题" :show-overflow-tooltip="true" />
-            <el-table-column prop="state" label="发布状态" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                    <el-tag v-if="scope.row.state == 0">未发布</el-tag>
-                    <el-tag type="success" v-else-if="scope.row.state == 1">已发布</el-tag>
-                </template>
-            </el-table-column>
-            <el-table-column prop="addTime" label="创建时间" :show-overflow-tooltip="true" />
-            <el-table-column prop="releaseTime" label="发布时间" :show-overflow-tooltip="true" />
-            <el-table-column label="操作" prop="examineState,id" width="220" slot="default" fixed="right">
-                <template slot-scope="scope">
-                    <el-button class="but" type="primary" @click="openDialog(scope.row.id)">查看</el-button>
-                    <el-button :type="scope.row.state === 1 ? '' : scope.row.state === 0 ? 'primary' : ''"
-                        :disabled="scope.row.state === 1 ? true : scope.row.state === 0 ? false : true" class="but"
-                        @click="releaseDecision(scope.row.id)">发布</el-button>
-                    <el-button class="but" type="primary" @click="openModifyWorkDialog(scope.row.id)">修改</el-button>
-                    <el-button class="but" type="danger" @click="handleDelete(scope.row.id, scope.$index)">删除
-                    </el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="block">
-            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                :current-page="sorts.page" :page-sizes="[10, 20, 30, 40, 50]" :page-size="sorts.limit"
-                layout="prev, pager,next,jumper,total,sizes" :total="total">
-            </el-pagination>
-        </div>
-        <!-- 新增/编辑决策事项 -->
-        <el-dialog :visible.sync="workDialog" width="80%" class="detailDialog" :close-on-click-modal="false" top="40px">
-            <div slot="title">
-                <div class="addTitle">{{workTitle}}</div>
-            </div>
-            <div style="height:65vh;overflow: auto;padding-right: 20px">
-                <el-form :model="postManagement" label-width="140px">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="发文标题" prop="postTitle">
-                                <el-input v-model="postManagement.postTitle" placeholder="请输入发文标题" clearable>
-                                </el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="类型" prop="type">
-                                <el-select v-model="postManagement.type" @change="handleSelectChange" placeholder="请选择类型" style="width: 100%">
-                                    <el-option v-for="(el, index) in typeSelectData" :key="index" :label="el.label"
-                                        :value="el.value"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="意见反馈结束时间" prop="opinionFeedbackEnd">
-                                <el-date-picker v-model="postManagement.opinionFeedbackEnd" type="datetime"
-                                    placeholder="请选择意见反馈结束时间" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
-                                </el-date-picker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <div v-for="(item, index) in fileUploadList" style="display: flex;">
-                        <el-form-item :label="item.value"></el-form-item>
-                        <el-upload action="#" ref="upload" :auto-upload="false" accept="application/pdf"
-                            :file-list="item.fileList"
-                            :on-change="function(file, fileList) {return onChange(file,fileList, index)}"
-                            :on-remove="function(file, fileList) {return handleRemove(file,fileList, index)}">
-                            <el-button type="primary" slot="trigger" style="margin-left: 10px">上传文件</el-button>
-                        </el-upload>
-                    </div>
-                </el-form>
-            </div>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" size="mini" @click="saveWork">提交</el-button>
-                <el-button @click="goBackyynn" size="mini">返回</el-button>
-            </div>
-        </el-dialog>
-
-        <!--查看详细-->
-        <el-dialog :visible.sync="dialogTableVisible" :append-to-body="true" class="detailDialog" width="80%"
-            top="40px">
-            <div slot="title">
-                <div class="addTitle">查看决策事项详情</div>
-            </div>
-            <div style="height: 65vh;overflow: auto;padding-right: 20px">
-                <el-form :model="tableDetail" class="demo-form-inline" label-width="130px">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="发文标题">
-                                <el-input disabled v-model="tableDetail.postTitle" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="部门名称">
-                                <el-input disabled v-model="tableDetail.deptName" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="类型">
-                                <el-select disabled v-model="tableDetail.type" style="width: 100%">
-                                    <el-option v-for="(el, index) in typeSelectData" :key="index" :label="el.label"
-                                        :value="el.value"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="发布时间">
-                                <el-date-picker v-model="tableDetail.releaseTime" type="datetime"
-                                    value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%" disabled>
-                                </el-date-picker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="意见反馈结束时间">
-                                <el-date-picker v-model="tableDetail.opinionFeedbackEnd" type="datetime"
-                                    value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%" disabled>
-                                </el-date-picker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="决策草案">
-                                <el-input disabled v-model="tableDetail.draftInterpretation" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="草案解读">
-                                <el-input disabled v-model="tableDetail.draftDecision" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="政策解读">
-                                <el-input disabled v-model="tableDetail.policyInterpretation" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="决策文件">
-                                <el-input disabled v-model="tableDetail.makePolicy" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="征集情况反馈">
-                                <el-input disabled v-model="tableDetail.pdfContent" />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-            </div>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-    import TopTitle from '../components/TopTitle'
-    import api from '../api/index'
-
-    export default {
-        components: {
-            TopTitle
-        },
-        created() {
-            this.getData()
-        },
-        mounted() {},
-        data() {
-            return {
-                fileUploadList: [{
-                        value: '决策草案',
-                        fileList: []
-                    }, {
-                        value: '草案解读',
-                        fileList: []
-                    },
-                    {
-                        value: '政策解读',
-                        fileList: []
-                    },
-                    {
-                        value: '决策文件',
-                        fileList: []
-                    },
-                    {
-                        value: '征集情况反馈',
-                        fileList: []
-                    }
-                ],
-                tableStyle: {
-                    textAlign: 'center',
-                },
-                tableH: 'calc(100vh - 230px)',
-                label: "决策事项管理",
-                // 搜索参数
-                form: {
-                    name: '',
-                    region: '',
-                    type: []
-                },
-                // 列表数据
-                tableData: [],
-                // 总数
-                total: 0,
-                // 查看详细界面
-                dialogTableVisible: false,
-                //新增/编辑决策事项界面
-                workDialog: false,
-                //新增/编辑决策事项标题
-                workTitle: '新增决策事项',
-                // 新增/编辑表单
-                postManagement: {
-                    postTitle: '', //发文标题
-                    opinionFeedbackEnd: '', //意见反馈结束时间
-                    type: '', //类型
-                    file1: '',
-                    file2: '',
-                    file3: '',
-                    file4: '',
-                    file5: ''
-                },
-                //类型选择框
-                typeSelectData: [{
-                        label: '决策公示',
-                        value: '0'
-                    },
-                    {
-                        label: '意见征集',
-                        value: '1'
-                    },
-                    {
-                        label: '意见反馈',
-                        value: '2'
-                    },
-                    {
-                        label: '待公示',
-                        value: '3'
-                    },
-                    {
-                        label: '决策完成',
-                        value: '4'
-                    }
-                ],
-                // 详细内容
-                tableDetail: {},
-                // 分页
-                sorts: {
-                    page: 1,
-                    limit: 10,
-                },
-            }
-        },
-        methods: {
-            handleSelectChange() {
-                this.$forceUpdate()
-            },
-            //上传文件
-            onChange(file, fileList, index) {
-                if (file.raw.type === 'application/pdf') {
-                    this.assignFile(index, file);
-                    // 覆盖上次上传的文件
-                    if (fileList.length > 0) {
-                        this.fileUploadList[index].fileList = [fileList[fileList.length - 1]];
-                    }
-                } else {
-                    if (this.fileUploadList[index].fileList.length == 0) {
-                        this.fileUploadList[index].fileList = [];
-                    } else {
-                        this.fileUploadList[index].fileList = [fileList[0]];
-                    }
-                    this.$message.error('只能上传PDF!');
-                }
-            },
-            //删除文件
-            handleRemove(file, fileList, index) {
-                switch (index) {
-                    case 0:
-                        this.postManagement.draftInterpretation = '';
-                        break;
-                    case 1:
-                        this.postManagement.draftDecision = '';
-                        break;
-                    case 2:
-                        this.postManagement.policyInterpretation = '';
-                        break;
-                    case 3:
-                        this.postManagement.makePolicy = '';
-                        break;
-                    case 4:
-                        this.postManagement.pdfContent = '';
-                        break;
-                }
-                this.assignFile(index, null);
-            },
-            //文件流赋值
-            assignFile(index, file) {
-                switch (index) {
-                    case 0:
-                        this.postManagement.file1 = file;
-                        break;
-                    case 1:
-                        this.postManagement.file2 = file;
-                        break;
-                    case 2:
-                        this.postManagement.file3 = file;
-                        break;
-                    case 3:
-                        this.postManagement.file4 = file;
-                        break;
-                    case 4:
-                        this.postManagement.file5 = file;
-                        break;
-                }
-            },
-            //返回
-            goBackyynn() {
-                this.workDialog = false;
-            },
-            //打开新增决策事项
-            openAddWork() {
-                this.postManagement = {
-                    postTitle: '',
-                    opinionFeedbackEnd: '',
-                    type: '',
-                    file1: null,
-                    file2: null,
-                    file3: null,
-                    file4: null,
-                    file5: null
-                };
-                this.fileUploadList.forEach(element => {
-                    element.fileList = [];
-                });
-                this.workTitle = '新增决策事项'
-                this.workDialog = true;
-            },
-            //打开修改决策事项
-            openModifyWorkDialog(id) {
-                this.workTitle = '编辑决策事项';
-                api.getPostById(id).then(r => {
-                    let data = r.data.data;
-                    this.postManagement = data;
-                    this.postManagement.type = data.type + '';
-                    this.postManagement.file1 = '';
-                    this.postManagement.file2 = '';
-                    this.postManagement.file3 = '';
-                    this.postManagement.file4 = '';
-                    this.postManagement.file5 = '';
-                    this.postManagement.draftInterpretation = data.draftInterpretation ? data.draftInterpretation : '';
-                    this.postManagement.draftDecision = data.draftDecision ? data.draftDecision : '';
-                    this.postManagement.policyInterpretation = data.policyInterpretation ? data.policyInterpretation : '';
-                    this.postManagement.makePolicy = data.makePolicy ? data.makePolicy : '';
-                    this.postManagement.pdfContent = data.pdfContent ? data.pdfContent : '';
-                    this.fileUploadList[0].fileList = data.draftInterpretation ? [{
-                        name: data.draftInterpretation
-                    }] : [];
-                    this.fileUploadList[1].fileList = data.draftDecision ? [{
-                        name: data.draftDecision
-                    }] : [];
-                    this.fileUploadList[2].fileList = data.policyInterpretation ? [{
-                        name: data.policyInterpretation
-                    }] : [];
-                    this.fileUploadList[3].fileList = data.makePolicy ? [{
-                        name: data.makePolicy
-                    }] : [];
-                    this.fileUploadList[4].fileList = data.pdfContent ? [{
-                        name: data.pdfContent
-                    }] : [];
-                    this.workDialog = true;
-                })
-            },
-            //保存
-            saveWork() {
-                if (!this.postManagement.postTitle) {
-                    this.$message.error('请输入发文标题！');
-                    return;
-                }
-                if (!this.postManagement.type) {
-                    this.$message.error('请选择类型！');
-                    return;
-                }
-                if (!this.postManagement.opinionFeedbackEnd) {
-                    this.$message.error('请选择意见反馈结束时间！');
-                    return;
-                }
-                let fd = new FormData();
-                fd.append('file1', this.postManagement.file1 ? this.postManagement.file1.raw : '');
-                fd.append('file2', this.postManagement.file2 ? this.postManagement.file2.raw : '');
-                fd.append('file3', this.postManagement.file3 ? this.postManagement.file3.raw : '');
-                fd.append('file4', this.postManagement.file4 ? this.postManagement.file4.raw : '');
-                fd.append('file5', this.postManagement.file5 ? this.postManagement.file5.raw : '');
-                fd.append('postTitle', this.postManagement.postTitle);
-                fd.append('opinionFeedbackEnd', this.postManagement.opinionFeedbackEnd);
-                fd.append('type', this.postManagement.type);
-                if (this.workTitle == '编辑决策事项') {
-                    fd.append('id', this.postManagement.id);
-                    fd.append('draftInterpretation', this.postManagement.file1 ? '' : this.postManagement
-                        .draftInterpretation);
-                    fd.append('draftDecision', this.postManagement.file2 ? '' : this.postManagement.draftDecision);
-                    fd.append('policyInterpretation', this.postManagement.file3 ? '' : this.postManagement
-                        .policyInterpretation);
-                    fd.append('makePolicy', this.postManagement.file4 ? '' : this.postManagement.makePolicy);
-                    fd.append('pdfContent', this.postManagement.file5 ? '' : this.postManagement.pdfContent);
-                    api.updatePostById(fd).then(r => {
-                        if (r.data.result) {
-                            this.$message.success('修改成功');
-                            this.getData();
-                            this.workDialog = false;
-                        } else {
-                            this.$message.error("修改失败");
-                        }
-                    }).catch(() => {
-                        this.$message.error("修改失败");
-                    })
-                } else {
-                    api.savePost(fd).then(r => {
-                        if (r.data.result) {
-                            this.$message.success('新增成功');
-                            this.getData();
-                            this.workDialog = false;
-                        } else {
-                            this.$message.error("新增失败");
-                        }
-                    }).catch(() => {
-                        this.$message.error("新增失败");
-                    })
-                }
-            },
-            //选取条件
-            selectRegion() {
-                // console.log(this.form.region)
-            },
-            //根据条件查询
-            serachWork() {
-                // if (this.form.region !== '') {
-                //     if (this.form.region === 'uploaderPhone') {
-                //         // let params = {
-                //         //     page: 1,
-                //         //     limit: 10,
-                //         //     uploaderPhone: this.form.name
-                //         // }
-                //         this.sorts.uploaderPhone = this.form.name;
-                //         this.sorts.pictureTitle = '';
-                //         this.sorts.pictureAuthor = '';
-                //         this.sorts.page = 1;
-                //         let params = this.sorts;
-                //         api.queryWork({
-                //             params
-                //         }).then(res => {
-                //             this.total = res.data.count
-                //             this.tableData = res.data.data
-                //         })
-                //     }
-                //     if (this.form.region === 'pictureTitle') {
-                //         // let params = {
-                //         //     page: 1,
-                //         //     limit: 10,
-                //         //     pictureTitle: this.form.name
-                //         // }
-                //         this.sorts.pictureTitle = this.form.name;
-                //         this.sorts.uploaderPhone = '';
-                //         this.sorts.pictureAuthor = '';
-                //         this.sorts.page = 1;
-                //         let params = this.sorts;
-                //         api.queryWork({
-                //             params
-                //         }).then(res => {
-                //             this.total = res.data.count
-                //             this.tableData = res.data.data
-                //             // console.log(this.tableData);
-                //         })
-                //     }
-                //     if (this.form.region === 'pictureAuthor') {
-                //         // let params = {
-                //         //     page: 1,
-                //         //     limit: 10,
-                //         //     pictureAuthor: this.form.name
-                //         // }
-                //         this.sorts.pictureTitle = '';
-                //         this.sorts.uploaderPhone = '';
-                //         this.sorts.pictureAuthor = this.form.name;
-                //         this.sorts.page = 1;
-                //         let params = this.sorts;
-                //         api.queryWork({
-                //             params
-                //         }).then(res => {
-                //             this.total = res.data.count
-                //             this.tableData = res.data.data
-                //             // console.log(this.tableData);
-                //         })
-                //     }
-                // } else {
-                //     this.$refs.multipleTable.clearSort();
-                //     this.column = undefined
-                //     this.sorts.page = 1
-                //     this.sorts = {
-                //         page: 1,
-                //         limit: 10,
-                //         isAlbum: '',
-                //         examineState: '',
-                //         pictureType: '',
-                //         uploadTime: '',
-                //         updateTime: '',
-                //         uploaderPhone: '',
-                //         pictureTitle: '',
-                //         pictureAuthor: '',
-                //     }
-                //     let params = this.sorts
-                //     // this.getData()
-                //     api.queryWork({
-                //         params
-                //     }).then(res => {
-                //         this.total = res.data.count
-                //         this.tableData = res.data.data
-                //         // console.log(this.tableData);
-                //     })
-                // }
-
-            },
-            //发布事项
-            releaseDecision(id) {
-                let params = {
-                    id: id
-                }
-                this.$confirm('是否发布该事项?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(() => {
-                    api.updateState({
-                        params
-                    }).then(res => {
-                        if (res.data.result) {
-                            this.getData();
-                            this.$message({
-                                type: 'success',
-                                message: '发布成功!'
-                            });
-                        } else {
-                            this.$message({
-                                type: 'info',
-                                message: '发布失败!'
-                            });
-                        }
-                    })
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消发布'
-                    });
-                });
-            },
-            //切换列表条数
-            handleSizeChange(pageSize) {
-                this.sorts.limit = pageSize
-                this.sorts.page = 1;
-                this.getData();
-            },
-            //切换页码
-            handleCurrentChange(currentPage) {
-                this.$refs.multipleTable.bodyWrapper.scrollTop = 0;
-                this.sorts.page = currentPage;
-                this.getData();
-            },
-            //删除
-            handleDelete(id, index) {
-                this.$confirm("您确定要删除该数据吗?", "提示", {
-                    cancelButtonClass: "btn-custom-cancel",
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    api.deletePostById(id).then(res => {
-                        if (res.data.result) {
-                            this.$message({
-                                type: 'success',
-                                message: '删除成功!'
-                            });
-                            this.tableData.splice(index, 1);
-                            this.getData();
-                        } else {
-                            this.$message({
-                                type: 'info',
-                                message: '删除失败!'
-                            });
-                        }
-                    })
-                }).catch(() => {
-                    this.$message({
-                        type: 'info',
-                        message: '已取消删除'
-                    });
-                })
-            },
-            //查看
-            openDialog(id) {
-                this.dialogTableVisible = true;
-                api.getPostById(id).then(r => {
-                    this.tableDetail = r.data.data;
-                })
-            },
-            // 获取列表数据
-            getData() {
-                if (this.form.region !== '') {
-                    if (this.form.region === 'uploaderPhone') {
-                        let params = {
-                            page: this.sorts.page,
-                            limit: this.sorts.limit,
-                            uploaderPhone: this.form.name
-                        }
-                        api.selectPostList({
-                            params
-                        }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                    if (this.form.region === 'pictureTitle') {
-                        let params = {
-                            page: this.sorts.page,
-                            limit: this.sorts.limit,
-                            pictureTitle: this.form.name
-                        }
-                        api.selectPostList({
-                            params
-                        }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                    if (this.form.region === 'pictureAuthor') {
-                        let params = {
-                            page: this.sorts.page,
-                            limit: this.sorts.limit,
-                            pictureAuthor: this.form.name
-                        }
-                        api.selectPostList({
-                            params
-                        }).then(r => {
-                            this.total = r.data.count
-                            this.tableData = r.data.data
-                        })
-                    }
-                } else {
-                    let params = {
-                        page: this.sorts.page,
-                        limit: this.sorts.limit,
-                    }
-                    api.selectPostList({
-                        params
-                    }).then(r => {
-                        this.total = r.data.count
-                        this.tableData = r.data.data
-                    })
-                }
-            },
-            // 清空输入框
-            clearreset() {
-                this.form.name = ''
-            },
-            // 清空输入框
-            reset() {
-                this.form.region = ''
-                this.form.name = ''
-                this.getData()
-            }
-        },
-    }
-</script>
-
-<style scoped lang="less">
-    /* 禁用后的勾选*/
-    /deep/ .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
-        border-color: #def5cb;
-    }
-
-    /deep/ .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
-        background-color: #157de9;
-        border-color: #DCDFE6;
-    }
-
-    /deep/ [data-v-2cde7735] .el-upload-list--picture .el-upload-list__item-name {
-        display: block;
-        margin-top: 0px;
-        margin-left: -78px;
-    }
-
-    /deep/ .el-upload-list--picture .el-upload-list__item {
-        display: flex;
-        flex-direction: column-reverse;
-        width: 100%;
-        height: 100%;
-    }
-
-    /deep/ .el-upload-list--picture .el-upload-list__item-name i {
-        display: none;
-    }
-
-    /deep/ .el-upload-list--picture .el-upload-list__item-name {
-        display: block;
-        margin-top: 0px;
-    }
-
-    /deep/ .el-upload-list--picture .el-upload-list__item-thumbnail {
-        width: 100%;
-        height: 100%;
-    }
-
-    /deep/ .el-dialog__body {
-        padding: 0 0 30px 20px;
-        color: #606266;
-        font-size: 14px;
-        word-break: break-all;
-    }
-
-    /deep/ .el-form-item__label {
-        padding: 0;
-    }
-
-    .yxnaContent {
-        padding: 10px;
-    }
-
-    .addTitle {
-        font-size: 18px;
-        font-weight: bold;
-        margin-bottom: 10px;
-    }
-
-    /deep/ .btn-custom-cancel {
-        float: right !important;
-        margin-left: 10px !important;
-    }
-
-    .add {
-        width: 66px;
-        height: 38px;
-        margin-left: 0;
-    }
-
-    /deep/ .el-message-box__btns .el-button:nth-child(2) {
-        margin-right: 10px;
-        float: right;
-    }
-
-    /deep/ .el-col-12 {
-        width: 50%;
-        text-align: left;
-    }
-
-    .search {
-        width: 66px;
-        height: 38px;
-        margin-left: 0;
-    }
-
-    /deep/ .el-form-item__label {
-        height: 40px;
-        width: 110px;
-        background-color: #FAFAFA;
-        text-align: center;
-        border: 1px solid #DCDFE6;
-        border-radius: 2px 0 0 2px;
-    }
-
-    /deep/ .el-button.is-disabled {
-        color: #C0C4CC !important;
-    }
-
-    /deep/.el-button--primary.is-disabled {
-        color: #FFF !important;
-    }
-
-    /deep/ .el-input__inner {
-        border-radius: 2px 0 0 2px;
-    }
-
-    .el-select>.el-input {
-        width: 200px;
-    }
-
-    /deep/ .el-textarea__inner {
-        height: 100px;
-    }
-
-
-    /deep/ .el-dialog__title {
-        font-size: 14px;
-    }
-
-    /deep/ .el-pagination__total {
-        margin-left: 10px !important;
-    }
-
-    .el-pagination {
-        margin: 0;
-        margin-top: 10px;
-        /* position: fixed;
-        left: 13rem; */
-    }
-
-    /deep/ .el-table--scrollable-x .el-table__body-wrapper {
-        z-index: 2;
-    }
-
-    .imgBox {
-        width: 100%;
-        /*height: 55vh;*/
-        height: 100%;
-    }
-
-    .but {
-        width: 36px;
-        height: 22px;
-        padding: 0;
-        font-size: 12px;
-    }
-
-    .el-checkbox {
-        margin: 0;
-        margin-right: 10px;
-    }
-
-    /deep/ .bewrite>.el-form-item__label {
-        width: 100%;
-        text-align: left;
-        padding-left: 21px;
-    }
-
-    /deep/ .el-form--inline .el-form-item {
-        margin-right: 0px;
-    }
-
-    /deep/ [data-v-2cde7735] .el-form-item__label {
-        border: 1px solid #DCDFE6;
-        /*border-right: transparent;*/
-    }
-
-    /*    空白框*/
-    /deep/ .formTempBox {
-        height: 38px;
-        border: 1px solid #DCDFE6;
-        width: 100%;
-        border-left: transparent;
-        background-color: #FAFAFA;
-    }
-</style>

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

@@ -1,20 +0,0 @@
-<template>
-    <div>
-        <layout></layout>
-    </div>
-</template>
-
-<script>
-    import Layout from "../components/LayoutPage"
-
-    export default {
-        name: "HomePage",
-        components: {
-            Layout
-        }
-    }
-</script>
-
-<style scoped>
-
-</style>

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

@@ -40,7 +40,6 @@
             // 验证失败
             if (rule.field === 'userName') callback(new Error('请输入账号'))
             if (rule.field === 'password') callback(new Error('请输入密码'))
-
         }
     }
     export default {
@@ -115,7 +114,6 @@
                     loading.close()
                 })
             },
-
         }
     }
 </script>

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/decisionMatters/DecisionMatters.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="yxnaContent">
-        <!--        操作栏-->
+        <!-- 操作栏 -->
         <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
             <el-button type="primary" class="add" @click="openAddWork">新增</el-button>
             <!-- <div style="display: flex">

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/mapEdit/MapEdit.vue

@@ -49,7 +49,7 @@
 
 <script>
 import api from '../../api/index'
-import { mapState } from '../../constants/mapState'
+import { mapState } from './constants/mapState'
 
 export default {
     created() {

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/constants/mapState.js → nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/mapEdit/constants/mapState.js

@@ -1,15 +1,15 @@
-export const mapState = [
-    {
-        // 状态
-        code: 0,
-        name: '未解决'
-    },
-    {
-        code: 1,
-        name: '已解决'
-    },
-    {
-        code: 2,
-        name: '不处理'
-    }
+export const mapState = [
+    {
+        // 状态
+        code: 0,
+        name: '未解决'
+    },
+    {
+        code: 1,
+        name: '已解决'
+    },
+    {
+        code: 2,
+        name: '不处理'
+    }
 ]