Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/api/appManagement/pushManagement.js

+import fetch from 'utils/fetch';
+
+/**
+ * 获取列表
+ * @param query
+ */
+export function getPushList(query) {
+  return fetch({
+    url: '/api/universal/jpush/list',
+    method: 'Get',
+    params: query
+  });
+}
+
+/**
+ * 获取弹窗管理列表某一条数据
+ * @param query
+ */
+export function getObj(id) {
+  return fetch({
+    url: '/api/universal/jpush/getOne/'+id,
+    method: 'Get'
+  })
+}
+
+/**
+ * 弹窗管理--添加
+ * @param query
+ */
+export function addObj(obj) {
+    return fetch({
+      url: '/api/universal/jpush/addMessagePush',
+      method: 'post',
+      data: obj
+    });
+  }
+
+/**
+ * 编辑某一条数据,上下架
+ * @param query
+ */
+export function editObj(data) {
+  return fetch({
+    url: '/api/universal/jpush/udpMessagePush',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 删除数据
+ * @param query
+ */
+export function delObj(id) {
+  return fetch({
+    url: '/api/universal/jpush/del/' + id,
+    method: 'delete',
+  })
+}
+
+/**
+ * 立即推送
+ * @param query
+ */
+export function pushStype(query) {
+  return fetch({
+    url: '/api/universal/jpush/stype',
+    method: 'Get',
+    params: query
+  });
+}
+
+

src/api/vehicle/vehicleInfo/index.js

@@ -63,6 +63,7 @@ export function getBookedInfo(vehicleId, yearMonth) {
     method: 'get'
   });
 }
+
 /*
 * 根据id获取片区下省份
 * */
@@ -89,3 +90,11 @@ export function editObj(param) {
     data: param
   });
 }
+
+//检查车辆编码是否存在
+export function checkCode(code, id) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/exist_code/' + code + '?id=' + id,
+    method: 'get'
+  });
+}

src/router/index.js

@@ -334,7 +334,7 @@ export const asyncRouterMap = [{
     {
       path: 'bookRecord',
       component: _import('vehicle/bookRecord/index'),
-      name: '车辆申请管理',
+      name: '车辆排班管理',
       authority: 'bookRecord'
     },
     {
@@ -364,7 +364,7 @@ export const asyncRouterMap = [{
     {
       path: 'vehicleSchedulManage',
       component: _import('vehicle/vehicleSchedulManage/index'),
-      name: '车辆排班管理',
+      name: '车辆排班表',
       authority: 'vehicleSchedulManage'
     },
     {
@@ -519,6 +519,12 @@ export const asyncRouterMap = [{
       component: _import('appManagement/selectedActivities/index'),
       name: '首页精选活动',
       authority: 'selectedActivities'
+    },
+	{
+      path: 'pushManagement',
+      component: _import('appManagement/pushManagement/index'),
+      name: '消息推送',
+      authority: 'pushManagement'
     }
   ]
 },

src/views/vehicle/bookRecord/index.vue

@@ -9,10 +9,12 @@
                        :value="val.code"></el-option>
           </el-select>
         </el-form-item>
+          <el-form-item label="车辆编码">
+            <el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
+          </el-form-item>
         <el-form-item label="车牌号">
           <el-input v-model="listQuery.numberPlate" placeholder="请输入车牌号"></el-input>
         </el-form-item>
-
         <el-form-item label="用途">
 					<el-select class="filter-item" v-model="listQuery.bookType" placeholder="请选择">
 					  <el-option :key="undefined" label="无" :value="undefined"></el-option>
@@ -1492,7 +1494,7 @@
           var obj = {
             vehicleBookRecordId:row.id
           };
-					
+
           unbook(obj)
             .then(response => {
               if(response.code==1){
@@ -1510,7 +1512,7 @@
                   type: 'error',
                   duration: 2000
                 });
-              } 
+              }
             }).catch(response=>{
               console.log(response)
             }

src/views/vehicle/vehicleDepartureLog/index.vue

@@ -3,7 +3,7 @@
     <div class="filter-container">
       <el-form>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="5">
             <el-form-item>
               <el-date-picker
                 v-model="listQuery.time"
@@ -15,13 +15,18 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="5">
+            <el-form-item>
+              <el-input type="number" style="width: 200px;" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
             <el-form-item >
               <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
                         v-model="listQuery.numberPlate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="5">
             <el-form-item>
               <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
             </el-form-item>

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -16,6 +16,9 @@
               <el-form-item label="车牌">
                 <el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
               </el-form-item>
+            <el-form-item label="车辆编码">
+              <el-input type="number" style="width: 200px;" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
+            </el-form-item>
               <el-form-item label="用途">
                 <el-select class="filter-item" v-model="listQuery.useType" placeholder="请选择用途">
                   <el-option :key="undefined" label="无" :value="undefined"></el-option>
@@ -473,6 +476,10 @@
       }
     },
     created() {
+        const numberPlate = this.$route.query.numberPlate;
+        if (numberPlate) {
+            this.listQuery.numberPlate = numberPlate;
+        }
       this.getList();
       this.getAllVehicleType();
       let currentMonth = getCurrentMonth();

src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue

@@ -4,6 +4,7 @@
     <div class="filter-container">
       <el-input style="width: 200px;" placeholder="车牌号"
                 v-model="listQuery.numberPlate"></el-input>
+      <el-input type="number" style="width: 200px;" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
       <el-date-picker
         v-model="listQuery.selectedMonth"
         type="month"

src/views/vehicle/vehicleUpkeepLog/index.vue

@@ -3,6 +3,7 @@
     <div class="filter-container">
       <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
                 v-model="listQuery.numberPlate"></el-input>
+        <el-input type="number" style="width: 200px;" v-model.number="listQuery.code" class="filter-item" placeholder="请输入车辆编码"></el-input>
       <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
     </div>
     <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row