diff --git a/README.md b/README.md index e1fcade..c6ee696 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ https://1x.antdv.com/components/icon/ 首页 /home #### 有组织 - + 有组织排放 /youzuzhi/paifang 待联调 有组织排放统计 /youzuzhi/paifangtongji 待联调 @@ -69,9 +69,9 @@ https://1x.antdv.com/components/icon/ #### 清洁运输 -清洁运输 /cleanTravel/home -厂区车辆台账 /cleanTravel/ledger -清洁运输趋势 /cleanTravel/trend +清洁运输 /cleanTravel/home 联调完成 +厂区车辆台账 /cleanTravel/ledger 联调完成 +清洁运输趋势 /cleanTravel/trend 磅秤台账 /cleanTravel/bangcheng (已做)待联调 #### 视频广场 diff --git a/components/NewBg.vue b/components/NewBg.vue index 81507ad..785e04e 100644 --- a/components/NewBg.vue +++ b/components/NewBg.vue @@ -21,7 +21,7 @@ .bg { width: 100%; box-sizing: border-box; - height: 100%; + height: 100vh; box-sizing: border-box; background: url('~/assets/images/new/大背景.png') center no-repeat; background-size: 100% 100%; diff --git a/components/smallCommon/Curd.vue b/components/smallCommon/Curd.vue index 941a263..8a0e624 100644 --- a/components/smallCommon/Curd.vue +++ b/components/smallCommon/Curd.vue @@ -90,6 +90,9 @@ + + @@ -100,6 +103,7 @@ export default { name: "user", data() { return { + cacheData: [], isValidate: false, tableDataSource: [], form: this.$form.createForm(this, {name: `form_${new Date().valueOf()}`}), @@ -155,6 +159,11 @@ export default { type: Object, default: () => ({}) }, + customSearch: { + type: Function, + default: () => null + + } }, computed: { searchItems() { @@ -179,8 +188,8 @@ export default { this.handleSearch() }, methods: { - viewDetails(data){ - this.$emit('viewDetails',data) + viewDetails(data) { + this.$emit('viewDetails', data) }, gtDecorator(menuItem) { if (menuItem.rules) { @@ -252,6 +261,11 @@ export default { reset() { this.form.resetFields(); }, + doSearch () { + if (this.customSearch) { + this.tableDataSource = this.customSearch(JSON.parse(JSON.stringify(this.cacheData))) + } + }, async handleSearch(e) { e && e.preventDefault(); const values = this.form.getFieldsValue() @@ -263,9 +277,11 @@ export default { }) if (noPage) { this.page = false + this.cacheData = data this.tableDataSource = data } else { this.page.total = data.total || 0 + this.cacheData = data.items this.tableDataSource = data.items } }, diff --git a/components/smallCommon/CusDesc.vue b/components/smallCommon/CusDesc.vue index 260c587..e358bc5 100644 --- a/components/smallCommon/CusDesc.vue +++ b/components/smallCommon/CusDesc.vue @@ -1,9 +1,9 @@ @@ -37,7 +37,11 @@ export default { text-align: left; vertical-align: top; .desc { + width: 100%; margin-top: 16px; + display: flex; + justify-content: flex-start; + align-items: center; &:first-child { margin-top: 0; } diff --git a/components/smallCommon/CustomTable.vue b/components/smallCommon/CustomTable.vue index 66b7f82..7126181 100644 --- a/components/smallCommon/CustomTable.vue +++ b/components/smallCommon/CustomTable.vue @@ -2,7 +2,7 @@ diff --git a/pages/wuzuzhi/xichejiguanli.vue b/pages/wuzuzhi/xichejiguanli.vue index 294bc73..a441bb9 100644 --- a/pages/wuzuzhi/xichejiguanli.vue +++ b/pages/wuzuzhi/xichejiguanli.vue @@ -15,6 +15,7 @@
西门洗车
正常 +
diff --git a/pages/youzuzhi/paifang.vue b/pages/youzuzhi/paifang.vue index 2e6a0e4..5197f0c 100644 --- a/pages/youzuzhi/paifang.vue +++ b/pages/youzuzhi/paifang.vue @@ -1,94 +1,142 @@ - - diff --git a/pages/youzuzhi/paifangtongji.vue b/pages/youzuzhi/paifangtongji.vue index 82bd5ff..345a36f 100644 --- a/pages/youzuzhi/paifangtongji.vue +++ b/pages/youzuzhi/paifangtongji.vue @@ -1,15 +1,11 @@