Prechádzať zdrojové kódy

地图加系统参数

qukaidi 1 deň pred
rodič
commit
9b8f8ce9cc

+ 10 - 3
src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -17,8 +17,8 @@
           @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
           @row-update="rowSave">
         <template slot="plateNo" slot-scope="{row}">
-                <span class="el-button--text" style="cursor: pointer"
-                      @click="openTrack(row)">{{ row.plateNo }}</span>
+          <span v-if="isMap" class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
+          <span v-else>{{ row.plateNo }}</span>
         </template>
         <template slot="menuLeft">
           <el-button type="info" size="small" @click="outExport" icon="el-icon-download">导出</el-button>
@@ -185,6 +185,7 @@ import {getToken} from "@/util/auth";
 import {gaude} from "@/api/gaude";
 import {getSalesman} from "@/api/landTransportation/bulkCargo";
 import { dateFormat } from "@/util/date";
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
   name: "index",
   data() {
@@ -985,7 +986,8 @@ export default {
           overHidden: true,
           prop: 'extraAmountItemC'
         }]
-      }
+      },
+      isMap:false,
     }
   },
   watch: {
@@ -1066,6 +1068,11 @@ export default {
     })
     this.key++
     this.calculateHu()
+    isProcurement({ param: "is.map" }).then(res => {
+      if (res.data.data == 1) {
+        this.isMap = true;
+      }
+    });
   },
   methods: {
     calculateHu() {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 563 - 454
src/views/landTransportation/dispatchingCars/detailPage.vue


+ 10 - 2
src/views/landTransportation/motorcadeDriver/index.vue

@@ -97,7 +97,8 @@
         <!--          ></crop-select>-->
         <!--        </template>-->
         <template slot-scope="{row}" slot="plateNo">
-          <span class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
+          <span v-if="isMap" class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
+          <span v-else>{{ row.plateNo }}</span>
         </template>
         <template slot-scope="{row,index}" slot="menu">
           <el-button type="text" size="small" v-if="row.status === 1" @click="rowSaveT(row, index)">
@@ -179,6 +180,7 @@ import { location } from "@/api/gaude";
 import { businessStatisticsFrequency } from "@/api/wel";
 import { defaultDate } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
   name: "index",
   components: {
@@ -734,7 +736,8 @@ export default {
       },
       totalData: {},
       activeName: '1',
-      dispatchACarTimer: null
+      dispatchACarTimer: null,
+      isMap:false,
     }
   },
   watch: {
@@ -753,6 +756,11 @@ export default {
       arrivalTime: [defaultDate(4)[0] + ' 00:00:00', defaultDate(4)[1] + ' 23:59:59']
     }
     this.key++
+    isProcurement({ param: "is.map" }).then(res => {
+      if (res.data.data == 1) {
+        this.isMap = true;
+      }
+    });
     this.findObject(this.entrustOptionTwoT.column, "plateNo").change = (data) => {
       fleetListTwo({ plateNo: data.value }).then(res => {
         this.goodsList[data.index].driverId = res.data.data[0].driverId

+ 12 - 5
src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -383,7 +383,8 @@
         :option="vehicleOption"
       >
         <template slot="plateNo" slot-scope="{ row }">
-          <span class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
+          <span v-if="isMap" class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
+          <span v-else>{{ row.plateNo }}</span>
         </template>
         <template slot-scope="scope" slot="menu">
           <el-link type="primary" :disabled="vehicleDelete" style="font-size: 12px" @click="vehicleClick(scope.row)">
@@ -582,7 +583,7 @@ import { gaude, location } from "@/api/gaude";
 //地图回放
 import trackPlayback from "@/components/trackPlayback";
 import { contrastList, contrastObj } from "@/util/contrastData";
-
+import { isProcurement } from "@/api/basicData/configuration";
 import { getUserInfo } from "@/api/system/user";
 
 export default {
@@ -1651,13 +1652,13 @@ export default {
             // label: '结算金额',
             label: this.$t("land118n.settlementAmount"),
             type: "settlementAmount",
-            hide:JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id=='809700'?false:true,
+            hide: JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id == "809700" ? false : true
           },
           {
             // label: '结算时间',
             label: this.$t("land118n.settlementTime"),
             type: "settlementDate",
-            hide:JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id=='809700'?false:true,
+            hide: JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id == "809700" ? false : true
           }
         ]
       },
@@ -1780,7 +1781,8 @@ export default {
       oldentrustList: {},
       oldgoodsList: {},
       oldvehicleList: {},
-      oldorderFilesList: {}
+      oldorderFilesList: {},
+      isMap: false
     };
   },
   async created() {
@@ -1793,6 +1795,11 @@ export default {
     this.keyContact++;
     this.collectionOption = await this.getColumnData(this.getColumnName(85.4), this.collectionOptionBackup);
     this.paymentOption = await this.getColumnData(this.getColumnName(85.5), this.paymentOptionBackup);
+    isProcurement({ param: "is.map" }).then(res => {
+      if (res.data.data == 1) {
+        this.isMap = true;
+      }
+    });
     if (this.id) {
       if (this.id.slice(0, 4) === "copy") {
         detailDelegationList({ id: this.id.slice(4, this.id.length), kind: "1" }).then(res => {

+ 9 - 1
src/views/landTransportation/reportAnalysis/index.vue

@@ -6,7 +6,8 @@
         @search-reset="query = {}" :search.sync="query" @search-criteria-switch="searchCriteriaSwitch"
         @row-save="(row, done, loading) => { rowSave(row, 0, done, loading) }" @row-update="rowSave">
         <template slot="plateNo" slot-scope="{row}">
-          <span class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
+           <span v-if="isMap" class="el-button--text" style="cursor: pointer" @click="openTrack(row)">{{ row.plateNo }}</span>
+          <span v-else>{{ row.plateNo }}</span>
         </template>
           <template slot="vehicleOwned" slot-scope="{row}">
               <span :style="{ color: row.vehicleOwned === 1 ? '#409EFF' : '' }">{{ row.vehicleOwned === 1 ? '自有' : '非自有' }}</span>
@@ -136,6 +137,7 @@ import {
 import { getToken } from "@/util/auth";
 import { gaude } from "@/api/gaude";
 import { dateFormat } from "@/util/date";
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
   name: "index",
   watch: {
@@ -182,6 +184,7 @@ export default {
   },
   data() {
     return {
+      isMap:false,
       key: 0,
       form: {},
       enclosure: false,
@@ -456,6 +459,11 @@ export default {
     this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88.1), this.optionList);
     this.collectionOption = await this.getColumnData(this.getColumnName(88.2), this.collectionOptionBackup);
     this.key++
+    isProcurement({ param: "is.map" }).then(res => {
+      if (res.data.data == 1) {
+        this.isMap = true;
+      }
+    });
     if (this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('总调度') !== -1) {
       let type = false
       for (let item in this.goodsOptionCrud.column) {

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov