chenrui пре 4 година
родитељ
комит
233917b380

+ 10 - 0
src/libs/getDate.js

@@ -12,6 +12,16 @@ export default {
     obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
     return obj
   },
+  //  近7天
+  getRecentday () {
+    const obj = {
+      starttime: '',
+      endtime: ''
+    }
+    obj.starttime = moment().subtract('days', 6).format('YYYY-MM-DD')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    return obj
+  },
   // 获取昨日的开始结束时间
   getYesterday () {
     const obj = {

+ 11 - 13
src/views/equipmentManage/equipment/equipment.vue

@@ -1,21 +1,21 @@
 <template>
-  <a-card :bordered="false" class="network-table-page-search-wrapper">
-    <div class="network-searchForm">
-      <a-form layout="inline" :form="form" ref="form" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
+  <a-card :bordered="false" class="equipment-table-page-search-wrapper">
+    <div class="equipment-searchForm">
+      <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
           <a-col :span="6">
             <a-form-item label="设备编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="network-equipmentNo" allowClear :maxLength="30" v-decorator="[ 'queryParam.equipmentNo', { initialValue: queryParam.equipmentNo, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入网点名称" />
+              <a-input id="equipment-equipmentNo" allowClear :maxLength="30" v-model="queryParam.equipmentNo" placeholder="请输入网点名称" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="network-networkName" allowClear :maxLength="30" v-decorator="[ 'queryParam.networkName', { initialValue: queryParam.networkName, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入网点名称" />
+              <a-input id="equipment-networkName" allowClear :maxLength="30" v-model="queryParam.networkName" placeholder="请输入网点名称" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
-            <a-button class="handle-btn serach-btn" id="network-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button class="handle-btn" type="" id="network-btn-reset" @click="handleReset">重置</a-button>
+            <a-button class="handle-btn serach-btn" id="equipment-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+            <a-button class="handle-btn" type="" id="equipment-btn-reset" @click="handleReset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
@@ -34,16 +34,15 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <!-- <a-icon type="edit" id="network-handleEdit" title="编辑" class="actionBtn icon-orange" @click="handleEdit(record)" /> -->
         <a-button
           type="primary"
           class="btn-edit-s"
-          id="organization-edit"
+          id="equipment-log-btn"
           @click="checkLog(record)">掉线日志</a-button>
       </template>
     </s-table>
     <!-- 掉线日志 -->
-    <equipmentLogModal :openModal="openLogModal" :equipmentId="equipmentId" @close="openLogModal=false" />
+    <equipment-log-modal :openModal="openLogModal" :equipmentId="equipmentId" @close="openLogModal=false" />
   </a-card>
 </template>
 
@@ -55,7 +54,6 @@ export default {
   components: { STable, VSelect, equipmentLogModal },
   data () {
     return {
-      form: this.$form.createForm(this),
       formItemLayout: {
         labelCol: { span: 7 },
         wrapperCol: { span: 17 }
@@ -135,8 +133,8 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-  .network-table-page-search-wrapper{
-    .network-searchForm{
+  .equipment-table-page-search-wrapper{
+    .equipment-searchForm{
       .ant-form-inline .ant-form-item{
         width: 100%;
       }

+ 2 - 2
src/views/equipmentManage/equipment/logModal.vue

@@ -79,8 +79,8 @@ export default {
       },
       // 将默认当天时间日期回显在时间选择框中
       time: [
-        moment(getDate.getToday().starttime, this.dateFormat),
-        moment(getDate.getToday().endtime, this.dateFormat)
+        moment(getDate.getRecentday().starttime, this.dateFormat),
+        moment(getDate.getRecentday().endtime, this.dateFormat)
       ],
       dateFormat: 'YYYY-MM-DD',
       // 表头

+ 1 - 1
src/views/equipmentManage/network/detailsModal.vue

@@ -55,7 +55,7 @@
         :pagination="false"
         bordered></a-table>
     </div>
-    <div class="btn-cont"><a-button id="detail-network-modal-back" @click="isShow = false">返回列表</a-button></div>
+    <div class="btn-cont"><a-button id="network-detail-modal-back" @click="isShow = false">返回列表</a-button></div>
   </a-modal>
 </template>
 

+ 16 - 15
src/views/equipmentManage/network/editModal.vue

@@ -9,14 +9,14 @@
     @cancle="isShow=false"
     :width="1000">
     <a-form
-      id="logistics-form"
+      id="network-edit-form"
       :form="form"
       ref="form"
       v-bind="formItemLayout"
       @submit="handleSubmit">
       <a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-input
-          id="logistics-name"
+          id="network-edit-name"
           :maxLength="30"
           v-decorator="[
             'formData.name',
@@ -27,7 +27,7 @@
       </a-form-item>
       <a-form-item label="地址" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-cascader
-          id="network-areas"
+          id="network-edit-areas"
           v-decorator="[
             'options',
             {initialValue: areas,
@@ -38,7 +38,7 @@
       </a-form-item>
       <a-form-item label="详细地址" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-input
-          id="logistics-address"
+          id="network-edit-address"
           :maxLength="30"
           v-decorator="[
             'formData.address',
@@ -51,28 +51,27 @@
         <a-col :span="10">
           <a-form-item label="纬度" :label-col="{ span: 10 }" :wrapper-col="{ span: 14 }">
             <a-input
-              id="logistics-lat"
+              id="network-edit-lat"
               v-decorator="[
                 'formData.lat',
                 { initialValue: formData.lat, rules: [
                   { required: true, message: '请输入纬度' },
-                  { pattern: new RegExp(/^d{1}$/), message: '请输入正确的纬度,整数部分为0~90,必须输入1到8位小数' }
+                  { pattern: /^[\-\+]?([0-8]?\d{1}\.\d{1,8}|90\.0{1,8})$/, message: '请输入正确的纬度,整数部分为0~90,必须输入1到8位小数' }
                 ] }
               ]"
               placeholder="请输入纬度"
               allowClear />
-              <!-- { pattern: '^[\-\+]?([0-8]?\d{1}\.\d{1,8}|90\.0{1,8})$', message: '请输入正确的纬度,整数部分为0~90,必须输入1到8位小数' } -->
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="经度" :label-col="{ span: 10 }" :wrapper-col="{ span: 14 }">
             <a-input
-              id="logistics-lnt"
+              id="network-edit-lnt"
               v-decorator="[
                 'formData.lnt',
                 { initialValue: formData.lnt, getValueFromEvent: $filterEmpty, rules: [
                   { required: true, message: '请输入经度' },
-                  { pattern: '^[\-\+]?(0?\d{1,2}\.\d{1,8}|1[0-7]?\d{1}\.\d{1,8}|180\.0{1,8})$', message: '请输入正确的经度,整数部分为0~180,必须输入1到8位小数' }
+                  { pattern: /^[\-\+]?(0?\d{1,2}\.\d{1,8}|1[0-7]?\d{1}\.\d{1,8}|180\.0{1,8})$/, message: '请输入正确的经度,整数部分为0~180,必须输入1到8位小数' }
                 ] }
               ]"
               placeholder="请输入经度"
@@ -81,19 +80,20 @@
         </a-col>
         <a-col :span="4">
           <a href="https://lbs.qq.com/tool/getpoint/" target="_blank">
-            <a-button type="primary" id="logistics-search-jwd" class="logistics-search-jwd" size="small">查询坐标</a-button>
+            <a-button type="primary" id="network-edit-search-jwd" class="network-edit-search-jwd" size="small">查询坐标</a-button>
           </a>
         </a-col>
       </a-row>
       <a-form-item label="选择兑换规则" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-select
+          id="network-edit-rules"
           allowClear
           v-decorator="[
             'formData.exchangeRules',
             { initialValue: formData.exchangeRules,
-              rules: [{ required: true, message: '请选择投递时间段' }] },
+              rules: [{ required: true, message: '请选择兑换规则' }] },
           ]"
-          placeholder="请选择投递时间段"
+          placeholder="请选择兑换规则"
           @change="exchangeRulesChange"
         >
           <a-select-option v-for="(item,index) in deliverList" :key="index" :value="item.value">
@@ -103,6 +103,7 @@
       </a-form-item>
       <a-form-item label="投递时间段" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
         <a-select
+          id="network-edit-times"
           allowClear
           v-decorator="[
             'formData.deliver',
@@ -118,8 +119,8 @@
         </a-select>
       </a-form-item>
       <a-form-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-        <a-button type="primary" html-type="submit" id="logistics-submit" style="margin-right: 15px">保存</a-button>
-        <a-button @click="isShow=false" style="margin-left: 15px" id="logistics-close">取消</a-button>
+        <a-button type="primary" html-type="submit" id="network-edit-submit" style="margin-right: 15px">保存</a-button>
+        <a-button @click="isShow=false" style="margin-left: 15px" id="network-edit-close">取消</a-button>
       </a-form-item>
     </a-form>
   </a-modal>
@@ -208,7 +209,7 @@ export default {
 
 <style lang="less">
   .edit-network-modal{
-    .logistics-search-jwd{
+    .network-edit-search-jwd{
       margin-top: 8px;
     }
   }

+ 4 - 3
src/views/equipmentManage/network/equipmentModal.vue

@@ -26,13 +26,13 @@
         <div class="search-sub-item" v-if="resultData && isFocus">
           <p>{{ resultData.name }}</p>
           <a-button
-            id="equipment-bind"
+            id="equipment-unbind"
             v-if="!resultData.params"
             type="primary"
             ghost
             size="small"
             @click="onBundling(resultData)">立即绑定</a-button>
-          <a-button v-else disabled type="link">已绑定</a-button>
+          <a-button id="equipment-bind" v-else disabled type="link">已绑定</a-button>
         </div>
       </a-card>
     </div>
@@ -50,6 +50,7 @@
       <!-- 箱体类型 -->
       <template slot="type" slot-scope="record">
         <a-select
+          id="equipment-type"
           allowClear
           placeholder="请选择箱体类型"
           style="width: 100%;"
@@ -64,7 +65,7 @@
         <a-switch
           checkedChildren="启用"
           unCheckedChildren="禁用"
-          id="bannerSetting-changeFlagHandle"
+          id="equipment-changeFlagHandle"
           v-model="record.workStatus == 1 ? true : false"
           @change="changeFlagHandle(record)"
         />

+ 6 - 8
src/views/equipmentManage/network/network.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false" class="network-table-page-search-wrapper">
     <div class="network-searchForm">
-      <a-form layout="inline" :form="form" ref="form" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
+      <a-form layout="inline" v-bind="formItemLayout" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
           <a-col :span="6">
             <a-form-item label="创建时间" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
@@ -16,7 +16,7 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="network-networkName" allowClear :maxLength="30" v-decorator="[ 'queryParam.networkName', { initialValue: queryParam.networkName, getValueFromEvent: $filterEmpty, rules: [] }]" placeholder="请输入网点名称" />
+              <a-input id="network-networkName" allowClear :maxLength="30" v-model="queryParam.networkName" placeholder="请输入网点名称" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -41,7 +41,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button class="add-btn" id="network-btn-add" type="primary" :loading="loading" @click="handleEdit">新增网点</a-button>
+      <a-button class="add-btn" id="network-btn-add" type="primary" @click="handleEdit">新增网点</a-button>
     </div>
     <!-- 合计 -->
     <div class="total">
@@ -65,11 +65,11 @@
       </template>
     </s-table>
     <!-- 新增编辑 -->
-    <editNetworkModal :openModal="openNetworkModal" :networkId="networkId" @success="handleReset" @close="openNetworkModal=false" />
+    <edit-network-modal :openModal="openNetworkModal" :networkId="networkId" @success="handleReset" @close="openNetworkModal=false" />
     <!-- 详情 -->
-    <detailsNetworkModal :openModal="openDetailModal" :networkId="networkId" @close="openDetailModal=false" />
+    <details-network-modal :openModal="openDetailModal" :networkId="networkId" @close="openDetailModal=false" />
     <!-- 绑定箱体设备 -->
-    <equipmentModal :openModal="openBindModal" :networkId="networkId" @close="openBindModal=false" />
+    <equipment-modal :openModal="openBindModal" :networkId="networkId" @close="openBindModal=false" />
   </a-card>
 </template>
 
@@ -86,7 +86,6 @@ export default {
   components: { STable, VSelect, editNetworkModal, detailsNetworkModal, equipmentModal },
   data () {
     return {
-      form: this.$form.createForm(this),
       formItemLayout: {
         labelCol: { span: 7 },
         wrapperCol: { span: 17 }
@@ -100,7 +99,6 @@ export default {
         city: null, // 市
         area: null // 区
       },
-      loading: false, // 导出loading
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },