修改

src/utils/fetch.js

 import axios from 'axios'
 import store from '../store'
+import {openLoading, closeLoading} from './utils'
 // import { getHostnameAndPort } from '../utils'
 // axios.defaults.withCredentials = true
 
@@ -14,14 +15,6 @@ service.interceptors.request.use(config => {
   config.headers['sysCode'] = 26
   config.headers['token'] = localStorage.getItem('storageToken')
   config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
-  // if (config.data && config.data.setEntry) {
-  //   config.headers['sysCode'] = config.data.sysCode || 10
-  //   if(config.data.token){
-  //      config.headers['token'] = config.data.token || '63C3FA92AF8A45A48B31EB7FD97B95EB'
-  //   }
-   
-  //   config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
-  // }
   return config
 }, error => {
  // logger.debug('service.interceptors.request: ', error)

src/views/question-naire/question-list.vue

@@ -53,7 +53,7 @@
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" align="center" min-width="200">
                     <template slot-scope="scope">
-                        <el-button type="primary" size="small" @click="edit(scope.row)">编辑</el-button>
+                        <el-button type="primary" size="small" @click="editQuestion(scope.row)">编辑</el-button>
                         <el-button type="primary" v-if="scope.row.status == 1" size="small" @click="onAndDownLine(scope.row)">上线</el-button>
 						<el-button type="primary" v-if="scope.row.status == 2" size="small" @click="onAndDownLine(scope.row)">下线</el-button>
                         <!-- <el-button type="primary" size="small" @click="reviewQuestion(scope.row)">查看题库</el-button> -->
@@ -98,10 +98,10 @@
                     <el-input v-model="questionEditList.name" maxlength="30" placeholder="标题最多30字符" style="width: 300px;"></el-input>
                 </el-form-item>
                 <el-form-item label="题库导入" prop="fileName">
-                    <el-col :span="10">
-                        <el-input class="form-input" :placeholder="excelFileName" v-model="fileName" disabled style="width: 300px;"/>
+                    <el-col :span="12">
+                        <el-input class="form-input" :placeholder="excelFileName" v-model="fileName" disabled style="width: 99%;"/>
                     </el-col>
-                    <el-col :span="6">
+                    <el-col :span="10">
                         <el-upload 
                         class="upload-demo"
                         style="display: inline-block;width: 80px;" 
@@ -115,7 +115,7 @@
                     </el-col>
                 </el-form-item>
                 <el-form-item label="下一题按钮" v-if="questionEditList.showType == 1">
-                    <div class="submit-btn">
+                    <div class="submit-btn" style="margin-right:20px;">
                         <p>置灰不可点</p>
                         <el-upload
                             v-model="questionEditList.nextDisableClickUrl"
@@ -130,7 +130,7 @@
                             <img v-if="!questionEditList.nextDisableClickUrl" class="bg-img" src="https://files.yunqueyi.com/image/png/common/20190408164003674.png">
                         </div>
                     </div>
-                    <div class="submit-btn" style="margin-left:20px;">
+                    <div class="submit-btn">
                         <p>点亮可点</p>
                         <el-upload
                             v-model="questionEditList.nextClickUrl"
@@ -160,21 +160,19 @@
                 </el-form-item>
                 <el-form-item label="问卷起始时间" v-if="questionEditList.showType == 2 && questionEditList.headStyle == 1">
                     <el-date-picker 
-                        type="date" 
+                        type="datetime" 
                         placeholder="开始时间" 
                         v-model="questionEditList.startDate" 
-                        style="width: 144px;"
-                        format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd 00:00:00">
+                        style="width: 181px;"
+                        >
                     </el-date-picker>
                     <span>-</span>
                     <el-date-picker 
-                        type="date" 
+                        type="datetime" 
                         placeholder="结束时间" 
                         v-model="questionEditList.endDate" 
-                        style="width: 144px;"
-                        format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd 00:00:00">
+                        style="width: 181px;"
+                        >
                     </el-date-picker>
                 </el-form-item>
                 <div v-if="questionEditList.showType == 2 && questionEditList.headStyle == 2">
@@ -258,7 +256,9 @@ export default {
                 headDiagramUrl: '',
                 headStyle: 1,
                 subheading: '',
-                questionIntro: ''
+                questionIntro: '',
+                startDate: '',
+                endDate: ''
             },
             rules: {
                 name: [
@@ -334,14 +334,20 @@ export default {
                 headDiagramUrl: '',
                 headStyle: 1,
                 subheading: '',
-                questionIntro: ''
+                questionIntro: '',
+                startDate: '',
+                endDate: ''
             });
             vm.fileName = ''
             vm.fileArray = []
+            vm.excelFileName = ''
         },
         // 编辑
-        edit(row) {
+        editQuestion(row) {
             vm.discussEditVisible = true
+            vm.excelFileName = ''
+            vm.fileName = ''
+            vm.fileArray = []
             vm.GET('/campaign/adminQuestionnaire/getQuestionnaireById',{id:row.id}).then((res) => {
                 if(res.code == '000000') {
                     vm.questionEditList = Object.assign({},res.data)
@@ -367,10 +373,6 @@ export default {
                     vm.search()
                 }
             })
-        },
-        // 查看题库
-        reviewQuestion() {
-
         },
         // 导入题库
         beforeImport(file) {
@@ -480,8 +482,10 @@ export default {
             }
             vm.$refs.questionForm.validate((valid) => {
                 if(valid) {
+                    commonUtil.openLoading(vm)
                     vm.POST('/campaign/adminQuestionnaire/insertOrUpdateQuestionnaire',req).then((res) => {
                         if(res.code == '000000') {
+                            commonUtil.closeLoading(vm)
                             vm.discussEditVisible = false
                             vm.search()
                         }else {