From c66b8f227e87dda3376e8d83168874f466177362 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 15 Mar 2024 16:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/question.js                           |  2 -
 .../question/components/QuestionAddForm.vue   | 79 +++++++++++++------
 .../question/components/QuestionForm.vue      | 32 +++++++-
 src/views/question/index.vue                  | 29 ++++---
 vue.config.js                                 |  6 +-
 5 files changed, 108 insertions(+), 40 deletions(-)

diff --git a/src/api/question.js b/src/api/question.js
index 0dda73b..9a75db5 100644
--- a/src/api/question.js
+++ b/src/api/question.js
@@ -31,5 +31,3 @@ export function addQuestion(data) {
     data: data
   });
 }
-
-
diff --git a/src/views/question/components/QuestionAddForm.vue b/src/views/question/components/QuestionAddForm.vue
index 1378a99..886cfe2 100644
--- a/src/views/question/components/QuestionAddForm.vue
+++ b/src/views/question/components/QuestionAddForm.vue
@@ -1,7 +1,14 @@
 <template>
   <el-dialog title="试题" :close-on-click-modal="false" append-to-body :visible.sync="visible" width="900px" @close="closeDialog">
     <div>
-      <el-form ref="dialogForm" :model="dialogForm" :rules="dataRule" label-position="left" @keyup.enter.native="dialogFormSubmit()">
+      <el-form
+        ref="dialogForm"
+        :model="dialogForm"
+        :rules="dataRule"
+        label-width="80px"
+        label-position="left"
+        @keyup.enter.native="dialogFormSubmit()"
+      >
         <el-row>
           <el-col :span="24">
             <el-form-item label="题目" prop="question">
@@ -9,47 +16,47 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="选项A" prop="question">
               <el-input v-model="dialogForm.chooseA" maxlength="200" placeholder="请输入" clearable />
-          </el-form-item>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="选项B" prop="question">
               <el-input v-model="dialogForm.chooseB" maxlength="200" placeholder="请输入" clearable />
-          </el-form-item>
+            </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="选项C" prop="question">
               <el-input v-model="dialogForm.chooseC" maxlength="200" placeholder="请输入" clearable />
-          </el-form-item>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="选项D" prop="question">
               <el-input v-model="dialogForm.chooseD" maxlength="200" placeholder="请输入" clearable />
-          </el-form-item>
+            </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="选项E" prop="question">
               <el-input v-model="dialogForm.chooseE" maxlength="200" placeholder="请输入" clearable />
-          </el-form-item>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="选项F" prop="question">
               <el-input v-model="dialogForm.chooseF" maxlength="200" placeholder="请输入" clearable />
-          </el-form-item>
+            </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="选项G" prop="question">
               <el-input v-model="dialogForm.chooseG" maxlength="200" placeholder="请输入" clearable />
-          </el-form-item>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -63,11 +70,11 @@
           <el-col :span="24">
             <el-form-item label="科目" prop="subject">
               <span v-if="dialogForm.subject == 1">科一</span>
-              <span v-if="dialogForm.subject == 4">科四</span>
+              <span v-else-if="dialogForm.subject == 4">科四</span>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="精选500题" prop="isVip">
               <el-radio-group v-model="dialogForm.isVip" size="small">
@@ -132,11 +139,25 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-form-item label="题目图片" prop="imageUrl">
+            <el-upload
+              action="#"
+              accept=".png,.jpg,.jpeg,.gif"
+              :limit="1"
+              :http-request="handleImport"
+              :on-exceed="handleExceed"
+              :show-file-list="false"
+            >
+              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" style="width: 200px;">
+              <i v-else class="el-icon-plus" />
+            </el-upload>
+          </el-form-item>
+        </el-row>
       </el-form>
-
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button plain @click="(visible=false)">取消</el-button>
+      <el-button plain @click="visible = false">取消</el-button>
       <el-button v-jclick type="primary" :disabled="!canSubmit" @click="dialogFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
@@ -146,7 +167,7 @@
 import { addQuestion } from '@/api/question';
 
 export default {
-  data () {
+  data() {
     return {
       visible: false,
       canSubmit: true,
@@ -167,7 +188,7 @@ export default {
     };
   },
   methods: {
-    init (info = undefined) {
+    init(info = undefined) {
       // debugger
       this.visible = true;
       this.$nextTick(() => {
@@ -178,7 +199,7 @@ export default {
         }
       });
     },
-    resetDialogForm () {
+    resetDialogForm() {
       this.dialogForm = {
         questionId: undefined,
         isVip: 0,
@@ -190,14 +211,14 @@ export default {
         examKeys: undefined
       };
     },
-    closeDialog () {
+    closeDialog() {
       this.$emit('update:dialogVisible', false);
     },
     // 表单提交
-    dialogFormSubmit () {
+    dialogFormSubmit() {
       this.$refs.dialogForm.validate((valid) => {
         if (valid) {
-          updateQuestion(this.dialogForm).then(response => {
+          addQuestion(this.dialogForm).then((response) => {
             if (response.code == 200) {
               this.$modal.msgSuccess('修改成功');
               // this.visible = true;
@@ -205,6 +226,20 @@ export default {
           });
         }
       });
+    },
+    handleImport(opt) {
+      const data = new FormData();
+      data.append('file', opt.file);
+      // 上传
+      // api.upload(data).then(resp => {
+      //   if (resp.code == 200) {
+      //     this.$modal.msgSuccess('文件上传成功');
+      //     this.dialogForm.imageUrl = resp.data;
+      //   }
+      // });
+    },
+    handleExceed(files) {
+      this.handleImport({ file: files[0] });
     }
   }
 };
diff --git a/src/views/question/components/QuestionForm.vue b/src/views/question/components/QuestionForm.vue
index 50f3af9..7837e46 100644
--- a/src/views/question/components/QuestionForm.vue
+++ b/src/views/question/components/QuestionForm.vue
@@ -6,10 +6,25 @@
           <el-col :span="24">
             <el-form-item label="题目" prop="question">
               <div>{{ dialogForm.question }}</div>
-              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" width="100" alt="">
+              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" width="200" alt="">
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-form-item label="替换图片">
+            <el-upload
+              action="#"
+              accept=".png,.jpg,.jpeg,.gif"
+              :limit="1"
+              :http-request="handleImport"
+              :on-exceed="handleExceed"
+              :show-file-list="false"
+            >
+              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" style="width: 300px;">
+              <i v-else class="el-icon-plus" />
+            </el-upload>
+          </el-form-item>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="选项" prop="question">
@@ -146,6 +161,7 @@ export default {
         // this.$refs['dialogForm'].resetFields();
         if (info) {
           this.dialogForm = this.deepClone(info);
+          this.fileUrl = info.imageUrl;
         }
       });
     },
@@ -177,6 +193,20 @@ export default {
           });
         }
       });
+    },
+    handleImport(opt) {
+      const data = new FormData();
+      data.append('file', opt.file);
+      // 上传
+      // api.upload(data).then(resp => {
+      //   if (resp.code == 200) {
+      //     this.$modal.msgSuccess('文件上传成功');
+      //     this.dialogForm.imageUrl = resp.data;
+      //   }
+      // });
+    },
+    handleExceed(files) {
+      this.handleImport({ file: files[0] });
     }
   }
 };
diff --git a/src/views/question/index.vue b/src/views/question/index.vue
index 1f617db..a6d6905 100644
--- a/src/views/question/index.vue
+++ b/src/views/question/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" style="text-align:center">
+  <div class="app-container" style="text-align: center">
     <el-form size="small" :inline="true" label-width="68px" @submit.native.prevent>
       <el-row :gutter="20">
         <el-form-item label="车型">
@@ -16,22 +16,24 @@
           </el-radio-group>
         </el-form-item>
       </el-row>
+      <el-form-item>
+        <el-checkbox v-model="queryParams.isWatermark" :label="true">是否有水印</el-checkbox>
+      </el-form-item>
       <el-form-item label="题目">
-        <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width:400px" @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width: 400px" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
-
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="tableList" style="width:80%;margin:auto" @row-click="handleEdit">
+    <el-table v-loading="loading" :data="tableList" style="width: 80%; margin: auto" @row-click="handleEdit">
       <el-table-column type="index" width="55" align="center" />
       <el-table-column label="题目" align="center" prop="question" min-width="140" />
       <el-table-column label="选项" align="center" min-width="140">
-        <template slot-scope="{row}">
+        <template slot-scope="{ row }">
           <p v-if="row.chooseA">A:{{ row.chooseA }}</p>
           <p v-if="row.chooseB">B:{{ row.chooseB }}</p>
           <p v-if="row.chooseC">C:{{ row.chooseC }}</p>
@@ -43,18 +45,18 @@
       </el-table-column>
       <el-table-column label="答案" align="center" prop="trueAnswer" min-width="100" />
       <el-table-column label="科目" align="center" prop="subject" min-width="100">
-        <template slot-scope="{row}">
+        <template slot-scope="{ row }">
           <p v-if="row.subject == 1">科一</p>
           <p v-if="row.subject == 4">科四</p>
         </template>
       </el-table-column>
       <el-table-column label="是否新规" align="center" min-width="100">
-        <template slot-scope="{row}">
+        <template slot-scope="{ row }">
           {{ row.isNew ? '是' : '' }}
         </template>
       </el-table-column>
       <el-table-column label="车型" align="center" min-width="100">
-        <template slot-scope="{row}">
+        <template slot-scope="{ row }">
           {{ row.carTypeId == 1001 ? '小车' : '摩托车' }}
         </template>
       </el-table-column>
@@ -68,7 +70,6 @@
     <!-- <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
     <QuestionForm v-if="dialogVisible" ref="dialogForm" :dialog-visible="dialogVisible" @update="getList" />
     <QuestionAddForm v-if="dialogAddVisible" ref="dialogAddForm" :dialog-visible="dialogAddVisible" @update="getList" />
-
   </div>
 </template>
 
@@ -80,7 +81,8 @@ import QuestionAddForm from './components/QuestionAddForm.vue';
 export default {
   name: 'Question',
   components: {
-    QuestionForm, QuestionAddForm
+    QuestionForm,
+    QuestionAddForm
   },
   data() {
     return {
@@ -106,7 +108,7 @@ export default {
     /** 查询文件列表 */
     getList() {
       this.loading = true;
-      searchQuestion(this.queryParams).then(response => {
+      searchQuestion(this.queryParams).then((response) => {
         this.tableList = response.data;
         // this.total = response.total;
         this.loading = false;
@@ -135,7 +137,10 @@ export default {
     handleAdd(item) {
       this.dialogAddVisible = true;
       this.$nextTick(() => {
-        this.$refs.dialogAddForm.init(item);
+        this.$refs.dialogAddForm.init({
+          subject: this.queryParams.subject,
+          carTypeId: this.queryParams.carTypeId
+        });
       });
     }
   }
diff --git a/vue.config.js b/vue.config.js
index 9466293..77bed88 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       [process.env.VUE_APP_BASE_API + '/driver-api']: {
         // target: `http://118.31.23.45:8888/driver-api/`,
-        target: `http://localhost:8888/driver-api/`,
+        target: `https://xueche.ahduima.com/duima/driver-api/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API + '/driver-api']: ''
@@ -43,8 +43,8 @@ module.exports = {
       },
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `https://xueche.ahduima.com/duima/`,
-        target: `http://localhost:8086`,
+        target: `https://xueche.ahduima.com/duima/`,
+        // target: `http://localhost:8086`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''