From e8158d16a13c2ea1f2d8566578137db4394ab610 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 18:36:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/carEvent.vue | 8 ++--
h5/pages/visitorApplication/visitorApplication.vue | 8 ++-
h5/main.js | 4 +-
admin/src/views/business/device.vue | 31 ++++++++++++++-
h5/pages/appointmentDetails/appointmentDetails.vue | 1
admin/src/views/business/empower.vue | 6 ++
admin/src/components/common/CommonHeader.vue | 6 +-
admin/src/views/business/retention.vue | 2
h5/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue | 2 +
admin/src/api/business/device.js | 5 ++
h5/pages/userinfo/userinfo.vue | 6 +-
admin/src/views/business/deviceEvent.vue | 2
12 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/admin/src/api/business/device.js b/admin/src/api/business/device.js
index 16cb174..8f0b945 100644
--- a/admin/src/api/business/device.js
+++ b/admin/src/api/business/device.js
@@ -21,3 +21,8 @@
export function updateById (data) {
return request.post('/business/device/updateById', data)
}
+
+// 淇敼鏄惁闂ㄧ鍏ュ彛
+export function updateEntranceById (data) {
+ return request.post('/business/device/updateEntranceById', data)
+}
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 17685f1..10523a8 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -88,9 +88,9 @@
},
computed: {
...mapState(['menuData', 'userInfo']),
- title () {
- return this.$route.meta.title
- }
+ // title () {
+ // return this.$route.meta.title
+ // }
},
filters: {
// 灞曠ず鍚嶇О
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index baf8d1e..97a3f4e 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -8,7 +8,7 @@
<el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
<el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃/閮ㄩ棬鍚嶇О" prop="companyName">
+ <el-form-item label="鍏徃/閮ㄩ棬" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ュ叕鍙�/閮ㄩ棬鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="memberType">
@@ -71,9 +71,9 @@
</el-table-column>
<el-table-column label="褰掑睘鐢ㄦ埛绫诲瀷" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.personType === '0'">鍔冲姟璁垮</span>
- <span v-if="row.personType === '1'">鏅�氳瀹�</span>
- <span v-if="row.personType === '2'">鍐呴儴浜哄憳</span>
+ <span v-if="row.personType == 0">鍔冲姟璁垮</span>
+ <span v-if="row.personType == 1">鏅�氳瀹�</span>
+ <span v-if="row.personType == 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
<el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index 097b646..db38236 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -8,6 +8,12 @@
<el-form-item label="鍖哄煙鍚嶇О" prop="regionPathName">
<el-input v-model="searchForm.regionPathName" placeholder="璇疯緭鍏ュ尯鍩熷悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
+ <el-form-item label="鏄惁鍥尯鍏ュ彛" prop="isEntrance">
+ <el-select v-model="searchForm.isEntrance" placeholder="璇烽�夋嫨">
+ <el-option label="鏄�" value="1"></el-option>
+ <el-option label="鍚�" value="0"></el-option>
+ </el-select>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -28,6 +34,18 @@
<el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О"></el-table-column>
<el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�"></el-table-column>
<el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
+ <el-table-column label="鏄惁鍥尯鍏ュ彛">
+ <template slot-scope="{row}">
+ <el-switch
+ @change="changeManufature($event, row)"
+ v-model="row.isEntrance"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="1"
+ :inactive-value="0">
+ </el-switch>
+ </template>
+ </el-table-column>
<el-table-column prop="no" label="璁惧鍙�"></el-table-column>
<!-- <el-table-column-->
<!-- v-if="containPermissions(['business:device:update'])"-->
@@ -48,7 +66,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>
+<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
</TableLayout>
</template>
@@ -57,7 +75,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
-import { syncDevices } from '@/api/business/device'
+import { syncDevices, updateEntranceById } from '@/api/business/device'
import { memberSync } from '@/api/business/member'
export default {
name: 'Device',
@@ -68,7 +86,8 @@
// 鎼滅储
searchForm: {
doorName: '',
- regionPathName: ''
+ regionPathName: '',
+ isEntrance: ''
},
options: []
}
@@ -83,6 +102,12 @@
this.search()
},
methods: {
+ changeManufature(e, row) {
+ updateEntranceById({
+ id: row.id,
+ isEntrance: e
+ })
+ },
synchronousData () {
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 1e7d2ac..c746b6c 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -5,7 +5,7 @@
<el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
<el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃/缁勭粐鍚嶇О" prop="companyName">
+ <el-form-item label="鍏徃/缁勭粐" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ュ叕鍙�/缁勭粐鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="personType">
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index f9ccaed..8933cd6 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -19,6 +19,9 @@
<el-form-item label="鍏徃" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
+ <el-form-item label="璁惧鍚嶇О" prop="deviceName">
+ <el-input v-model="searchForm.deviceName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
<el-form-item label="涓嬪彂璧峰鏃堕棿" prop="startTime">
<el-date-picker
@change="seleTime"
@@ -128,7 +131,8 @@
startTime: '',
endTime: '',
sendStatus: '',
- radio: null
+ radio: null,
+ deviceName: ''
},
time: []
}
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index aee3934..1dd9cb2 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -5,7 +5,7 @@
<el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
<el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃/閮ㄩ棬鍚嶇О" prop="companyName">
+ <el-form-item label="鍏徃/閮ㄩ棬" prop="companyName">
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ュ叕鍙�/閮ㄩ棬鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="type">
diff --git a/h5/main.js b/h5/main.js
index 4c4e332..7f45269 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -9,8 +9,8 @@
// Vue.prototype.$baseUrl = 'http://192.168.0.111:10027/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
-Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
-// Vue.prototype.$baseUrl = 'http://218.23.218.228:9912/web_interface/'
+// Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
+Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/'
Vue.prototype.$store = store;
App.mpType = 'app'
diff --git a/h5/pages/appointmentDetails/appointmentDetails.vue b/h5/pages/appointmentDetails/appointmentDetails.vue
index d27642b..9d85809 100644
--- a/h5/pages/appointmentDetails/appointmentDetails.vue
+++ b/h5/pages/appointmentDetails/appointmentDetails.vue
@@ -178,6 +178,7 @@
align-items: center;
margin-top: 30rpx;
.box_list_item_label {
+ flex-shrink: 0;
font-size: 28rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index fc49bd6..11fbad0 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -86,8 +86,8 @@
userAnswerId: '',
name: '',
phone: '',
- idcardType: '',
- idcardTypeName: '',
+ idcardType: '0',
+ idcardTypeName: '韬唤璇�',
idcardNo: '',
faceImg: '',
faceImgUrl: '',
@@ -221,7 +221,7 @@
var that = this
that.type = type
if (type === 'faceImg') {
- that.$refs.cropper.open()
+ that.$refs.cropper.chooseImage()
return
}
uni.chooseImage({
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index ecc0b4f..d143805 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -8,7 +8,7 @@
<text>*</text>
</view>
<view class="list_item_content">
- <input type="number" maxlength="11" v-model="form1.phone1" placeholder="璇疯緭鍏ユ墜鏈哄彿" @blur="getUser" placeholder-style="color: #999999;" />
+ <input type="number" maxlength="11" v-model="form1.phone1" :placeholder="verify == '0' ? '杈撳叆鎵嬫満鍙峰悗鑷姩鑾峰彇' : '璇疯緭鍏ユ墜鏈哄彿'" @blur="getUser" placeholder-style="color: #999999;" />
</view>
</view>
<view class="list_item">
@@ -57,7 +57,7 @@
<text>*</text>
</view>
<view class="list_item_content">
- <input type="text" v-model="form1.reason" placeholder="璇疯緭鍏ユ潵璁夸簨鐢憋紝鎮ㄦ潵鍋氫粈涔堢殑" placeholder-style="color: #999999;" />
+ <input type="text" v-model="form1.reason" placeholder="璇疯緭鍏ユ潵璁夸簨鐢�" placeholder-style="color: #999999;" />
</view>
</view>
<view class="list_item">
@@ -1115,7 +1115,9 @@
.list_item {
width: 100%;
- height: 98rpx;
+ // min-height: 98rpx;
+ padding: 30rpx 0;
+ box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
diff --git a/h5/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue b/h5/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue
index d70ec32..a99a042 100644
--- a/h5/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue
+++ b/h5/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue
@@ -353,6 +353,7 @@
success: (res) => {
this.resetData();
this.initImage(res.tempFiles[0].path);
+ // this.open()
}
});
},
@@ -369,6 +370,7 @@
* @param {String} url 鍥剧墖閾炬帴
*/
initImage(url) {
+ this.open()
uni.getImageInfo({
src: url,
success: (res) => {
--
Gitblit v1.9.3