youxiw2000 / trash · Commits

Commit c3360b896143fe9472201e7bc271c72f1810c4d4

Authored by 2c
1 parent a7400e77
build: skipped

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

Inline Side-by-side
Showing 7 changed files with 72 additions and 64 deletions
trash-ui/package.json
  View file @c3360b8
... ... @@ -49,6 +49,7 @@
49 49 "element-ui": "2.13.2",
50 50 "file-saver": "2.0.1",
51 51 "fuse.js": "3.4.4",
  52 + "gcoord": "^1.0.5",
52 53 "husky": "^8.0.3",
53 54 "js-beautify": "1.10.2",
54 55 "js-cookie": "2.2.0",
... ...
trash-ui/src/views/gps/trajectory/index.vue
  View file @c3360b8
... ... @@ -94,6 +94,7 @@ import {listCarInfo} from "@/api/unit/carInfo";
94 94 import AMapLoader from '@amap/amap-jsapi-loader';
95 95 import Treeselect from "@riophae/vue-treeselect";
96 96 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
  97 +import gcoord from 'gcoord';
97 98  
98 99 export default {
99 100 name: "Trajectory",
... ... @@ -182,7 +183,13 @@ export default {
182 183 listTrajectory(this.queryParams).then(res => {
183 184 this.lineArr = [];
184 185 this.lineArr = res.map(item => {
185   - return [item.longitude, item.latitude]
  186 + //WGS84坐标转GCJ02坐标
  187 + var result = gcoord.transform(
  188 + [item.longitude, item.latitude], // 经纬度坐标
  189 + gcoord.WGS84, // 当前坐标系
  190 + gcoord.GCJ02 // 目标坐标系
  191 + );
  192 + return result
186 193 }).filter((item, index, array) => {
187 194 if (index === 0) return true; // 永远保持第一点
188 195 const prevItem = array[index - 1];
... ... @@ -228,7 +235,7 @@ export default {
228 235 }).then(async (AMap) => {
229 236 _this.map = await new AMap.Map("trajectoryMap", { //设置地图容器id
230 237 center: [113.01814545605467, 28.201039299894283], // 初始化地图中心点位置
231   - zoom: 11, //初始化地图层级
  238 + zoom: 17, //初始化地图层级
232 239 resizeEnable: true,
233 240 });
234 241 if (_this.lineArr.length !== 0) {
... ...
trash-ui/src/views/unit/businessUnit/index.vue
  View file @c3360b8
... ... @@ -25,13 +25,13 @@
25 25 @keyup.enter.native="handleQuery"
26 26 />
27 27 </el-form-item>
28   - <el-form-item label="审批状态" prop="status">
29   - <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
30   - <el-option label="审批中" value="0" />
31   - <el-option label="审批通过" value="1" />
32   - <el-option label="被驳回" value="2" />
33   - </el-select>
34   - </el-form-item>
  28 +<!-- <el-form-item label="审批状态" prop="status">-->
  29 +<!-- <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">-->
  30 +<!-- <el-option label="审批中" value="0" />-->
  31 +<!-- <el-option label="审批通过" value="1" />-->
  32 +<!-- <el-option label="被驳回" value="2" />-->
  33 +<!-- </el-select>-->
  34 +<!-- </el-form-item>-->
35 35 <el-form-item>
36 36 <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
37 37 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
... ... @@ -89,12 +89,12 @@
89 89 <el-table-column label="车辆数" align="center" prop="carNumber" />
90 90 <el-table-column label="法人代表" align="center" prop="legalRepresentative" />
91 91 <el-table-column label="联系方式" align="center" prop="legalRepresentativePhone" />
92   - <el-table-column label="审批状态" align="center" prop="status">
93   - <template slot-scope="scope">
94   - <span>{{ parseStatus(scope.row.status) }}</span>
95   - </template>
96   - </el-table-column>
97   - <el-table-column label="信用状态" align="center" prop="creditStatus" />
  92 +<!-- <el-table-column label="审批状态" align="center" prop="status">-->
  93 +<!-- <template slot-scope="scope">-->
  94 +<!-- <span>{{ parseStatus(scope.row.status) }}</span>-->
  95 +<!-- </template>-->
  96 +<!-- </el-table-column>-->
  97 +<!-- <el-table-column label="信用状态" align="center" prop="creditStatus" />-->
98 98 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
99 99 <template slot-scope="scope">
100 100 <el-button
... ...
trash-ui/src/views/unit/carInfo/index.vue
  View file @c3360b8
... ... @@ -93,13 +93,13 @@
93 93 <el-table-column label="车辆品牌" align="center" prop="carBrank" />
94 94 <el-table-column label="所属区域" align="center" prop="emissionStandard" />
95 95 <el-table-column label="车辆类型" align="center" prop="carType" />
96   - <el-table-column label="SIM卡号" align="center" prop="farmeNumber" />
97   - <el-table-column label="审批状态" align="center" prop="status" >
98   - <template slot-scope="scope">
99   - {{ parseStatus(scope.row.status)}}
100   - </template>
101   - </el-table-column>
102   - <el-table-column label="信用状态" align="center" prop="creditStatus" />
  96 + <el-table-column label="SIM卡号" align="center" prop="carEquipment" />
  97 +<!-- <el-table-column label="审批状态" align="center" prop="status" >-->
  98 +<!-- <template slot-scope="scope">-->
  99 +<!-- {{ parseStatus(scope.row.status)}}-->
  100 +<!-- </template>-->
  101 +<!-- </el-table-column>-->
  102 +<!-- <el-table-column label="信用状态" align="center" prop="creditStatus" />-->
103 103 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
104 104 <template slot-scope="scope">
105 105 <el-button
... ...
trash-ui/src/views/unit/disposalSite/index.vue
  View file @c3360b8
... ... @@ -22,21 +22,21 @@
22 22 <el-option v-for="(area,index) in areas" :label="area.name" :value="area.name" :key="index"/>
23 23 </el-select>
24 24 </el-form-item>
25   - <el-form-item label="审核情况" prop="auditStatus">
26   - <el-select v-model="queryParams.auditStatus" placeholder="审核情况" clearable size="small">
27   - <el-option label="新增审核中" value="新增审核中" />
28   - <el-option label="审核通过" value="审核通过" />
29   - <el-option label="新增审核驳回" value="新增审核驳回" />
30   - <el-option label="变更审核中" value="变更审核中" />
31   - <el-option label="变更审核驳回" value="变更审核驳回" />
32   - </el-select>
33   - </el-form-item>
34   - <el-form-item label="信用状态" prop="creditStatus">
35   - <el-select v-model="queryParams.creditStatus" placeholder="请选择信用状态" clearable size="small">
36   - <el-option label="正常" value="正常" />
37   - <el-option label="失信" value="失信" />
38   - </el-select>
39   - </el-form-item>
  25 +<!-- <el-form-item label="审核情况" prop="auditStatus">-->
  26 +<!-- <el-select v-model="queryParams.auditStatus" placeholder="审核情况" clearable size="small">-->
  27 +<!-- <el-option label="新增审核中" value="新增审核中" />-->
  28 +<!-- <el-option label="审核通过" value="审核通过" />-->
  29 +<!-- <el-option label="新增审核驳回" value="新增审核驳回" />-->
  30 +<!-- <el-option label="变更审核中" value="变更审核中" />-->
  31 +<!-- <el-option label="变更审核驳回" value="变更审核驳回" />-->
  32 +<!-- </el-select>-->
  33 +<!-- </el-form-item>-->
  34 +<!-- <el-form-item label="信用状态" prop="creditStatus">-->
  35 +<!-- <el-select v-model="queryParams.creditStatus" placeholder="请选择信用状态" clearable size="small">-->
  36 +<!-- <el-option label="正常" value="正常" />-->
  37 +<!-- <el-option label="失信" value="失信" />-->
  38 +<!-- </el-select>-->
  39 +<!-- </el-form-item>-->
40 40 <el-form-item label="期限范围" prop="termRange">
41 41 <el-select v-model="queryParams.termRange" placeholder="请选择期限范围" clearable size="small">
42 42 <el-option label="已超期" value="已超期" />
... ... @@ -110,8 +110,8 @@
110 110 </template>
111 111 </el-table-column>
112 112 <el-table-column label="消纳来源" align="center" prop="absorbSource" />
113   - <el-table-column label="审核情况" align="center" prop="auditStatus" />
114   - <el-table-column label="信用状态" align="center" prop="creditStatus" />
  113 +<!-- <el-table-column label="审核情况" align="center" prop="auditStatus" />-->
  114 +<!-- <el-table-column label="信用状态" align="center" prop="creditStatus" />-->
115 115 <el-table-column label="期限范围" align="center" prop="termRange" />
116 116 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
117 117 <template slot-scope="scope">
... ...
trash-ui/src/views/unit/driver/index.vue
  View file @c3360b8
... ... @@ -20,13 +20,13 @@
20 20 />
21 21 </el-form-item>
22 22  
23   - <el-form-item label="审批状态" prop="status">
24   - <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
25   - <el-option label="审批中" value="0" />
26   - <el-option label="审批通过" value="1" />
27   - <el-option label="被驳回" value="2" />
28   - </el-select>
29   - </el-form-item>
  23 +<!-- <el-form-item label="审批状态" prop="status">-->
  24 +<!-- <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">-->
  25 +<!-- <el-option label="审批中" value="0" />-->
  26 +<!-- <el-option label="审批通过" value="1" />-->
  27 +<!-- <el-option label="被驳回" value="2" />-->
  28 +<!-- </el-select>-->
  29 +<!-- </el-form-item>-->
30 30 <el-form-item>
31 31 <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
32 32 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
... ... @@ -101,11 +101,11 @@
101 101 <!-- <span>{{ parseTime(scope.row.drivingLicenceEndDate, '{y}-{m}-{d}') }}</span>-->
102 102 <!-- </template>-->
103 103 <!-- </el-table-column>-->
104   - <el-table-column label="审批状态" align="center" prop="status" >
105   - <template slot-scope="scope">
106   - {{ parseStatus(scope.row.status)}}
107   - </template>
108   - </el-table-column>
  104 +<!-- <el-table-column label="审批状态" align="center" prop="status" >-->
  105 +<!-- <template slot-scope="scope">-->
  106 +<!-- {{ parseStatus(scope.row.status)}}-->
  107 +<!-- </template>-->
  108 +<!-- </el-table-column>-->
109 109 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
110 110 <template slot-scope="scope">
111 111 <el-button
... ...
trash-ui/src/views/unit/enterprise/index.vue
  View file @c3360b8
... ... @@ -25,13 +25,13 @@
25 25 @keyup.enter.native="handleQuery"
26 26 />
27 27 </el-form-item>
28   - <el-form-item label="审批状态" prop="status">
29   - <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
30   - <el-option label="审批中" value="0" />
31   - <el-option label="审批通过" value="1" />
32   - <el-option label="被驳回" value="2" />
33   - </el-select>
34   - </el-form-item>
  28 +<!-- <el-form-item label="审批状态" prop="status">-->
  29 +<!-- <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">-->
  30 +<!-- <el-option label="审批中" value="0" />-->
  31 +<!-- <el-option label="审批通过" value="1" />-->
  32 +<!-- <el-option label="被驳回" value="2" />-->
  33 +<!-- </el-select>-->
  34 +<!-- </el-form-item>-->
35 35 <el-form-item>
36 36 <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
37 37 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
... ... @@ -89,12 +89,12 @@
89 89 <el-table-column label="车辆数" align="center" prop="carNumber" />
90 90 <el-table-column label="法人代表" align="center" prop="legalRepresentative" />
91 91 <el-table-column label="联系方式" align="center" prop="legalRepresentativePhone" />
92   - <el-table-column label="审批状态" align="center" prop="status">
93   - <template slot-scope="scope">
94   - <span>{{ parseStatus(scope.row.status) }}</span>
95   - </template>
96   - </el-table-column>
97   - <el-table-column label="信用状态" align="center" prop="creditStatus" />
  92 +<!-- <el-table-column label="审批状态" align="center" prop="status">-->
  93 +<!-- <template slot-scope="scope">-->
  94 +<!-- <span>{{ parseStatus(scope.row.status) }}</span>-->
  95 +<!-- </template>-->
  96 +<!-- </el-table-column>-->
  97 +<!-- <el-table-column label="信用状态" align="center" prop="creditStatus" />-->
98 98 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
99 99 <template slot-scope="scope">
100 100 <el-button
... ...