diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 21eff606b..49ffb192e 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -19,30 +19,31 @@
>
-
-
-
-
- 至
-
-
-
+
+
+
+ 至
+
+
+
nowData ||
- time.getTime() < startDate ||
- time.getTime() === startDate
+ time.getTime() < startTime ||
+ time.getTime() === startTime
);
} else {
return time.getTime() > nowData;
@@ -328,7 +329,6 @@ export default {
status: "",
startDate: "",
endDate: "",
- date: ["", ""],
},
importBtnTitle: "导入",
@@ -357,13 +357,11 @@ export default {
...mapGetters(["clientHeight", "iframeHeight"]),
},
watch: {
- "fmData.date": function (val) {
- if (Array.isArray(val) && val.length == 2) {
- this.fmData.startDate = val[0].split("-").join("");
- this.fmData.endDate = val[1].split("-").join("");
- } else {
- this.fmData.startDate = "";
- this.fmData.endDate = "";
+ "fmData.endDate": function (val) {
+ if (val && val != "") {
+ console.log(val);
+ let arrayTemp = val.split(" ");
+ this.fmData.endDate = arrayTemp[0] + " 23:59:59";
}
},
},