merge test

2023-11-24 17:31:21 +08:00 · 2023-11-24 17:31:21 +08:00 · b3a117f6c6
commit b3a117f6c6
parent 8929e53724 db081c1bd1
16 changed files with 8 additions and 23 deletions
--- a/src/views/warehouse/chart/BarChart.vue
+++ b/src/views/warehouse/chart/BarChart.vue
@ -1,5 +1,5 @@
 <template>
-	<div :class="className" :style="{ height: height, width: width }" />
+	<div :class="className" :style="{ height: height, width: width,marginLeft: '10px' }" />
 </template>

 <script>
@ -97,7 +97,7 @@ export default {
 					{
 						containLabel: true,
 						top: 40,
-						left: '2%',
+						left: '4%',
 						right: '2%',
 						bottom: '3%',
 						bottom: '55%',
@ -105,7 +105,7 @@ export default {
 					{
 						containLabel: true,
 						top: 40,
-						left: '2%',
+						left: '4%',
 						right: '2%',
 						bottom: '3%',
 						top: '55%',
--- a/src/views/warehouse/end-material/warehouseHis/index.vue
+++ b/src/views/warehouse/end-material/warehouseHis/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/end-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/end-material/warehouseRealtime/index.vue
@ -2,13 +2,12 @@
 * @Author: zwq
 * @Date: 2023-11-03 16:37:06
 * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:54:31
+ * @LastEditTime: 2023-11-24 14:35:01
 * @Description:
 -->
 <template>
 	<div class="app-container">
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/end-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/end-material/warehouseRealtimeLocation/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/out-material/warehouseHis/index.vue
+++ b/src/views/warehouse/out-material/warehouseHis/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/out-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/out-material/warehouseRealtime/index.vue
@ -2,13 +2,12 @@
 * @Author: zwq
 * @Date: 2023-11-03 16:37:06
 * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:54:14
+ * @LastEditTime: 2023-11-24 14:36:24
 * @Description:
 -->
 <template>
 	<div class="app-container">
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/out-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/out-material/warehouseRealtimeLocation/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/package-material/warehouseHis/index.vue
+++ b/src/views/warehouse/package-material/warehouseHis/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/package-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/package-material/warehouseRealtime/index.vue
@ -2,13 +2,12 @@
 * @Author: zwq
 * @Date: 2023-11-03 16:37:06
 * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:53:54
+ * @LastEditTime: 2023-11-24 14:36:08
 * @Description:
 -->
 <template>
 	<div class="app-container">
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/package-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/package-material/warehouseRealtimeLocation/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/part-material/warehouseHis/index.vue
+++ b/src/views/warehouse/part-material/warehouseHis/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/part-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/part-material/warehouseRealtime/index.vue
@ -2,13 +2,12 @@
 * @Author: zwq
 * @Date: 2023-11-03 16:37:06
 * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:53:28
+ * @LastEditTime: 2023-11-24 14:35:51
 * @Description:
 -->
 <template>
 	<div class="app-container">
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/part-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/part-material/warehouseRealtimeLocation/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/raw-material/warehouseHis/index.vue
+++ b/src/views/warehouse/raw-material/warehouseHis/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/raw-material/warehouseRealtime/index.vue
+++ b/src/views/warehouse/raw-material/warehouseRealtime/index.vue
@ -2,13 +2,12 @@
 * @Author: zwq
 * @Date: 2023-11-03 16:37:06
 * @LastEditors: zwq
- * @LastEditTime: 2023-11-23 15:52:53
+ * @LastEditTime: 2023-11-24 14:35:29
 * @Description:
 -->
 <template>
 	<div class="app-container">
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
--- a/src/views/warehouse/raw-material/warehouseRealtimeLocation/index.vue
+++ b/src/views/warehouse/raw-material/warehouseRealtimeLocation/index.vue
@ -2,7 +2,6 @@
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
 		<search-bar
-			:isFold="true"
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />