解决冲突

src/lang/zh.js

@@ -154,6 +154,7 @@ export default {
         motorcade: '车队',
         vehicleNumber: '车号',
         vehicleOwned: '车辆归属',
+        hasGpsId: '安装温控',
         driver: '司机',
         goods: '货物',
         loadingAndUnloading: '装卸货',

src/views/landTransportation/reportAnalysis/index.vue

@@ -379,7 +379,7 @@ export default {
             prop: 'vehicleOwned',
             overHidden: true,
             index: 11,
-            search: true,
+            search: false,
             slot: true,
             type: "select",
             dicData:[
@@ -396,6 +396,29 @@ export default {
                 label: "label",
                 value: "value"
             }
+        },{
+            label: this.$t("land118n.hasGpsId"),
+            width: 90,
+            prop: 'hasGpsId',
+            overHidden: true,
+            index: 11,
+            search: false,
+            slot: true,
+            type: "select",
+            dicData:[
+                {
+                    label: '安装',
+                    value: 1
+                },
+                {
+                    label: '未安装',
+                    value: 0
+                }
+            ],
+            props: {
+                label: "label",
+                value: "value"
+            }
         }, {
           // label: '货运地点',
           label: this.$t("land118n.freightLocation"),