From c87112aa6bfe824f5052f366893749af28b14354 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 03 三月 2025 09:50:08 +0800
Subject: [PATCH] ll
---
pda/pages/index/queueup.vue | 2
h5/pages/login/login.vue | 2
admin/src/views/business/empower.vue | 3
admin/src/views/business/trainTime.vue | 43 ++--------
admin/src/components/business/OperaHiddenDangerWindow.vue | 2
admin/src/views/business/visitEvent.vue | 3
h5/pages/staff/task/vDangetAppr.vue | 20 +++-
admin/src/views/business/smsEmail.vue | 1
admin/src/views/operation/serviceCar/apprRecord.vue | 8 +
admin/src/views/statistics/platformStatic.vue | 7 +
admin/src/views/operation/danger/record.vue | 103 ++++++++++---------------
11 files changed, 79 insertions(+), 115 deletions(-)
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index fbaf9f4..8595d0c 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -127,7 +127,7 @@
</div>
<div class="line">
<div class="company">
- {{ item.createUserName }} {{ item.companyName }}
+ {{ item.createUserName }}
<div style="display: inline" v-if="index == logList.length-1">
锛�<span class="status-green" v-if="model.status==1">宸插鐞�</span>
<span class="status-blue" v-if="model.status==0">寰呭鐞�</span>
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index de18c1b..358967b 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -173,7 +173,8 @@
},
reset () {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = ''
+ this.searchForm = {}
+ this.time = []
// this.changeRadio('0')
this.search()
}
diff --git a/admin/src/views/business/smsEmail.vue b/admin/src/views/business/smsEmail.vue
index eb2262d..abfca39 100644
--- a/admin/src/views/business/smsEmail.vue
+++ b/admin/src/views/business/smsEmail.vue
@@ -122,6 +122,7 @@
this.$refs.searchForm.resetFields()
this.searchForm.radio = ''
// this.changeRadio('0')
+ this.searchForm = {}
this.time = []
this.search()
},
diff --git a/admin/src/views/business/trainTime.vue b/admin/src/views/business/trainTime.vue
index d571886..e8c8222 100644
--- a/admin/src/views/business/trainTime.vue
+++ b/admin/src/views/business/trainTime.vue
@@ -86,17 +86,18 @@
},
methods: {
changeRadio(e) {
+ this.searchForm.radio = e
if (e === '0') {
- this.searchForm.startTimeStart = timeForMat(0)[0]
- this.searchForm.startTimeEnd = timeForMat(0)[1]
+ this.searchForm.sendStartDate = timeForMat(0)[0]
+ this.searchForm.sendEndDate = timeForMat(0)[1]
this.time = timeForMat(0)
} else if (e === '1') {
- this.searchForm.startTimeStart = timeForMat(6)[0]
- this.searchForm.startTimeEnd = timeForMat(6)[1]
+ this.searchForm.sendStartDate = timeForMat(6)[0]
+ this.searchForm.sendEndDate = timeForMat(6)[1]
this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startTimeStart = timeForMat(29)[0]
- this.searchForm.startTimeEnd = timeForMat(29)[1]
+ this.searchForm.sendStartDate = timeForMat(29)[0]
+ this.searchForm.sendEndDate = timeForMat(29)[1]
this.time = timeForMat(29)
}
this.search()
@@ -106,40 +107,14 @@
this.searchForm.startTimeStart = e[0]
this.searchForm.startTimeEnd = e[1]
this.searchForm.radio = null
- this.search()
- }
- },
- changeRadio1(e) {
- if (e === '0') {
- this.searchForm.endTimeStart = timeForMat(0)[0]
- this.searchForm.endTimeEnd = timeForMat(0)[1]
- this.time1 = timeForMat(0)
- } else if (e === '1') {
- this.searchForm.endTimeStart = timeForMat(6)[0]
- this.searchForm.endTimeEnd = timeForMat(6)[1]
- this.time1 = timeForMat(6)
- } else if (e === '2') {
- this.searchForm.endTimeStart = timeForMat(29)[0]
- this.searchForm.endTimeEnd = timeForMat(29)[1]
- this.time1 = timeForMat(29)
- }
- this.search()
- },
- seleTime1(e) {
- if (e && e.length > 1) {
- this.searchForm.endTimeStart = e[0]
- this.searchForm.endTimeEnd = e[1]
- this.searchForm.radio1 = null
+ this.time = [e[0], e[1]]
this.search()
}
},
reset() {
this.$refs.searchForm.resetFields()
+ this.searchForm = {}
this.time = []
- this.time1 = []
- this.searchForm.radio = ''
- this.searchForm.radio1 = '0'
- // this.changeRadio('0')
this.search()
}
}
diff --git a/admin/src/views/business/visitEvent.vue b/admin/src/views/business/visitEvent.vue
index c01ecdc..8310e30 100644
--- a/admin/src/views/business/visitEvent.vue
+++ b/admin/src/views/business/visitEvent.vue
@@ -155,8 +155,7 @@
reset () {
this.$refs.searchForm.resetFields()
this.time = []
- this.searchForm.radio = '0'
- this.changeRadio('0')
+ this.searchForm = {}
this.search()
}
}
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index fc53b4c..f1161d1 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -6,50 +6,36 @@
<el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎻愭姤浜虹粍缁�" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" clearable @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" clearable
+ @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="璐ｄ换閮ㄩ棬" prop="dutyCompanyName">
- <el-input v-model="searchForm.dutyCompanyName" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" clearable @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.dutyCompanyName" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�" clearable
+ @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="闅愭偅鍖哄煙" prop="areaId">
- <el-select v-model="searchForm.areaId" placeholder="璇烽�夋嫨闅愭偅鍖哄煙" clearable @change="search">
- <el-option
- v-for="item in areaList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-select v-model="searchForm.areaId" placeholder="璇烽�夋嫨闅愭偅鍖哄煙" clearable @change="search">
+ <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="闅愭偅绫诲瀷" prop="cateId">
<el-select v-model="searchForm.cateId" placeholder="璇烽�夋嫨闅愭偅绫诲瀷" clearable @change="search">
- <el-option
- v-for="item in cateList"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
+ <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
<el-option label="寰呭鐞�" value="0"></el-option>
<el-option label="宸插鐞�" value="1"></el-option>
<el-option label="宸查��鍥�" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎻愭姤鏃堕棿" prop="startTime">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- @keypress.enter.native="search"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- :default-time="['00:00:00', '23:59:59']"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
+ <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
+ range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
@@ -65,15 +51,12 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:hiddendanger:create', 'business:hiddendanger:exportExcel']">
- <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']" @click="handleEdit">鏂板缓</el-button></li>
- <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']" @click="handleEx">瀵煎嚭</el-button></li>
+ <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']"
+ @click="handleEdit">鏂板缓</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']"
+ @click="handleEx">瀵煎嚭</el-button></li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="dutyCompanyName" show-overflow-tooltip label="璐ｄ换閮ㄩ棬" min-width="150px"></el-table-column>
<el-table-column prop="areaName" label="闅愭偅鍖哄煙" show-overflow-tooltip min-width="150px"></el-table-column>
@@ -83,33 +66,27 @@
<el-table-column prop="createDate" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column label="澶勭悊缁撴灉" min-width="100px">
<template slot-scope="{row}">
- <span class="status-blue" v-if="row.status === 0">寰呭鐞�</span>
- <span class="status-green" v-if="row.status === 1">宸插鐞�</span>
- <span class="status-red" v-if="row.status === 2">宸查��鍥�</span>
+ <span class="status-blue" v-if="row.status === 0">寰呭鐞�</span>
+ <span class="status-green" v-if="row.status === 1">宸插鐞�</span>
+ <span class="status-red" v-if="row.status === 2">宸查��鍥�</span>
</template>
</el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column
- label="鎿嶄綔"
- min-width="180"
- fixed="right"
- >
+ <el-table-column label="鎿嶄綔" min-width="180" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�',row)" >鏌ョ湅璇︽儏</el-button>
- <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:hiddendanger:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-edit"
+ @click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�', row)">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
+ v-permissions="['business:hiddendanger:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
- <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange"/>
+ <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange" />
<!-- 鏂板缓 -->
- <HiddenDangerParam @close="isShowEdit = false" @success="search" v-if="isShowEdit" ref="HiddenDangerParamRef" />
+ <HiddenDangerParam @close="isShowEdit = false" @success="search" v-if="isShowEdit" ref="HiddenDangerParamRef" />
</TableLayout>
</template>
@@ -124,8 +101,8 @@
export default {
name: 'Empower',
extends: BaseTable,
- components: { TableLayout, Pagination ,OperaHiddenDangerWindow, HiddenDangerParam},
- data () {
+ components: { TableLayout, Pagination, OperaHiddenDangerWindow, HiddenDangerParam },
+ data() {
return {
isShowEdit: false,
// 鎼滅储
@@ -144,7 +121,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '闅愭偅闅忔墜鎷嶇鐞�',
api: '/business/hiddenDanger',
@@ -156,7 +133,7 @@
this.loadParams()
},
methods: {
- handleEx () {
+ handleEx() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
@@ -173,13 +150,13 @@
})
})
},
- handleEdit () {
+ handleEdit() {
this.isShowEdit = true
this.$nextTick(() => {
this.$refs.HiddenDangerParamRef.isShowModal = true
})
},
- changeRadio (e) {
+ changeRadio(e) {
this.searchForm.radio = e
if (e === '0') {
this.searchForm.queryStartTime = timeForMat(0)[0]
@@ -196,7 +173,7 @@
}
this.search()
},
- loadParams () {
+ loadParams() {
allList({
})
.then(res => {
@@ -217,17 +194,19 @@
.finally(() => {
})
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.queryStartTime = e[0]
this.searchForm.queryEndTime = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = '0'
- this.changeRadio('0')
- // this.search()
+ this.searchForm = {}
+ this.time = []
+ // this.searchForm.radio = '0'
+ // this.changeRadio('0')
+ this.search()
}
}
}
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 01da171..62e2630 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -263,9 +263,11 @@
},
reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = '0'
- this.changeRadio('0')
- // this.search()
+ this.searchForm = {}
+ this.time = []
+ // this.searchForm.radio = '0'
+ // this.changeRadio('0')
+ this.search()
}
}
}
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
index 0cb0834..8449de0 100644
--- a/admin/src/views/statistics/platformStatic.vue
+++ b/admin/src/views/statistics/platformStatic.vue
@@ -159,10 +159,11 @@
},
clear() {
this.filters = {
- selDate: []
+ // selDate: []
+ fastdate: '0'
}
- this.getList()
- // this.changeRadio('0')
+ // this.getList()
+ this.changeRadio('0')
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index 53074fa..cac61df 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -41,7 +41,7 @@
export default {
data() {
return {
- code: '11'
+ code: ''
}
},
onLoad(option) {
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index 2f6b65d..5645fd8 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -98,7 +98,7 @@
</view>
<view class="line">
<view class="company">
- {{ item.createUserName }} {{ item.companyName }}
+ {{ item.createUserName }}
<view style="display: inline" v-if="index == flowList.length - 1">
锛�
<span v-if="info.status == 1">宸插悓鎰�</span>
@@ -843,7 +843,7 @@
}
.main_app {
- background-color: #fff;
+ background-color: #f7f7f7;
padding-bottom: 0;
position: relative;
@@ -864,7 +864,9 @@
display: flex;
margin-bottom: 48rpx;
position: relative;
-
+ &:nth-last-child(1){
+ margin-bottom: 0;
+ }
.separate {
position: absolute;
width: 4rpx;
@@ -1020,7 +1022,10 @@
}
}
- .module_list {
+ .module_list {
+ background-color: #fff;
+ margin: 0 -30rpx;
+ padding: 0 30rpx;
.title {
font-weight: 600;
font-size: 32rpx;
@@ -1070,8 +1075,9 @@
.status_wrap {
position: relative;
- padding: 30rpx 0;
-
+ padding: 30rpx;
+ background-color: #fff;
+ margin: 0 -30rpx;
.name {
font-weight: 600;
font-size: 32rpx;
@@ -1151,7 +1157,7 @@
.status {
position: absolute;
- right: -30rpx;
+ right: 0rpx;
top: 0;
height: 60rpx;
line-height: 60rpx;
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index af2a0f0..5deb4b4 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -35,7 +35,7 @@
<text>{{ item.carCodeFront.slice(2) }}</text>
</view>
<view class="status" v-if="item.signDate"
- >绛惧埌鏃堕棿锛歿{ item.signDate.slice(11, 16) }}</view
+ >绛惧埌鏃堕棿锛歿{ item.signDate.slice(5, 16) }}</view
>
</view>
<view class="line" v-if="item.billCode">
--
Gitblit v1.9.3