Merge pull request 'dev-qsh' (#13) from dev-qsh into master

Reviewed-on: qiushanhe/dm-manage-web#13

public/index.html

@@ -95,8 +95,8 @@
     <script src="/loading/index.js"></script>
     <script type="text/javascript">
       window._AMapSecurityConfig = {
-        securityJsCode:'f653df5a2c5f44ae68faaab6f6a6b8ab',
-    }
+        securityJsCode: 'f653df5a2c5f44ae68faaab6f6a6b8ab'
+      };
     </script>
     <script src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
     <script src="https://webapi.amap.com/maps?v=1.4.15&key=713d839ff505943b0f18e6df45f3b0dc&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.Geocoder,AMap.Scale"></script>

src/views/question/components/QuestionForm.vue

@@ -5,20 +5,21 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="题目" prop="question">
-              <span>{{ dialogForm.question }}</span>
+              <div>{{ dialogForm.question }}</div>
+              <img v-if="dialogForm.imageUrl" :src="dialogForm.imageUrl" width="100" alt="">
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="选项" prop="question">
-              <span v-if="dialogForm.chooseA">a:{{ dialogForm.chooseA }}<span>
-                  <span v-if="dialogForm.chooseB">b:{{ dialogForm.chooseB }} </span>
-                  <span v-if="dialogForm.chooseC">c:{{ dialogForm.chooseC }} </span>
-                  <span v-if="dialogForm.chooseD">d:{{ dialogForm.chooseD }}</span>
-                  <span v-if="dialogForm.chooseE">e:{{ dialogForm.chooseE }}</span>
-                  <span v-if="dialogForm.chooseF">f:{{ dialogForm.chooseF }}</span>
-                  <span v-if="dialogForm.chooseG">g:{{ dialogForm.chooseG }}</span>
+              <span v-if="dialogForm.chooseA">A:{{ dialogForm.chooseA }}<span>
+                <span v-if="dialogForm.chooseB">B:{{ dialogForm.chooseB }} </span>
+                <span v-if="dialogForm.chooseC">C:{{ dialogForm.chooseC }} </span>
+                <span v-if="dialogForm.chooseD">D:{{ dialogForm.chooseD }}</span>
+                <span v-if="dialogForm.chooseE">E:{{ dialogForm.chooseE }}</span>
+                <span v-if="dialogForm.chooseF">F:{{ dialogForm.chooseF }}</span>
+                <span v-if="dialogForm.chooseG">G:{{ dialogForm.chooseG }}</span>
               </span></span></el-form-item>
           </el-col>
         </el-row>
@@ -163,6 +164,7 @@ export default {
           updateQuestion(this.dialogForm).then(response => {
             if (response.code == 200) {
               this.$modal.msgSuccess('修改成功');
+              this.$emit('update');
               // this.visible = true;
             }
           });

src/views/question/index.vue

@@ -1,6 +1,20 @@
 <template>
   <div class="app-container" style="text-align:center">
-    <el-form size="small" :inline="true" label-width="68px">
+    <el-form size="small" :inline="true" label-width="68px" @submit.native.prevent>
+      <el-row :gutter="20">
+        <el-form-item label="车型">
+          <el-radio-group v-model="queryParams.carTypeId">
+            <el-radio :label="1001">小车</el-radio>
+            <el-radio :label="1002">摩托车</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="科目">
+          <el-radio-group v-model="queryParams.subject">
+            <el-radio :label="1">科一</el-radio>
+            <el-radio :label="4">科四</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-row>
       <el-form-item label="题目">
         <el-input v-model="queryParams.question" placeholder="请输入题目" clearable style="width:400px" @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -15,13 +29,13 @@
       <el-table-column label="题目" align="center" prop="question" min-width="140" />
       <el-table-column label="选项" align="center" min-width="140">
         <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>
-          <p v-if="row.chooseD">d:{{ row.chooseD }}</p>
-          <p v-if="row.chooseE">e:{{ row.chooseE }}</p>
-          <p v-if="row.chooseF">f:{{ row.chooseF }}</p>
-          <p v-if="row.chooseG">g:{{ row.chooseG }}</p>
+          <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>
+          <p v-if="row.chooseD">D:{{ row.chooseD }}</p>
+          <p v-if="row.chooseE">E:{{ row.chooseE }}</p>
+          <p v-if="row.chooseF">F:{{ row.chooseF }}</p>
+          <p v-if="row.chooseG">G:{{ row.chooseG }}</p>
         </template>
       </el-table-column>
       <el-table-column label="答案" align="center" prop="trueAnswer" min-width="100" />
@@ -31,7 +45,16 @@
           <p v-if="row.subject == 4">科四</p>
         </template>
       </el-table-column>
-
+      <el-table-column label="是否新规" align="center" min-width="100">
+        <template slot-scope="{row}">
+          {{ row.isNew ? '是' : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="车型" align="center" min-width="100">
+        <template slot-scope="{row}">
+          {{ row.carTypeId == 1001 ? '小车' : '摩托车' }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-download" @click="handleEdit(scope.row)">编辑</el-button>
@@ -65,7 +88,9 @@ export default {
       tableList: [],
       // 查询参数
       queryParams: {
-        question: ''
+        question: '',
+        carTypeId: 1001,
+        subject: 1
       },
       dialogVisible: false,
       dialogAddVisible: false
@@ -87,7 +112,11 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
+      if (this.queryParams.question) {
         this.getList();
+      } else {
+        this.$modal.msgWarning('请输入题目');
+      }
     },
     /** 重置按钮操作 */
     resetQuery() {

src/views/sch/place/index.vue

@@ -477,7 +477,7 @@ export default {
       if (item.placeId) {
         return updatePlace(item);
       } else {
-        return addPlace(item)
+        return addPlace(item);
       }
     },
     checkPlaceFormValidate() {
@@ -739,6 +739,7 @@ export default {
 .actived-school {
   border: 2px solid #409eff !important;
 }
+
 ::v-deep .el-radio__label {
   vertical-align: middle;
 }

src/views/zs/clue/ClueForm/components/MapDialog.vue

@@ -19,11 +19,12 @@ export default {
       placeSearch: null,
       currentPoint: undefined,
       marker: null,
-      searchBody: undefined
-    }
+      searchBody: undefined,
+      geocoder: null
+    };
   },
   beforeDestroy() {
-    console.log("mapdialog----beforeDestroy")
+    console.log('mapdialog----beforeDestroy');
     this.marker = null;
     this.placeSearch = null;
 
@@ -31,23 +32,23 @@ export default {
     this.dialogMap = null;
   },
   mounted() {
-    console.log("mounted")
-    this.initData()
+    console.log('mounted');
+    this.initData();
   },
   created() {
-    console.log("created")
+    console.log('created');
   },
   methods: {
     initData(point = undefined) {
-      console.log(point)
-      this.visible = true
+      console.log(point);
+      this.visible = true;
       // this.searchBody = undefined
       this.$nextTick(() => {
         this.resetData();
         if (point) {
           this.currentPoint = point;
         }
-        this.initMap()
+        this.initMap();
       });
     },
     resetData() {
@@ -55,10 +56,10 @@ export default {
       this.dialogMap && this.marker && this.dialogMap.remove(this.marker);
       this.marker = null;
       // this.placeSearch = null;
-      this.searchBody = null
+      this.searchBody = null;
     },
     initMap() {
-      console.log("初始化地图")
+      console.log('初始化地图');
       if (!this.dialogMap) {
         this.dialogMap = new AMap.Map('dialogMap', {
           zoom: 12,
@@ -78,20 +79,19 @@ export default {
         });
         this.dialogMap.addControl(new AMap.Scale());
         const auto = new AMap.Autocomplete({
-          input: 'search', // 前端搜索框
-        })
+          input: 'search' // 前端搜索框
+        });
         this.placeSearch = new AMap.PlaceSearch({
           map: this.dialogMap,
           pageSize: 10, // 单页显示结果条数
           pageIndex: 1, // 页码
-          autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-        })
-        AMap.event.addListener(auto, 'select', this.select)
+          autoFitView: true // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+        });
+        AMap.event.addListener(auto, 'select', this.select);
         this.geocoder = new AMap.Geocoder();
       }
 
       this.initMapCenter();
-
     },
     // 初始化编辑地图的中心点
     initMapCenter() {
@@ -142,10 +142,9 @@ export default {
     handleMapSave() {
       if (this.currentPoint.lat && this.currentPoint.lng) {
         // 通知父组件
-        this.$emit("handleMapDialogPoint", this.currentPoint);
+        this.$emit('handleMapDialogPoint', this.currentPoint);
         this.visible = false;
         this.$emit('update:mapDialogVisible', false);
-
       } else {
         this.$message.error('请在地图上选择位置后保存！');
       }
@@ -153,8 +152,8 @@ export default {
     closeDialog() {
       this.$emit('update:mapDialogVisible', false);
     }
-  },
   }
+};
 </script>
 
 <style scoped>
@@ -162,6 +161,7 @@ export default {
   width: 100%;
   height: 400px;
 }
+
 .search-body {
   position: absolute;
   top: 90px;

src/views/zs/clue/components/ClueFormDialog.vue

@@ -452,7 +452,8 @@ export default {
       // );
       if (this.currentPoint.lng && this.currentPoint.lat) {
         regeo({
-          key: 'f2f35d6adc4a16bb879d303cead56237',
+          // key: 'f2f35d6adc4a16bb879d303cead56237',
+          key: '0e62be0896c6b8d27d453445f0fb8bc4',
           location: this.currentPoint.lng + ',' + this.currentPoint.lat
         }).then((resp) => {
           if (resp.status === '1') {
@@ -512,7 +513,8 @@ export default {
     async getWalkingDistance(start, end) {
       if (start && end) {
         const resp = await walking({
-          key: 'f2f35d6adc4a16bb879d303cead56237',
+          // key: 'f2f35d6adc4a16bb879d303cead56237',
+          key: '0e62be0896c6b8d27d453445f0fb8bc4',
           origin: start[0] + ',' + start[1],
           destination: end[0] + ',' + end[1]
         });
@@ -554,7 +556,8 @@ export default {
     async querySearch(queryString, cb) {
       if (queryString) {
         const resp = await inputtips({
-          key: 'f2f35d6adc4a16bb879d303cead56237',
+          // key: 'f2f35d6adc4a16bb879d303cead56237',
+          key: '0e62be0896c6b8d27d453445f0fb8bc4',
           keywords: queryString
         });
         cb(resp.tips);
@@ -589,6 +592,7 @@ export default {
   width: 100%;
   height: 400px;
 }
+
 .address {
   position: absolute;
   left: 30px;
@@ -596,6 +600,7 @@ export default {
   width: 400px;
   background: #fff;
 }
+
 .box-card {
   position: absolute;
   right: 30px;
@@ -613,14 +618,17 @@ export default {
 .el-divider--horizontal {
   margin: 6px 0;
 }
+
 li {
   padding: 6px;
+
   .name {
     font-size: 12px;
     line-height: 16px;
     text-overflow: ellipsis;
     overflow: hidden;
   }
+
   .addr {
     line-height: 16px;
     font-size: 10px;
@@ -630,6 +638,5 @@ li {
   .highlighted .addr {
     color: #ddd;
   }
-}
-</style>
+}</style>
 

src/views/zs/sign/index.vue

@@ -29,9 +29,9 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" fixed="right" align="center" width="160">
-        <template slot-scope="scope">
-          <el-button v-if="scope.row.checkState == 0||scope.row.checkState == 3" v-hasPermi="['zs:sign:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleAddAndUpdate(scope.row)">修改</el-button>
-          <el-button v-if="scope.row.checkState == 1 " v-hasPermi="['zs:sign:check']" size="mini" type="text" @click="handleCheck(scope.row)">审核</el-button>
+        <template slot-scope="{row}">
+          <el-button v-show="row.checkState == 0 || row.checkState == 3" v-hasPermi="['zs:sign:edit']" size="mini" type="text" icon="el-icon-edit" @click="handleAddAndUpdate(scope.row)">修改</el-button>
+          <el-button v-if="row.checkState == 1" v-hasPermi="['zs:sign:check']" size="mini" type="text" @click="handleCheck(scope.row)">审核</el-button>
           <el-button v-hasPermi="['zs:sign:remove']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     open: true,
     proxy: {
       [process.env.VUE_APP_BASE_API + '/driver-api']: {
-        // target: `https://xueche.ahduima.com/duima/`,
-        target: `http://localhost:8888/driver-api/`,
+        target: `https://jwl.ahduima.com/driver-api/`,
+        // target: `http://localhost:8888/driver-api/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API + '/driver-api']: ''
@@ -50,7 +50,6 @@ module.exports = {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       }
-
     },
     disableHostCheck: true
   },
@@ -106,10 +105,12 @@ module.exports = {
       config
         .plugin('ScriptExtHtmlWebpackPlugin')
         .after('html')
-        .use('script-ext-html-webpack-plugin', [{
+        .use('script-ext-html-webpack-plugin', [
+          {
             // `runtime` must same as runtimeChunk name. default is `runtime`
             inline: /runtime\..*\.js$/
-        }])
+          }
+        ])
         .end();
       config.optimization.splitChunks({
         chunks: 'all',