From fc9837fc0136271d0e4bf75652764788181b074d Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Mon, 19 Aug 2024 14:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=91=E6=8F=B4=E8=8F=9C=E5=8D=95=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rescue/Locations.vue    | 19 ++++++-------
 src/views/rescue/api/Locations.js |  4 +--
 src/views/rescue/driverIndex.vue  | 46 +++++++++++++++----------------
 src/views/rescue/rescueRoad.vue   | 14 +++++-----
 4 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/views/rescue/Locations.vue b/src/views/rescue/Locations.vue
index 6333b25..1f76ae8 100644
--- a/src/views/rescue/Locations.vue
+++ b/src/views/rescue/Locations.vue
@@ -4,7 +4,7 @@
       <el-form-item label="地点" prop="dictLabel">
         <el-input
           v-model="queryParams.searchValue"
-          placeholder="请输入账号"
+          placeholder="请输入地点"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -30,12 +30,12 @@
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="排序" align="center" prop="dictSort" />
+      <el-table-column label="排序" align="center" prop="sort" />
 
       <el-table-column label="扣车地址" align="center" prop="dictLabel">
         <template slot-scope="scope">
-          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
-          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
+          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.label}}</span>
+          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.label}}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -62,7 +62,6 @@
           <el-input v-model="form.dictLabel" placeholder="请输入账号" />
         </el-form-item>
 
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -131,6 +130,7 @@
         typeOptions: [],
         // 查询参数
         queryParams: {
+          searchValue: ""
         },
         // 表单参数
         form: {},
@@ -155,8 +155,7 @@
       /** 查询字典数据列表 */
       getList() {
         this.loading = true;
-        getKcPosition(this.queryParams).then(response => {
-          console.log(response)
+        getKcPosition(this.queryParams.searchValue).then(response => {
           this.dataList = response.data;
           this.loading = false;
         });
@@ -231,9 +230,9 @@
       },
       /** 删除按钮操作 */
       handleDelete(row) {
-        const dictCodes = row.dictCode || this.ids;
-        this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
-          return delKcPosition(dictCodes);
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除字典编码为"' + ids + '"的数据项？').then(function() {
+          return delKcPosition(ids);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
diff --git a/src/views/rescue/api/Locations.js b/src/views/rescue/api/Locations.js
index 0a77274..18cc2fb 100644
--- a/src/views/rescue/api/Locations.js
+++ b/src/views/rescue/api/Locations.js
@@ -4,11 +4,11 @@ import request from '@/utils/request'
 // pid
 
 
-export function getKcPosition() {
+export function getKcPosition(searchValue) {
   return request({
     url: '/system/rescueInfo/getKcPosition',
     method: 'get',
-
+    params: searchValue ? {searchValue} : {}
   })
 }
 export function addKcPosition(data) {
diff --git a/src/views/rescue/driverIndex.vue b/src/views/rescue/driverIndex.vue
index e65d37a..0ede344 100644
--- a/src/views/rescue/driverIndex.vue
+++ b/src/views/rescue/driverIndex.vue
@@ -181,7 +181,7 @@
                 <el-form-item label="司机性别">
                   <el-select v-model="form.sex" placeholder="请选择性别">
                     <el-option
-                      v-for="dict in dict.type.sys_user_sex"
+                      v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -236,14 +236,14 @@
                   <div style="position: relative">
                     <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
                     <el-form-item label=" 车辆类型" prop="rescueCarType">
-                      <el-select v-model="item.rescueCarType"  placeholder="请选择车辆类型">
-                        <el-option
-                          v-for="dict in dict.type.jyc_type"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
+<!--                      <el-select v-model="item.rescueCarType"  placeholder="请选择车辆类型">-->
+<!--                        <el-option-->
+<!--                          v-for="dict in dict.type.jyc_type"-->
+<!--                          :key="dict.value"-->
+<!--                          :label="dict.label"-->
+<!--                          :value="dict.value"-->
+<!--                        ></el-option>-->
+<!--                      </el-select>-->
                     </el-form-item>
 
                   </div>
@@ -304,13 +304,13 @@
                 <div style="position: relative">
                   <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
                 <el-form-item label="车辆性质" prop="carUseNature">
-                  <el-radio-group v-model="item.carUseNature">
-                    <el-radio
-                      v-for="dict in dict.type.car_use_nature"
-                      :key="dict.value"
-                      :label="dict.value"
-                    >{{dict.label}}</el-radio>
-                  </el-radio-group>
+<!--                  <el-radio-group v-model="item.carUseNature">-->
+<!--                    <el-radio-->
+<!--                      v-for="dict in dict.type.car_use_nature"-->
+<!--                      :key="dict.value"-->
+<!--                      :label="dict.value"-->
+<!--                    >{{dict.label}}</el-radio>-->
+<!--                  </el-radio-group>-->
                 </el-form-item>
                 </div>
               </el-col>
@@ -318,13 +318,13 @@
                 <div style="position: relative">
                   <div style="position: absolute; left: 35px;top: 10px; color: red">*</div>
                 <el-form-item label=" 车牌颜色" prop="carLicenseColor">
-                  <el-radio-group v-model="item.carLicenseColor">
-                    <el-radio
-                      v-for="dict in dict.type.car_license_color"
-                      :key="dict.value"
-                      :label="dict.value"
-                    >{{dict.label}}</el-radio>
-                  </el-radio-group>
+<!--                  <el-radio-group v-model="item.carLicenseColor">-->
+<!--                    <el-radio-->
+<!--                      v-for="dict in dict.type.car_license_color"-->
+<!--                      :key="dict.value"-->
+<!--                      :label="dict.value"-->
+<!--                    >{{dict.label}}</el-radio>-->
+<!--                  </el-radio-group>-->
                 </el-form-item>
                 </div>
               </el-col>
diff --git a/src/views/rescue/rescueRoad.vue b/src/views/rescue/rescueRoad.vue
index c709636..024b394 100644
--- a/src/views/rescue/rescueRoad.vue
+++ b/src/views/rescue/rescueRoad.vue
@@ -30,12 +30,12 @@
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="排序" align="center" prop="dictSort" />
+      <el-table-column label="排序" align="center" prop="sort" />
 
       <el-table-column label="路段" align="center" prop="dictLabel">
         <template slot-scope="scope">
-          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
-          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
+          <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.label}}</span>
+          <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.label}}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -198,7 +198,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加扣车地址";
+      this.title = "添加救援路段";
       this.form.dictType = this.queryParams.dictType;
     },
     // 多选框选中数据
@@ -231,9 +231,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const dictCodes = row.dictCode || this.ids;
-      this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
-        return delRescueRoad(dictCodes);
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除字典编码为"' + ids + '"的数据项？').then(function() {
+        return delRescueRoad(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");