添加搜索条件

src/utils/request.js

@@ -5,81 +5,81 @@ import { getToken } from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
-  // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+    baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+    // withCredentials: true, // send cookies when cross-domain requests
+    timeout: 5000 // request timeout
 })
 
 // request interceptor
 service.interceptors.request.use(
-  config => {
-    // do something before request is sent
+    config => {
+        // do something before request is sent
 
-    if (store.getters.token) {
-      // let each request carry token
-      // ['X-Token'] is a custom headers key
-      // please modify it according to the actual situation
-      config.headers['X-Token'] = getToken()
-      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+        if (store.getters.token) {
+            // let each request carry token
+            // ['X-Token'] is a custom headers key
+            // please modify it according to the actual situation
+            config.headers['X-Token'] = getToken()
+            config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+        }
+        return config
+    },
+    error => {
+        // do something with request error
+        console.log(error) // for debug
+        return Promise.reject(error)
     }
-    return config
-  },
-  error => {
-    // do something with request error
-    console.log(error) // for debug
-    return Promise.reject(error)
-  }
 )
 
 // response interceptor
 service.interceptors.response.use(
-  /**
-   * If you want to get http information such as headers or status
-   * Please return  response => response
-  */
+    /**
+     * If you want to get http information such as headers or status
+     * Please return  response => response
+     */
 
-  /**
-   * Determine the request status by custom code
-   * Here is just an example
-   * You can also judge the status by HTTP Status Code
-   */
-  response => {
-    const res = response.data
+    /**
+     * Determine the request status by custom code
+     * Here is just an example
+     * You can also judge the status by HTTP Status Code
+     */
+    response => {
+        const res = response.data
 
-    // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 200) {
-      Message({
-        message: res.message || 'Error',
-        type: 'error',
-        duration: 5 * 1000
-      })
+        // if the custom code is not 20000, it is judged as an error.
+        if (res.code !== 200) {
+            Message({
+                message: res.message || 'Error',
+                type: 'error',
+                duration: 5 * 1000
+            })
 
-      if (res.code === 501) {
-        // to re-login
-        MessageBox.confirm('你的账号已经登出，请重新登录！', '确认', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
+            if (res.code === 501) {
+                // to re-login
+                // MessageBox.confirm('你的账号已经登出，请重新登录！', '确认', {
+                //   confirmButtonText: '重新登录',
+                //   cancelButtonText: '取消',
+                //   type: 'warning'
+                // }).then(() => {
+                //   store.dispatch('user/resetToken').then(() => {
+                //     location.reload()
+                //   })
+                // })
+            }
+            return Promise.reject(new Error(res.message || 'Error'))
+        } else {
+            return res
+        }
+    },
+    error => {
+        console.log('err' + error) // for debug
+        Message({
+            message: error.message,
+            type: 'error',
+            duration: 5 * 1000
         })
-      }
-      return Promise.reject(new Error(res.message || 'Error'))
-    } else {
-      return res
+        return Promise.reject(error)
     }
-  },
-  error => {
-    console.log('err' + error) // for debug
-    Message({
-      message: error.message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
 )
 
-export default service
+export default service

src/views/device/allocation/allocation-modal.vue

@@ -71,10 +71,10 @@ export default {
 			/**提交表单对象 */
       dataForm: {
         id: '',
-				deviceType: '',
-				usedArr: [],
+				deviceType: 1,
+				usedArr: ['1','2'],
 				used: '',
-				describeArr: [],
+				describeArr: ['1'],
 				describe: '',
 				customId: '',
 				sn: [],

src/views/device/allocation/allocationAdd.vue

@@ -199,7 +199,7 @@ export default {
 				this.$refs.addBatch.init()
 				this.$refs.addBatch.title = '设备调拨'
 				this.$refs.addBatch.dataForm.batchNum = numbers
-				this.$refs.addBatch.number = 88
+				this.$refs.addBatch.number = this.multipleSelection.length
 				// this.$refs.addOrUpdate.packTitle = row.packTitle
 				// this.$refs.addOrUpdate.typeTitle = row.typeTitle
 			});

src/views/device/allocation/allocationBatch-modal.vue

@@ -71,10 +71,10 @@ export default {
 			/**提交表单对象 */
       dataForm: {
         id: '',
-				deviceType: '',
-				usedArr: [],
+				deviceType: 1,
+				usedArr: ['1','2'],
 				used: '',
-				describeArr: [],
+				describeArr: ['1'],
 				describe: '',
 				customId: '',
 				batchNum: [],
@@ -84,8 +84,8 @@ export default {
 			typeTitle: '',
       number: 0,
 			option: [
-				{label: '动力电池', value: '1'},
-				{label: '储能电池', value: '2'}
+				{label: '动力电池', value: 1},
+				{label: '储能电池', value: 2}
 			],
 			usedOption: [
 				{label: '智慧运营', value: '1'},

src/views/device/allocation/details.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <h1><i class="el-icon-arrow-left" @click="goBack"></i>查看详情</h1>
-		<div class="top-info">
+		<!-- <div class="top-info">
 			出库成功 <span>500</span>
-		</div>
+		</div> -->
 
 		<el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
 			<el-row>

src/views/device/allocation/index.vue

@@ -4,7 +4,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="电池" name="first">
         <div class="top-info">
-          已调拨设备 <span>1864</span>，可调拨设备 <span>200</span>
+          已调拨设备 <span>{{dataTotle.transfer}}</span>，可调拨设备 <span>{{dataTotle.transferAble}}</span>
         </div>
 
         <el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
@@ -28,7 +28,8 @@
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                  @change="timeChange">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -350,6 +351,7 @@
 
 <script>
 import { transferList } from '@/api/device/allocation'
+import { dataTotle } from '@/api/device/info'
 export default {
   components: {  },
   data() {
@@ -365,8 +367,10 @@ export default {
         index: 1,
         length: 20,
         sn: '',
-        type: '',
-        sort: 'id desc',
+        type: null,
+        sort: '',
+        recordTimeStart: '',
+        recordTimeEnd: '',
       },
 			/**是否显示新增弹窗 */
 			addVisible: false,
@@ -375,19 +379,50 @@ export default {
         {label: '全部', value: null},
         {label: '商用', value: 1},
         {label: '测试', value: 2},
-        {label: '试用', value: 3}
       ],
-      activeName: 'first'
+      activeName: 'first',
+      dataTotle: {}
     }
   },
   created() {
     this.getDataList()
+    this.getDataTotle()
   },
   methods: {
     //切换tab页
     handleClick(tab) {
       this.activeName = tab.name
     },
+    //时间选择
+    timeChange(data) {
+      this.listQuery.recordTimeStart = this.DateToStr(data[0])
+      this.listQuery.recordTimeEnd = this.DateToStr(data[1])
+    },
+    //日期转字符串
+    DateToStr(date) {
+     var year = date.getFullYear();//年
+     var month = date.getMonth();//月
+     var day = date.getDate();//日
+     var hours = date.getHours();//时
+     var min = date.getMinutes();//分
+     var second = date.getSeconds();//秒
+     return year + "-" +
+         ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+         (day > 9 ? day : ("0" + day)) + " " +
+         (hours > 9 ? hours : ("0" + hours)) + ":" +
+         (min > 9 ? min : ("0" + min)) + ":" +
+         (second > 9 ? second : ("0" + second));
+    },
+    //数据统计
+    getDataTotle() {
+      dataTotle().then(res => {
+        if (res.code === 200) {
+          this.dataTotle = res.data
+        } else {
+          return this.$message.error(res.message)
+        }
+      })
+    },
     //搜索
     searchHandle() {
       this.listQuery.index = 1
@@ -435,7 +470,9 @@ export default {
         length: 20,
         sn: '',
         type: null,
-        sort: '+id'
+        sort: '',
+        recordTimeStart: '',
+        recordTimeEnd: '',
       }
       this.searchHandle()
     },

src/views/device/delivery/batchOut.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <h1><i class="el-icon-arrow-left" @click="goBack"></i>批次出库</h1>
-		<div class="top-info">
+		<!-- <div class="top-info">
 			已出库设备 <span>1864</span>，可出库设备 <span>200</span>
-		</div>
+		</div> -->
 
 		<el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
 			<el-row>
 				<el-col :span="16">
 					<el-form-item label="批次号">
-						<el-input v-model="listQuery.sn" placeholder="请输入批次号" clearable></el-input>
+						<el-input v-model="listQuery.batchNum" placeholder="请输入批次号" clearable></el-input>
 					</el-form-item>
 				</el-col>
 				
@@ -79,7 +79,7 @@
 
       <el-table-column align="center" label="查看明细" width="180">
         <template slot-scope="scope">
-          <el-button @click="gotoDetail(scope.row.batch_num)" type="text">查看</el-button>
+          <el-button @click="gotoDetail(scope.row.operate_id)" type="text">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -113,6 +113,7 @@ export default {
         sn: '',
         type: null,
         sort: '',
+        batchNum: ''
       },
 			/**是否显示新增弹窗 */
 			addVisible: false,
@@ -143,6 +144,7 @@ export default {
         sn: '',
         type: null,
         sort: '',
+        batchNum: ''
       }
       this.getDataList()
     },

src/views/device/delivery/batchOutDetail.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <h1><i class="el-icon-arrow-left" @click="goBack"></i>批次出库-查看详情</h1>
-		<div class="top-info">
+		<!-- <div class="top-info">
 			设备共计 <span>1864</span>
-		</div>
+		</div> -->
 
 		<el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
 			<el-row>
@@ -126,7 +126,7 @@ export default {
   },
   created() {
     if (this.$route.query.batchId !== undefined) {
-      this.listQuery.batchNum = this.$route.query.batchId
+      this.listQuery.operateID = this.$route.query.batchId
     }
     this.getDataList()
   },

src/views/device/delivery/index.vue

@@ -4,7 +4,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="电池" name="first">
         <div class="top-info">
-          已出库设备 <span>1864</span>，可出库设备 <span>200</span>
+          已出库设备 <span>{{dataTotle.outStorage}}</span>，可出库设备 <span>{{dataTotle.outStorageAble}}</span>
         </div>
 
         <el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
@@ -17,7 +17,7 @@
             
             <el-col :span="5">
               <el-form-item label="出库类型">
-                <el-select v-model="listQuery.type">
+                <el-select v-model="listQuery.outType">
                   <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select> 
               </el-form-item>
@@ -29,7 +29,8 @@
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                  @change="timeChange">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -358,6 +359,7 @@
 
 <script>
 import { deliveryList } from '@/api/device/delivery'
+import { dataTotle } from '@/api/device/info'
 import Create from '@/views/device/delivery/delivery-add.vue'
 
 export default {
@@ -375,8 +377,10 @@ export default {
         index: 1,
         length: 20,
         sn: '',
-        type: null,
+        outType: null,
         sort: '',
+        recordTimeEnd: '',
+        recordTimeStart: '',
       },
 			/**是否显示新增弹窗 */
 			addVisible: false,
@@ -385,13 +389,14 @@ export default {
         {label: '全部', value: null},
         {label: '商用', value: 1},
         {label: '测试', value: 2},
-        {label: '试用', value: 3}
       ],
-      activeName: 'first'
+      activeName: 'first',
+      dataTotle: {},
     }
   },
   created() {
     this.getDataList()
+    this.getDataTotle()
   },
   methods: {
     //切换tab页
@@ -403,7 +408,49 @@ export default {
       this.listQuery.index = 1
       this.getDataList()
     },
-
+    //时间选择
+    timeChange(data) {
+      this.listQuery.recordTimeStart = this.DateToStr(data[0])
+      this.listQuery.recordTimeEnd = this.DateToStr(data[1])
+    },
+    //日期转字符串
+    DateToStr(date) {
+     var year = date.getFullYear();//年
+     var month = date.getMonth();//月
+     var day = date.getDate();//日
+     var hours = date.getHours();//时
+     var min = date.getMinutes();//分
+     var second = date.getSeconds();//秒
+     return year + "-" +
+         ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+         (day > 9 ? day : ("0" + day)) + " " +
+         (hours > 9 ? hours : ("0" + hours)) + ":" +
+         (min > 9 ? min : ("0" + min)) + ":" +
+         (second > 9 ? second : ("0" + second));
+    },
+    //数据统计
+    getDataTotle() {
+      dataTotle().then(res => {
+        if (res.code === 200) {
+          this.dataTotle = res.data
+        } else {
+          return this.$message.error(res.message)
+        }
+      })
+    },
+    //重置
+    resetForm() {
+      this.listQuery = {
+        index: 1,
+        length: 20,
+        sn: '',
+        outType: null,
+        sort: '',
+        recordTimeEnd: '',
+        recordTimeStart: '',
+      }
+      this.getDataList()
+    },
     //获取列表数据
     getDataList() {
       this.loading = true

src/views/device/handle/index.vue

@@ -4,7 +4,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="电池" name="first">
         <div class="top-info">
-          历史处置电池 <span>1864</span>
+          历史处置电池 <span>{{dataTotle.handle}}</span>
         </div>
 
         <el-form :inline="true" :model="listQuery" @keyup.enter.native="handleFilter()">
@@ -277,6 +277,7 @@
 
 <script>
 import { handleList } from '@/api/device/handle'
+import { dataTotle } from '@/api/device/info'
 import Create from '@/views/device/handle/handle-add.vue'
 import Info from '@/views/device/handle/handle-info.vue'
 
@@ -303,11 +304,13 @@ export default {
 			/**是否显示新增弹窗 */
 			addVisible: false,
       infoVisiable: false,
-      activeName: 'first'
+      activeName: 'first',
+      dataTotle: {},
     }
   },
   created() {
     this.getDataList()
+    this.getDataTotle()
   },
   methods: {
     //切换tab页
@@ -319,6 +322,16 @@ export default {
       this.listQuery.index = 1
       this.getDataList()
     },
+    //数据统计
+    getDataTotle() {
+      dataTotle().then(res => {
+        if (res.code === 200) {
+          this.dataTotle = res.data
+        } else {
+          return this.$message.error(res.message)
+        }
+      })
+    },
     //重置
     resetForm() {
       this.listQuery = {

src/views/device/info/index.vue

@@ -21,7 +21,8 @@
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                  @change="timeChange">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -271,7 +272,8 @@
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                  @change="timeChange">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -411,7 +413,9 @@ export default {
         imei: '',
         orderBy: '',
         sort: '',
-        time: []
+        time: [],
+        recordTimeStart: '',
+        recordTimeEnd: '',
       },
 			/**是否显示新增弹窗 */
 			addVisible: false,
@@ -428,6 +432,26 @@ export default {
     this.getDataTotle()
   },
   methods: {
+    //时间选择
+    timeChange(data) {
+      this.listQuery.recordTimeStart = this.DateToStr(data[0])
+      this.listQuery.recordTimeEnd = this.DateToStr(data[1])
+    },
+    //日期转字符串
+    DateToStr(date) {
+     var year = date.getFullYear();//年
+     var month = date.getMonth();//月
+     var day = date.getDate();//日
+     var hours = date.getHours();//时
+     var min = date.getMinutes();//分
+     var second = date.getSeconds();//秒
+     return year + "-" +
+         ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+         (day > 9 ? day : ("0" + day)) + " " +
+         (hours > 9 ? hours : ("0" + hours)) + ":" +
+         (min > 9 ? min : ("0" + min)) + ":" +
+         (second > 9 ? second : ("0" + second));
+    },
     //切换tab页
     handleClick(tab) {
       this.activeName = tab.name
@@ -513,7 +537,9 @@ export default {
         imei: '',
         orderBy: '',
         sort: '',
-        time: []
+        time: [],
+        recordTimeStart: null,
+        recordTimeEnd: null,
       }
       this.getDataList()
     },

src/views/device/storage/index.vue

@@ -4,7 +4,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="电池" name="first">
         <div class="top-info">
-          总录入电池 <span>1864</span>，已入库电池 <span>200</span>，未入库电池 <span style="color: #D9001B;">200</span>
+          总录入电池 <span>{{dataTotle.total}}</span>，已入库电池 <span>{{dataTotle.inStorage}}</span>，未入库电池 <span style="color: #D9001B;">{{dataTotle.notInStorage}}</span>
         </div>
 
         <el-form :inline="true" :model="listQuery" @keyup.enter.native="searchHandle()">
@@ -28,7 +28,8 @@
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+                  end-placeholder="结束日期"
+                  @change="timeChange">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -372,6 +373,7 @@
 
 <script>
 import { storageInList } from '@/api/device/storage'
+import { dataTotle } from '@/api/device/info'
 import Create from '@/views/device/storage/create.vue'
 
 export default {
@@ -388,6 +390,9 @@ export default {
         length: 20,
         sn: '',
         sort: 'id desc',
+        checkStatus: null,
+        recordTimeStart: '',
+        recordTimeEnd: '',
         // checkStatus: []
       },
       //总条数
@@ -406,17 +411,49 @@ export default {
         {label: '已通过', value: 1},
         {label: '未通过', value: 0}
       ],
-      activeName: 'first'
+      activeName: 'first',
+      dataTotle: {},
     }
   },
   created() {
     this.getDataList()
+    this.getDataTotle()
   },
   methods: {
+    //时间选择
+    timeChange(data) {
+      this.listQuery.recordTimeStart = this.DateToStr(data[0])
+      this.listQuery.recordTimeEnd = this.DateToStr(data[1])
+    },
+    //日期转字符串
+    DateToStr(date) {
+     var year = date.getFullYear();//年
+     var month = date.getMonth();//月
+     var day = date.getDate();//日
+     var hours = date.getHours();//时
+     var min = date.getMinutes();//分
+     var second = date.getSeconds();//秒
+     return year + "-" +
+         ((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
+         (day > 9 ? day : ("0" + day)) + " " +
+         (hours > 9 ? hours : ("0" + hours)) + ":" +
+         (min > 9 ? min : ("0" + min)) + ":" +
+         (second > 9 ? second : ("0" + second));
+    },
     //切换tab页
     handleClick(tab) {
       this.activeName = tab.name
     },
+    //数据统计
+    getDataTotle() {
+      dataTotle().then(res => {
+        if (res.code === 200) {
+          this.dataTotle = res.data
+        } else {
+          return this.$message.error(res.message)
+        }
+      })
+    },
     //搜索
     searchHandle() {
       this.listQuery.index = 1
@@ -430,7 +467,9 @@ export default {
         sn: '',
         status: [1],
         sort: 'id desc',
-        checkStatus: null
+        checkStatus: null,
+        recordTimeStart: '',
+        recordTimeEnd: '',
       }
       this.getDataList()
     },

src/views/device/storage/warehousing.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <h1><i class="el-icon-arrow-left" @click="goBack"></i>电池批次入库</h1>
-		<div class="top-info">
+		<!-- <div class="top-info">
 			共计电池 <span>{{totalData}}</span>，未入库电池 <span>200</span>批次号: 录入时间:
-		</div>
+		</div> -->
 		<el-form :inline="true" :model="listQuery" @keyup.enter.native="handleFilter()">
 			<el-row style="float: right;">
 				<el-form-item>
@@ -112,7 +112,7 @@ export default {
         title: undefined,
         type: undefined,
         sort: '+id',
-        batchNum: ''
+        batchNum: '',
       },
 			/**批量选中的数据列表 */
 			multipleSelection: [],