车辆轨迹不准bug修复，基础信息隐藏审批状态

2c
1 parent a7400e77
Showing 7 changed files with 72 additions and 64 deletions
trash-ui/package.json
trash-ui/src/views/gps/trajectory/index.vue
trash-ui/src/views/unit/businessUnit/index.vue
trash-ui/src/views/unit/carInfo/index.vue
trash-ui/src/views/unit/disposalSite/index.vue
trash-ui/src/views/unit/driver/index.vue
trash-ui/src/views/unit/enterprise/index.vue
@@ -49,6 +49,7 @@
     "element-ui": "2.13.2",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
+    "gcoord": "^1.0.5",
     "husky": "^8.0.3",
     "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
@@ -94,6 +94,7 @@ import {listCarInfo} from &quot;@/api/unit/carInfo&quot;;
 import AMapLoader from '@amap/amap-jsapi-loader';
 import Treeselect from "@riophae/vue-treeselect";
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import gcoord from 'gcoord';
 export default {
   name: "Trajectory",
@@ -182,7 +183,13 @@ export default {
         listTrajectory(this.queryParams).then(res => {
           this.lineArr = [];
           this.lineArr = res.map(item => {
-            return [item.longitude, item.latitude]
+            //WGS84坐标转GCJ02坐标
+            var result = gcoord.transform(
+              [item.longitude, item.latitude],    // 经纬度坐标
+              gcoord.WGS84,               // 当前坐标系
+              gcoord.GCJ02                 // 目标坐标系
+            );
+            return result
           }).filter((item, index, array) => {
             if (index === 0) return true; // 永远保持第一点
             const prevItem = array[index - 1];
@@ -228,7 +235,7 @@ export default {
       }).then(async (AMap) => {
         _this.map = await new AMap.Map("trajectoryMap", { //设置地图容器id
           center: [113.01814545605467, 28.201039299894283], // 初始化地图中心点位置
-          zoom: 11, //初始化地图层级
+          zoom: 17, //初始化地图层级
           resizeEnable: true,
         });
         if (_this.lineArr.length !== 0) {
@@ -25,13 +25,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审批状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
-          <el-option label="审批中" value="0" />
-          <el-option label="审批通过" value="1" />
-          <el-option label="被驳回" value="2" />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="审批状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">-->
+<!--          <el-option label="审批中" value="0" />-->
+<!--          <el-option label="审批通过" value="1" />-->
+<!--          <el-option label="被驳回" value="2" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -89,12 +89,12 @@
       <el-table-column label="车辆数" align="center" prop="carNumber" />
       <el-table-column label="法人代表" align="center" prop="legalRepresentative" />
       <el-table-column label="联系方式" align="center" prop="legalRepresentativePhone" />
-      <el-table-column label="审批状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span>{{ parseStatus(scope.row.status) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="信用状态" align="center" prop="creditStatus" />
+<!--      <el-table-column label="审批状态" align="center" prop="status">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseStatus(scope.row.status) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="信用状态" align="center" prop="creditStatus" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -93,13 +93,13 @@
       <el-table-column label="车辆品牌" align="center" prop="carBrank" />
       <el-table-column label="所属区域" align="center" prop="emissionStandard" />
       <el-table-column label="车辆类型" align="center" prop="carType" />
-      <el-table-column label="SIM卡号" align="center" prop="farmeNumber" />
-      <el-table-column label="审批状态" align="center" prop="status" >
-        <template slot-scope="scope">
-          {{ parseStatus(scope.row.status)}}
-        </template>
-      </el-table-column>
-      <el-table-column label="信用状态" align="center" prop="creditStatus" />
+      <el-table-column label="SIM卡号" align="center" prop="carEquipment" />
+<!--      <el-table-column label="审批状态" align="center" prop="status" >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{ parseStatus(scope.row.status)}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="信用状态" align="center" prop="creditStatus" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -22,21 +22,21 @@
           <el-option v-for="(area,index) in areas" :label="area.name" :value="area.name" :key="index"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="审核情况" prop="auditStatus">
-        <el-select v-model="queryParams.auditStatus" placeholder="审核情况" clearable size="small">
-          <el-option label="新增审核中" value="新增审核中" />
-          <el-option label="审核通过" value="审核通过" />
-          <el-option label="新增审核驳回" value="新增审核驳回" />
-          <el-option label="变更审核中" value="变更审核中" />
-          <el-option label="变更审核驳回" value="变更审核驳回" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="信用状态" prop="creditStatus">
-        <el-select v-model="queryParams.creditStatus" placeholder="请选择信用状态" clearable size="small">
-          <el-option label="正常" value="正常" />
-          <el-option label="失信" value="失信" />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="审核情况" prop="auditStatus">-->
+<!--        <el-select v-model="queryParams.auditStatus" placeholder="审核情况" clearable size="small">-->
+<!--          <el-option label="新增审核中" value="新增审核中" />-->
+<!--          <el-option label="审核通过" value="审核通过" />-->
+<!--          <el-option label="新增审核驳回" value="新增审核驳回" />-->
+<!--          <el-option label="变更审核中" value="变更审核中" />-->
+<!--          <el-option label="变更审核驳回" value="变更审核驳回" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="信用状态" prop="creditStatus">-->
+<!--        <el-select v-model="queryParams.creditStatus" placeholder="请选择信用状态" clearable size="small">-->
+<!--          <el-option label="正常" value="正常" />-->
+<!--          <el-option label="失信" value="失信" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="期限范围" prop="termRange">
         <el-select v-model="queryParams.termRange" placeholder="请选择期限范围" clearable size="small">
           <el-option label="已超期" value="已超期" />
@@ -110,8 +110,8 @@
         </template>
       </el-table-column>
       <el-table-column label="消纳来源" align="center" prop="absorbSource" />
-      <el-table-column label="审核情况" align="center" prop="auditStatus" />
-      <el-table-column label="信用状态" align="center" prop="creditStatus" />
+<!--      <el-table-column label="审核情况" align="center" prop="auditStatus" />-->
+<!--      <el-table-column label="信用状态" align="center" prop="creditStatus" />-->
       <el-table-column label="期限范围" align="center" prop="termRange" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -20,13 +20,13 @@
         />
       </el-form-item>
-      <el-form-item label="审批状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
-          <el-option label="审批中" value="0" />
-          <el-option label="审批通过" value="1" />
-          <el-option label="被驳回" value="2" />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="审批状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">-->
+<!--          <el-option label="审批中" value="0" />-->
+<!--          <el-option label="审批通过" value="1" />-->
+<!--          <el-option label="被驳回" value="2" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -101,11 +101,11 @@
 <!--          <span>{{ parseTime(scope.row.drivingLicenceEndDate, '{y}-{m}-{d}') }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="审批状态" align="center" prop="status" >
-        <template slot-scope="scope">
-          {{ parseStatus(scope.row.status)}}
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="审批状态" align="center" prop="status" >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{ parseStatus(scope.row.status)}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -25,13 +25,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审批状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
-          <el-option label="审批中" value="0" />
-          <el-option label="审批通过" value="1" />
-          <el-option label="被驳回" value="2" />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="审批状态" prop="status">-->
+<!--        <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">-->
+<!--          <el-option label="审批中" value="0" />-->
+<!--          <el-option label="审批通过" value="1" />-->
+<!--          <el-option label="被驳回" value="2" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -89,12 +89,12 @@
       <el-table-column label="车辆数" align="center" prop="carNumber" />
       <el-table-column label="法人代表" align="center" prop="legalRepresentative" />
       <el-table-column label="联系方式" align="center" prop="legalRepresentativePhone" />
-      <el-table-column label="审批状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <span>{{ parseStatus(scope.row.status) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="信用状态" align="center" prop="creditStatus" />
+<!--      <el-table-column label="审批状态" align="center" prop="status">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseStatus(scope.row.status) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="信用状态" align="center" prop="creditStatus" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button