编辑挑战时, excel导入题目增加type

.env.production

@@ -1,2 +1,2 @@
-#VUE_APP_BASE_API = 'http://192.168.100.22:2900'
+VUE_APP_BASE_API = 'http://192.168.100.22:2900'
-VUE_APP_BASE_API = 'https://puzzle-admin.kingsome.cn'
+#VUE_APP_BASE_API = 'https://puzzle-admin.kingsome.cn'

dist/css/chunk-2ffaffe4.d97489d0.css

@@ -0,0 +1 @@
+[data-v-62f54f8e]:export{menuBg:#304156;menuText:#bfcbd9;menuActiveText:#409eff}.upload-container[data-v-62f54f8e]{width:100%;position:relative}.upload-container[data-v-62f54f8e]:after{content:"";display:table;clear:both}.upload-container .image-uploader[data-v-62f54f8e]{width:35%;float:left}.upload-container .image-preview[data-v-62f54f8e]{width:200px;position:relative;border:1px dashed #d9d9d9;float:left;margin-left:50px}.upload-container .image-preview .image-preview-wrapper[data-v-62f54f8e]{position:relative;width:100%}.upload-container .image-preview .image-preview-wrapper img[data-v-62f54f8e]{width:100%}.upload-container .image-preview .image-preview-action[data-v-62f54f8e]{position:absolute;width:100%;left:0;top:0;cursor:default;color:#fff;opacity:0;font-size:20px;background-color:rgba(0,0,0,.5);transition:opacity .3s;cursor:pointer;text-align:center;line-height:200px}.upload-container .image-preview .image-preview-action .el-icon-delete[data-v-62f54f8e]{font-size:36px}.upload-container .image-preview:hover .image-preview-action[data-v-62f54f8e]{opacity:1}.upload-container .image-app-preview[data-v-62f54f8e]{width:320px;height:180px;position:relative;border:1px dashed #d9d9d9;float:left;margin-left:50px}.upload-container .image-app-preview .app-fake-conver[data-v-62f54f8e]{height:44px;position:absolute;width:100%;text-align:center;line-height:64px;color:#fff}[data-v-616030e4]:export{menuBg:#304156;menuText:#bfcbd9;menuActiveText:#409eff}.bottom[data-v-616030e4]{margin-top:13px;line-height:12px;display:flex;justify-content:space-between;align-items:center}.bottom span[data-v-616030e4]{font-size:13px;color:#999}.button[data-v-616030e4]{padding:0;min-height:auto;float:right}.image[data-v-616030e4]{width:100%;display:block}.one-block[data-v-616030e4]{border:1px solid #ebebeb;border-radius:3px;transition:.2s;padding:24px;margin-bottom:24px;box-shadow:0 2px 12px 0 rgba(0,0,0,.1)}

dist/css/chunk-5eb2cf46.66cf7a01.css

@@ -1 +0,0 @@
-[data-v-465027df]:export{menuBg:#304156;menuText:#bfcbd9;menuActiveText:#409eff}.action-bar[data-v-465027df]{margin-bottom:15px}.excel-upload-input[data-v-465027df]{display:none;z-index:-9999}.el-form-item[data-v-465027df]{margin-bottom:22px}[data-v-1194820e]:export{menuBg:#304156;menuText:#bfcbd9;menuActiveText:#409eff}.action-bar[data-v-1194820e]{margin-bottom:15px}.excel-upload-input[data-v-1194820e]{display:none;z-index:-9999}

dist/css/chunk-93605462.ceeab5a1.css

@@ -1 +0,0 @@
-[data-v-3e3926ee]:export{menuBg:#304156;menuText:#bfcbd9;menuActiveText:#409eff}.bottom[data-v-3e3926ee]{margin-top:13px;line-height:12px;display:flex;justify-content:space-between;align-items:center}.bottom span[data-v-3e3926ee]{font-size:13px;color:#999}.button[data-v-3e3926ee]{padding:0;min-height:auto;float:right}.image[data-v-3e3926ee]{width:100%;display:block}.one-block[data-v-3e3926ee]{border:1px solid #ebebeb;border-radius:3px;transition:.2s;padding:24px;margin-bottom:24px;box-shadow:0 2px 12px 0 rgba(0,0,0,.1)}

dist/css/chunk-968583b6.f0e736e7.css

@@ -0,0 +1 @@
+[data-v-51d4bf66]:export{menuBg:#304156;menuText:#bfcbd9;menuActiveText:#409eff}.bottom[data-v-51d4bf66]{margin-top:13px;line-height:12px;display:flex;justify-content:space-between;align-items:center}.bottom span[data-v-51d4bf66]{font-size:13px;color:#999}.sub-bottom[data-v-51d4bf66]{display:flex;justify-content:space-between}.button[data-v-51d4bf66]{padding:0;min-height:auto;float:right}.image[data-v-51d4bf66]{width:100%;display:block}.one-block[data-v-51d4bf66]{border:1px solid #ebebeb;border-radius:3px;transition:.2s;padding:24px;margin-bottom:24px;box-shadow:0 2px 12px 0 rgba(0,0,0,.1)}

dist/css/chunk-b3ff7f44.07dc1089.css

@@ -0,0 +1 @@
+[data-v-fe08448c]:export{menuBg:#304156;menuText:#bfcbd9;menuActiveText:#409eff}.action-bar[data-v-fe08448c]{margin-bottom:15px}.excel-upload-input[data-v-fe08448c]{display:none;z-index:-9999}.el-form-item[data-v-fe08448c]{margin-bottom:22px}[data-v-43ef58cc]:export{menuBg:#304156;menuText:#bfcbd9;menuActiveText:#409eff}.action-bar[data-v-43ef58cc]{margin-bottom:15px}.excel-upload-input[data-v-43ef58cc]{display:none;z-index:-9999}

dist/precache-manifest.6fb466d40c7fcf2769a01f19e571018a.js

@@ -8,11 +8,11 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/css/404.96fe1c26.css"
   },
   {
-    "revision": "76629469ef69953252ce",
+    "revision": "5d66a78f49f45d5e6ce0",
     "url": "/css/app.82284a16.css"
   },
   {
-    "revision": "7488493388b347106689",
+    "revision": "746171d02fcd47d73815",
     "url": "/css/chunk-01717ca4.0461aed2.css"
   },
   {
@@ -20,7 +20,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/css/chunk-0a4f4aa8.3fc2e519.css"
   },
   {
-    "revision": "867136c5faedd2a54221",
+    "revision": "355bdd7c56b5d232aee1",
     "url": "/css/chunk-0be7c560.200293c4.css"
   },
   {
@@ -28,11 +28,11 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/css/chunk-0f612d01.372fdeb4.css"
   },
   {
-    "revision": "57951964b311db17e4bf",
+    "revision": "8b07f683ff3e7e6775cf",
     "url": "/css/chunk-1461ada7.200293c4.css"
   },
   {
-    "revision": "afac612a68c1c8c9d0e5",
+    "revision": "db77e5b98f48be023961",
     "url": "/css/chunk-17bb2ec1.c069f7e6.css"
   },
   {
@@ -47,36 +47,40 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "revision": "7b366c1c9c8e6e91f016",
     "url": "/css/chunk-281b1a31.1f0605c9.css"
   },
+  {
+    "revision": "20385462925eecb31c0a",
+    "url": "/css/chunk-2ffaffe4.d97489d0.css"
+  },
   {
     "revision": "4e3c1360db9477932ac7",
     "url": "/css/chunk-5337e365.9011efc0.css"
   },
   {
-    "revision": "f40ce9ffb58dd48da8d0",
+    "revision": "7c79196c6c61419dea71",
-    "url": "/css/chunk-5eb2cf46.66cf7a01.css"
-  },
-  {
-    "revision": "fc4833c65ebb44092533",
     "url": "/css/chunk-646f364d.7d04feee.css"
   },
   {
-    "revision": "f6f98047c3176baa32bd",
+    "revision": "1d89ea2ff53bebf07d50",
     "url": "/css/chunk-8d6861b8.90c6c4e5.css"
   },
   {
-    "revision": "0a2bc193c0d46c78b062",
+    "revision": "7a70456fd0cacde2105f",
-    "url": "/css/chunk-93605462.ceeab5a1.css"
+    "url": "/css/chunk-968583b6.f0e736e7.css"
   },
   {
-    "revision": "9249a6ef97bd0cd22ad9",
+    "revision": "f3fab585784c3455c13f",
+    "url": "/css/chunk-b3ff7f44.07dc1089.css"
+  },
+  {
+    "revision": "1214e7031daf07cbdfe8",
     "url": "/css/chunk-c01eabb6.200293c4.css"
   },
   {
-    "revision": "d4d90f4e307b3b07c43f",
+    "revision": "1ef374a78b639702a77c",
     "url": "/css/chunk-caf615d4.200293c4.css"
   },
   {
-    "revision": "e89088eec3e4f9707f3a",
+    "revision": "5eadfdf907cb9e9abb7d",
     "url": "/css/chunk-db2c0ce8.38768785.css"
   },
   {
@@ -84,7 +88,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/css/chunk-db2e4b88.eb2f870a.css"
   },
   {
-    "revision": "79a9ab92c5dab145503f",
+    "revision": "05f29fdbab672b1646ea",
     "url": "/css/chunk-fd5993aa.0461aed2.css"
   },
   {
@@ -140,7 +144,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/img/404.a57b6f31.png"
   },
   {
-    "revision": "48e3607297f2d5c2bc32598ab0056f07",
+    "revision": "2a16abc18b469a70fe79eef0abb5df67",
     "url": "/index.html"
   },
   {
@@ -152,16 +156,16 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/js/404.1ae749ee.js"
   },
   {
-    "revision": "76629469ef69953252ce",
+    "revision": "5d66a78f49f45d5e6ce0",
-    "url": "/js/app.3e8b857e.js"
+    "url": "/js/app.f39a4546.js"
   },
   {
     "revision": "4308fe0503e593d27da4",
     "url": "/js/auth-redirect.d5b70f0f.js"
   },
   {
-    "revision": "7488493388b347106689",
+    "revision": "746171d02fcd47d73815",
-    "url": "/js/chunk-01717ca4.b0281c8e.js"
+    "url": "/js/chunk-01717ca4.05fa2bed.js"
   },
   {
     "revision": "9161baaf8f28536d4e75",
@@ -172,20 +176,20 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/js/chunk-0b733548.c2755497.js"
   },
   {
-    "revision": "867136c5faedd2a54221",
+    "revision": "355bdd7c56b5d232aee1",
-    "url": "/js/chunk-0be7c560.975568dc.js"
+    "url": "/js/chunk-0be7c560.810fc81b.js"
   },
   {
     "revision": "a6f91f9d74ce813bd8d0",
     "url": "/js/chunk-0f612d01.99892ac1.js"
   },
   {
-    "revision": "57951964b311db17e4bf",
+    "revision": "8b07f683ff3e7e6775cf",
-    "url": "/js/chunk-1461ada7.11bf105c.js"
+    "url": "/js/chunk-1461ada7.340fba9a.js"
   },
   {
-    "revision": "afac612a68c1c8c9d0e5",
+    "revision": "db77e5b98f48be023961",
-    "url": "/js/chunk-17bb2ec1.29df0dd8.js"
+    "url": "/js/chunk-17bb2ec1.e826861f.js"
   },
   {
     "revision": "b3f7758407f0e35fb119",
@@ -199,49 +203,57 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "revision": "7b366c1c9c8e6e91f016",
     "url": "/js/chunk-281b1a31.64f340d5.js"
   },
+  {
+    "revision": "20385462925eecb31c0a",
+    "url": "/js/chunk-2ffaffe4.978db34f.js"
+  },
+  {
+    "revision": "b36e5ffc9181f956c9be",
+    "url": "/js/chunk-50b4ae97.21d56b7f.js"
+  },
   {
     "revision": "4e3c1360db9477932ac7",
     "url": "/js/chunk-5337e365.b6185851.js"
   },
   {
-    "revision": "f40ce9ffb58dd48da8d0",
+    "revision": "7c79196c6c61419dea71",
-    "url": "/js/chunk-5eb2cf46.80cafacc.js"
+    "url": "/js/chunk-646f364d.68a80b9c.js"
   },
   {
-    "revision": "fc4833c65ebb44092533",
+    "revision": "1d89ea2ff53bebf07d50",
-    "url": "/js/chunk-646f364d.dea9405f.js"
+    "url": "/js/chunk-8d6861b8.178fbcd5.js"
   },
   {
-    "revision": "f6f98047c3176baa32bd",
+    "revision": "7a70456fd0cacde2105f",
-    "url": "/js/chunk-8d6861b8.c8fcbd42.js"
+    "url": "/js/chunk-968583b6.eb33e6d2.js"
   },
   {
-    "revision": "0a2bc193c0d46c78b062",
+    "revision": "f3fab585784c3455c13f",
-    "url": "/js/chunk-93605462.0758b9a4.js"
+    "url": "/js/chunk-b3ff7f44.d018d27e.js"
   },
   {
-    "revision": "9249a6ef97bd0cd22ad9",
+    "revision": "1214e7031daf07cbdfe8",
-    "url": "/js/chunk-c01eabb6.4d39b3d4.js"
+    "url": "/js/chunk-c01eabb6.046271ac.js"
   },
   {
-    "revision": "d4d90f4e307b3b07c43f",
+    "revision": "1ef374a78b639702a77c",
-    "url": "/js/chunk-caf615d4.ddea436c.js"
+    "url": "/js/chunk-caf615d4.f65b9717.js"
   },
   {
-    "revision": "67eddfb47ed3433c9768",
+    "revision": "80046de21126b698645f",
-    "url": "/js/chunk-d8d59a28.7ce72226.js"
+    "url": "/js/chunk-d8d59a28.a2d1a941.js"
   },
   {
-    "revision": "e89088eec3e4f9707f3a",
+    "revision": "5eadfdf907cb9e9abb7d",
-    "url": "/js/chunk-db2c0ce8.af595a17.js"
+    "url": "/js/chunk-db2c0ce8.c653e7f6.js"
   },
   {
     "revision": "aa1703a88247154927f7",
     "url": "/js/chunk-db2e4b88.e058519a.js"
   },
   {
-    "revision": "79a9ab92c5dab145503f",
+    "revision": "05f29fdbab672b1646ea",
-    "url": "/js/chunk-fd5993aa.801fdaa9.js"
+    "url": "/js/chunk-fd5993aa.6e5ec164.js"
   },
   {
     "revision": "6007173314a5d3c69adb",

dist/service-worker.js

@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.7b0b8b8ffcec1490442ff84cda9e7339.js"
+  "/precache-manifest.6fb466d40c7fcf2769a01f19e571018a.js"
 );
 
 workbox.core.setCacheNameDetails({prefix: "pyxis-fe"});

src/api/exam.ts

@@ -8,6 +8,7 @@ export interface IExamQuerstion {
   a2?: string
   a3?: string
   a4?: string
+  type: number
 }
 
 export interface IExamData {

src/views/exam/components/PuzzleList.vue

@@ -90,6 +90,13 @@
         prop="a4"
     >
     </el-table-column>
+    <el-table-column
+        label="题目类型"
+    >
+      <template slot-scope="{row}">
+        <span>{{ row.type === 3 ? '问卷' : '普通' }}</span>
+      </template>
+    </el-table-column>
     <el-table-column
         align="center"
         width="180"
@@ -176,6 +183,24 @@
               clearable
           />
         </el-form-item>
+        <el-form-item label="题目类型" prop="type">
+          <el-select
+              v-model="record.type"
+              placeholder="选择类型"
+              name="type"
+              required
+              class="w100"
+          >
+            <el-option
+                label="普通"
+                :value="1"
+            />
+            <el-option
+                label="问卷"
+                :value="3"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div style="text-align:right;">
         <el-button
@@ -372,7 +397,8 @@ export default class extends Vue {
       a1: '',
       a2: '',
       a3: '',
-      a4: ''
+      a4: '',
+      type: 1
     }
   }
 
@@ -564,7 +590,7 @@ export default class extends Vue {
 
   private handleDownload() {
     this.downloadLoading = true
-    const tHeader = ['question', 'a1', 'a2', 'a3', 'a4']
+    const tHeader = ['question', 'a1', 'a2', 'a3', 'a4', 'type']
     const list = this.multipleSelection.length > 0 ? this.multipleSelection.slice(0) : this.questions.slice(0)
     this.filename = parseTime(new Date(), '{y}{m}{d}{h}{i}{s}')
     const data = formatJson(tHeader, list)