Home Explore Help
Sign In
community
/
dwsurvey-ui
6
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

发布DWSurvey Vue 版本

wkeyuan 3 years ago
parent
5c8c11b7ff
commit
30ab774208
32 changed files with 149 additions and 317 deletions
Split View Show Diff Stats
  1. 1 1
      README.md
  2. 1 1
      index.html
  3. 2 19
      src/App.vue
  4. 4 6
      src/api/admin/admin-user.js
  5. 2 2
      src/api/dw-login.js
  6. 10 21
      src/api/dw-survey.js
  7. 2 2
      src/api/dw-user.js
  8. 0 113
      src/components/HelloWorld.vue
  9. 1 1
      src/components/layouts/DwFooter.vue
  10. 1 2
      src/components/layouts/DwHeaderLogin.vue
  11. 7 9
      src/components/layouts/DwNavMenu.vue
  12. 2 2
      src/components/layouts/Layout.vue
  13. 1 1
      src/components/layouts/LoginLayout.vue
  14. 1 1
      src/main.js
  15. 2 3
      src/router/index.js
  16. 6 6
      src/utils/dw-authorized.js
  17. 8 23
      src/utils/dw-common.js
  18. 16 16
      src/utils/dw-msg.js
  19. 25 25
      src/utils/request.js
  20. 5 7
      src/views/Login.vue
  21. 5 5
      src/views/dw-admin/AdminUserList.vue
  22. 2 3
      src/views/dw-survey/dw-collect/DwAnswer.vue
  23. 1 1
      src/views/dw-survey/dw-collect/DwAnswerUrlMain.vue
  24. 6 6
      src/views/dw-survey/dw-collect/DwAnswerWeixin.vue
  25. 1 1
      src/views/dw-survey/dw-collect/DwSurveyAttr.vue
  26. 24 25
      src/views/dw-survey/dw-data/DwSurveyAnswerInfo.vue
  27. 2 2
      src/views/dw-survey/dw-data/DwSurveyCharts.vue
  28. 2 3
      src/views/dw-user/DwUser.vue
  29. 2 3
      src/views/dw-user/DwUserMenu.vue
  30. 7 7
      src/views/dw-user/DwUserPwd.vue
  31. BIN
      static/diaowen/images/favicon.ico
  32. BIN
      static/favicon.ico

+ 1 - 1
README.md
View File 

@@ -1,6 +1,6 @@
 
 # dwsurvey-oss-front-vue
 
 
-> DWSurvey 开源问卷系统，社区版VUE前端代码
 
+> DWSurvey 开源问卷系统，基于VUE实现的社区版前端代码仓库
 
 
 ## Build Setup

+ 1 - 1
index.html
View File 

@@ -3,7 +3,7 @@
 
   <head>
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
 
+    <link rel="shortcut icon" href="static/diaowen/images/favicon.ico" type="image/x-icon" />
 
     <title>dwsurvey-oss-front-vue</title>
 
   </head>
 
   <body>

+ 2 - 19
src/App.vue
View File 

@@ -1,24 +1,7 @@
 
 <template>
 
-  <!--    <img src="./assets/logo.png">-->
 
-  <!--    <router-view/>-->
 
   <div id="app" >
 
     <router-view/>
 
   </div>
 
-<!--  <div id="app" >
 
-    <el-container style="padding: 0px;">
 
-      <el-header height="80" style="padding: 0px;" >
 
-        <component :is="currentHeader"></component>
 
-      </el-header>
 
-      <el-container style="z-index: 1;">
 
-        <el-container>
 
-          <el-main style="padding: 20px 0px;" >
 
-            <router-view></router-view>
 
-          </el-main>
 
-          <el-footer><dw-footer></dw-footer></el-footer>
 
-        </el-container>
 
-      </el-container>
 
-    </el-container>
 
-  </div>-->
 
 </template>
 
 
 <script>
 
@@ -47,9 +30,9 @@ export default {
 
   methods: {
 
     loginStatus: function () {
 
       const fullPath = this.$route.fullPath
 
-      if(fullPath.indexOf("login")>=0){
 
+      if (fullPath.indexOf('login') >= 0) {
 
         this.currentHeader = 'dw-header-login'
 
-      }else{
 
+      } else {
 
         this.currentHeader = 'dw-header'
 
       }
 
     }

+ 4 - 6
src/api/admin/admin-user.js
View File 

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 import API from '@/api/index.js'
 
 
 // 登录方法
 
-export function dwAdminUserList(pageSize, current, status, loginName) {
 
+export function dwAdminUserList (pageSize, current, status, loginName) {
 
   const params = {
 
     pageSize,
 
     current,
 
@@ -16,13 +16,12 @@ export function dwAdminUserList(pageSize, current, status, loginName) {
 
   })
 
 }
 
 
-
 
 /**
 
  * 创建用户
 
  * @param data
 
  * @returns {*}
 
  */
 
-export function dwUserCreate(data) {
 
+export function dwUserCreate (data) {
 
   return request({
 
     url: API.adminUserCreate,
 
     method: 'post',
 
@@ -30,7 +29,7 @@ export function dwUserCreate(data) {
 
   })
 
 }
 
 
-export function dwUserUpdate(data) {
 
+export function dwUserUpdate (data) {
 
   return request({
 
     url: API.adminUserUpdate,
 
     method: 'put',
 
@@ -38,8 +37,7 @@ export function dwUserUpdate(data) {
 
   })
 
 }
 
 
-
 
-export function dwUserDelete(data) {
 
+export function dwUserDelete (data) {
 
   return request({
 
     url: API.adminUserDelete,
 
     method: 'delete',

+ 2 - 2
src/api/dw-login.js
View File 

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 import API from '@/api/index.js'
 
 
 // 登录方法
 
-export function dwLogin(username, password) {
 
+export function dwLogin (username, password) {
 
   const params = {
 
     username,
 
     password
 
@@ -15,7 +15,7 @@ export function dwLogin(username, password) {
 
 }
 
 
 // 退出方法
 
-export function logout() {
 
+export function logout () {
 
   return request({
 
     url: API.logOut,
 
     method: 'post'

+ 10 - 21
src/api/dw-survey.js
View File 

@@ -7,7 +7,7 @@ import API from '@/api/index.js'
 
  * @param current
 
  * @returns {*}
 
  */
 
-export function dwSurveyList(pageSize, current, surveyName, surveyState) {
 
+export function dwSurveyList (pageSize, current, surveyName, surveyState) {
 
   const params = {
 
     pageSize,
 
     current,
 
@@ -20,31 +20,28 @@ export function dwSurveyList(pageSize, current, surveyName, surveyState) {
 
     params
 
   })
 
 }
 
-
 
 /**
 
  * 创建问卷
 
  * @param data
 
  * @returns {*}
 
  */
 
-export function dwSurveyCreate(data) {
 
+export function dwSurveyCreate (data) {
 
   return request({
 
     url: API.surveyCreate,
 
     method: 'post',
 
     data
 
   })
 
 }
 
-
 
-
 
 /**
 
  * 复制问卷
 
  * @param data
 
  * @returns {*}
 
  */
 
-export function dwSurveyCopy(fromSurveyId,surveyName) {
 
+export function dwSurveyCopy (fromSurveyId, surveyName) {
 
   const params = {
 
     fromSurveyId,
 
     surveyName,
 
-    tag:'2'
 
+    tag: '2'
 
   }
 
   return request({
 
     url: API.surveyCopy,
 
@@ -52,13 +49,12 @@ export function dwSurveyCopy(fromSurveyId,surveyName) {
 
     params
 
   })
 
 }
 
-
 
 /**
 
  * 获取问卷信息
 
  * @param surveyId
 
  * @returns {*}
 
  */
 
-export function dwSurveyInfo(surveyId) {
 
+export function dwSurveyInfo (surveyId) {
 
   const params = {
 
     id: surveyId
 
   }
 
@@ -68,41 +64,36 @@ export function dwSurveyInfo(surveyId) {
 
     params
 
   })
 
 }
 
-
 
 /**
 
  * 更新问卷信息
 
  * @param data
 
  * @returns {*}
 
  */
 
-export function dwSurveyUpdate(data) {
 
+export function dwSurveyUpdate (data) {
 
   return request({
 
     url: API.surveyUpdate,
 
     method: 'put',
 
     data
 
   })
 
 }
 
-
 
-
 
 /**
 
  * 更新问卷信息
 
  * @param data
 
  * @returns {*}
 
  */
 
-export function dwSurveyDelete(data) {
 
+export function dwSurveyDelete (data) {
 
   return request({
 
     url: API.surveyDelete,
 
     method: 'delete',
 
     data
 
   })
 
 }
 
-
 
-
 
 /**
 
  * 获取问卷的统计信息
 
  * @param surveyId
 
  * @returns {*}
 
  */
 
-export function dwSurveyReport(surveyId) {
 
+export function dwSurveyReport (surveyId) {
 
   const params = {
 
     surveyId
 
   }
 
@@ -112,7 +103,6 @@ export function dwSurveyReport(surveyId) {
 
     params
 
   })
 
 }
 
-
 
 /**
 
  * 获取问卷的答卷列表
 
  * @param pageSize
 
@@ -120,7 +110,7 @@ export function dwSurveyReport(surveyId) {
 
  * @param surveyId
 
  * @returns {*}
 
  */
 
-export function dwSurveyAnswerList(pageSize,current,surveyId) {
 
+export function dwSurveyAnswerList (pageSize, current, surveyId) {
 
   const params = {
 
     pageSize,
 
     current,
 
@@ -132,13 +122,12 @@ export function dwSurveyAnswerList(pageSize,current,surveyId) {
 
     params
 
   })
 
 }
 
-
 
 /**
 
  * 获取问卷答卷详情
 
  * @param answerId
 
  * @returns {*}
 
  */
 
-export function dwSurveyAnswerInfo(answerId) {
 
+export function dwSurveyAnswerInfo (answerId) {
 
   const params = {
 
     answerId
 
   }

+ 2 - 2
src/api/dw-user.js
View File 

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 import API from '@/api/index.js'
 
 
 // 登录方法
 
-export function dwUserInfo() {
 
+export function dwUserInfo () {
 
   return request({
 
     url: API.curUserInfo,
 
     method: 'get'
 
@@ -10,7 +10,7 @@ export function dwUserInfo() {
 
 }
 
 
 // 退出方法
 
-export function dwUserPwd(curpwd,pwd) {
 
+export function dwUserPwd (curpwd, pwd) {
 
   const params = {
 
     curpwd,
 
     pwd

+ 0 - 113
src/components/HelloWorld.vue
View File 

@@ -1,113 +0,0 @@
 
-<template>
 
-  <div class="hello">
 
-    <h1>{{ msg }}</h1>
 
-    <h2>Essential Links</h2>
 
-    <ul>
 
-      <li>
 
-        <a
 
-          href="https://vuejs.org"
 
-          target="_blank"
 
-        >
 
-          Core Docs
 
-        </a>
 
-      </li>
 
-      <li>
 
-        <a
 
-          href="https://forum.vuejs.org"
 
-          target="_blank"
 
-        >
 
-          Forum
 
-        </a>
 
-      </li>
 
-      <li>
 
-        <a
 
-          href="https://chat.vuejs.org"
 
-          target="_blank"
 
-        >
 
-          Community Chat
 
-        </a>
 
-      </li>
 
-      <li>
 
-        <a
 
-          href="https://twitter.com/vuejs"
 
-          target="_blank"
 
-        >
 
-          Twitter
 
-        </a>
 
-      </li>
 
-      <br>
 
-      <li>
 
-        <a
 
-          href="http://vuejs-templates.github.io/webpack/"
 
-          target="_blank"
 
-        >
 
-          Docs for This Template
 
-        </a>
 
-      </li>
 
-    </ul>
 
-    <h2>Ecosystem</h2>
 
-    <ul>
 
-      <li>
 
-        <a
 
-          href="http://router.vuejs.org/"
 
-          target="_blank"
 
-        >
 
-          vue-router
 
-        </a>
 
-      </li>
 
-      <li>
 
-        <a
 
-          href="http://vuex.vuejs.org/"
 
-          target="_blank"
 
-        >
 
-          vuex
 
-        </a>
 
-      </li>
 
-      <li>
 
-        <a
 
-          href="http://vue-loader.vuejs.org/"
 
-          target="_blank"
 
-        >
 
-          vue-loader
 
-        </a>
 
-      </li>
 
-      <li>
 
-        <a
 
-          href="https://github.com/vuejs/awesome-vue"
 
-          target="_blank"
 
-        >
 
-          awesome-vue
 
-        </a>
 
-      </li>
 
-    </ul>
 
-  </div>
 
-</template>
 
-
 
-<script>
 
-export default {
 
-  name: 'HelloWorld',
 
-  data () {
 
-    return {
 
-      msg: 'Welcome to Your Vue.js App'
 
-    }
 
-  }
 
-}
 
-</script>
 
-
 
-<!-- Add "scoped" attribute to limit CSS to this component only -->
 
-<style scoped>
 
-h1, h2 {
 
-  font-weight: normal;
 
-}
 
-ul {
 
-  list-style-type: none;
 
-  padding: 0;
 
-}
 
-li {
 
-  display: inline-block;
 
-  margin: 0 10px;
 
-}
 
-a {
 
-  color: #42b983;
 
-}
 
-</style>

+ 1 - 1
src/components/layouts/DwFooter.vue
View File 

@@ -28,7 +28,7 @@ export default {
 
         versionNumber: 'OSS V5.0',
 
         versionBuilt: '20211128',
 
         years: '2012-2021'
 
-      },
 
+      }
 
     }
 
   },
 
   mounted () {

+ 1 - 2
src/components/layouts/DwHeaderLogin.vue
View File 

@@ -34,10 +34,9 @@
 
 
 <script>
 
 import DwNavMenu from '@/components/layouts/DwNavMenu.vue'
 
-import API from '@/api/index.js'
 
 
 export default {
 
-  name: 'DwHeader.vue',
 
+  name: 'DwHeaderLogin',
 
   components: {
 
     'dw-nav-menu': DwNavMenu
 
   }

+ 7 - 9
src/components/layouts/DwNavMenu.vue
View File 

@@ -10,8 +10,7 @@
 
     @select="handleSelect">
 
     <el-menu-item index="/dw/survey" >我的问卷</el-menu-item>
 
     <el-menu-item index="/dw/user" >个人中心</el-menu-item>
 
-    <el-menu-item index="/dw/admin/user" v-has-dw-role="'DWSURVEY_SUPER_ADMIN'" >用户管理</el-menu-item>
 
-<!--    <el-menu-item index="/#" >帮助文档</el-menu-item>-->
 
+    <el-menu-item v-has-dw-role="'DWSURVEY_SUPER_ADMIN'" index="/dw/admin/user" >用户管理</el-menu-item>
 
   </el-menu>
 
 </template>
 
 <script>
 
@@ -23,6 +22,11 @@ export default {
 
       defActive: '/dw/survey'
 
     }
 
   },
 
+  watch: {
 
+    $route: function (to, from) {
 
+      this.setDefActive()
 
+    }
 
+  },
 
   mounted () {
 
     this.setDefActive()
 
   },
 
@@ -35,20 +39,14 @@ export default {
 
     },
 
     setDefActive () {
 
       const fullPath = this.$route.fullPath
 
-      console.debug("fullPath:"+fullPath)
 
       if (fullPath.indexOf('/dw/survey') >= 0) {
 
         this.defActive = '/dw/survey'
 
       } else if (fullPath.indexOf('/dw/admin/user') >= 0) {
 
         this.defActive = '/dw/admin/user'
 
-      } else if (fullPath.indexOf('/dw/user') >= 0){
 
+      } else if (fullPath.indexOf('/dw/user') >= 0) {
 
         this.defActive = '/dw/user'
 
       }
 
     }
 
-  },
 
-  watch: {
 
-    $route: function (to, from) {
 
-      this.setDefActive()
 
-    }
 
   }
 
 }
 
 </script>

+ 2 - 2
src/components/layouts/Layout.vue
View File 

@@ -44,9 +44,9 @@ export default {
 
   methods: {
 
     loginStatus: function () {
 
       const fullPath = this.$route.fullPath
 
-      if(fullPath.indexOf("login")>=0){
 
+      if (fullPath.indexOf('login') >= 0) {
 
         this.currentHeader = 'dw-header-login'
 
-      }else{
 
+      } else {
 
         this.currentHeader = 'dw-header'
 
       }
 
     }

+ 1 - 1
src/components/layouts/LoginLayout.vue
View File 

@@ -24,7 +24,7 @@ import DwNavMenu from '@/components/layouts/DwNavMenu.vue'
 
 import DwFooter from '@/components/layouts/DwFooter.vue'
 
 
 export default {
 
-  name: 'Layout',
 
+  name: 'LoginLayout',
 
   components: {
 
     'dw-nav-menu': DwNavMenu,
 
     'dw-header': DwHeader,

+ 1 - 1
src/main.js
View File 

@@ -22,6 +22,6 @@ Vue.component('icon', Icon)
 
 new Vue({
 
   el: '#app',
 
   router,
 
-  components: { App },
 
+  components: {App},
 
   template: '<App/>'
 
 })

+ 2 - 3
src/router/index.js
View File 

@@ -1,6 +1,5 @@
 
 import Vue from 'vue'
 
 import Router from 'vue-router'
 
-import HelloWorld from '@/components/HelloWorld'
 
 import Layout from '@/components/layouts/Layout.vue'
 
 import LoginLayout from '@/components/layouts/LoginLayout.vue'
 
 import NoTopLayout from '@/components/layouts/NoTopLayout.vue'
 
@@ -103,7 +102,7 @@ export default new Router({
 
           path: '/no-top/dw-survey/d/data/:id/:answerId',
 
           name: 'DwSurveyAnswerInfo',
 
           component: DwSurveyAnswerInfo
 
-        },
 
+        }
 
       ]
 
     },
 
     {
 
@@ -117,6 +116,6 @@ export default new Router({
 
           component: Login
 
         }
 
       ]
 
-    },
 
+    }
 
   ]
 
 })

+ 6 - 6
src/utils/dw-authorized.js
View File 

@@ -1,21 +1,21 @@
 
 
 export default {
 
-  setUserName(userName) {
 
+  setUserName (userName) {
 
     localStorage.setItem('dw_oss_user_name', userName)
 
   },
 
-  getUserName() {
 
-    if(localStorage.hasOwnProperty('dw_oss_user_name')){
 
+  getUserName () {
 
+    if (localStorage.hasOwnProperty('dw_oss_user_name')) {
 
       return localStorage.getItem('dw_oss_user_name')
 
     }
 
     return 'none'
 
   },
 
-  setAuthority(authority) {
 
+  setAuthority (authority) {
 
     const dwAuthority = typeof authority === 'string' ? [authority] : authority
 
     localStorage.setItem('dw_oss_authority', JSON.stringify(dwAuthority))
 
   },
 
-  getAuthority() {
 
+  getAuthority () {
 
     let authority = []
 
-    if(localStorage.hasOwnProperty('dw_oss_authority')){
 
+    if (localStorage.hasOwnProperty('dw_oss_authority')) {
 
       const authorityString = localStorage.getItem('dw_oss_authority')
 
       try {
 
         if (authorityString) {

+ 8 - 23
src/utils/dw-common.js
View File 

@@ -2,37 +2,22 @@
 
 import Vue from 'vue'
 
 import DwAuthorized from './dw-authorized'
 
 
-function changeHasRole(el, binding){
 
-  console.debug('binding.value:');
 
-  console.debug(binding)
 
-  console.debug(binding.value)
 
-  /*if (roleCheck(binding.value)) {
 
-    el.style.display=""
 
-  }else{
 
-    el.style.display="none"
 
-  }*/
 
-  if(!roleCheck(binding.value)){
 
+function changeHasRole (el, binding) {
 
+  if (!roleCheck(binding.value)) {
 
     el.parentNode.removeChild(el)
 
   }
 
-  function roleCheck(value) {
 
+  function roleCheck (value) {
 
     const authority = DwAuthorized.getAuthority()
 
-    for(let i=0;i<authority.length;i++) {
 
-      if(value===authority[i]) {
 
-        return true;
 
+    for (let i=0; i<authority.length; i++) {
 
+      if (value === authority[i]) {
 
+        return true
 
       }
 
     }
 
-    return false;
 
+    return false
 
   }
 
 }
 
-
 
 Vue.directive('hasDwRole', {
 
-  /*bind: function(el, binding,vnode) {
 
-    changeHasRole(el, binding)
 
-  },
 
-  update(el, binding,vnode){
 
-    changeHasRole(el, binding)
 
-  }*/
 
-  inserted: function(el, binding) {
 
+  inserted: function (el, binding) {
 
     changeHasRole(el, binding)
 
   }
 
 })

+ 16 - 16
src/utils/dw-msg.js
View File 

@@ -1,13 +1,13 @@
 
-import {Message,MessageBox} from 'element-ui'
 
+import {Message, MessageBox} from 'element-ui'
 
 
-export function msgError(message) {
 
+export function msgError (message) {
 
   Message({
 
     message: message,
 
     type: 'error',
 
     duration: 5 * 1000
 
   })
 
 }
 
-export function msgInfo(message) {
 
+export function msgInfo (message) {
 
   Message({
 
     message: message,
 
     type: 'info',
 
@@ -15,25 +15,25 @@ export function msgInfo(message) {
 
   })
 
 }
 
 
-export function msgBoxNoLogin(){
 
+export function msgBoxNoLogin () {
 
   MessageBox.confirm('未登录状态，是否重新登录', '系统提示', {
 
-      confirmButtonText: '重新登录',
 
-      cancelButtonText: '取消',
 
-      type: 'warning'
 
-    }
 
+    confirmButtonText: '重新登录',
 
+    cancelButtonText: '取消',
 
+    type: 'warning'
 
+  }
 
   ).then(() => {
 
     window.location.href = '/#/login'
 
-  }).catch(() => {});
 
+  }).catch(() => {})
 
 }
 
 
-export function msgBoxNoRole(){
 
+export function msgBoxNoRole () {
 
   MessageBox.confirm('账号没有相关操作权限', '系统提示', {
 
-      confirmButtonText: '确认',
 
-      showCancelButton: false,
 
-      showClose: false,
 
-      type: 'warning'
 
-    }
 
+    confirmButtonText: '确认',
 
+    showCancelButton: false,
 
+    showClose: false,
 
+    type: 'warning'
 
+  }
 
   ).then(() => {
 
     window.location.href = '/#/'
 
-  }).catch(() => {});
 
+  }).catch(() => {})
 
 }

+ 25 - 25
src/utils/request.js
View File 

@@ -1,14 +1,12 @@
 
 import axios from 'axios'
 
-import { Notification, MessageBox, Message, Loading } from 'element-ui'
 
-import {msgBoxNoLogin, msgBoxNoRole, msgError, msgInfo} from './dw-msg'
 
-
 
+import {msgBoxNoLogin, msgBoxNoRole, msgError} from './dw-msg'
 
 
 // 全局的 axios 默认值
 
 axios.defaults.baseURL = process.env.DW_API_URL
 
 // 请求超时时间
 
-axios.defaults.timeout = 10000;
 
+axios.defaults.timeout = 10000
 
 // post请求头
 
-axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
 
+axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
 
 
 const service = axios.create({
 
   // axios中请求配置有baseURL选项，表示请求URL公共部分
 
@@ -20,7 +18,7 @@ const service = axios.create({
 
 // 请求拦截器
 
 service.interceptors.request.use(
 
   config => {
 
-    return config;
 
+    return config
 
   },
 
   error => {
 
     console.log('request-error:'+error)
 
@@ -34,15 +32,16 @@ service.interceptors.response.use(
 
     console.debug(response)
 
     if (response.status === 200) {
 
       const {data} = response
 
-      if(data.hasOwnProperty('resultCode')) {
 
-        if(data.resultCode === 401 ) {
 
+      if (data.hasOwnProperty('resultCode')) {
 
+        if (data.resultCode === 401) {
 
           msgBoxNoLogin()
 
-        }else if(data.resultCode === 403 ) {
 
+        } else if (data.resultCode === 403) {
 
           msgBoxNoRole()
 
-        } else if(data.resultCode !== 200 ) {
 
+        } else if (data.resultCode !== 200) {
 
           let message = `异常码：${data.resultCode}`
 
-          if(data.hasOwnProperty('resultMsg'))
 
+          if (data.hasOwnProperty('resultMsg')) {
 
             message = `${data.resultMsg}，异常码：${data.resultCode}`
 
+          }
 
           msgError(message)
 
         }
 
       }
 
@@ -54,27 +53,28 @@ service.interceptors.response.use(
 
   error => {
 
     // 服务器状态码不是200的情况
 
     console.log('err' + error)
 
-    let { message } = error;
 
-    if (message.includes("Network Error")) {
 
-      message = "后端接口连接异常";
 
-    } else if (message.includes("timeout")) {
 
-      message = "系统接口请求超时";
 
-    } else if (message.includes("Request failed with status code")) {
 
-      const code = message.substr(message.length - 3);
 
-      if(code==="401" || code==="403"){
 
+    let {message} = error
 
+    if (message.includes('Network Error')) {
 
+      message = '后端接口连接异常'
 
+    } else if (message.includes('timeout')) {
 
+      message = '系统接口请求超时'
 
+    } else if (message.includes('Request failed with status code')) {
 
+      const code = message.substr(message.length - 3)
 
+      if (code === '401' || code === '403') {
 
         message=null
 
-        if(code==="401"){
 
+        if (code === '401') {
 
           msgBoxNoLogin()
 
-        }else if(code==="403"){
 
+        } else if (code === '403') {
 
           msgBoxNoRole()
 
         }
 
-      }else{
 
-        message = "系统接口" + message.substr(message.length - 3) + "异常";
 
+      } else {
 
+        message = '系统接口' + message.substr(message.length - 3) + '异常'
 
       }
 
     }
 
-    if(message!=null) msgError(message)
 
+    if (message != null) {
 
+      msgError(message)
 
+    }
 
     return Promise.reject(error)
 
   }
 
 )
 
-
 
 export default service

+ 5 - 7
src/views/Login.vue
View File 

@@ -14,7 +14,7 @@
 
             </div>
 
           </div>
 
           <div>
 
-            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" status-icon label-position="top" label-width="100px" class="demo-ruleForm" @submit.native.prevent >
 
+            <el-form ref="ruleForm" :model="ruleForm" :rules="rules" status-icon label-position="top" label-width="100px" class="demo-ruleForm" @submit.native.prevent >
 
               <el-form-item label="用户名" prop="email">
 
                 <el-input v-model="ruleForm.email" autocomplete="on" ></el-input>
 
               </el-form-item>
 
@@ -23,7 +23,6 @@
 
               </el-form-item>
 
               <el-form-item>
 
                 <el-button type="primary" native-type="submit" style="width: 100%;" @click="submitForm('ruleForm')" >登录</el-button>
 
-<!--                <el-button @click="resetForm('ruleForm')">重置</el-button>-->
 
               </el-form-item>
 
             </el-form>
 
           </div>
 
@@ -36,7 +35,7 @@
 
 
 import DwAuthorized from '../utils/dw-authorized'
 
 import {msgError} from '../utils/dw-msg'
 
-import { dwLogin } from "@/api/dw-login";
 
+import {dwLogin} from '@/api/dw-login'
 
 
 export default {
 
   name: 'Login',
 
@@ -82,15 +81,14 @@ export default {
 
               }
 
             }
 
           })
 
-
 
         } else {
 
           console.log('error submit!!')
 
           return false
 
         }
 
-      });
 
+      })
 
     },
 
-    resetForm(formName) {
 
-      this.$refs[formName].resetFields();
 
+    resetForm (formName) {
 
+      this.$refs[formName].resetFields()
 
     }
 
   }
 
 }

+ 5 - 5
src/views/dw-admin/AdminUserList.vue
View File 

@@ -25,7 +25,7 @@
 
             <el-row :span="24" type="flex" justify="space-between" align="middle">
 
               <el-col :span="4"><h3>用户管理</h3></el-col>
 
               <el-col :span="20" style="text-align: right;">
 
-                <el-button type="primary" size="medium" v-has-dw-role="'dwAdmin'"  @click="dialogTitle = '创建用户';userFormRules.pwd = { required: false };userForm.id=null;dialogFormVisible = true">添加用户</el-button>
 
+                <el-button v-has-dw-role="'dwAdmin'" type="primary" size="medium" @click="dialogTitle = '创建用户';userFormRules.pwd = { required: false };userForm.id=null;dialogFormVisible = true">添加用户</el-button>
 
               </el-col>
 
             </el-row>
 
           </div>
 
@@ -75,11 +75,11 @@
 
           </el-table>
 
           <div class="dw-pagination">
 
             <el-pagination
 
-              background
 
-              layout="prev, pager, next"
 
               :page-size="pageSize"
 
               :current-page="currentPage"
 
               :total="total"
 
+              background
 
+              layout="prev, pager, next"
 
               @current-change="handleCurrentChange"
 
             >
 
             </el-pagination>
 
@@ -89,7 +89,7 @@
 
     </el-row>
 
     <div>
 
       <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible" append-to-body width="40%" >
 
-        <el-form :model="userForm" :rules="userFormRules" ref="userForm" status-icon  label-position="top">
 
+        <el-form ref="userForm" :model="userForm" :rules="userFormRules" status-icon label-position="top">
 
           <el-form-item :label-width="formLabelWidth" label="设置账号" prop="loginName" style="margin-top: 0px;">
 
             <el-input v-model="userForm.loginName" autocomplete="off" placeholder="请设置登录账号" show-word-limit ></el-input>
 
           </el-form-item>
 
@@ -156,7 +156,7 @@ export default {
 
     }
 
   },
 
   mounted () {
 
-    this.queryList(1);
 
+    this.queryList(1)
 
   },
 
   methods: {
 
     buttonClickA (href) {

+ 2 - 3
src/views/dw-survey/dw-collect/DwAnswer.vue
View File 

@@ -9,14 +9,13 @@ export default {
 
     this.loadAnswer()
 
   },
 
   methods: {
 
-    loadAnswer: function(){
 
+    loadAnswer () {
 
       const sid = this.$route.params.sid
 
-      window.location.href=process.env.DW_WEB_URL+"/static/diaowen/answer-p.html?sid="+sid;
 
+      window.location.href=process.env.DW_WEB_URL+'/static/diaowen/answer-p.html?sid='+sid
 
     }
 
   }
 
 }
 
 </script>
 
-
 
 <style scoped>
 
 
 </style>

+ 1 - 1
src/views/dw-survey/dw-collect/DwAnswerUrlMain.vue
View File 

@@ -57,7 +57,7 @@ export default {
 
       console.debug(this.survey)
 
       const clipboard = new Clipboard(e.target, {text: () => text})
 
       clipboard.on('success', e => {
 
-        this.$message({ type: 'success', message: '复制成功' })
 
+        this.$message({type: 'success', message: '复制成功'})
 
         // 释放内存
 
         clipboard.off('error')
 
         clipboard.off('success')

+ 6 - 6
src/views/dw-survey/dw-collect/DwAnswerWeixin.vue
View File 

@@ -33,7 +33,7 @@
 
               <el-row type="flex" gutter="20" justify="start" align="middle">
 
                 <el-col :span="8" >
 
                   <div class="dw-dcs-main-wx-step">1、使用微信扫一扫功能。</div>
 
-                  <el-image src="http://localhost:8181/diaowen/images/img1/weixin_collect1.jpg" class="dw-dcs-main-img">
 
+                  <el-image src="/static/diaowen/images/img1/weixin_collect1.jpg" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -41,7 +41,7 @@
 
                 </el-col>
 
                 <el-col :span="8">
 
                   <div class="dw-dcs-main-wx-step">2、打开问卷后，点击右上角的“分享”按钮。</div>
 
-                  <el-image src="http://localhost:8181/diaowen/images/img1/weixin_collect2.jpg" class="dw-dcs-main-img">
 
+                  <el-image src="/static/diaowen/images/img1/weixin_collect2.jpg" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -49,7 +49,7 @@
 
                 </el-col>
 
                 <el-col :span="8">
 
                   <div class="dw-dcs-main-wx-step">3、选择“发送给朋友”或“分享到朋友圈”</div>
 
-                  <el-image src="http://localhost:8181/diaowen/images/img1/weixin_collect3.jpg" class="dw-dcs-main-img">
 
+                  <el-image src="/static/diaowen/images/img1/weixin_collect3.jpg" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -75,7 +75,7 @@
 
               <el-row type="flex" gutter="20" justify="start" align="top">
 
                 <el-col :span="8" >
 
                   <div class="dw-dcs-main-wx-step">1、打开公众账号。</div>
 
-                  <el-image src="http://localhost:8181/diaowen/images/img1/weixin_b_s3.png" class="dw-dcs-main-img">
 
+                  <el-image src="/static/diaowen/images/img1/weixin_b_s3.png" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -83,7 +83,7 @@
 
                 </el-col>
 
                 <el-col :span="8">
 
                   <div class="dw-dcs-main-wx-step">2、将链接放入公众号中确认后推送文章。</div>
 
-                  <el-image src="http://localhost:8181/diaowen/images/img1/weixin_b_s4.jpeg" class="dw-dcs-main-img">
 
+                  <el-image src="/static/diaowen/images/img1/weixin_b_s4.jpeg" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -117,7 +117,7 @@ export default {
 
   },
 
   methods: {
 
     copyActiveCode (e, text) {
 
-      const clipboard = new Clipboard(e.target, { text: () => text })
 
+      const clipboard = new Clipboard(e.target, {text: () => text})
 
       clipboard.on('success', e => {
 
         this.$message({type: 'success', message: '复制成功'})
 
         // 释放内存

+ 1 - 1
src/views/dw-survey/dw-collect/DwSurveyAttr.vue
View File 

@@ -131,7 +131,7 @@ export default {
 
       console.log(data)
 
       dwSurveyUpdate(data).then((response) => {
 
         console.log(response)
 
-        const data = response.data;
 
+        const data = response.data
 
         if (data.resultCode === 200) {
 
           this.$message({type: 'success', message: '保存成功'})
 
         } else {

+ 24 - 25
src/views/dw-survey/dw-data/DwSurveyAnswerInfo.vue
View File 

@@ -1,6 +1,6 @@
 
 <template>
 
   <div>
 
-    <el-page-header @back="goBack" content="答卷详情" class="dw-page-header" ></el-page-header>
 
+    <el-page-header content="答卷详情" class="dw-page-header" @back="goBack" ></el-page-header>
 
     <div class="dw-answer-content">
 
       <el-row type="flex" class="row-bg">
 
         <el-col :span="16" :push="4">
 
@@ -10,32 +10,32 @@
 
                 <template slot="label">
 
                   <i class="el-icon-location-information"></i> 答卷IP
 
                 </template>
 
-                {{survey.surveyAnswer.ipAddr}}
 
+                {{ survey.surveyAnswer.ipAddr }}
 
               </el-descriptions-item>
 
               <el-descriptions-item>
 
                 <template slot="label">
 
                   <i class="el-icon-timer"></i>
 
                   答卷时间
 
                 </template>
 
-                {{survey.surveyAnswer.endAnDate}}
 
+                {{ survey.surveyAnswer.endAnDate }}
 
               </el-descriptions-item>
 
               <el-descriptions-item>
 
                 <template slot="label">
 
                   <i class="el-icon-monitor"></i>
 
                   答题数
 
                 </template>
 
-                {{survey.surveyAnswer.completeItemNum}}
 
+                {{ survey.surveyAnswer.completeItemNum }}
 
               </el-descriptions-item>
 
               <el-descriptions-item>
 
                 <template slot="label">
 
                   <i class="el-icon-price-tag"></i> 答卷ID
 
                 </template>
 
-                {{survey.surveyAnswer.id}}
 
+                {{ survey.surveyAnswer.id }}
 
               </el-descriptions-item>
 
             </el-descriptions>
 
             <div class="dw-answer-title" style="padding-top: 30px;padding-bottom: 0px;">答卷结果信息</div>
 
             <div style="padding: 0px 20px 30px 20px;">
 
-              <dw-survey-answer-qu-common v-bind:key="item.id" v-bind:id="item.id" v-bind:index="index" v-for="(item,index) in survey.questions" v-bind:question="item" ></dw-survey-answer-qu-common>
 
+              <dw-survey-answer-qu-common v-for="(item,index) in survey.questions" :key="item.id" :id="item.id" :index="index" :question="item" ></dw-survey-answer-qu-common>
 
             </div>
 
           </div>
 
         </el-col>
 
@@ -58,7 +58,7 @@ export default {
 
   data () {
 
     return {
 
       survey: {
 
-        questions:[],
 
+        questions: []
 
       },
 
       tableData: [],
 
       pageSize: 10,
 
@@ -116,7 +116,7 @@ export default {
 
         for (let i=0; i < this.survey.questions.length; i++) {
 
           const questionData = this.survey.questions[i]
 
           const quType = questionData.quType
 
-          var quOptionsObj
 
+          let quOptionsObj
 
           if (quType==='CHECKBOX') {
 
             questionData.quTypeName = '多选题'
 
             quOptionsObj = questionData.quCheckboxs
 
@@ -138,38 +138,38 @@ export default {
 
             questionData.quTypeName = quType
 
           }
 
           if (quType==='CHECKBOX' || quType==='SCORE' || quType==='ORDERQU' || quType==='MULTIFILLBLANK') {
 
-            for(let j=0; j < quOptionsObj.length; j++){
 
+            for (let j=0; j < quOptionsObj.length; j++) {
 
               const item = quOptionsObj[j]
 
               if (quType==='CHECKBOX') {
 
-                const anCheckboxs = questionData.anCheckboxs;
 
-                for (let k=0; k<anCheckboxs.length; k++){
 
-                  if(anCheckboxs[k].quItemId===item.id){
 
+                const anCheckboxs = questionData.anCheckboxs
 
+                for (let k=0; k<anCheckboxs.length; k++) {
 
+                  if (anCheckboxs[k].quItemId === item.id) {
 
                     item.answer = true
 
                     break
 
                   }
 
                 }
 
-              }else if (quType==='SCORE') {
 
-                const anScores = questionData.anScores;
 
-                for (let k=0; k<anScores.length; k++){
 
-                  if(anScores[k].quRowId===item.id){
 
-                    if(anScores[k].answserScore!=null){
 
+              } else if (quType==='SCORE') {
 
+                const anScores = questionData.anScores
 
+                for (let k=0; k<anScores.length; k++) {
 
+                  if (anScores[k].quRowId === item.id) {
 
+                    if (anScores[k].answserScore != null) {
 
                       item.answer = parseInt(anScores[k].answserScore)
 
                       break
 
                     }
 
                   }
 
                 }
 
-              }else if (quType==='ORDERQU') {
 
-                const anOrders = questionData.anOrders;
 
-                for (let k=0; k<anOrders.length; k++){
 
-                  if(anOrders[k].quRowId===item.id){
 
+              } else if (quType==='ORDERQU') {
 
+                const anOrders = questionData.anOrders
 
+                for (let k=0; k<anOrders.length; k++) {
 
+                  if (anOrders[k].quRowId === item.id) {
 
                     item.answer = anOrders[k].orderyNum
 
                     break
 
                   }
 
                 }
 
-              }else if (quType==='MULTIFILLBLANK') {
 
+              } else if (quType==='MULTIFILLBLANK') {
 
                 const anDFillblanks = questionData.anDFillblanks
 
-                for (let k=0; k<anDFillblanks.length; k++){
 
-                  if(anDFillblanks[k].quItemId===item.id){
 
+                for (let k=0; k<anDFillblanks.length; k++) {
 
+                  if (anDFillblanks[k].quItemId === item.id) {
 
                     item.answer = anDFillblanks[k].answer
 
                     break
 
                   }
 
@@ -178,7 +178,6 @@ export default {
 
             }
 
           }
 
         }
 
-
 
       })
 
     },
 
     handleCurrentChange: function (val) {

+ 2 - 2
src/views/dw-survey/dw-data/DwSurveyCharts.vue
View File 

@@ -64,10 +64,10 @@ export default {
 
           } else {
 
             questionData.quTypeName = questionData.quType
 
           }
 
-          let quStatOptions = []
 
+          const quStatOptions = []
 
           if (questionData.quType === 'RADIO' || questionData.quType === 'CHECKBOX' || questionData.quType === 'SCORE' || questionData.quType === 'ORDERQU' || questionData.quType === 'MULTIFILLBLANK') {
 
             for (let j=0; j < quOptionsObj.length; j++) {
 
-              let item = quOptionsObj[j]
 
+              const item = quOptionsObj[j]
 
               let quStatOption
 
               if (questionData.quType === 'RADIO' || questionData.quType === 'CHECKBOX') {
 
                 const anCount = item.anCount

+ 2 - 3
src/views/dw-user/DwUser.vue
View File 

@@ -34,11 +34,10 @@
 
     </el-row>
 
   </div>
 
 </template>
 
-
 
 <script>
 
-
 
 import DwUserMenu from './DwUserMenu'
 
-import { dwUserInfo } from '../../api/dw-user'
 
+import {dwUserInfo} from '../../api/dw-user'
 
+
 
 export default {
 
   name: 'DwUser',
 
   components: {

+ 2 - 3
src/views/dw-user/DwUserMenu.vue
View File 

@@ -28,12 +28,11 @@ export default {
 
     this.setDefActive()
 
   },
 
   methods: {
 
-    setDefActive: function(){
 
+    setDefActive () {
 
       const fullPath = this.$route.fullPath
 
-      if(fullPath.indexOf('/dw/user/pwd')>=0){
 
+      if (fullPath.indexOf('/dw/user/pwd') >= 0) {
 
         this.defActive = '/dw/user/pwd'
 
       }
 
-
 
     }
 
   }
 
 }

+ 7 - 7
src/views/dw-user/DwUserPwd.vue
View File 

@@ -9,7 +9,7 @@
 
             </el-col>
 
             <el-col :span="20">
 
               <div style="padding: 30px;width: 400px;">
 
-                <el-form :model="ruleForm" :rules="rules" ref="ruleForm" status-icon label-width="100px" label-position="top">
 
+                <el-form ref="ruleForm" :model="ruleForm" :rules="rules" status-icon label-width="100px" label-position="top">
 
                   <el-form-item label="原密码" prop="age">
 
                     <el-input v-model="ruleForm.oldPass" autocomplete="off" show-password></el-input>
 
                   </el-form-item>
 
@@ -52,7 +52,7 @@ export default {
 
         }
 
         callback()
 
       }
 
-    };
 
+    }
 
     var validatePass2 = (rule, value, callback) => {
 
       if (value === '') {
 
         callback(new Error('请再次输入密码'))
 
@@ -61,7 +61,7 @@ export default {
 
       } else {
 
         callback()
 
       }
 
-    };
 
+    }
 
     return {
 
       ruleForm: {
 
         pass: '',
 
@@ -79,7 +79,7 @@ export default {
 
           {required: true, message: '请输入原登录密码', trigger: 'blur'}
 
         ]
 
       }
 
-    };
 
+    }
 
   },
 
   mounted () {
 
 
@@ -88,7 +88,7 @@ export default {
 
     submitForm (formName) {
 
       this.$refs[formName].validate((valid) => {
 
         if (valid) {
 
-          dwUserPwd(this.ruleForm.oldPass,this.ruleForm.pass).then((response) => {
 
+          dwUserPwd(this.ruleForm.oldPass, this.ruleForm.pass).then((response) => {
 
             const httpResult = response.data
 
             if (httpResult.resultCode === 200) {
 
               this.$message.success('密码修改成功')
 
@@ -98,11 +98,11 @@ export default {
 
           })
 
         } else {
 
           console.log('error submit!!')
 
-          return false;
 
+          return false
 
         }
 
       })
 
     },
 
-    resetForm(formName) {
 
+    resetForm (formName) {
 
       this.$refs[formName].resetFields()
 
     }
 
   }

BIN
static/diaowen/images/favicon.ico
View File


BIN
static/favicon.ico
View File