分段时间选择不需要联动

src/views/sceneLibrary/gradingRulesList.vue

@@ -39,7 +39,7 @@
             </template>
             <template slot="searchItem3">
                 <span class="label">创建时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="searchDate"
                     type="daterange"
                     format="yyyy-MM-dd"
@@ -48,6 +48,25 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.yearMin"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.yearMax"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
             <template slot="searchBtn1">
@@ -194,20 +213,35 @@ export default {
     computed: { ...mapState(["roleCode"]) },
     methods: {
         doSearch() {
-            if (this.searchDate) {
-                this.searchParams.yearMin = `${this.searchDate[0]} 00:00:00`;
-                this.searchParams.yearMax = `${this.searchDate[1]} 23:59:59`;
-            } else {
-                this.searchParams.yearMin = "";
-                this.searchParams.yearMax = "";
+            // if (this.searchDate) {
+            //     this.searchParams.yearMin = `${this.searchDate[0]} 00:00:00`;
+            //     this.searchParams.yearMax = `${this.searchDate[1]} 23:59:59`;
+            // } else {
+            //     this.searchParams.yearMin = "";
+            //     this.searchParams.yearMax = "";
+            // }
+
+            let yearMin = "";
+            if (this.searchParams.yearMin) {
+                yearMin = `${this.searchParams.yearMin} 00:00:00`;
+            }
+
+            let yearMax = "";
+            if (this.searchParams.yearMax) {
+                yearMax = `${this.searchParams.yearMax} 23:59:59`;
+            }
+
+            if (yearMin && yearMax && yearMin > yearMax) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             let pageMap = {
                 // rulesCode: this.searchParams.rulesCode,
                 ruleName: this.searchParams.ruleName,
                 ruleDescription: this.searchParams.ruleDescription,
-                yearMin: this.searchParams.yearMin,
-                yearMax: this.searchParams.yearMax,
+                yearMin,
+                yearMax,
                 share: this.activeName === "1" ? "1" : "0",
             };
             this.refreshList(pageMap);
@@ -226,7 +260,7 @@ export default {
                 yearMin: "",
                 yearMax: "",
             };
-            this.searchDate = "";
+            // this.searchDate = "";
             this.doSearch();
         },
         viewRow(row) {

src/views/sceneLibrary/scenarioTestPackageManagementList.vue

@@ -27,7 +27,7 @@
             </template>
             <template slot="searchItem3">
                 <span class="label">创建时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="searchDate"
                     type="daterange"
                     format="yyyy-MM-dd"
@@ -36,6 +36,25 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.yearMin"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.yearMax"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
 
@@ -169,19 +188,26 @@ export default {
     computed: { ...mapState(["roleCode"]) },
     methods: {
         doSearch() {
-            if (this.searchDate) {
-                this.searchParams.yearMin = `${this.searchDate[0]} 00:00:00`;
-                this.searchParams.yearMax = `${this.searchDate[1]} 23:59:59`;
-            } else {
-                this.searchParams.yearMin = "";
-                this.searchParams.yearMax = "";
+            let yearMin = "";
+            if (this.searchParams.yearMin) {
+                yearMin = `${this.searchParams.yearMin} 00:00:00`;
+            }
+
+            let yearMax = "";
+            if (this.searchParams.yearMax) {
+                yearMax = `${this.searchParams.yearMax} 23:59:59`;
+            }
+
+            if (yearMin && yearMax && yearMin > yearMax) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             let pageMap = {
                 packageCode: this.searchParams.packageCode,
                 packageName: this.searchParams.packageName,
-                yearMin: this.searchParams.yearMin,
-                yearMax: this.searchParams.yearMax,
+                yearMin,
+                yearMax,
                 share: this.activeName === "1" ? "1" : "0",
             };
             this.refreshList(pageMap);
@@ -199,7 +225,7 @@ export default {
                 yearMin: "",
                 yearMax: "",
             };
-            this.searchDate = "";
+            // this.searchDate = "";
             this.doSearch();
         },
         pageControl(data) {

src/views/systemManagement/clusteringManagement.vue

@@ -14,7 +14,7 @@
             </template>
             <template slot="searchItem2">
                 <span class="label">操作时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="modifyTimeRange"
                     type="datetimerange"
                     format="yyyy-MM-dd HH:mm:ss"
@@ -23,11 +23,30 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.modifyTimeStart"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.modifyTimeEnd"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
             <template slot="searchItem3">
                 <span class="label">到期时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="dueTimeRange"
                     type="daterange"
                     format="yyyy-MM-dd"
@@ -36,6 +55,25 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.dueTimeStart"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.dueTimeEnd"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
             <template slot="searchBtn1">
@@ -56,11 +94,17 @@
         </div>-->
 
         <div style="border-top: none; margin: 30px 40px 10px 40px">
-            <span>仿真软件已分配未到期节点数量：{{totalSimulation}}
-                <span v-if = " totalSimulationAll && totalSimulationAll >= 0"> / {{totalSimulationAll}}</span>
+            <span
+                >仿真软件已分配未到期节点数量：{{ totalSimulation }}
+                <span v-if="totalSimulationAll && totalSimulationAll >= 0">
+                    / {{ totalSimulationAll }}</span
+                >
             </span>
-            <span style="margin-left: 20%">动力学软件已分配未到期节点数量：{{totalDynamic}}
-                <span v-if = " totalDynamicAll && totalDynamicAll >= 0"> / {{totalDynamicAll}}</span>
+            <span style="margin-left: 20%"
+                >动力学软件已分配未到期节点数量：{{ totalDynamic }}
+                <span v-if="totalDynamicAll && totalDynamicAll >= 0">
+                    / {{ totalDynamicAll }}</span
+                >
             </span>
         </div>
         <tableList
@@ -95,7 +139,7 @@ import searchLayout from "@/components/grid/searchLayout";
 import tableList from "@/components/grid/TableList";
 
 export default {
-    name: "clusteringManagement", // 账户管理
+    name: "clusteringManagement", // 集群管理
     components: { searchLayout, tableList },
     data() {
         return {
@@ -105,16 +149,16 @@ export default {
                 dueTimeStart: "",
                 dueTimeEnd: "",
                 modifyTimeStart: "",
-                modifyTimeEnd: ""
+                modifyTimeEnd: "",
             },
-            modifyTimeRange:[],
-            dueTimeRange:[],
+            modifyTimeRange: [],
+            dueTimeRange: [],
             list: [],
-            totalSimulation:0,
-            totalSimulationAll:-1,
-            totalDynamic:0,
-            totalDynamicAll:-1,
-            useTypeList:[],
+            totalSimulation: 0,
+            totalSimulationAll: -1,
+            totalDynamic: 0,
+            totalDynamicAll: -1,
+            useTypeList: [],
             columns: [
                 //表格列
                 {
@@ -133,9 +177,11 @@ export default {
                 {
                     label: "到期时间",
                     prop: "dateSimulationLicense",
-                    formatter:(data)=>{
-                        return data.dateSimulationLicense?data.dateSimulationLicense.slice(0,10):''
-                    }
+                    formatter: (data) => {
+                        return data.dateSimulationLicense
+                            ? data.dateSimulationLicense.slice(0, 10)
+                            : "";
+                    },
                 },
                 {
                     label: "动力学软件license",
@@ -144,11 +190,13 @@ export default {
                 {
                     label: "到期时间",
                     prop: "dateDynamicLicense",
-                    formatter:(data)=>{
-                        return data.dateDynamicLicense?data.dateDynamicLicense.slice(0,10):''
-                    }
+                    formatter: (data) => {
+                        return data.dateDynamicLicense
+                            ? data.dateDynamicLicense.slice(0, 10)
+                            : "";
+                    },
                 },
-                {   
+                {
                     label: "操作时间",
                     prop: "modifyTime",
                 },
@@ -174,45 +222,88 @@ export default {
             },
         };
     },
-    created(){
+    created() {
         //获取未到期已分配节点数量
         this.$axios({
-            method:'POST',
-            url:this.$api.systemManagement.getClusterNum,
-            data:{}
-        }).then(res=>{
-            if(res.code=='200'){
-                this.totalSimulation=res.info.totalSimulation;
-                this.totalSimulationAll=res.info.totalSimulationAll;
-                this.totalDynamic=res.info.totalDynamic;
-                this.totalDynamicAll=res.info.totalDynamicAll;
+            method: "POST",
+            url: this.$api.systemManagement.getClusterNum,
+            data: {},
+        }).then((res) => {
+            if (res.code == "200") {
+                this.totalSimulation = res.info.totalSimulation;
+                this.totalSimulationAll = res.info.totalSimulationAll;
+                this.totalDynamic = res.info.totalDynamic;
+                this.totalDynamicAll = res.info.totalDynamicAll;
             }
-        })
+        });
     },
-    async mounted(){
+    async mounted() {
         await this.$dicsListsInit({
-            useTypeList: "useType"
+            useTypeList: "useType",
         });
     },
     methods: {
-        doSearch(){
-            this.searchParams.modifyTimeStart=this.modifyTimeRange[0]||''
-            this.searchParams.modifyTimeEnd=this.modifyTimeRange[1]||''
-            this.searchParams.dueTimeStart=this.dueTimeRange[0]||''
-            this.searchParams.dueTimeEnd=this.dueTimeRange[1]||''
-            this.refreshList(this.searchParams)
+        doSearch() {
+            // this.searchParams.modifyTimeStart = this.modifyTimeRange[0] || "";
+            // this.searchParams.modifyTimeEnd = this.modifyTimeRange[1] || "";
+            // this.searchParams.dueTimeStart = this.dueTimeRange[0] || "";
+            // this.searchParams.dueTimeEnd = this.dueTimeRange[1] || "";
+            // this.refreshList(this.searchParams);
+
+            let modifyTimeStart = "";
+            if (this.searchParams.modifyTimeStart) {
+                modifyTimeStart = `${this.searchParams.modifyTimeStart} 00:00:00`;
+            }
+
+            let modifyTimeEnd = "";
+            if (this.searchParams.modifyTimeEnd) {
+                modifyTimeEnd = `${this.searchParams.modifyTimeEnd} 23:59:59`;
+            }
+
+            if (
+                modifyTimeStart &&
+                modifyTimeEnd &&
+                modifyTimeStart > modifyTimeEnd
+            ) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
+            }
+
+            let dueTimeStart = "";
+            if (this.searchParams.dueTimeStart) {
+                dueTimeStart = `${this.searchParams.dueTimeStart} 00:00:00`;
+            }
+
+            let dueTimeEnd = "";
+            if (this.searchParams.dueTimeEnd) {
+                dueTimeEnd = `${this.searchParams.dueTimeEnd} 23:59:59`;
+            }
+
+            if (dueTimeStart && dueTimeEnd && dueTimeStart > dueTimeEnd) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
+            }
+
+            let pageMap = {
+                username: this.searchParams.username,
+                modifyTimeStart,
+                modifyTimeEnd,
+                dueTimeStart,
+                dueTimeEnd,
+            };
+            this.refreshList(pageMap);
         },
-        reset(){
+        reset() {
             this.searchParams = {
                 userName: "",
                 dueTimeStart: "",
                 dueTimeEnd: "",
                 modifyTimeStart: "",
-                modifyTimeEnd: ""
-            }
-            this.modifyTimeRange=[]
-            this.dueTimeRange=[]
-            this.refreshList(this.searchParams)
+                modifyTimeEnd: "",
+            };
+            this.modifyTimeRange = [];
+            this.dueTimeRange = [];
+            this.refreshList(this.searchParams);
         },
         refreshList(param) {
             param
@@ -221,15 +312,15 @@ export default {
         },
         addConfig() {
             this.$router.push({
-                path:'/clusteringDetail'
-            })
+                path: "/clusteringDetail",
+            });
         },
         addMarkDia(row) {
-            let query = {...row}
+            let query = { ...row };
             this.$router.push({
-                path:'/clusteringDetail',
-                query
-            })
+                path: "/clusteringDetail",
+                query,
+            });
         },
     },
 };

src/views/systemManagement/handleLogManagement.vue

@@ -40,7 +40,7 @@
             </template>
             <template slot="searchItem4">
                 <span class="label">操作时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="createDate"
                     type="daterange"
                     format="yyyy-MM-dd"
@@ -49,6 +49,25 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.createTimeBegin"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.createTimeEnd"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
             <template slot="searchBtn1">
@@ -135,20 +154,39 @@ export default {
 
     methods: {
         doSearch() {
-            if (this.createDate) {
-                this.searchParams.createTimeBegin = `${this.createDate[0]}`;
-                this.searchParams.createTimeEnd = `${this.createDate[1]}`;
-            } else {
-                this.searchParams.createTimeBegin = "";
-                this.searchParams.createTimeEnd = "";
+            // if (this.createDate) {
+            //     this.searchParams.createTimeBegin = `${this.createDate[0]}`;
+            //     this.searchParams.createTimeEnd = `${this.createDate[1]}`;
+            // } else {
+            //     this.searchParams.createTimeBegin = "";
+            //     this.searchParams.createTimeEnd = "";
+            // }
+
+            let createTimeBegin = "";
+            if (this.searchParams.createTimeBegin) {
+                createTimeBegin = `${this.searchParams.createTimeBegin} 00:00:00`;
+            }
+
+            let createTimeEnd = "";
+            if (this.searchParams.createTimeEnd) {
+                createTimeEnd = `${this.searchParams.createTimeEnd} 23:59:59`;
+            }
+
+            if (
+                createTimeBegin &&
+                createTimeEnd &&
+                createTimeBegin > createTimeEnd
+            ) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             let pageMap = {
                 username: this.searchParams.username,
                 module: this.searchParams.module,
                 operationType: this.searchParams.operationType,
-                createTimeBegin: this.searchParams.createTimeBegin,
-                createTimeEnd: this.searchParams.createTimeEnd,
+                createTimeBegin,
+                createTimeEnd,
             };
             this.refreshList(pageMap);
         },
@@ -166,7 +204,7 @@ export default {
                 createTimeBegin: "",
                 createTimeEnd: "",
             };
-            this.createDate = "";
+            // this.createDate = "";
             this.doSearch();
         },
     },

src/views/systemManagement/loginLogManagement.vue

@@ -14,7 +14,7 @@
             </template>
             <template slot="searchItem2">
                 <span class="label">登录时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="createDate"
                     type="daterange"
                     format="yyyy-MM-dd"
@@ -23,6 +23,25 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.createTimeBegin"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.createTimeEnd"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
             <template slot="searchBtn1">
@@ -74,9 +93,9 @@ export default {
                 {
                     label: "登录状态",
                     prop: "state",
-                    formatter: (data)=>{
+                    formatter: (data) => {
                         return data.state == 1 ? "成功" : "失败";
-                    }
+                    },
                 },
                 {
                     label: "登录时间",
@@ -104,18 +123,37 @@ export default {
 
     methods: {
         doSearch() {
-            if (this.createDate) {
-                this.searchParams.createTimeBegin = `${this.createDate[0]}`;
-                this.searchParams.createTimeEnd = `${this.createDate[1]}`;
-            } else {
-                this.searchParams.createTimeBegin = "";
-                this.searchParams.createTimeEnd = "";
+            // if (this.createDate) {
+            //     this.searchParams.createTimeBegin = `${this.createDate[0]}`;
+            //     this.searchParams.createTimeEnd = `${this.createDate[1]}`;
+            // } else {
+            //     this.searchParams.createTimeBegin = "";
+            //     this.searchParams.createTimeEnd = "";
+            // }
+
+            let createTimeBegin = "";
+            if (this.searchParams.createTimeBegin) {
+                createTimeBegin = `${this.searchParams.createTimeBegin} 00:00:00`;
+            }
+
+            let createTimeEnd = "";
+            if (this.searchParams.createTimeEnd) {
+                createTimeEnd = `${this.searchParams.createTimeEnd} 23:59:59`;
+            }
+
+            if (
+                createTimeBegin &&
+                createTimeEnd &&
+                createTimeBegin > createTimeEnd
+            ) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             let pageMap = {
                 username: this.searchParams.username,
-                createTimeBegin: this.searchParams.createTimeBegin,
-                createTimeEnd: this.searchParams.createTimeEnd,
+                createTimeBegin,
+                createTimeEnd,
             };
             this.refreshList(pageMap);
         },
@@ -131,7 +169,7 @@ export default {
                 createTimeBegin: "",
                 createTimeEnd: "",
             };
-            this.createDate = "";
+            // this.createDate = "";
             this.doSearch();
         },
     },

src/views/systemManagement/scenePacketDistributionList.vue

@@ -15,7 +15,7 @@
             </template>
             <template slot="searchItem2">
                 <span class="label">操作时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="createDate"
                     type="daterange"
                     format="yyyy-MM-dd"
@@ -24,6 +24,25 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.yearMin"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.yearMax"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
 
@@ -118,18 +137,25 @@ export default {
 
     methods: {
         doSearch() {
-            if (this.createDate) {
-                this.searchParams.yearMin = `${this.createDate[0]}`;
-                this.searchParams.yearMax = `${this.createDate[1]}`;
-            } else {
-                this.searchParams.yearMin = "";
-                this.searchParams.yearMax = "";
+            let yearMin = "";
+            if (this.searchParams.yearMin) {
+                yearMin = `${this.searchParams.yearMin} 00:00:00`;
+            }
+
+            let yearMax = "";
+            if (this.searchParams.yearMax) {
+                yearMax = `${this.searchParams.yearMax} 23:59:59`;
+            }
+
+            if (yearMin && yearMax && yearMin > yearMax) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             let pageMap = {
                 userName: this.searchParams.userName,
-                yearMin: this.searchParams.yearMin,
-                yearMax: this.searchParams.yearMax,
+                yearMin,
+                yearMax,
             };
             this.refreshList(pageMap);
         },
@@ -145,7 +171,7 @@ export default {
                 yearMin: "",
                 yearMax: "",
             };
-            this.createDate = "";
+            // this.createDate = "";
             this.doSearch();
         },
         editRow(userName) {

src/views/systemManagement/sceneUploadList.vue

@@ -15,7 +15,7 @@
             </template>
             <template slot="searchItem2">
                 <span class="label">上传时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="uploadDate"
                     type="daterange"
                     format="yyyy-MM-dd"
@@ -24,6 +24,25 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.timeBegin"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.timeEnd"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
 
@@ -278,18 +297,33 @@ export default {
 
     methods: {
         doSearch() {
-            if (this.uploadDate) {
-                this.searchParams.timeBegin = `${this.uploadDate[0]}`;
-                this.searchParams.timeEnd = `${this.uploadDate[1]}`;
-            } else {
-                this.searchParams.timeBegin = "";
-                this.searchParams.timeEnd = "";
+            // if (this.uploadDate) {
+            //     this.searchParams.timeBegin = `${this.uploadDate[0]}`;
+            //     this.searchParams.timeEnd = `${this.uploadDate[1]}`;
+            // } else {
+            //     this.searchParams.timeBegin = "";
+            //     this.searchParams.timeEnd = "";
+            // }
+
+            let timeBegin = "";
+            if (this.searchParams.timeBegin) {
+                timeBegin = `${this.searchParams.timeBegin} 00:00:00`;
+            }
+
+            let timeEnd = "";
+            if (this.searchParams.timeEnd) {
+                timeEnd = `${this.searchParams.timeEnd} 23:59:59`;
+            }
+
+            if (timeBegin && timeEnd && timeBegin > timeEnd) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             let pageMap = {
                 name: this.searchParams.name,
-                timeBegin: this.searchParams.timeBegin,
-                timeEnd: this.searchParams.timeEnd,
+                timeBegin,
+                timeEnd,
             };
             this.refreshList(pageMap);
         },
@@ -305,7 +339,7 @@ export default {
                 timeBegin: "",
                 timeEnd: "",
             };
-            this.uploadDate = "";
+            // this.uploadDate = "";
             this.doSearch();
         },
         addOne() {

src/views/systemManagement/systemLogManagement.vue

@@ -35,7 +35,7 @@
             </template>
             <template slot="searchItem4">
                 <span class="label">操作时间</span>
-                <el-date-picker
+                <!-- <el-date-picker
                     v-model="createDate"
                     type="daterange"
                     format="yyyy-MM-dd"
@@ -44,6 +44,25 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                 >
+                </el-date-picker> -->
+                <el-date-picker
+                    v-model="searchParams.createTimeBegin"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="开始日期"
+                    class="dateRangeInput"
+                >
+                </el-date-picker>
+                <span class="dateSeparator">至</span>
+                <el-date-picker
+                    v-model="searchParams.createTimeEnd"
+                    type="date"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="结束日期"
+                    class="dateRangeInput"
+                >
                 </el-date-picker>
             </template>
             <template slot="searchBtn1">
@@ -141,12 +160,31 @@ export default {
 
     methods: {
         doSearch() {
-            if (this.createDate) {
-                this.searchParams.createTimeBegin = `${this.createDate[0]}`;
-                this.searchParams.createTimeEnd = `${this.createDate[1]}`;
-            } else {
-                this.searchParams.createTimeBegin = "";
-                this.searchParams.createTimeEnd = "";
+            // if (this.createDate) {
+            //     this.searchParams.createTimeBegin = `${this.createDate[0]}`;
+            //     this.searchParams.createTimeEnd = `${this.createDate[1]}`;
+            // } else {
+            //     this.searchParams.createTimeBegin = "";
+            //     this.searchParams.createTimeEnd = "";
+            // }
+
+            let createTimeBegin = "";
+            if (this.searchParams.createTimeBegin) {
+                createTimeBegin = `${this.searchParams.createTimeBegin} 00:00:00`;
+            }
+
+            let createTimeEnd = "";
+            if (this.searchParams.createTimeEnd) {
+                createTimeEnd = `${this.searchParams.createTimeEnd} 23:59:59`;
+            }
+
+            if (
+                createTimeBegin &&
+                createTimeEnd &&
+                createTimeBegin > createTimeEnd
+            ) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             if (this.operation.length === 1) {
@@ -165,8 +203,8 @@ export default {
                 module: this.searchParams.module,
                 operationType: this.searchParams.operationType,
                 content: this.searchParams.content,
-                createTimeBegin: this.searchParams.createTimeBegin,
-                createTimeEnd: this.searchParams.createTimeEnd,
+                createTimeBegin,
+                createTimeEnd,
             };
             this.refreshList(pageMap);
         },
@@ -185,7 +223,7 @@ export default {
                 createTimeBegin: "",
                 createTimeEnd: "",
             };
-            this.createDate = "";
+            // this.createDate = "";
             this.operation = [];
             this.doSearch();
         },

src/views/workManagement/autoRunProjectList.vue

@@ -28,7 +28,7 @@
                 </template>
                 <template slot="searchItem3">
                     <span class="label">创建时间</span>
-                    <el-date-picker
+                    <!-- <el-date-picker
                         v-model="createDate"
                         type="daterange"
                         format="yyyy-MM-dd"
@@ -37,6 +37,25 @@
                         start-placeholder="开始日期"
                         end-placeholder="结束日期"
                     >
+                    </el-date-picker> -->
+                    <el-date-picker
+                        v-model="searchParams.createStartDate"
+                        type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        placeholder="开始日期"
+                        class="dateRangeInput"
+                    >
+                    </el-date-picker>
+                    <span class="dateSeparator">至</span>
+                    <el-date-picker
+                        v-model="searchParams.createEndDate"
+                        type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        placeholder="结束日期"
+                        class="dateRangeInput"
+                    >
                     </el-date-picker>
                 </template>
 
@@ -131,7 +150,7 @@ import searchLayout from "@/components/grid/searchLayout";
 import tableList from "@/components/grid/TableList";
 
 export default {
-    name: "autoRunProjectList", // 自动运行项目列表
+    name: "autoRunProjectList", // 自动化测试列表
     components: { searchLayout, tableList },
     data() {
         return {
@@ -161,7 +180,7 @@ export default {
                     prop: "algorithm",
                 },
                 {
-                    label: "自动运行次数",
+                    label: "自动化测试次数",
                     prop: "automaticRunTimes",
                 },
                 {
@@ -202,19 +221,30 @@ export default {
     },
     methods: {
         doSearch() {
-            if (this.createDate) {
-                this.searchParams.createStartDate = `${this.createDate[0]}`;
-                this.searchParams.createEndDate = `${this.createDate[1]}`;
-            } else {
-                this.searchParams.createStartDate = "";
-                this.searchParams.createEndDate = "";
+            let createStartDate = "";
+            if (this.searchParams.createStartDate) {
+                createStartDate = `${this.searchParams.createStartDate} 00:00:00`;
+            }
+
+            let createEndDate = "";
+            if (this.searchParams.createEndDate) {
+                createEndDate = `${this.searchParams.createEndDate} 23:59:59`;
+            }
+
+            if (
+                createStartDate &&
+                createEndDate &&
+                createStartDate > createEndDate
+            ) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             let pageMap = {
                 projectId: this.searchParams.projectId,
                 projectName: this.searchParams.projectName,
-                createStartDate: this.searchParams.createStartDate,
-                createEndDate: this.searchParams.createEndDate,
+                createStartDate,
+                createEndDate,
             };
             this.refreshList(pageMap);
 
@@ -237,7 +267,7 @@ export default {
                 createStartDate: "",
                 createEndDate: "",
             };
-            this.createDate = "";
+            // this.createDate = "";
             this.doSearch();
         },
         addOne() {
@@ -247,7 +277,7 @@ export default {
             // 停用
             if (value === "1") {
                 row.automaticRunState = "0";
-                this.$confirm("确认该项目停用自动运行？", "提示", {
+                this.$confirm("确认该项目停用自动化测试？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning",
@@ -271,7 +301,7 @@ export default {
             } else {
                 // 启用
                 row.automaticRunState = "1";
-                this.$confirm("确认该项目启用自动运行？", "提示", {
+                this.$confirm("确认该项目启用自动化测试？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning",

src/views/workManagement/manualRunProjectList.vue

@@ -50,7 +50,7 @@
                 </template>
                 <template slot="searchItem5">
                     <span class="label">创建时间</span>
-                    <el-date-picker
+                    <!-- <el-date-picker
                         v-model="createDate"
                         type="daterange"
                         format="yyyy-MM-dd"
@@ -59,11 +59,30 @@
                         start-placeholder="开始日期"
                         end-placeholder="结束日期"
                     >
+                    </el-date-picker> -->
+                    <el-date-picker
+                        v-model="searchParams.createStartDate"
+                        type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        placeholder="开始日期"
+                        class="dateRangeInput"
+                    >
+                    </el-date-picker>
+                    <span class="dateSeparator">至</span>
+                    <el-date-picker
+                        v-model="searchParams.createEndDate"
+                        type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        placeholder="结束日期"
+                        class="dateRangeInput"
+                    >
                     </el-date-picker>
                 </template>
                 <template slot="searchItem6">
                     <span class="label">完成时间</span>
-                    <el-date-picker
+                    <!-- <el-date-picker
                         v-model="finishDate"
                         type="daterange"
                         format="yyyy-MM-dd"
@@ -72,6 +91,25 @@
                         start-placeholder="开始日期"
                         end-placeholder="结束日期"
                     >
+                    </el-date-picker> -->
+                    <el-date-picker
+                        v-model="searchParams.finishDateStart"
+                        type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        placeholder="开始日期"
+                        class="dateRangeInput"
+                    >
+                    </el-date-picker>
+                    <span class="dateSeparator">至</span>
+                    <el-date-picker
+                        v-model="searchParams.finishDateEnd"
+                        type="date"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        placeholder="结束日期"
+                        class="dateRangeInput"
+                    >
                     </el-date-picker>
                 </template>
 
@@ -196,7 +234,7 @@ import searchLayout from "@/components/grid/searchLayout";
 import tableList from "@/components/grid/TableList";
 
 export default {
-    name: "manualRunProjectList", // 手动运行项目列表
+    name: "manualRunProjectList", // 标准化测试列表
     components: { searchLayout, tableList },
     data() {
         return {
@@ -291,20 +329,50 @@ export default {
     },
     methods: {
         doSearch() {
-            if (this.createDate) {
-                this.searchParams.createStartDate = `${this.createDate[0]}`;
-                this.searchParams.createEndDate = `${this.createDate[1]}`;
-            } else {
-                this.searchParams.createStartDate = "";
-                this.searchParams.createEndDate = "";
+            // if (this.createDate) {
+            //     this.searchParams.createStartDate = `${this.createDate[0]}`;
+            //     this.searchParams.createEndDate = `${this.createDate[1]}`;
+            // } else {
+            //     this.searchParams.createStartDate = "";
+            //     this.searchParams.createEndDate = "";
+            // }
+
+            // if (this.finishDate) {
+            //     this.searchParams.finishDateStart = `${this.finishDate[0]}`;
+            //     this.searchParams.finishDateEnd = `${this.finishDate[1]}`;
+            // } else {
+            //     this.searchParams.finishDateStart = "";
+            //     this.searchParams.finishDateEnd = "";
+            // }
+
+            let createStartDate = "";
+            if (this.searchParams.createStartDate) {
+                createStartDate = `${this.searchParams.createStartDate} 00:00:00`;
             }
 
-            if (this.finishDate) {
-                this.searchParams.finishDateStart = `${this.finishDate[0]}`;
-                this.searchParams.finishDateEnd = `${this.finishDate[1]}`;
-            } else {
-                this.searchParams.finishDateStart = "";
-                this.searchParams.finishDateEnd = "";
+            let createEndDate = "";
+            if (this.searchParams.createEndDate) {
+                createEndDate = `${this.searchParams.createEndDate} 23:59:59`;
+            }
+
+            if (createStartDate && createEndDate && createStartDate > createEndDate) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
+            }
+
+            let finishDateStart = "";
+            if (this.searchParams.finishDateStart) {
+                finishDateStart = `${this.searchParams.finishDateStart} 00:00:00`;
+            }
+
+            let finishDateEnd = "";
+            if (this.searchParams.finishDateEnd) {
+                finishDateEnd = `${this.searchParams.finishDateEnd} 23:59:59`;
+            }
+
+            if (finishDateStart && finishDateEnd && finishDateStart > finishDateEnd) {
+                this.$message.error("结束时间不能早于开始时间");
+                return;
             }
 
             let pageMap = {
@@ -312,10 +380,10 @@ export default {
                 projectName: this.searchParams.projectName,
                 nowRunState: this.searchParams.nowRunState,
                 evaluationLevel: this.searchParams.evaluationLevel,
-                createStartDate: this.searchParams.createStartDate,
-                createEndDate: this.searchParams.createEndDate,
-                finishDateStart: this.searchParams.finishDateStart,
-                finishDateEnd: this.searchParams.finishDateEnd,
+                createStartDate,
+                createEndDate,
+                finishDateStart,
+                finishDateEnd,
             };
             this.refreshList(pageMap);
 
@@ -342,8 +410,8 @@ export default {
                 finishDateStart: "",
                 finishDateEnd: "",
             };
-            this.createDate = "";
-            this.finishDate = "";
+            // this.createDate = "";
+            // this.finishDate = "";
             this.doSearch();
         },
         addOne() {