Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/option/mt/Mengtiandatapushback.js

@@ -124,7 +124,7 @@ export const columnList = [
   {
     prop: 'createTime',
     label: '创建时间',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -136,7 +136,7 @@ export const columnList = [
   {
     prop: 'updateTime',
     label: '更新时间',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],

src/views/factory/mt/Mengtiandatapushback.vue

@@ -5,7 +5,34 @@
       <!-- 搜索模块 -->
       <el-row v-if="search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class="el-fr-d">
+        <el-form :inline="true" :model="TopQuery" class="el-fr-d">
+          <div>
+            <el-form-item label="创建日期">
+              <el-date-picker
+                v-model="TopQuery.time1"
+                type="datetimerange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                :default-time="defaultTime2"
+              />
+            </el-form-item>
+            <el-form-item label="更新日期">
+              <el-date-picker
+                v-model="TopQuery.time2"
+                type="datetimerange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                :default-time="defaultTime2"
+              />
+            </el-form-item>
+          </div>
+
           <!-- 查询按钮 -->
           <el-form-item class="el-btn">
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@@ -102,6 +129,7 @@ import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
 import error from '@/error';
+const TopQuery = ref({});
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -222,6 +250,8 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
+  processRowProperty(index, row, details);
+  onLoad();
 };
 
 /** 表格表头输入框搜索 */
@@ -240,7 +270,24 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  details.search = false; //关闭搜索
+  // 创建时间
+  if (TopQuery.value.time1?.length) {
+    details.query.startCreateTime = dayjs(TopQuery.value.time1[0]).format('YYYY-MM-DD HH:mm:ss'); //创建时间开始
+    details.query.endCreateTime = dayjs(TopQuery.value.time1[1]).format('YYYY-MM-DD HH:mm:ss'); //创建时间结束
+  } else {
+    delete details.query.startCreateTime;
+    delete details.query.endCreateTime;
+  }
+  // 更新时间
+  if (TopQuery.value.time2?.length) {
+    details.query.startUpdateTime = dayjs(TopQuery.value.time2[0]).format('YYYY-MM-DD HH:mm:ss'); //创建时间开始
+    details.query.endUpdateTime = dayjs(TopQuery.value.time2[1]).format('YYYY-MM-DD HH:mm:ss'); //创建时间结束
+  } else {
+    delete details.query.startUpdateTime;
+    delete details.query.endUpdateTime;
+  }
+  console.log(TopQuery.value, '日期');
+  onLoad();
 };
 // 每页多少条
 const sizeChange = val => {
@@ -465,7 +512,7 @@ const searchReset = () => {
 .el-fr-d {
   width: 100%;
   display: flex;
-  justify-content: flex-end;
+  justify-content: space-between;
   .el-btn {
     margin-right: 0;
   }