Merge branch 'master' into feature/subscribe_modify

# Conflicts:
#	src/views/custom/subscribe/index.vue

.env.development

@@ -7,9 +7,9 @@ ENV = 'development'
 #  VUE_APP_BASE_API = 'http://eam.modernfarming.cn:8000/'
 #  白少后台本地
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
+# VUE_APP_BASE_API = 'http://192.168.1.77:8082/'
 # 线上测试
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
+VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8082/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'

src/views/asset/basics/index.vue

@@ -307,19 +307,19 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="状态:" prop="status">
-                <el-select v-model="createTemp.status" placeholder="状态" class="filter-item">
+                <el-select v-model="createTemp.status" placeholder="状态" class="filter-item" style="width:100%">
                   <el-option v-for="item in getDictByName" :key="item.id" :label="item.label" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="购置日期:" prop="purchaseDate">
-                <el-date-picker v-model="createTemp.purchaseDate" type="date" placeholder="选择日期" style="width:170px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
+                <el-date-picker v-model="createTemp.purchaseDate" type="date" placeholder="选择日期" style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="入场日期:" prop="entranceDate">
-                <el-date-picker v-model="createTemp.entranceDate" type="date" placeholder="选择日期" style="width:170px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
+                <el-date-picker v-model="createTemp.entranceDate" type="date" placeholder="选择日期" style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -346,7 +346,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="保养级别:" prop="upkeepgrade">
-                <el-select ref="upkeepgrade" v-model="createTemp.upkeepgrade" placeholder="保养级别" class="filter-item" @visible-change="upkeepgradeChange" @change="changeUpkeepgrade">
+                <el-select ref="upkeepgrade" v-model="createTemp.upkeepgrade" placeholder="保养级别" style="width:100%" class="filter-item" @visible-change="upkeepgradeChange" @change="changeUpkeepgrade">
                   <el-option v-for="item in upkeepgrades" :key="item.id" :label="item.label" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -395,14 +395,14 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="录入人:" prop="inputUser">
-                <el-select v-model="createTemp.inputUser" placeholder="录入人" class="filter-item">
+                <el-select v-model="createTemp.inputUser" placeholder="录入人" class="filter-item" style="width:100%">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="录入时间:" prop="inputDatetime">
-                <el-date-picker v-model="createTemp.inputDatetime" :picker-options="pickerOptions1" type="date" placeholder="录入时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:170px;" />
+                <el-date-picker v-model="createTemp.inputDatetime" :picker-options="pickerOptions1" type="date" placeholder="录入时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -423,21 +423,21 @@
             </el-col> -->
             <el-col :span="6">
               <el-form-item label="一级督办:" prop="levelone">
-                <el-select v-model="createTemp.levelone" filterable placeholder="设备主管" class="filter-item">
+                <el-select v-model="createTemp.levelone" filterable placeholder="设备主管" class="filter-item" style="width:100%">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="一级间隔时间(小时)" prop="leveloneTime">
-                <el-select v-model="createTemp.leveloneTime" placeholder="间隔时间" class="filter-item">
+                <el-select v-model="createTemp.leveloneTime" placeholder="间隔时间" class="filter-item" style="width:100%">
                   <el-option v-for="item in pushNameList2" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="二级督办:" prop="leveltwo">
-                <el-select v-model="createTemp.leveltwo"  filterable placeholder="设备助理" class="filter-item">
+                <el-select v-model="createTemp.leveltwo"  filterable placeholder="设备助理" class="filter-item" style="width:100%">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -446,21 +446,21 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="二级间隔时间(小时)" prop="leveltwoTime">
-                <el-select v-model="createTemp.leveltwoTime" placeholder="间隔时间" class="filter-item">
+                <el-select v-model="createTemp.leveltwoTime" placeholder="间隔时间" class="filter-item" style="width:100%">
                   <el-option v-for="item in pushNameList2" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="三级督办:" prop="levelthree">
-                <el-select v-model="createTemp.levelthree"  filterable placeholder="场长" class="filter-item">
+                <el-select v-model="createTemp.levelthree"  filterable placeholder="场长" class="filter-item" style="width:100%">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="三级间隔时间(小时)" prop="levelthreeTime">
-                <el-select v-model="createTemp.levelthreeTime" placeholder="间隔时间" class="filter-item">
+                <el-select v-model="createTemp.levelthreeTime" placeholder="间隔时间" style="width:100%">
                   <el-option v-for="item in pushNameList2" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -2032,6 +2032,7 @@ export default {
       this.createTemp.depreciation = '5'
       this.createTemp.license = ''
       this.createTemp.duration = ''
+      this.createTemp.maintenance = []
     },
 
 
@@ -2257,7 +2258,7 @@ export default {
       }
 
 
-      if (row.maintenance !== undefined) {
+      if (row.maintenance && row.maintenance.length>0) {
         var newArr = row.maintenance.split(",")
         var arr2 = []
         newArr.forEach(function(item){
@@ -2265,6 +2266,8 @@ export default {
         })
         console.log('arr2',arr2)
         this.createTemp.maintenance = arr2
+      }else{
+        this.$set(this.createTemp,'maintenance',[])
       }
 
 
@@ -2331,6 +2334,7 @@ export default {
               this.createTemp.upkeepgrade = this.createTemp.upkeepgradeId
               this.createTemp.upkeepgradeId = ''
             }
+
             this.createTemp.deptId = this.createTemp.deptId
             this.createTemp.departmentName = this.createTemp.departmentName
             this.createTemp.employeeId = this.createTemp.employeId
@@ -2358,8 +2362,11 @@ export default {
 
             this.requestParam.parammaps.maintenance = this.requestParam.parammaps.maintenance.toString()
           }
-
-
+          if(this.requestParam.parammaps.duration == undefined || this.requestParam.parammaps.duration == "" || this.requestParam.parammaps.duration == null){
+            this.requestParam.parammaps.duration == 0
+            this.$set(this.requestParam.parammaps,'duration',0)
+          }
+            console.log(this.createTemp.maintenance,'maintenance')
             PostDataByName(this.requestParam).then(response => {
               console.log(response)
               if (response.msg !== 'fail') {
@@ -2372,6 +2379,12 @@ export default {
                 this.$notify({ title: '成功', message: '保存成功-', type: 'success', duration: 2000 })
                 // this.reload()
               } else {
+                let arr = this.requestParam.parammaps.maintenance.split(",")
+                let arr1 = []
+                for(let i =0 ;i<arr.length;i++){
+                  arr1.push(parseInt(arr[i]))
+                }
+                this.$set(this.createTemp,'maintenance',arr1)
                 failproccess(response, this.$notify)
               }
             })

src/views/custom/subscribe/index.vue

@@ -267,14 +267,14 @@
               <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
-          <el-table-column v-if="createTemp.providerId == ''" label="价格" prop="price" align="center" min-width="150">
-            <template slot-scope="scope">
-              <div  v-for="item in scope.row.pricearr">
-                <el-tooltip class="item" effect="dark" placement="top-start">
-                  <div slot="content">{{item}}</div>
-                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
-                </el-tooltip>
-              </div>
+          <el-table-column v-if="createTemp.providerId == ''" label="价格" prop="price" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div  v-for="item in scope.row.pricearr">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
             </template>
           </el-table-column>
           <el-table-column v-else label="价格" prop="price" align="center" min-width="150">
@@ -495,9 +495,38 @@
               <span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
             </template>
           </el-table-column>
-          <el-table-column  v-if="createTemp.purchaseType == '1'" label="价格" prop="price" align="center" min-width="150">
+          <el-table-column  v-if="createTemp.purchaseType == '1'" label="价格" prop="price" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div v-if="createTemp.purchaseType == '1'" v-for="item in scope.row.pricearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column  v-if="createTemp.purchaseType == '3'" label="价格" prop="price" align="center" min-width="150">
+            <template slot-scope="scope">
+              <el-form :model="scope.row" :rules="rules">
+                <el-form-item prop="price">
+                  <el-input v-model="scope.row.price" style="margin-top:15px"  />
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="createTemp.purchaseType == '1'" label="使用周期" min-width="120px" align="center">
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.lifeCyclearr">
+                <el-tooltip class="item" effect="dark" placement="top-start">
+                  <div slot="content">{{item}}</div>
+                  <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="createTemp.purchaseType == '1'" label="合同差异项" min-width="120px" align="center">
             <template slot-scope="scope">
-              <div v-if="createTemp.purchaseType == '1'" v-for="item in scope.row.pricearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+              <div v-for="item in scope.row.contractVarianceItemarr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
                 <el-tooltip class="item" effect="dark" placement="top-start">
                   <div slot="content">{{item}}</div>
                   <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
@@ -1665,13 +1694,17 @@ export default {
                   this.$set(item,'price','0')
                   this.$set(item,'amount','0')
                 }
-                if(this.dialogStatus !=='special'){
-                  var pricearr = item.price.split(",")
-                  this.$set(item,'pricearr',pricearr)
-                  var lifeCyclearr = item.lifeCycle.split(",")
-                  this.$set(item,'lifeCyclearr',lifeCyclearr)
-                  var contractVarianceItemarr = item.contractVarianceItem.split(",")
-                  this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
+                if(item.price){
+                  var pricearr = item.price.split(",")
+                  this.$set(item,'pricearr',pricearr)
+                }
+                if(item.lifeCycle){
+                  var lifeCyclearr = item.lifeCycle.split(",")
+                  this.$set(item,'lifeCyclearr',lifeCyclearr)
+                }
+                if(item.contractVarianceItem){
+                  var contractVarianceItemarr = item.contractVarianceItem.split(",")
+                  this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
                 }
                 this.listAdd.unshift(item)
                 this.$forceUpdate()
@@ -1699,11 +1732,15 @@ export default {
                 this.$set(item,'price','0')
                 this.$set(item,'amount','0')
               }
-              if(this.dialogStatus !=='special'){
+              if(item.price){
                 var pricearr = item.price.split(",")
                 this.$set(item,'pricearr',pricearr)
+              }
+              if(item.lifeCycle){
                 var lifeCyclearr = item.lifeCycle.split(",")
                 this.$set(item,'lifeCyclearr',lifeCyclearr)
+              }
+              if(item.contractVarianceItem){
                 var contractVarianceItemarr = item.contractVarianceItem.split(",")
                 this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
               }
@@ -1731,11 +1768,15 @@ export default {
               this.$set(item,'price','0')
               this.$set(item,'amount','0')
             }
-            if(this.dialogStatus !=='special'){
+            if(item.price){
               var pricearr = item.price.split(",")
               this.$set(item,'pricearr',pricearr)
+            }
+            if(item.lifeCycle){
               var lifeCyclearr = item.lifeCycle.split(",")
               this.$set(item,'lifeCyclearr',lifeCyclearr)
+            }
+            if(item.contractVarianceItem){
               var contractVarianceItemarr = item.contractVarianceItem.split(",")
               this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
             }
@@ -1763,6 +1804,20 @@ export default {
             var contractVarianceItemarr = item.contractVarianceItem.split(",")
             this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
           }
+          if(this.createTemp.providerId == ''){
+            if(item.price){
+              var pricearr = item.price.split(",")
+              this.$set(item,'pricearr',pricearr)
+            }
+            if(item.lifeCycle){
+              var lifeCyclearr = item.lifeCycle.split(",")
+              this.$set(item,'lifeCyclearr',lifeCyclearr)
+            }
+            if(item.contractVarianceItem){
+              var contractVarianceItemarr = item.contractVarianceItem.split(",")
+              this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
+            }
+          }
           this.listAdd.unshift(item)
           this.$forceUpdate()
         }
@@ -2457,7 +2512,9 @@ export default {
       this.statueReason = false
     },
     createExamineData3() {
-      console.log('点击了供应主管审核')
+      console.log('点击了供应主管审核',this.examineTemp.statue)
+
+      console.log(this.examineTemp.purchase_type,'=====')
       console.log(this.isApplyEx4,'=====')
       this.isokDisable = true
       setTimeout(() => {
@@ -2701,7 +2758,8 @@ export default {
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getCreateDepartDownList()
-      this.dialogStatus = 'special'
+      this.dialogStatus = 'special'
+      this.createTemp.purchaseType = '3'
       this.dialogFormVisible2 = true
       this.$nextTick(() => {
         this.$refs['createTemp'].clearValidate()
@@ -2876,8 +2934,7 @@ export default {
         }else{
           console.log('赠品-走原有保存')
           this.special_saveSave()
-        }
-
+        }
       } else {
         this.$message({
           title: '',

src/views/maintenance/repair/index.vue

@@ -2498,9 +2498,22 @@ export default {
               return false
             }
           }
-
-
-
+          if (this.listAddCont[j].providerName == null || this.listAddCont[j].providerName === '') {
+            this.$message({ type: 'warning', message: '请检查供应商是否未填写', duration: 2000 })
+            return false
+          }
+          if (this.listAddCont[j].eqCode == null || this.listAddCont[j].eqCode === '') {
+            this.$message({ type: 'warning', message: '请检查设备名称是否未填写', duration: 2000 })
+            return false
+          }
+          if (this.listAddCont[j].eqName == null || this.listAddCont[j].eqName === '') {
+            this.$message({ type: 'warning', message: '请检查设备内部编号是否未填写', duration: 2000 })
+            return false
+          }
+          if (this.listAddCont[j].typea == null || this.listAddCont[j].typea === '') {
+            this.$message({ type: 'warning', message: '请检查费用类型是否未填写', duration: 2000 })
+            return false
+          }
 
         }
         var amount = 0

src/views/report/vehiclerunningtime/index.vue

@@ -0,0 +1,279 @@
+<template>
+  <div class="app-container">
+
+    <div v-if="isPercentage" class="percentage" style="width: 210px;height: 90px;background: #fff;position: fixed;bottom: 0;left: 0;z-index: 9999999999999;">
+      <h4 style="padding-left: 10px;line-height: 0;">导出进度:</h4>
+      <el-progress style="padding-left: 10px;" :text-inside="true" :stroke-width="26" :percentage="percentage" />
+    </div>
+
+    <div class="filter-container">
+      <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 280px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="时间" end-placeholder="时间" :picker-options="pickerOptions" />
+      <el-select v-model="getdataListParm.parammaps.pastureId" placeholder="牧场" class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-select v-model="getdataListParm.parammaps.departmentId" clearable placeholder="部门" class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+
+      <el-input v-model="getdataListParm.parammaps.eqName" placeholder="请输入设备名称" style="width: 200px;" class="filter-item" />
+      <el-input v-model="getdataListParm.parammaps.eqCode" placeholder="请输入设备内部编号" style="width: 200px;" class="filter-item" />
+
+
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+
+      <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
+
+
+      <el-table
+        :key="tableKey"
+        v-loading="listLoading"
+        element-loading-text="给我一点时间"
+        :data="list"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;"
+        :row-style="rowStyle"
+        :cell-style="cellStyle"
+        class="elTable"
+        :max-height="myHeight"
+      >
+        <el-table-column label="序号" align="center" type="index" width="50px">
+          <template slot-scope="scope">
+            <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="日期" align="center" prop="date" />
+        <el-table-column label="运营中心" align="center" prop="center" />
+        <el-table-column label="大区" align="center" prop="region" />
+        <el-table-column label="牧场" align="center" prop="pastureName" />
+        <el-table-column label="部门" align="center" prop="departmentName" />
+        <el-table-column label="设备类别" align="center" prop="eqClass" />
+        <el-table-column label="设备名称" align="center" prop="eqName" />
+        <el-table-column label="设备内部编号" align="center" prop="eqCode" />
+        <el-table-column label="物联网编码" align="center" prop="license" />
+        <el-table-column label="规格" align="center" prop="specification" />
+        <el-table-column label="品牌" align="center" prop="brand" />
+        <el-table-column label="用途" align="center" prop="purpose" />
+        <el-table-column label="购置日期" align="center" prop="purchaseDate" />
+        <el-table-column label="入场时间" align="center" prop="entranceDate" />
+        <el-table-column label="报废时间" align="center" prop="leaveDate" />
+        <el-table-column label="标准工作时长" align="center" prop="duration" />
+        <el-table-column label="时长" align="center" prop="hour" />
+      </el-table>
+      <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
+    </div>
+  </div>
+</template>
+
+<script>
+// 引入
+import { GetDataByName, GetDataByNames, getRecuData, GetAccount,getJson } from '@/api/common'
+import waves from '@/directive/waves'
+
+import { parseTime, json2excel, sortChange } from '@/utils/index.js'
+import Pagination from '@/components/Pagination'
+import TreeSelect from '@/components/TreeSelect'
+import Cookies from 'js-cookie'
+export default {
+  name: 'Vehiclerunningtime',
+  components: { Pagination, TreeSelect },
+  directives: { waves },
+  data() {
+    return {
+      findAllPasture: [], findAllDepart: [],
+      requestParams: [
+        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }}
+      ],
+      getDepartParam: { name: 'findAllDepart1', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }},
+
+      tableKey: 0,
+      list: [],
+
+      selectData: '',
+      pickerMinDate: '',
+      pickerRange:3600 * 1000 * 24 * 60,
+      pickerOptions: {
+      //   onPick:({maxDate,minDate }) => {
+      //     if (minDate && this.pickerMinDate) {
+      //       this.pickerMinDate = null
+      //     } else if (minDate) {
+      //       this.pickerMinDate = minDate.getTime()
+      //     }
+      //  },
+      //   disabledDate: (time) => {
+      //     if (this.pickerMinDate) {
+      //         return (time.getTime() > (this.pickerMinDate + this.pickerRange))  ||(time.getTime() < (this.pickerMinDate - this.pickerRange))
+      //     }
+      //   return false
+      //   },
+      },
+
+
+      total: 0,
+      listLoading: true,
+      getdataListParm: {
+        name: 'startStopRecord', page: 1, offset: 1, pagecount: 10, returntype: 'Map',inputDatetime: [parseTime(new Date().getTime() - 30 * 24 * 60 * 60 * 1000, '{y}-{m}-{d}'), parseTime(new Date().getTime() - 24 * 60 * 60 * 1000, '{y}-{m}-{d}')],
+        parammaps: { pastureId: parseInt(Cookies.get('pastureid')), pastureName: Cookies.get('pasturename'), departmentId: '', eqClassId: '', eqName: '',eqCode:'',startTime: "",
+        endTime: "",departmentId: "" ,inputDatetime: [parseTime(new Date().getTime() - 30 * 24 * 60 * 60 * 1000, '{y}-{m}-{d}'), parseTime(new Date().getTime() - 24 * 60 * 60 * 1000, '{y}-{m}-{d}')], page: 1, offset: 1, pagecount: 10,}
+      },
+      requestParam: { name: 'insertAsset', offset: 0, pagecount: 0, parammaps: {}}, statueReason: false,
+      downLoadParm: {},
+      downLoadList: [],
+      pageNum: 0,
+      pageSize: 0,
+      isPercentage: false,
+      percentage: 1,
+      isokDisable: false,
+      rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150
+    }
+  },
+  created() {
+    this.get_select_list()
+     this.get_table_data()
+
+  },
+  methods: {
+    get_select_list() {
+      GetDataByNames(this.requestParams).then(response => {
+        if (response.data.list !== null) {
+          this.findAllPasture = response.data.findAllPasture.list
+          this.getDepartDownList()
+        }
+      })
+    },
+    getDepartDownList() {
+      GetDataByName(this.getDepartParam).then(response => {
+        this.findAllDepart = response.data.list
+      })
+    },
+    changePastureName(item) {
+      this.getDepartParam.parammaps.pastureId = this.findAllPasture.find(obj => obj.name == item).id
+      this.getdataListParm.parammaps.departmentId = ''
+      this.getDepartDownList()
+    },
+    get_table_data() {
+      this.listLoading = true
+      // console.log(this.findAllPasture.find(obj => obj.name == this.getdataListParm.parammaps.pastureName).id,'===')
+      if (this.getdataListParm.parammaps.pastureName == '现代牧业') {
+        // this.getdataListParm.parammaps.pastureName = ''
+        this.getdataListParm.parammaps.pastureId = ''
+      }
+
+      if (this.getdataListParm.parammaps.inputDatetime == null) {
+        this.getdataListParm.parammaps.startTime = ''
+        this.getdataListParm.parammaps.endTime = ''
+      } else {
+        this.getdataListParm.parammaps.startTime = parseTime(this.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+        this.getdataListParm.parammaps.endTime = parseTime(this.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      }
+      this.getdataListParm.parammaps.offset = this.getdataListParm.offset
+      this.getdataListParm.parammaps.pagecount = this.getdataListParm.pagecount
+      this.getdataListParm.parammaps.page = this.getdataListParm.page
+      let url = '/authdata/vehicle/list'
+      let data = '?pastureId='+ this.getdataListParm.parammaps.pastureId
+              + '&startTime=' + this.getdataListParm.parammaps.startTime
+              + '&endTime=' + this.getdataListParm.parammaps.endTime
+              + '&offset=' + this.getdataListParm.offset
+              + '&pagecount=' + this.getdataListParm.pagecount
+              + '&eqCode=' + this.getdataListParm.parammaps.eqCode
+              + '&eqName=' + this.getdataListParm.parammaps.eqName
+              + '&departmentId=' + this.getdataListParm.parammaps.departmentId
+      getJson(url,data).then(response => {
+        console.log('table数据', response.data.vehicle)
+        if (response.data.list !== null) {
+          this.list = response.data.vehicle
+          this.pageNum = response.data.offset
+          this.pageSize = response.data.pagecount
+        } else {
+          this.list = []
+        }
+        this.total = response.data.count
+        setTimeout(() => {
+          this.listLoading = false
+        }, 100)
+      })
+    },
+    form_search() {
+      this.listLoading = true
+      this.getdataListParm.offset = 1
+      this.get_table_data()
+    },
+
+
+    handleDownload() {
+      this.$alert('车辆运行时间正在导出中，请勿刷新或离开本页面，若导出时间过长，建议缩小导出数据范围重新导出', {})
+      this.isPercentage = true
+      this.percentage = 1
+      var timer = setInterval(() => {
+        this.percentage += 5
+        if (this.percentage > 95) {
+          this.percentage = 99
+          clearInterval(timer)
+        }
+        this.percentage = this.percentage
+      }, 1000)
+      let url = '/authdata/vehicle/list'
+      let data = '?pastureId='+ this.getdataListParm.parammaps.pastureId
+              + '&startTime=' + this.getdataListParm.parammaps.startTime
+              + '&endTime=' + this.getdataListParm.parammaps.endTime
+              + '&offset=0'
+              + '&pagecount=' + this.total
+              + '&eqCode=' + this.getdataListParm.parammaps.eqCode
+              + '&eqName=' + this.getdataListParm.parammaps.eqName
+              + '&departmentId=' + this.getdataListParm.parammaps.departmentId
+      getJson(url,data).then(response => {
+        this.downLoadList = response.data.vehicle
+        if (response.data.vehicle !== '') {
+          this.percentage = 99
+          setTimeout(() => {
+            this.isPercentage = false
+          }, 2000)
+        }
+        const elecExcelDatas = [
+          {
+            tHeader: ['日期','运营中心','大区','牧场','部门','设备类别','设备名称','设备内部编号','物联网编码','规格','品牌','用途','购置日期','入场时间','报废时间','标准工作时长','时长'],
+            filterVal: ['date','center','region','pastureName','departmentName','eqClass','eqName','eqCode','license','specification','brand','purpose','purchaseDate','entranceDate','leaveDate','duration','hour' ],
+            tableDatas: this.downLoadList,
+            sheetName: '车辆运行时间'
+          }
+        ]
+        json2excel(elecExcelDatas, '车辆运行时间', true, 'xlsx')
+      })
+    }
+
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .el-autocomplete-suggestion li{
+    padding:0 3px!important;
+  }
+  .el-table .warning-row {
+      background: oldlace;
+  }
+  .el-table .success-row {
+      background: #f0f9eb;
+  }
+</style>
+<style lang="scss">
+  .upkeepgrade .el-form-item__label{
+    line-height: 20px;
+  }
+  .inputDatetime .el-range-separator{
+   padding: 0;
+   margin: 0 10px;
+  }
+  .el-radio__label{
+    padding-left: 2px !important;
+  }
+  .typeSelect span .el-popover__reference .el-input--suffix {
+    top:-3px;
+    .el-input__inner{
+      height:40px !important;
+    }
+  }
+</style>