Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

src/assets/i18n/langs/cn/carManage/carManage.js

@@ -4,9 +4,9 @@ export default {
     todayInCarNum:'今日进场车次',
     todayOutCarNum:'今日出场车次',
     numberOfVehiclesWhitelisted:'白名单车辆数',
-    numberOfTemporaryVehicles:'临时车辆数',
+    numberOfTemporaryVehicles:'长期车辆数',
     vehicleTypeEntryAndExitStatistics:'车种进出次数统计',
-    temporaryVehicleEntryAndExitRecords:'临时车进出记录',
+    temporaryVehicleEntryAndExitRecords:'长期车进出记录',
     placeholder_select: '请输入',
     carColor: '车牌颜色',
     carColorArr: ['蓝色', '绿色', '黄色', '白色', '黑色', '红色', '橙色', '青色', '紫色', '灰色', '粉色', '棕色'],
@@ -31,7 +31,7 @@ export default {
     out:'出',
     carPhotosUrl: '车辆图片',
     carType: '车辆类型',
-    carModuleType: '固定/临时车辆',//1固定车辆，2临时车辆
+    carModuleType: '固定/长期车辆',//1固定车辆，2长期车辆
     reserveStartTime: '预约开始时间',
     reserveEndTime: '预约结束时间',
     entryAndExitPermit: '允许进出次数',
@@ -52,9 +52,9 @@ export default {
     todayInCarNum: '今日进场车次',
     todayOutCarNum: '今日出场车次',
     whiteCarNum: '白名单车辆数',
-    temporaryCarNum: '临时车辆数',
+    temporaryCarNum: '长期车辆数',
     carTypeInOutNumStatistics: '车种进出次数统计',
-    temporaryCarRecord: '临时车进出记录',
+    temporaryCarRecord: '长期车进出记录',
     inOutTime: '进出时间',
     inOutCode: '进出标识',
     in: '进',
@@ -92,6 +92,6 @@ export default {
         name: '黑名单',
       },{
         value: '3',
-        name: '临时车',
+        name: '长期车',
     }],
 }

src/assets/i18n/langs/cn/carManage/overview.js

@@ -18,7 +18,7 @@ export default {
     presentVehicle: '当前在场车辆',
     whiteList: '白名单',
     blackList: '黑名单',
-    temporaryCar: '临时车',
+    temporaryCar: '长期车',
     gateName: '闸门名称',
     gateNumber: '闸门编号',
     gateInoutType: '进出口类型',

src/assets/i18n/langs/cn/dataBoard.js

@@ -139,7 +139,7 @@ export default {
     todayOutCarOnces: '今日出场车次',
     onces: '次',
     numberOfVehiclesWhitelisted: '白名单车辆数',
-    numberOfTemporaryVehicles: '临时车辆数',
+    numberOfTemporaryVehicles: '长期车辆数',
     carTypeInAndOutTotal: '车种进出统计',
     carNo: '车牌号',
     inOrOutTime: '进出时间',

src/views/companyFront/carManage/overview.vue

@@ -51,7 +51,7 @@
               <div class="itemInner itemInner4">
                 <img src="@/assets/images/carIcon4.png" alt="" srcset="" />
                 <div class="dataB">
-                  <p>临时车辆</p>
+                  <p>长期车辆</p>
                   <p class="num">{{statisticData.lsNum}}</p>
                 </div>
               </div>
@@ -151,7 +151,7 @@
             ></el-pagination>
           </div>
           <div class="whiteBlock">
-            <div class="pageTitle">临时车辆列表</div>
+            <div class="pageTitle">长期车辆列表</div>
             <el-table :data="temporaryCarList" class="tables">
               <el-table-column
                 prop="carNumber"

src/views/projectAdmin/dataBoard/digitalSite/index.vue

@@ -1977,7 +1977,7 @@
                             <!-- 次 -->
                           </p>
                           <p>
-                            <!-- 临时车辆数 -->
+                            <!-- 长期车辆数 -->
                             {{
                               $t('message.dataBoard.numberOfTemporaryVehicles')
                             }}

src/views/projectAdmin/dataBoardTwo/digitalSite/index.vue

@@ -2484,7 +2484,7 @@
                               <!-- 次 -->
                             </p>
                             <p>
-                              <!-- 临时车辆数 -->
+                              <!-- 长期车辆数 -->
                               {{
                                 $t(
                                   'message.dataBoard.numberOfTemporaryVehicles'

src/views/projectAdmin/jlw/digitalSite/centerTop.vue

@@ -1891,7 +1891,7 @@
                               <!-- 次 -->
                             </p>
                             <p>
-                              <!-- 临时车辆数 -->
+                              <!-- 长期车辆数 -->
                               {{
                                 $t(
                                   'message.dataBoard.numberOfTemporaryVehicles'

src/views/projectFront/carManage/carManage.vue

@@ -175,12 +175,12 @@
         <el-table-column
           prop="carModuleType"
           align="center"
-          label="固定/临时/外来车辆"
+          label="固定/长期/外来车辆"
           width="150"
         >
           <template slot-scope="scope">
             <span v-if="scope.row.carModuleType === 1">固定车辆</span>
-            <span v-else-if="scope.row.carModuleType === 2">临时车辆</span>
+            <span v-else-if="scope.row.carModuleType === 2">长期车辆</span>
             <span v-else>外来车辆</span>
           </template>
         </el-table-column>
@@ -460,7 +460,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <!-- 固定/临时车辆 -->
+          <!-- 固定/长期车辆 -->
           <el-form-item
             :label="$t('message.carManage.carModuleType')"
             prop="carModuleType"
@@ -468,7 +468,7 @@
             <!-- <el-radio-group v-model="addEditForm.carModuleType" @change="changeForm()"> -->
             <el-radio-group v-model="addEditForm.carModuleType">
               <el-radio :label="1">固定车辆</el-radio>
-              <el-radio :label="2">临时车辆</el-radio>
+              <el-radio :label="2">长期车辆</el-radio>
               <el-radio :label="3">外来车辆</el-radio>
             </el-radio-group>
           </el-form-item>
@@ -898,7 +898,7 @@
             <div>司机电话：</div>
             <div>是否黑名单：</div>
             <div>车辆图片：</div>
-            <div>固定/临时/外来车辆：</div>
+            <div>固定/长期/外来车辆：</div>
             <div>预约时间：</div>
             <div>允许进出次数：</div>
             <div>车辆下发状态：</div>
@@ -966,9 +966,9 @@
                 </el-col>
                 <el-col :span="12">
                   <div class="grid-content">
-                    <span class="label">固定/临时/外来车辆：</span>
+                    <span class="label">固定/长期/外来车辆：</span>
                     <span class="value" v-if="entityDetail.carModuleType === 1">固定车辆</span>
-                    <span class="value" v-else-if="entityDetail.carModuleType === 2">临时车辆</span>
+                    <span class="value" v-else-if="entityDetail.carModuleType === 2">长期车辆</span>
                     <span class="value" v-else>外来车辆</span>
                   </div>
                 </el-col>
@@ -1566,7 +1566,7 @@ export default {
       }
     },
     getStratEndTime() {
-      console.log("固定/临时车辆 " + this.addEditForm.carModuleType);
+      console.log("固定长期车辆 " + this.addEditForm.carModuleType);
       console.log("开始时间 " + this.addEditForm.reserveStartTime);
       console.log("结束时间 " + this.addEditForm.reserveEndTime);
       console.log("进出次数类型 " + this.addEditForm.entryAndExitPermit);

src/views/projectFront/carManage/carStatictis.vue

@@ -34,7 +34,7 @@
             <img src="@/assets/images/companyProject/1.png" />
             <div class="dataBox">
               <p class="num primaryText">{{ totalNum.temporarynum }}</p>
-              <!-- 临时车辆数 -->
+              <!-- 长期车辆数 -->
               <p class="text">{{$t('message.carManage.temporaryCarNum')}}</p>
             </div>
           </div>
@@ -52,7 +52,7 @@
     <div class="bottom">
       <div class="topLeft whiteBlock">
         <div class="blockInner">
-          <!-- 临时车进出记录 -->
+          <!-- 长期车进出记录 -->
           <div class="pageTitle">{{$t('message.carManage.temporaryCarRecord')}}</div>
           <div class="blockContent">
             <vue-scroll>

src/views/projectFront/carManage/realTimeData.vue

@@ -181,7 +181,7 @@ export default {
         name: '黑名单',
       },{
         value: '3',
-        name: '临时车',
+        name: '长期车',
       }],
       projectSn: "",
       time: [],

src/views/projectFront/panoramicView/overview.vue

@@ -51,7 +51,7 @@
                       <p>
                         <span>{{ carRealTimeData.temporarynum }}</span> 次
                       </p>
-                      <p>临时车辆数</p>
+                      <p>长期车辆数</p>
                     </div>
                   </div>
                 </div>

src/views/supplierAdmin/carManagement/carManage.vue

@@ -497,7 +497,7 @@ export default {
       }
     },
     getStratEndTime() {
-      console.log("固定/临时车辆 " + this.addEditForm.carModuleType);
+      console.log("固定/长期车辆 " + this.addEditForm.carModuleType);
       console.log("开始时间 " + this.addEditForm.reserveStartTime);
       console.log("结束时间 " + this.addEditForm.reserveEndTime);
       console.log("进出次数类型 " + this.addEditForm.entryAndExitPermit);