代码格式优化

.eslintrc.js

@@ -200,8 +200,9 @@ module.exports = {
     'yoda': [2, 'never'],
     'prefer-const': 2,
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'object-curly-spacing': [2, 'always', {
-      objectsInObjects: false
+    'object-curly-spacing': [2, 'never', {
+      objectsInObjects: false,
+      arraysInObjects: false
     }],
     'array-bracket-spacing': [2, 'never']
   }

src/api/index.js

@@ -18,5 +18,5 @@ export default {
   adminUserUpdate: `/api/dwsurvey/admin/user/edit.do`,
   adminUserDelete: `/api/dwsurvey/admin/user/delete.do`,
   curUserInfo: `/api/dwsurvey/app/user/currentUser.do`,
-  curUserPwdUpdate: `/api/dwsurvey/app/user/up-pwd.do`,
+  curUserPwdUpdate: `/api/dwsurvey/app/user/up-pwd.do`
 }

src/components/common/DwSurveyDcsWrapper.vue

@@ -90,14 +90,25 @@
 </template>
 
 <script>
-import { dwSurveyInfo } from '@/api/dw-survey'
+import {dwSurveyInfo} from '@/api/dw-survey'
 export default {
   name: 'DwSurveyDcsWrapper',
-  props: ['id', 'isAnswerUrl', 'isSurveySet', 'isSiteShare', 'isSiteComp', 'isAnswerWx', 'isSurveyChart', 'isAnswerData', 'isSurveyLog', 'isAnswerLog'],
+  props: {
+    id: {type: String, default: ''},
+    isAnswerUrl: {type: Boolean, default: false},
+    isSurveySet: {type: Boolean, default: false},
+    isSiteShare: {type: Boolean, default: false},
+    isSiteComp: {type: Boolean, default: false},
+    isAnswerWx: {type: Boolean, default: false},
+    isSurveyChart: {type: Boolean, default: false},
+    isAnswerData: {type: Boolean, default: false},
+    isSurveyLog: {type: Boolean, default: false},
+    isAnswerLog: {type: Boolean, default: false}
+  },
   data () {
     return {
       survey: {
-        sid: 'aaaaaa',
+        sid: '',
         answerUrl: '',
         answerUrlQR: '',
         siteCompCodeRoot: ''

src/components/layouts/DwHeader.vue

@@ -17,9 +17,9 @@
               <el-col :span="4" style="text-align: right;" >
                 <div>
                   <el-dropdown @command="handleCommand">
-                <span class="el-dropdown-link" >
-                  {{ userName }} <i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
+                    <span class="el-dropdown-link" >
+                      {{ userName }} <i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item command="myAccount">我的账号</el-dropdown-item>
                       <el-dropdown-item command="updatePwd">修改密码</el-dropdown-item>
@@ -38,34 +38,31 @@
 
 <script>
 import DwNavMenu from '@/components/layouts/DwNavMenu.vue'
-import API from '@/api/index.js'
 import DwAuthorized from '@/utils/dw-authorized'
 import {logout} from '@/api/dw-login'
 
 export default {
-  name: 'DwHeader.vue',
+  name: 'DwHeader',
+  components: {
+    'dw-nav-menu': DwNavMenu
+  },
   data () {
     return {
       userName: 'dwsurvey'
     }
   },
-  components: {
-    'dw-nav-menu': DwNavMenu
-  },
   mounted () {
     this.userName = DwAuthorized.getUserName()
   },
   methods: {
-    handleCommand: function(command){
-      console.debug(command);
+    handleCommand: function (command) {
       if (command === 'logout') {
-        logout().then((response) => {
-          const resultData = response.data
+        logout().then(() => {
           this.$router.push('/login')
         })
-      } else if (command === 'myAccount'){
+      } else if (command === 'myAccount') {
         this.$router.push('/dw/user')
-      } else if (command === 'updatePwd'){
+      } else if (command === 'updatePwd') {
         this.$router.push('/dw/user/pwd')
       }
     }

src/components/layouts/DwNavMenu.vue

@@ -1,25 +1,23 @@
 <template>
   <el-menu
-    mode="horizontal"
     :default-active="defActive"
-    @select="handleSelect"
+    mode="horizontal"
     background-color="#34495e"
     text-color="#fff"
     active-text-color="#409eff"
     class="dw-menu-height dw-menu"
     router
-  >
+    @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>
 </template>
-
 <script>
 
 export default {
-  name: 'DwNavMenu.vue',
+  name: 'DwNavMenu',
   data () {
     return {
       defActive: '/dw/survey'
@@ -35,24 +33,22 @@ export default {
     handleClose (key, keyPath) {
       console.log(key, keyPath)
     },
-    setDefActive: function(){
-
+    setDefActive () {
       const fullPath = this.$route.fullPath
-      console.debug("fullPath:"+fullPath);
-      if (fullPath.indexOf('/dw/survey')>=0) {
+      console.debug("fullPath:"+fullPath)
+      if (fullPath.indexOf('/dw/survey') >= 0) {
         this.defActive = '/dw/survey'
-      } else if(fullPath.indexOf('/dw/admin/user')>=0) {
+      } 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>

src/components/layouts/LoginLayout.vue

@@ -1,7 +1,5 @@
 <template>
-  <!--    <img src="./assets/logo.png">-->
-  <!--    <router-view/>-->
-  <div id="dw-layout" class="dw-layout-body" :style="{height: pageH}" >
+  <div id="dw-layout" :style="{height: pageH}" class="dw-layout-body" >
     <el-container style="padding: 0px;">
       <el-header height="80" style="padding: 0px;" >
         <dw-header-login></dw-header-login>

src/views/Login.vue

@@ -14,15 +14,15 @@
             </div>
           </div>
           <div>
-            <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-position="top" label-width="100px" class="demo-ruleForm" @submit.native.prevent >
+            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" 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>
               <el-form-item label="密码" prop="pass">
-                <el-input type="password" v-model="ruleForm.pass" autocomplete="off" show-password ></el-input>
+                <el-input v-model="ruleForm.pass" type="password" autocomplete="off" show-password ></el-input>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" native-type="submit" @click="submitForm('ruleForm')" style="width: 100%;">登录</el-button>
+                <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>
@@ -32,18 +32,15 @@
     </el-row>
   </div>
 </template>
-
 <script>
 
-import API from '@/api/index.js'
 import DwAuthorized from '../utils/dw-authorized'
 import {msgError} from '../utils/dw-msg'
 import { dwLogin } from "@/api/dw-login";
 
-
 export default {
-  name: 'Login.vue',
-  data() {
+  name: 'Login',
+  data () {
     return {
       ruleForm: {
         email: '',
@@ -51,44 +48,44 @@ export default {
       },
       rules: {
         email: [
-          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
-          { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
+          {required: true, message: '请输入邮箱地址', trigger: 'blur'},
+          {type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change']}
         ],
         pass: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
-          { min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur' }
+          {required: true, message: '请输入活动名称', trigger: 'blur'},
+          {min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur'}
         ]
       }
-    };
+    }
   },
   mounted () {
     this.pageH = window.height
   },
   methods: {
-    submitForm(formName) {
+    submitForm (formName) {
       // 进行登录验证
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          dwLogin(this.ruleForm.email,this.ruleForm.pass).then((response) => {
+          dwLogin(this.ruleForm.email, this.ruleForm.pass).then((response) => {
             const resultData = response.data
             console.log('login-begin')
             console.log(resultData)
-            if(resultData.status==="ok"){
+            if (resultData.status === 'ok') {
               DwAuthorized.setAuthority(resultData.currentAuthority)
               DwAuthorized.setUserName(this.ruleForm.email)
               this.$router.push('/dw/survey/')
-            }else{
-              if(resultData.hasOwnProperty('httpResult') && resultData.httpResult!=null && resultData.httpResult.hasOwnProperty('resultMsg')){
+            } else {
+              if (resultData.hasOwnProperty('httpResult') && resultData.httpResult!=null && resultData.httpResult.hasOwnProperty('resultMsg')) {
                 msgError(resultData.httpResult.resultMsg)
-              }else{
+              } else {
                 msgError('登录失败，请确认！')
               }
             }
           })
 
         } else {
-          console.log('error submit!!');
-          return false;
+          console.log('error submit!!')
+          return false
         }
       });
     },

src/views/dw-admin/AdminUserList.vue

@@ -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" @click="dialogTitle = '创建用户';userFormRules.pwd = { required: false };userForm.id=null;dialogFormVisible = true" v-has-dw-role="'dwAdmin'" >添加用户</el-button>
+                <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-col>
             </el-row>
           </div>
@@ -64,10 +64,10 @@
               <template slot-scope="scope">
                 <el-button-group>
                   <el-tooltip effect="dark" content="编辑问卷" placement="top">
-                    <el-button size="mini" content="编辑" @click="handleEdit(scope.$index, scope.row)" icon="el-icon-edit"></el-button>
+                    <el-button size="mini" content="编辑" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)"></el-button>
                   </el-tooltip>
                   <el-tooltip effect="dark" content="删除问卷" placement="top">
-                    <el-button size="mini" @click="handleDelete(scope.$index, scope.row)" icon="el-icon-delete"></el-button>
+                    <el-button size="mini" icon="el-icon-delete" @click="handleDelete(scope.$index, scope.row)" ></el-button>
                   </el-tooltip>
                 </el-button-group>
               </template>
@@ -90,18 +90,18 @@
     <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-item label="设置账号" prop="loginName" :label-width="formLabelWidth" style="margin-top: 0px;">
+          <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>
-          <el-form-item label="账号状态" prop="status" :label-width="formLabelWidth" class="dw-dialog-form-item">
+          <el-form-item :label-width="formLabelWidth" label="账号状态" prop="status" class="dw-dialog-form-item">
             <el-radio-group v-model="userForm.status">
               <el-radio :label="0">不可用</el-radio>
               <el-radio :label="1">未激活</el-radio>
               <el-radio :label="2">激活</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="设置密码" prop="pwd" :label-width="formLabelWidth" class="dw-dialog-form-item" >
-            <el-input v-model="userForm.pwd"  autocomplete="off" placeholder="新建时必须设置密码，修改时不设置代表不修改。" show-password ></el-input>
+          <el-form-item :label-width="formLabelWidth" label="设置密码" prop="pwd" class="dw-dialog-form-item" >
+            <el-input v-model="userForm.pwd" autocomplete="off" placeholder="新建时必须设置密码，修改时不设置代表不修改。" show-password ></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -116,7 +116,7 @@
 
 <script>
 
-import { dwAdminUserList, dwUserCreate, dwUserDelete, dwUserUpdate } from '../../api/admin/admin-user'
+import {dwAdminUserList, dwUserCreate, dwUserDelete, dwUserUpdate} from '../../api/admin/admin-user'
 
 export default {
   name: 'AdminUserList',
@@ -140,16 +140,16 @@ export default {
       },
       userFormRules: {
         loginName: [
-          { required: true, message: '请输入登录账号', trigger: 'blur' },
-          { min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur' },
-          { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change']}
+          {required: true, message: '请输入登录账号', trigger: 'blur'},
+          {min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur'},
+          {type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change']}
         ],
         pwd: [
-          { required: true, message: '请输入登录密码', trigger: 'blur' },
-          { min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur' }
+          {required: true, message: '请输入登录密码', trigger: 'blur'},
+          {min: 6, max: 18, message: '长度在 6 到 18 个字符', trigger: 'blur'}
         ],
         status: [
-          { required: true, message: '请选择账号状态', trigger: 'change' }
+          {required: true, message: '请选择账号状态', trigger: 'change'}
         ]
       },
       formLabelWidth: '120px'
@@ -173,8 +173,8 @@ export default {
       this.queryList(val)
     },
     queryList (pageNo) {
-      const {status,loginName} = this.formInline;
-      dwAdminUserList(this.pageSize,pageNo,status,loginName).then((response) => {
+      const {status, loginName} = this.formInline
+      dwAdminUserList(this.pageSize, pageNo, status, loginName).then((response) => {
         const resultData = response.data.data
         this.tableData = resultData
         this.total = response.data.total
@@ -185,7 +185,7 @@ export default {
     handleEdit (index, row) {
       this.dialogTitle = `编辑用户`
       this.dialogFormVisible = true
-      this.userFormRules.pwd = { required: false }
+      this.userFormRules.pwd = {required: false}
       this.userForm.loginName = row.loginName
       this.userForm.status = row.status
       this.userForm.id = row.id
@@ -193,11 +193,11 @@ export default {
     },
     handleDelete (index, row) {
       console.log(index, row)
-      this.$msgbox.confirm("确认删除此用户吗？", "删除警告", {type:"warning",confirmButtonText:"确认删除"}).then(() => {
+      this.$msgbox.confirm('确认删除此用户吗？', '删除警告', {type: 'warning', confirmButtonText: '确认删除'}).then(() => {
         const data = {id: [row.id]}
         dwUserDelete(data).then((response) => {
           const httpResult = response.data
-          if (httpResult.resultCode === 200 ){
+          if (httpResult.resultCode === 200) {
             this.$message.success('删除成功，即将刷新数据。')
             this.queryList(1)
           } else {
@@ -205,17 +205,16 @@ export default {
           }
         })
       }).catch(() => {})
-
     },
     handleSaveUser () {
       this.$refs['userForm'].validate((valid) => {
         if (valid) {
           const {id, loginName, pwd, status} = this.userForm
-          if(id==null){
+          if (id === null) {
             const data = {loginName, pwd, status}
             dwUserCreate(data).then((response) => {
               const httpResult = response.data
-              if (httpResult.resultCode === 200 ) {
+              if (httpResult.resultCode === 200) {
                 this.$message.success('添加成功，即将刷新数据。')
                 this.queryList(1)
                 this.dialogFormVisible = false
@@ -227,7 +226,7 @@ export default {
             const data = {id, loginName, pwd, status}
             dwUserUpdate(data).then((response) => {
               const httpResult = response.data
-              if (httpResult.resultCode === 200 ) {
+              if (httpResult.resultCode === 200) {
                 this.$message.success('修改成功，即将刷新数据。')
                 this.queryList(1)
                 this.dialogFormVisible = false
@@ -240,8 +239,7 @@ export default {
           console.log('error submit!!')
           return false
         }
-      });
-
+      })
     }
   }
 }

src/views/dw-survey/DwSurveyList.vue

@@ -2,24 +2,24 @@
   <div>
     <el-row>
       <el-col :span="20" :offset="2">
-       <div class="dw-table-form" style="padding-left: 60px;">
-         <el-form :inline="true" :model="formInline" class="dw-form-inline" size="medium" >
-           <el-form-item label="问卷标题">
-             <el-input v-model="formInline.surveyName" placeholder="请输入查询的问卷标题" clearable></el-input>
-           </el-form-item>
-           <el-form-item label="问卷状态" style="margin-left: 40px;">
-             <el-select v-model="formInline.surveyState" placeholder="请选择问卷状态" clearable>
-               <el-option label="设计中" value="0"></el-option>
-               <el-option label="收集中" value="1"></el-option>
-               <el-option label="收集结束" value="2"></el-option>
-             </el-select>
-           </el-form-item>
-           <el-form-item style="margin-left: 40px;">
-             <el-button @click="onSubmit">重置</el-button>
-             <el-button type="primary" @click="onSubmit">查询</el-button>
-           </el-form-item>
-         </el-form>
-       </div>
+        <div class="dw-table-form" style="padding-left: 60px;">
+          <el-form :inline="true" :model="formInline" class="dw-form-inline" size="medium" >
+            <el-form-item label="问卷标题">
+              <el-input v-model="formInline.surveyName" placeholder="请输入查询的问卷标题" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="问卷状态" style="margin-left: 40px;">
+              <el-select v-model="formInline.surveyState" placeholder="请选择问卷状态" clearable>
+                <el-option label="设计中" value="0"></el-option>
+                <el-option label="收集中" value="1"></el-option>
+                <el-option label="收集结束" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item style="margin-left: 40px;">
+              <el-button @click="onSubmit">重置</el-button>
+              <el-button type="primary" @click="onSubmit">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
         <div class="dw-table">
           <div class="dw-table-title">
             <el-row :span="24" type="flex" justify="space-between" align="middle">
@@ -67,35 +67,19 @@
               <template slot-scope="scope">
                 <el-button-group>
                   <el-tooltip effect="dark" content="编辑问卷" placement="top">
-                    <el-button
-                      size="mini"
-                      content="编辑问卷"
-                      @click="buttonClickA(`/static/diaowen/design.html?surveyId=${scope.row.id}`)"
-                      icon="el-icon-edit"></el-button>
+                    <el-button size="mini" content="编辑问卷" icon="el-icon-edit" @click="buttonClickA(`/static/diaowen/design.html?surveyId=${scope.row.id}`)" ></el-button>
                   </el-tooltip>
                   <el-tooltip effect="dark" content="答卷地址" placement="top">
-                    <el-button
-                      size="mini"
-                      @click="handlePush(`/dw/survey/c/url/${scope.row.id}`)"
-                      icon="el-icon-share"></el-button>
+                    <el-button size="mini" icon="el-icon-share" @click="handlePush(`/dw/survey/c/url/${scope.row.id}`)"></el-button>
                   </el-tooltip>
                   <el-tooltip effect="dark" content="答卷数据" placement="top">
-                    <el-button
-                      size="mini"
-                      @click="handlePush(`/dw/survey/d/chart/${scope.row.id}`)"
-                      icon="el-icon-s-data"></el-button>
+                    <el-button size="mini" icon="el-icon-s-data" @click="handlePush(`/dw/survey/d/chart/${scope.row.id}`)"></el-button>
                   </el-tooltip>
                   <el-tooltip effect="dark" content="复制问卷" placement="top">
-                    <el-button
-                      size="mini"
-                      @click="handleCopy(scope.$index, scope.row)"
-                      icon="el-icon-copy-document"></el-button>
+                    <el-button size="mini" icon="el-icon-copy-document" @click="handleCopy(scope.$index, scope.row)"></el-button>
                   </el-tooltip>
                   <el-tooltip effect="dark" content="删除问卷" placement="top">
-                    <el-button
-                      size="mini"
-                      @click="handleDelete(scope.$index, scope.row)"
-                      icon="el-icon-delete"></el-button>
+                    <el-button size="mini" icon="el-icon-delete" @click="handleDelete(scope.$index, scope.row)"></el-button>
                   </el-tooltip>
                 </el-button-group>
               </template>
@@ -103,12 +87,12 @@
           </el-table>
           <div class="dw-pagination">
             <el-pagination
-              background
-              layout="prev, pager, next"
-              @current-change="handleCurrentChange"
               :page-size="pageSize"
               :current-page="currentPage"
               :total="total"
+              background
+              layout="prev, pager, next"
+              @current-change="handleCurrentChange"
             >
             </el-pagination>
           </div>
@@ -119,7 +103,7 @@
     <div>
       <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible" append-to-body width="40%" >
         <el-form :model="form" label-position="top">
-          <el-form-item label="问卷标题" :label-width="formLabelWidth">
+          <el-form-item :label-width="formLabelWidth" label="问卷标题" >
             <el-input v-model="form.name" autocomplete="off" placeholder="请输入问卷标题" ></el-input>
           </el-form-item>
         </el-form>
@@ -135,8 +119,8 @@
 
 <script>
 
-import { dwSurveyCreate, dwSurveyList } from '@/api/dw-survey'
-import { dwSurveyCopy, dwSurveyDelete } from '../../api/dw-survey'
+import {dwSurveyCreate, dwSurveyList} from '@/api/dw-survey'
+import {dwSurveyCopy, dwSurveyDelete} from '../../api/dw-survey'
 
 export default {
   name: 'SurveyList',
@@ -177,12 +161,12 @@ export default {
       this.dialogTitle = '复制问卷'
     },
     handleDelete (index, row) {
-      this.$msgbox.confirm("确认删除此问卷吗？", "删除警告", {type:"warning",confirmButtonText:"确认删除"}).then(() => {
-        const data = {id:[row.id]}
+      this.$msgbox.confirm('确认删除此问卷吗？', '删除警告', {type: 'warning', confirmButtonText: '确认删除'}).then(() => {
+        const data = {id: [row.id]}
         dwSurveyDelete(data).then((response) => {
           console.log(response)
           const httpResult = response.data
-          if (httpResult.resultCode === 200 ){
+          if (httpResult.resultCode === 200) {
             this.$message.success('删除成功，即将刷新数据。')
             this.queryList(1)
           } else {
@@ -199,7 +183,7 @@ export default {
       this.queryList(val)
     },
     queryList (pageNo) {
-      const {surveyName,surveyState} = this.formInline
+      const {surveyName, surveyState} = this.formInline
       dwSurveyList(this.pageSize, pageNo, surveyName, surveyState).then((response) => {
         const resultData = response.data.data
         this.tableData = resultData
@@ -222,29 +206,29 @@ export default {
         const resultData = httpResult.data
         if (httpResult.resultCode === 200) {
           this.dialogFormVisible = false
-          this.$confirm('问卷创建成功，点击“继续编辑问卷”进入问卷编辑。', '系统提示', {confirmButtonText:'继续编辑问卷'}).then(({ value }) => {
+          this.$confirm('问卷创建成功，点击“继续编辑问卷”进入问卷编辑。', '系统提示', {confirmButtonText: '继续编辑问卷'}).then(({value}) => {
             window.location.href=`/static/diaowen/design.html?surveyId=${resultData.id}`
           }).catch(() => {
             this.queryList(1)
           })
         } else {
-          this.$message.error('创建问卷失败');
+          this.$message.error('创建问卷失败')
         }
       })
     },
     copySurvey (surveyId) {
-      dwSurveyCopy(surveyId,this.form.name).then((response) =>{
+      dwSurveyCopy(surveyId, this.form.name).then((response) => {
         const httpResult = response.data
         const resultData = httpResult.data
-        if (httpResult.resultCode === 200 ) {
+        if (httpResult.resultCode === 200) {
           this.dialogFormVisible = false
-          this.$confirm('问卷复制成功，点击“继续编辑问卷”进入问卷编辑。', '系统提示', {confirmButtonText:'继续编辑问卷'}).then(({ value }) => {
+          this.$confirm('问卷复制成功，点击“继续编辑问卷”进入问卷编辑。', '系统提示', {confirmButtonText: '继续编辑问卷'}).then(({value}) => {
             window.location.href=`/static/diaowen/design.html?surveyId=${resultData.id}`
           }).catch(() => {
             this.queryList(1)
           })
         } else {
-          this.$message.error('问卷复制失败');
+          this.$message.error('问卷复制失败')
         }
       })
     }

src/views/dw-survey/dw-collect/DwAnswerUrlMain.vue

@@ -45,12 +45,17 @@ export default {
   components: {
     Clipboard
   },
-  props: ['survey'],
+  props: {
+    survey: {
+      type: Object,
+      default: () => {}
+    }
+  },
   methods: {
     copyActiveCode (e, text) {
       // console.debug(this.$children[0].survey)
       console.debug(this.survey)
-      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: '复制成功' })
         // 释放内存
@@ -60,7 +65,7 @@ export default {
       })
       clipboard.on('error', e => {
         // 不支持复制
-        this.$message({ type: 'warning', message: '该浏览器不支持自动复制' })
+        this.$message({type: 'warning', message: '该浏览器不支持自动复制'})
         // 释放内存
         clipboard.off('error')
         clipboard.off('success')

src/views/dw-survey/dw-collect/DwAnswerWeixin.vue

@@ -119,7 +119,7 @@ export default {
     copyActiveCode (e, text) {
       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')
@@ -127,7 +127,7 @@ export default {
       })
       clipboard.on('error', e => {
         // 不支持复制
-        this.$message({ type: 'waning', message: '该浏览器不支持自动复制' })
+        this.$message({type: 'waning', message: '该浏览器不支持自动复制'})
         // 释放内存
         clipboard.off('error')
         clipboard.off('success')

src/views/dw-survey/dw-collect/DwSiteComp.vue

@@ -57,14 +57,9 @@
             </el-col>
             <el-col :span="14">
               <div class="site-comp-right">
-                <div><el-input
-                  v-model="siteCompCode"
-                  :autosize="{ minRows: 2, maxRows: 8}"
-                  type="textarea"
-                  placeholder="请输入内容"
-                  disabled
-                  >
-                </el-input></div>
+                <div>
+                  <el-input v-model="siteCompCode" :autosize="{ minRows: 2, maxRows: 8}" type="textarea" placeholder="请输入内容" disabled></el-input>
+                </div>
                 <div style="padding-top: 10px;">
                   <el-button type="primary" icon="el-icon-copy-document" style="width: 100%;" @click="copyActiveCode($event,siteCompCode)">复制挂件代码</el-button>
                 </div>
@@ -85,6 +80,10 @@ import Clipboard from 'clipboard'
 
 export default {
   name: 'DwSiteComp',
+  components: {
+    DwSurveyDcsWrapper,
+    Clipboard
+  },
   data () {
     return {
       color1: '#409EFF',
@@ -94,17 +93,13 @@ export default {
       siteCompCode: '<div id="dwsurveyWebSiteFixed" style="position: fixed; right: 0px; left: auto; top: 520px; z-index: 99999;"><a target=\'_blank\' id="dwsurveyWebSiteFixedA" href="" style="background-color: rgb(24, 144, 255); width: 15px; display: block; padding: 10px 6px 10px 10px; color: white; cursor: pointer; float: right; vertical-align: middle; text-decoration: none; font-size: 12px; box-sizing: content-box; line-height: 20px;">问卷调查</a></div>'
     }
   },
-  components: {
-    DwSurveyDcsWrapper,
-    Clipboard
-  },
   methods: {
     copyActiveCode (e, text) {
       const webSiteElementCode = document.getElementById('dwsurveyWebAnswerCompCode')
       this.siteCompCode = webSiteElementCode.innerHTML
-      const clipboard = new Clipboard(e.target, { text: () => this.siteCompCode })
+      const clipboard = new Clipboard(e.target, {text: () => this.siteCompCode})
       clipboard.on('success', e => {
-        this.$message({ type: 'success', message: '复制成功' })
+        this.$message({type: 'success', message: '复制成功'})
         // 释放内存
         clipboard.off('error')
         clipboard.off('success')
@@ -112,7 +107,7 @@ export default {
       })
       clipboard.on('error', e => {
         // 不支持复制
-        this.$message({ type: 'waning', message: '该浏览器不支持自动复制' })
+        this.$message({type: 'waning', message: '该浏览器不支持自动复制'})
         // 释放内存
         clipboard.off('error')
         clipboard.off('success')

src/views/dw-survey/dw-collect/DwSiteShare.vue

@@ -33,9 +33,9 @@ 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: '复制成功' })
+        this.$message({type: 'success', message: '复制成功'})
         // 释放内存
         clipboard.off('error')
         clipboard.off('success')
@@ -43,7 +43,7 @@ export default {
       })
       clipboard.on('error', e => {
         // 不支持复制
-        this.$message({ type: 'waning', message: '该浏览器不支持自动复制' })
+        this.$message({type: 'waning', message: '该浏览器不支持自动复制'})
         // 释放内存
         clipboard.off('error')
         clipboard.off('success')

src/views/dw-survey/dw-collect/DwSurveyAttr.vue

@@ -69,7 +69,6 @@
 <script>
 
 import DwSurveyDcsWrapper from '@/components/common/DwSurveyDcsWrapper'
-import API from '@/api/index.js'
 import {dwSurveyInfo, dwSurveyUpdate} from '@/api/dw-survey'
 
 export default {
@@ -134,9 +133,9 @@ export default {
         console.log(response)
         const data = response.data;
         if (data.resultCode === 200) {
-          this.$message({ type: 'success', message: '保存成功' })
+          this.$message({type: 'success', message: '保存成功'})
         } else {
-          this.$message({ type: 'error', message: data.resultMsg })
+          this.$message({type: 'error', message: data.resultMsg})
         }
       })
     }

src/views/dw-survey/dw-data/DwSurveyAnswer.vue

@@ -38,16 +38,10 @@
             <template slot-scope="scope">
               <el-button-group>
                 <el-tooltip effect="dark" content="查看数据" placement="top">
-                  <el-button
-                    size="mini"
-                    @click="handleGo(`/no-top/dw-survey/d/data/${scope.row.surveyId}/${scope.row.id}`)"
-                    icon="el-icon-view"></el-button>
+                  <el-button size="mini" icon="el-icon-view" @click="handleGo(`/no-top/dw-survey/d/data/${scope.row.surveyId}/${scope.row.id}`)"></el-button>
                 </el-tooltip>
                 <el-tooltip effect="dark" content="删除数据" placement="top">
-                  <el-button
-                    size="mini"
-                    @click="handleDelete(scope.$index, scope.row)"
-                    icon="el-icon-delete"></el-button>
+                  <el-button size="mini" icon="el-icon-delete" @click="handleDelete(scope.$index, scope.row)"></el-button>
                 </el-tooltip>
               </el-button-group>
             </template>
@@ -55,11 +49,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>
@@ -71,7 +65,7 @@
 <script>
 
 import DwSurveyDcsWrapper from '@/components/common/DwSurveyDcsWrapper'
-import { dwSurveyAnswerList } from '@/api/dw-survey'
+import {dwSurveyAnswerList} from '@/api/dw-survey'
 
 export default {
   name: 'DwSurveyAnswer',

src/views/dw-survey/dw-data/DwSurveyAnswerInfo.vue

@@ -45,7 +45,6 @@
 </template>
 <script>
 
-import API from '@/api/index.js'
 import DwSurveyDcsWrapper from '@/components/common/DwSurveyDcsWrapper'
 import DwSurveyAnswerQuCommon from './DwSurveyAnswerQuCommon'
 import {dwSurveyAnswerInfo} from '@/api/dw-survey'
@@ -111,8 +110,6 @@ export default {
       console.log(index, row)
     },
     querySurveyAnswer () {
-      // pageSize?: number;
-      // currentPage?: number;
       dwSurveyAnswerInfo(this.$route.params.answerId).then((response) => {
         const resultData = response.data.data
         this.survey = resultData
@@ -120,30 +117,30 @@ export default {
           const questionData = this.survey.questions[i]
           const quType = questionData.quType
           var quOptionsObj
-          if (quType==="CHECKBOX") {
+          if (quType==='CHECKBOX') {
             questionData.quTypeName = '多选题'
             quOptionsObj = questionData.quCheckboxs
-          } else if (quType==="RADIO") {
+          } else if (quType==='RADIO') {
             questionData.quTypeName = '单选题'
             quOptionsObj = questionData.quRadios
-          } else if (quType==="FILLBLANK") {
+          } else if (quType==='FILLBLANK') {
             questionData.quTypeName = '填空题'
-          } else if (quType==="SCORE") {
+          } else if (quType==='SCORE') {
             questionData.quTypeName = '评分题'
             quOptionsObj = questionData.quScores
-          } else if (quType==="ORDERQU") {
+          } else if (quType==='ORDERQU') {
             questionData.quTypeName = '排序题'
             quOptionsObj = questionData.quOrderbys
-          } else if (quType==="MULTIFILLBLANK") {
+          } else if (quType==='MULTIFILLBLANK') {
             questionData.quTypeName = '多项填空题'
             quOptionsObj = questionData.quMultiFillblanks
           } else {
             questionData.quTypeName = quType
           }
-          if (quType==="CHECKBOX" || quType==="SCORE" || quType==="ORDERQU" || quType==="MULTIFILLBLANK") {
+          if (quType==='CHECKBOX' || quType==='SCORE' || quType==='ORDERQU' || quType==='MULTIFILLBLANK') {
             for(let j=0; j < quOptionsObj.length; j++){
               const item = quOptionsObj[j]
-              if (quType==="CHECKBOX") {
+              if (quType==='CHECKBOX') {
                 const anCheckboxs = questionData.anCheckboxs;
                 for (let k=0; k<anCheckboxs.length; k++){
                   if(anCheckboxs[k].quItemId===item.id){
@@ -151,7 +148,7 @@ export default {
                     break
                   }
                 }
-              }else if (quType==="SCORE") {
+              }else if (quType==='SCORE') {
                 const anScores = questionData.anScores;
                 for (let k=0; k<anScores.length; k++){
                   if(anScores[k].quRowId===item.id){
@@ -161,7 +158,7 @@ export default {
                     }
                   }
                 }
-              }else if (quType==="ORDERQU") {
+              }else if (quType==='ORDERQU') {
                 const anOrders = questionData.anOrders;
                 for (let k=0; k<anOrders.length; k++){
                   if(anOrders[k].quRowId===item.id){
@@ -169,7 +166,7 @@ export default {
                     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){

src/views/dw-survey/dw-data/DwSurveyAnswerQuCommon.vue

@@ -46,7 +46,16 @@
 
 export default {
   name: 'DwSurveyAnswerInfo',
-  props: ['question', 'index'],
+  props: {
+    question: {
+      type: Object,
+      default: () => []
+    },
+    index: {
+      type: Number,
+      default: 0
+    }
+  },
   data () {
     return {
       tableData: [],

src/views/dw-survey/dw-data/DwSurveyCharts.vue

@@ -3,7 +3,7 @@
     <dw-survey-dcs-wrapper :id="id" is-survey-chart="true" >
       <template v-slot:dw-dcs-main-slot="{survey}" >
         <div v-loading="loading" >
-          <dw-survey-charts-common :key="item.id" v-for="(item,index) in questions" :id="item.id" :index="index" :question="item" ></dw-survey-charts-common>
+          <dw-survey-charts-common v-for="(item,index) in questions" :key="item.id" :id="item.id" :index="index" :question="item" ></dw-survey-charts-common>
         </div>
       </template>
     </dw-survey-dcs-wrapper>
@@ -13,8 +13,8 @@
 
 import DwSurveyDcsWrapper from '@/components/common/DwSurveyDcsWrapper'
 import DwSurveyChartsCommon from './DwsurveyChartsCommon'
-import { msgInfo } from '@/utils/dw-msg'
-import { dwSurveyReport } from '@/api/dw-survey'
+import {msgInfo} from '@/utils/dw-msg'
+import {dwSurveyReport} from '@/api/dw-survey'
 
 export default {
   name: 'DwSurveyCharts',
@@ -25,7 +25,7 @@ export default {
   data () {
     return {
       questions: [],
-      loading: true,
+      loading: true
     }
   },
   mounted () {
@@ -37,7 +37,7 @@ export default {
         const resultData = response.data.data
         this.questions = resultData.questions
         if (this.questions.length <= 0) {
-          msgInfo("问卷还没有任何题目")
+          msgInfo('问卷还没有任何题目')
           this.loading = false
         }
         for (let i=0; i < this.questions.length; i++) {
@@ -69,7 +69,7 @@ export default {
             for (let j=0; j < quOptionsObj.length; j++) {
               let item = quOptionsObj[j]
               let quStatOption
-              if (questionData.quType === 'RADIO' || questionData.quType === 'CHECKBOX' ) {
+              if (questionData.quType === 'RADIO' || questionData.quType === 'CHECKBOX') {
                 const anCount = item.anCount
                 if (count === 0) {
                   count = 1
@@ -80,19 +80,19 @@ export default {
                 const bfbFloat = anCount / count * 100
                 const percent = bfbFloat.toFixed(2)
                 quOptionsObj[j].percent = percent
-                quStatOption = { 'optionName': item.optionName, 'anCount': item.anCount, 'percent': percent}
-              } else if (questionData.quType === "SCORE") {
+                quStatOption = {'optionName': item.optionName, 'anCount': item.anCount, 'percent': percent}
+              } else if (questionData.quType === 'SCORE') {
                 const avgScore = item.avgScore
                 const bfbFloat = avgScore/questionData.paramInt02*100
                 const percent = bfbFloat.toFixed(2)
                 // 平均分 setAvgScore
                 const anAvgScore = avgScore.toFixed(2)
-                quStatOption = { 'optionName': item.optionName, 'anCount': anAvgScore, 'percent': percent }
-              } else if (questionData.quType === "ORDERQU") {
+                quStatOption = {'optionName': item.optionName, 'anCount': anAvgScore, 'percent': percent}
+              } else if (questionData.quType === 'ORDERQU') {
                 const bfbFloat = (quOptionsObj.length-j) / ((1+quOptionsObj.length)*quOptionsObj.length/2) * 100
                 const percent = bfbFloat.toFixed(2)
-                quStatOption = { 'optionName': item.optionName, 'anCount': quOptionsObj.length-j, 'orderNum': j+1, 'percent': percent }
-              } else if (questionData.quType === "MULTIFILLBLANK") {
+                quStatOption = {'optionName': item.optionName, 'anCount': quOptionsObj.length-j, 'orderNum': j+1, 'percent': percent}
+              } else if (questionData.quType === 'MULTIFILLBLANK') {
                 const anCount = item.anCount
                 if (count === 0) {
                   count = 1
@@ -103,7 +103,7 @@ export default {
                 const bfbFloat = anCount / count * 100
                 const percent = bfbFloat.toFixed(2)
                 quOptionsObj[j].percent = percent
-                quStatOption = { 'optionName': item.optionName, 'anCount': item.anCount, 'percent': percent }
+                quStatOption = {'optionName': item.optionName, 'anCount': item.anCount, 'percent': percent}
               }
               quStatOptions.push(quStatOption)
             }

src/views/dw-survey/dw-data/DwsurveyChartsCommon.vue

@@ -75,10 +75,10 @@
 <script>
 
 import * as echarts from 'echarts/core'
-import { GridComponent, TitleComponent, TooltipComponent, LegendComponent } from 'echarts/components'
-import { LineChart, BarChart, PieChart } from 'echarts/charts'
-import { UniversalTransition, LabelLayout } from 'echarts/features'
-import { CanvasRenderer } from 'echarts/renderers'
+import {GridComponent, TitleComponent, TooltipComponent, LegendComponent} from 'echarts/components'
+import {LineChart, BarChart, PieChart} from 'echarts/charts'
+import {UniversalTransition, LabelLayout} from 'echarts/features'
+import {CanvasRenderer} from 'echarts/renderers'
 
 echarts.use([GridComponent, LineChart, BarChart, CanvasRenderer, UniversalTransition, TitleComponent,
   TooltipComponent,
@@ -88,7 +88,16 @@ echarts.use([GridComponent, LineChart, BarChart, CanvasRenderer, UniversalTransi
 
 export default {
   name: 'DwsurveyChartsCommon',
-  props: ['question', 'index'],
+  props: {
+    question: {
+      type: Object,
+      default: () => []
+    },
+    index: {
+      type: Number,
+      default: 0
+    }
+  },
   data () {
     return {
       activeName: 'bar'
@@ -126,7 +135,7 @@ export default {
       for (let i=0; i< quStatOptions.length; i++) {
         items.push(quStatOptions[i].optionName)
         itemValues.push(quStatOptions[i].anCount)
-        itemNameValues.push({ 'value': quStatOptions[i].anCount, 'name': quStatOptions[i].optionName })
+        itemNameValues.push({'value': quStatOptions[i].anCount, 'name': quStatOptions[i].optionName})
       }
       console.debug(items)
       let yAxisShow = true

src/views/dw-user/DwUserPwd.vue

@@ -9,7 +9,7 @@
             </el-col>
             <el-col :span="20">
               <div style="padding: 30px;width: 400px;">
-                <el-form :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" label-position="top">
+                <el-form :model="ruleForm" :rules="rules" ref="ruleForm" 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>
@@ -42,24 +42,24 @@ export default {
   components: {
     DwUserMenu
   },
-  data() {
+  data () {
     var validatePass = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入密码'));
+        callback(new Error('请输入密码'))
       } else {
         if (this.ruleForm.checkPass !== '') {
-          this.$refs.ruleForm.validateField('checkPass');
+          this.$refs.ruleForm.validateField('checkPass')
         }
-        callback();
+        callback()
       }
     };
     var validatePass2 = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请再次输入密码'));
+        callback(new Error('请再次输入密码'))
       } else if (value !== this.ruleForm.pass) {
-        callback(new Error('两次输入密码不一致!'));
+        callback(new Error('两次输入密码不一致!'))
       } else {
-        callback();
+        callback()
       }
     };
     return {
@@ -70,13 +70,13 @@ export default {
       },
       rules: {
         pass: [
-          { validator: validatePass, trigger: 'blur' }
+          {validator: validatePass, trigger: 'blur'}
         ],
         checkPass: [
-          { validator: validatePass2, trigger: 'blur' }
+          {validator: validatePass2, trigger: 'blur'}
         ],
         oldPass: [
-          { required: true, message: '请输入原登录密码', trigger: 'blur' },
+          {required: true, message: '请输入原登录密码', trigger: 'blur'}
         ]
       }
     };
@@ -85,25 +85,25 @@ export default {
 
   },
   methods: {
-    submitForm(formName) {
+    submitForm (formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           dwUserPwd(this.ruleForm.oldPass,this.ruleForm.pass).then((response) => {
             const httpResult = response.data
-            if(httpResult.resultCode === 200 ){
+            if (httpResult.resultCode === 200) {
               this.$message.success('密码修改成功')
-            }else{
+            } else {
               this.$message.error('密码修改失败')
             }
           })
         } else {
-          console.log('error submit!!');
+          console.log('error submit!!')
           return false;
         }
-      });
+      })
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields();
+      this.$refs[formName].resetFields()
     }
   }
 }