From e434c72ecb3d99e2bd8b4113998940034b0000be Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 11:41:37 +0800
Subject: [PATCH] 冲突解决
---
src/views/realTimePolice/realHistory.vue | 2
src/views/resource/oss.vue | 2
src/views/feedback/feedback.vue | 2
src/views/regions/regions.vue | 2
src/views/task/task.vue | 2
src/views/realTimePolice/real.vue | 2
src/views/work/claim.vue | 2
src/views/report/reportlist copy.vue | 2
src/views/work/done.vue | 2
src/views/taskfeedback/taskfeedback.vue | 2
src/views/resource/attach.vue | 2
src/views/zc/zc.vue | 2
src/views/system/topmenu.vue | 2
src/views/monitor/log/error.vue | 2
src/views/alarm/alarm.vue | 2
src/views/flow/follow.vue | 2
src/views/suser/suser.vue | 2
src/views/desk/notice.vue | 2
src/views/survey/survey.vue | 2
src/views/work/send.vue | 2
src/views/clientManagement/clientManagement.vue | 2
src/views/duty/duty.vue | 2
src/views/district/district.vue | 2
src/views/enclosure/enclosure.vue | 2
src/views/system/client.vue | 2
src/views/wj/wj.vue | 2
src/views/healthcode/healthcode.vue | 2
src/views/trajectory/trajectory.vue | 2
src/views/position/position.vue | 2
src/views/system/user.vue | 2
src/views/system/tenant.vue | 2
src/views/report/reportlist.vue | 2
src/views/reported/reported.vue | 2
src/views/flow/manager.vue | 2
src/views/xlfeedback/xlfeedback.vue | 2
src/views/monitor/log/usual.vue | 2
src/views/flow/model.vue | 2
src/views/system/cs.vue | 2
src/views/routein/routein.vue | 2
src/views/dj/dj.vue | 2
src/views/deploy/deploy.vue | 2
src/views/street/street.vue | 2
src/views/security/security.vue | 2
src/views/tool/code.vue | 2
src/views/parcel/parcel.vue | 2
src/page/index/logo.vue | 21 -------
src/views/resource/sms.vue | 2
src/views/parcel/parcelKind.vue | 2
src/views/system/post.vue | 2
src/views/animalHeat/animalHeat.vue | 2
src/views/visitrecord/visitrecord.vue | 2
src/views/work/start.vue | 2
src/views/equipment/equipment.vue | 2
src/views/monitor/log/api.vue | 2
src/views/work/todo.vue | 2
src/views/policeInformationDistribution/index.vue | 2
src/views/tool/datasource.vue | 2
src/views/clientManagement/clientManagement_copy.vue | 2
58 files changed, 57 insertions(+), 78 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 09f2bf9..bb26f87 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -347,33 +347,14 @@
};
},
created() {
- // this.getData();
this.websocketStart();
},
computed: {
...mapGetters(["website", "keyCollapse"]),
},
methods: {
- // getData() {
- // var that = this;
- // axios({
- // url: "/api/blade-jfpts/alarm/alarm/getLimit",
- // method: "get",
- // }).then(function (response) {
- // if (response.data.data.length > 0) {
- // that.deviceId = response.data.data[0].id;
- // } else {
- // that.deviceId = 0;
- // }
- // //获得最新ID，开启实时报警循环
- // that.layerRealtime();
- // });
- // },
layerRealtime(jid) {
var that = this;
- // window.clearTimeout(window.realTimeQuery);
- // that.deviceId = 334; // 测试用
- // window.realTimeQuery = setInterval(function () {
axios({
url: "/api/blade-jfpts/alarm/alarm/page",
method: "get",
@@ -412,7 +393,6 @@
}
}
});
- // }, 5000);
},
closeDialog() {
//关闭窗口回调，关闭警报
@@ -757,7 +737,6 @@
jid: that.form.id,
},
}).then((resdata) => {
- console.log(resdata);
});
newCallAxios
diff --git a/src/views/alarm/alarm.vue b/src/views/alarm/alarm.vue
index 38e6f80..de942c0 100644
--- a/src/views/alarm/alarm.vue
+++ b/src/views/alarm/alarm.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/animalHeat/animalHeat.vue b/src/views/animalHeat/animalHeat.vue
index 13b0626..f0b7561 100644
--- a/src/views/animalHeat/animalHeat.vue
+++ b/src/views/animalHeat/animalHeat.vue
@@ -92,7 +92,7 @@
option: {
menu:false,
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
border: false,
stripe:true,
tip: false,
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index a3ed6d4..30eaffe 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -269,7 +269,7 @@
option: {
height: 'auto',
indexLabel: '序号',
- calcHeight: 80,
+ calcHeight: 54,
labelWidth: '125',
dialogWidth: 1150,
menuWidth: 150,
diff --git a/src/views/clientManagement/clientManagement_copy.vue b/src/views/clientManagement/clientManagement_copy.vue
index bb24e5e..808f5e7 100644
--- a/src/views/clientManagement/clientManagement_copy.vue
+++ b/src/views/clientManagement/clientManagement_copy.vue
@@ -234,7 +234,7 @@
option: {
height: 'auto',
indexLabel: '序号',
- calcHeight: 80,
+ calcHeight: 54,
labelWidth: '100',
dialogWidth: 950,
menuWidth: 250,
diff --git a/src/views/deploy/deploy.vue b/src/views/deploy/deploy.vue
index 4a2a35d..db8cd45 100644
--- a/src/views/deploy/deploy.vue
+++ b/src/views/deploy/deploy.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index b459232..b8e478e 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -53,7 +53,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
dialogWidth: 950,
tip: false,
searchShow: true,
diff --git a/src/views/district/district.vue b/src/views/district/district.vue
index 984c235..c4a28e9 100644
--- a/src/views/district/district.vue
+++ b/src/views/district/district.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/dj/dj.vue b/src/views/dj/dj.vue
index b823a0a..f744624 100644
--- a/src/views/dj/dj.vue
+++ b/src/views/dj/dj.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/duty/duty.vue b/src/views/duty/duty.vue
index 3b10bee..bc6b7ad 100644
--- a/src/views/duty/duty.vue
+++ b/src/views/duty/duty.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/enclosure/enclosure.vue b/src/views/enclosure/enclosure.vue
index 6db749e..52f6330 100644
--- a/src/views/enclosure/enclosure.vue
+++ b/src/views/enclosure/enclosure.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/equipment/equipment.vue b/src/views/equipment/equipment.vue
index 66a4452..b7d45a9 100644
--- a/src/views/equipment/equipment.vue
+++ b/src/views/equipment/equipment.vue
@@ -61,7 +61,7 @@
option: {
lazy: true,
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tree: true,
tip: false,
searchShow: true,
diff --git a/src/views/feedback/feedback.vue b/src/views/feedback/feedback.vue
index 5ce473f..05802b7 100644
--- a/src/views/feedback/feedback.vue
+++ b/src/views/feedback/feedback.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue
index fbaa282..a42b393 100644
--- a/src/views/flow/follow.vue
+++ b/src/views/flow/follow.vue
@@ -64,7 +64,7 @@
deleteReason: '',
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue
index 060a941..8cc95c5 100644
--- a/src/views/flow/manager.vue
+++ b/src/views/flow/manager.vue
@@ -141,7 +141,7 @@
}],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/flow/model.vue b/src/views/flow/model.vue
index 89a45d0..a9505f2 100644
--- a/src/views/flow/model.vue
+++ b/src/views/flow/model.vue
@@ -193,7 +193,7 @@
flowUrl: '',
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index a936c29..ae02016 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -80,7 +80,7 @@
option: {
menu:false,
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
border: false,
stripe:true,
tip: false,
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index bef4765..44e83ab 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue
index 3196839..4b71241 100644
--- a/src/views/monitor/log/error.vue
+++ b/src/views/monitor/log/error.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index 329f77b..94272d8 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -36,7 +36,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index ad92577..ca1be49 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -87,7 +87,7 @@
option: {
menu:false,
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index b910a61..98481e5 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -88,7 +88,7 @@
option: {
menu:false,
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 4,
diff --git a/src/views/policeInformationDistribution/index.vue b/src/views/policeInformationDistribution/index.vue
index 56b96d8..aa81d43 100644
--- a/src/views/policeInformationDistribution/index.vue
+++ b/src/views/policeInformationDistribution/index.vue
@@ -109,7 +109,7 @@
option: {
height: "auto",
indexLabel: "序号",
- calcHeight: 30,
+ calcHeight: 54,
labelWidth: "100",
size: "mini",
dialogWidth: 950,
diff --git a/src/views/position/position.vue b/src/views/position/position.vue
index cdf105c..33d2209 100644
--- a/src/views/position/position.vue
+++ b/src/views/position/position.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 8442089..74dedae 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -174,7 +174,7 @@
option: {
height: "auto",
indexLabel: "序号",
- calcHeight: 30,
+ calcHeight: 54,
labelWidth: "100",
size: "mini",
border: false,
diff --git a/src/views/realTimePolice/realHistory.vue b/src/views/realTimePolice/realHistory.vue
index 0ef6bbc..fe4caff 100644
--- a/src/views/realTimePolice/realHistory.vue
+++ b/src/views/realTimePolice/realHistory.vue
@@ -113,7 +113,7 @@
option: {
height: "auto",
indexLabel: "序号",
- calcHeight: 30,
+ calcHeight: 54,
menuWidth: 240,
size: "mini",
border: false,
diff --git a/src/views/regions/regions.vue b/src/views/regions/regions.vue
index 88b5568..86f6299 100644
--- a/src/views/regions/regions.vue
+++ b/src/views/regions/regions.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/report/reportlist copy.vue b/src/views/report/reportlist copy.vue
index b33c12b..993e43a 100644
--- a/src/views/report/reportlist copy.vue
+++ b/src/views/report/reportlist copy.vue
@@ -66,7 +66,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/report/reportlist.vue b/src/views/report/reportlist.vue
index e6d6756..c729d65 100644
--- a/src/views/report/reportlist.vue
+++ b/src/views/report/reportlist.vue
@@ -66,7 +66,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/reported/reported.vue b/src/views/reported/reported.vue
index 30c534a..c5b2b6e 100644
--- a/src/views/reported/reported.vue
+++ b/src/views/reported/reported.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index 88e80a6..f9fab85 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -74,7 +74,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue
index f51480e..63f5283 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -79,7 +79,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/sms.vue b/src/views/resource/sms.vue
index 3f34af1..77a453c 100644
--- a/src/views/resource/sms.vue
+++ b/src/views/resource/sms.vue
@@ -79,7 +79,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/routein/routein.vue b/src/views/routein/routein.vue
index 2f286ff..be2c98a 100644
--- a/src/views/routein/routein.vue
+++ b/src/views/routein/routein.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 981313f..7787fd2 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -70,7 +70,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/street/street.vue b/src/views/street/street.vue
index bd8c67f..23528d6 100644
--- a/src/views/street/street.vue
+++ b/src/views/street/street.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/survey/survey.vue b/src/views/survey/survey.vue
index 0a3e2ce..a819697 100644
--- a/src/views/survey/survey.vue
+++ b/src/views/survey/survey.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/suser/suser.vue b/src/views/suser/suser.vue
index 625718c..7d42a99 100644
--- a/src/views/suser/suser.vue
+++ b/src/views/suser/suser.vue
@@ -48,7 +48,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
border: true,
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
index 0b6fe17..22200fa 100644
--- a/src/views/system/client.vue
+++ b/src/views/system/client.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/cs.vue b/src/views/system/cs.vue
index 4fa9767..84ef43c 100644
--- a/src/views/system/cs.vue
+++ b/src/views/system/cs.vue
@@ -248,7 +248,7 @@
},
option: {
height: "auto",
- calcHeight: 80,
+ calcHeight: 54,
size: "mini",
tip: false,
searchShow: true,
diff --git a/src/views/system/post.vue b/src/views/system/post.vue
index 3add06b..2e49c97 100644
--- a/src/views/system/post.vue
+++ b/src/views/system/post.vue
@@ -54,7 +54,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index 702f8c4..d0eb9ad 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -89,7 +89,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
index fdb6388..75a5b0d 100644
--- a/src/views/system/topmenu.vue
+++ b/src/views/system/topmenu.vue
@@ -91,7 +91,7 @@
menuTreeObj: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 3dd9d22..8debe4a 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -261,7 +261,7 @@
},
option: {
height: 'auto',
- calcHeight: 80,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/task/task.vue b/src/views/task/task.vue
index b71c841..e722ee2 100644
--- a/src/views/task/task.vue
+++ b/src/views/task/task.vue
@@ -53,7 +53,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/taskfeedback/taskfeedback.vue b/src/views/taskfeedback/taskfeedback.vue
index b734535..66239f7 100644
--- a/src/views/taskfeedback/taskfeedback.vue
+++ b/src/views/taskfeedback/taskfeedback.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index 7bfdfd2..1655ac5 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -64,7 +64,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
dialogWidth: 900,
tip: false,
searchShow: true,
diff --git a/src/views/tool/datasource.vue b/src/views/tool/datasource.vue
index 47e8d00..bb6e0e4 100644
--- a/src/views/tool/datasource.vue
+++ b/src/views/tool/datasource.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
dialogWidth: 900,
tip: false,
searchShow: true,
diff --git a/src/views/trajectory/trajectory.vue b/src/views/trajectory/trajectory.vue
index 1d0f7bc..e3b7fa3 100644
--- a/src/views/trajectory/trajectory.vue
+++ b/src/views/trajectory/trajectory.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/visitrecord/visitrecord.vue b/src/views/visitrecord/visitrecord.vue
index 2ebc6f2..ded9947 100644
--- a/src/views/visitrecord/visitrecord.vue
+++ b/src/views/visitrecord/visitrecord.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/wj/wj.vue b/src/views/wj/wj.vue
index 935f1b4..526a595 100644
--- a/src/views/wj/wj.vue
+++ b/src/views/wj/wj.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/claim.vue b/src/views/work/claim.vue
index 916fe50..cdde81d 100644
--- a/src/views/work/claim.vue
+++ b/src/views/work/claim.vue
@@ -87,7 +87,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
simplePage: true,
searchShow: true,
diff --git a/src/views/work/done.vue b/src/views/work/done.vue
index 57c5a24..af0416c 100644
--- a/src/views/work/done.vue
+++ b/src/views/work/done.vue
@@ -81,7 +81,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/send.vue b/src/views/work/send.vue
index 9c2d96d..9709fb5 100644
--- a/src/views/work/send.vue
+++ b/src/views/work/send.vue
@@ -85,7 +85,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/start.vue b/src/views/work/start.vue
index baf0262..ebf9a9e 100644
--- a/src/views/work/start.vue
+++ b/src/views/work/start.vue
@@ -100,7 +100,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/todo.vue b/src/views/work/todo.vue
index 975736c..c4308c7 100644
--- a/src/views/work/todo.vue
+++ b/src/views/work/todo.vue
@@ -87,7 +87,7 @@
workBox: false,
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
simplePage: true,
searchShow: true,
diff --git a/src/views/xlfeedback/xlfeedback.vue b/src/views/xlfeedback/xlfeedback.vue
index 8127740..1c8470f 100644
--- a/src/views/xlfeedback/xlfeedback.vue
+++ b/src/views/xlfeedback/xlfeedback.vue
@@ -49,7 +49,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/zc/zc.vue b/src/views/zc/zc.vue
index 620642d..bd31d7f 100644
--- a/src/views/zc/zc.vue
+++ b/src/views/zc/zc.vue
@@ -62,7 +62,7 @@
selectionList: [],
option: {
height:'auto',
- calcHeight: 30,
+ calcHeight: 54,
tip: false,
searchShow: true,
searchMenuSpan: 6,
--
Gitblit v1.9.3