From d71fde29b661900f67bfe5f8edc81626d910082f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 27 十二月 2023 09:11:31 +0800
Subject: [PATCH] Mr.Shi
---
admin/src/views/business/blackmailPersonnel.vue | 89 +++++--
admin/src/components/business/OperaVisitsDesWindow.vue | 48 +++
admin/src/views/business/freezePersonnel.vue | 32 ++
admin/src/api/business/parks.js | 7
admin/src/views/business/laborSource.vue | 11
admin/src/views/business/empower.vue | 80 +++++-
admin/src/views/business/visits.vue | 10
admin/src/views/business/strandedPersonnel.vue | 125 ++++++----
admin/src/views/business/deviceRole.vue | 6
admin/src/api/business/cars.js | 10
admin/vue.config.js | 6
admin/src/utils/util.js | 14 +
admin/src/views/business/parks.vue | 46 ++-
admin/src/api/business/strandedPersonnel.js | 45 ++++
admin/src/views/business/cars.vue | 51 ++--
admin/src/views/business/visitorManagement.vue | 11
admin/src/views/business/visitorSources.vue | 11
admin/src/api/system/common.js | 5
18 files changed, 432 insertions(+), 175 deletions(-)
diff --git a/admin/src/api/business/cars.js b/admin/src/api/business/cars.js
index 6aba135..f5efbe0 100644
--- a/admin/src/api/business/cars.js
+++ b/admin/src/api/business/cars.js
@@ -2,29 +2,29 @@
// 鏌ヨ
export function fetchList (data) {
- return request.post('/business/cars/page', data, {
+ return request.post('/business/parkBook/page', data, {
trim: true
})
}
// 鍒涘缓
export function create (data) {
- return request.post('/business/cars/create', data)
+ return request.post('/business/parkBook/create', data)
}
// 淇敼
export function updateById (data) {
- return request.post('/business/cars/updateById', data)
+ return request.post('/business/parkBook/updateById', data)
}
// 鍒犻櫎
export function deleteById (id) {
- return request.get(`/business/cars/delete/${id}`)
+ return request.get(`/business/parkBook/delete/${id}`)
}
// 鎵归噺鍒犻櫎
export function deleteByIdInBatch (ids) {
- return request.get('/business/cars/delete/batch', {
+ return request.get('/business/parkBook/delete/batch', {
params: {
ids
}
diff --git a/admin/src/api/business/parks.js b/admin/src/api/business/parks.js
index d104bc2..57f053b 100644
--- a/admin/src/api/business/parks.js
+++ b/admin/src/api/business/parks.js
@@ -6,3 +6,10 @@
trim: true
})
}
+
+// 鎵�灞炲仠杞﹀満鍒楄〃
+export function findList (data) {
+ return request.post('/business/parks/findList', data, {
+ trim: true
+ })
+}
diff --git a/admin/src/api/business/strandedPersonnel.js b/admin/src/api/business/strandedPersonnel.js
new file mode 100644
index 0000000..76f2b35
--- /dev/null
+++ b/admin/src/api/business/strandedPersonnel.js
@@ -0,0 +1,45 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/business/visits/retentionPage', data, {
+ trim: true
+ })
+}
+
+// 瀵煎嚭Excel
+export function exportExcel (data) {
+ return request.post('/business/visits/exportExcel', data, {
+ trim: true,
+ download: true
+ })
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/business/visits/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/business/visits/updateById', data)
+}
+
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/business/visits/delete/${id}`)
+}
+
+// 鏍规嵁ID鏌ヨ
+export function queryById (id) {
+ return request.get(`/business/visits/${id}`)
+}
+
+// 鎵归噺鍒犻櫎
+export function deleteByIdInBatch (ids) {
+ return request.get('/business/visits/delete/batch', {
+ params: {
+ ids
+ }
+ })
+}
diff --git a/admin/src/api/system/common.js b/admin/src/api/system/common.js
index b116149..157c8c7 100644
--- a/admin/src/api/system/common.js
+++ b/admin/src/api/system/common.js
@@ -46,3 +46,8 @@
export function updateLaborConfigDTO (data) {
return request.post('/system/dictData/updateLaborConfigDTO', data)
}
+
+// 鍒嗛〉鏌ヨ绯荤粺鐢ㄦ埛
+export function findAllList (data) {
+ return request.post('/system/user/findAllList', data)
+}
diff --git a/admin/src/components/business/OperaVisitsDesWindow.vue b/admin/src/components/business/OperaVisitsDesWindow.vue
index 9cf9b28..6170e27 100644
--- a/admin/src/components/business/OperaVisitsDesWindow.vue
+++ b/admin/src/components/business/OperaVisitsDesWindow.vue
@@ -23,7 +23,7 @@
<div class="list_item_info" v-if="info">闅忚杞﹁締锛歿{info.carNos}}</div>
<div class="list_item_table" v-if="info">
<el-table
- :data="info.lwWithUserList ? info.lwWithUserList : []"
+ :data="info.withUserList ? info.withUserList : []"
border
:header-cell-style="{background: '#dcdde2', color: 'rgb(51, 51, 51)'}"
style="width: 100%">
@@ -41,8 +41,12 @@
<el-table-column
prop="birthday"
label="骞撮緞">
+ <template slot-scope="{row}">
+ <span>{{getAge(row.birthday)}}</span>
+ </template>
</el-table-column>
<el-table-column
+ width="150"
prop="phone"
label="鎵嬫満鍙�">
</el-table-column>
@@ -55,7 +59,8 @@
</template>
</el-table-column>
<el-table-column
- prop="idcardNo"
+ width="160"
+ prop="idcardDecode"
label="韬唤璇佸彿鐮�">
</el-table-column>
<el-table-column
@@ -63,12 +68,28 @@
label="鍏徃">
</el-table-column>
<el-table-column
- prop="faceImg"
+ width="150"
label="浜鸿劯鐓х墖">
+ <template slot-scope="{row}">
+ <el-image
+ v-if="row.faceImg"
+ style="width: 100px; height: 100px"
+ :src="info.prefixUrl + row.faceImg"
+ :preview-src-list="[info.prefixUrl + row.faceImg]">
+ </el-image>
+ </template>
</el-table-column>
<el-table-column
- prop="imgurl"
+ width="150"
label="鍋ュ悍璇�">
+ <template slot-scope="{row}">
+ <el-image
+ v-if="row.imgurl"
+ style="width: 100px; height: 100px"
+ :src="info.prefixUrl + row.imgurl"
+ :preview-src-list="[info.prefixUrl + row.imgurl]">
+ </el-image>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -106,6 +127,19 @@
}
},
methods: {
+ getAge (val) {
+ if (!val) return ''
+ const currentYear = new Date().getFullYear() // 褰撳墠鐨勫勾浠�
+ const calculationYear = new Date(val).getFullYear() // 璁＄畻鐨勫勾浠�
+ const wholeTime = currentYear + val.substring(4) // 鍛ㄥ瞾鏃堕棿
+ const calculationAge = currentYear - calculationYear // 鎸夌収骞翠唤璁＄畻鐨勫勾榫�
+ // 鍒ゆ柇鏄惁杩囦簡鐢熸棩
+ if (new Date().getTime() > new Date(wholeTime).getTime()) {
+ return calculationAge
+ } else {
+ return calculationAge - 1
+ }
+ },
open (title, id) {
this.title = title
this.visible = true
@@ -118,7 +152,11 @@
}
}
</script>
-
+<style>
+ .el-image-viewer__wrapper {
+ z-index: 3000 !important;
+ }
+</style>
<style lang="scss" scoped>
.list {
width: 100%;
diff --git a/admin/src/utils/util.js b/admin/src/utils/util.js
index 48cf55e..26071e0 100644
--- a/admin/src/utils/util.js
+++ b/admin/src/utils/util.js
@@ -41,3 +41,17 @@
const timer2 = Y2 + '-' + M2 + '-' + D2 + ' ' + '00:00:00' // 涔嬪墠鐨�7澶╂垨鑰�30澶�
return [timer2, timer1]
}
+
+/**
+ * 鏈夋晥鏈熷垽鏂�
+ * @param startTime 寮�濮嬫棩鏈�
+ * @param endTime 缁撴潫鏃ユ湡
+ * @returns {string}
+ */
+export function validity (startTime, endTime) {
+ if (startTime && endTime) {
+ return `${startTime} 鑷� ${endTime}`
+ } else {
+ return '闀挎湡'
+ }
+}
diff --git a/admin/src/views/business/blackmailPersonnel.vue b/admin/src/views/business/blackmailPersonnel.vue
index 8d52eb5..a61b5e9 100644
--- a/admin/src/views/business/blackmailPersonnel.vue
+++ b/admin/src/views/business/blackmailPersonnel.vue
@@ -2,33 +2,26 @@
<TableLayout :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヨ瀹㈠悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎵嬫満鍙�" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
+ <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="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎿嶄綔浜哄憳" prop="code">
- <el-select v-model="searchForm.code" placeholder="璇烽�夋嫨">
+ <el-form-item label="鎿嶄綔浜哄憳" prop="createrId">
+ <el-select v-model="searchForm.createrId" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in user"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浜哄憳绫诲瀷" prop="companyId">
- <el-select v-model="searchForm.code" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-form-item label="浜哄憳绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="1"></el-option>
+ <el-option label="鍔冲姟" value="0"></el-option>
</el-select>
</el-form-item>
<section>
@@ -39,7 +32,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" v-permissions="['business:member:create']">绉诲嚭</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绉诲嚭</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -50,7 +43,7 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="idcard_id" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardDecode" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
<el-table-column label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type === 0">鍔冲姟璁垮</span>
@@ -58,7 +51,7 @@
<span v-if="row.type === 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
- <el-table-column prop="company_id" label="鍏徃" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鍏徃" min-width="100px"></el-table-column>
<el-table-column prop="edit_date" label="鎿嶄綔鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="editor" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column
@@ -68,7 +61,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']">绉诲嚭</el-button>
+ <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="thaw(row.id)">绉诲嚭</el-button>
</template>
</el-table-column>
</el-table>
@@ -86,6 +79,8 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { findAllList } from '@/api/system/common'
+import { updateRemoveStatusById } from '@/api/business/block'
export default {
name: 'blackmailPersonnel',
extends: BaseTable,
@@ -94,13 +89,13 @@
return {
// 鎼滅储
searchForm: {
- companyId: '',
+ companyName: '',
name: '',
- code: '',
+ createrId: '',
status: 2,
- type: 1
+ type: '1'
},
- options: []
+ user: []
}
},
created () {
@@ -111,6 +106,42 @@
'field.main': 'id'
})
this.search()
+ this.getUser()
+ },
+ methods: {
+ thaws () {
+ if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ const ids = this.tableData.selectedRows.map(item => {
+ return { id: item.id }
+ })
+ this.thaw(ids)
+ },
+ thaw (ids) {
+ this.$confirm('纭畾绉婚櫎姝ょ敤鎴峰悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ updateRemoveStatusById(ids)
+ .then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ }).catch(() => {
+
+ })
+ },
+ getUser () {
+ findAllList({})
+ .then(res => {
+ this.user = res.map(item => {
+ return {
+ name: item.realname,
+ id: item.id
+ }
+ })
+ })
+ }
}
}
</script>
diff --git a/admin/src/views/business/cars.vue b/admin/src/views/business/cars.vue
index f135dec..84cb295 100644
--- a/admin/src/views/business/cars.vue
+++ b/admin/src/views/business/cars.vue
@@ -5,18 +5,11 @@
<el-form-item label="杞︾墝鍙�" prop="code">
<el-input v-model="searchForm.code" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍛樺伐濮撳悕/鎵嬫満鍙�" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鍛樺伐濮撳悕/鎵嬫満鍙�" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="閮ㄩ棬" prop="code">
- <el-select v-model="value" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-form-item label="閮ㄩ棬" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ラ儴闂�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -26,7 +19,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" @click="$refs.operaCarsWindow.open('鏂板缓杞﹁締淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓</el-button></li>
+<!-- <li><el-button type="primary" @click="$refs.operaCarsWindow.open('鏂板缓杞﹁締淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓</el-button></li>-->
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -37,13 +30,25 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="code" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="code" label="鍋滆溅鍦�" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="鐢ㄦ埛绫诲瀷" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="閮ㄩ棬/鍏徃" min-width="100px"></el-table-column>
+ <el-table-column prop="parksName" label="鍋滆溅鍦�" min-width="100px"></el-table-column>
+ <el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.memberType === 0">鍔冲姟璁垮</span>
+ <span v-if="row.memberType === 1">鏅�氳瀹�</span>
+ <span v-if="row.memberType === 2">鍐呴儴浜哄憳</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="memberName" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="閮ㄩ棬/鍏徃" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="鏈夋晥鏈�" min-width="100px"></el-table-column>
+ <el-table-column prop="remark" label="鏈夋晥鏈�" min-width="100px">
+ <template slot-scope="{row}">
+ <span>{{validity(row.startTime, row.endTime)}}</span>
+<!-- <span v-if="!row.startTime || !row.endTime">闀挎湡</span>-->
+<!-- <span v-else>{{row.startTime}} 鑷� {{row.endTime}}</span>-->
+ </template>
+ </el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete'])"
@@ -52,7 +57,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaCarsWindow.open('缂栬緫杞﹁締淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:member:update']">缂栬緫</el-button>
+<!-- <el-button type="text" @click="$refs.operaCarsWindow.open('缂栬緫杞﹁締淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:member:update']">缂栬緫</el-button>-->
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -74,6 +79,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCarsWindow from '@/components/business/OperaCarsWindow'
+import { validity } from '@/utils/util'
export default {
name: 'Cars',
extends: BaseTable,
@@ -82,9 +88,10 @@
return {
// 鎼滅储
searchForm: {
- code: ''
- },
- options: []
+ code: '',
+ memberName: '',
+ companyName: ''
+ }
}
},
created () {
diff --git a/admin/src/views/business/deviceRole.vue b/admin/src/views/business/deviceRole.vue
index 221feb0..13129b7 100644
--- a/admin/src/views/business/deviceRole.vue
+++ b/admin/src/views/business/deviceRole.vue
@@ -28,7 +28,7 @@
<el-table-column prop="isDefault" label="鏄惁榛樿" min-width="100px">
<template slot-scope="{row}">
<el-switch
- @change="changeIsDefault"
+ @change="changeIsDefault($event, row.id)"
v-model="row.isDefault"
active-color="#13ce66"
inactive-color="#ff4949"
@@ -91,8 +91,8 @@
this.search()
},
methods: {
- changeIsDefault (r) {
- updateStatusById({ isDefault: r, type: 2 })
+ changeIsDefault (r, id) {
+ updateStatusById({ isDefault: r, type: 2, id })
.finally(() => {
this.search()
})
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index a6373f5..e65ceac 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -2,34 +2,45 @@
<TableLayout :permissions="['business:empower:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕鎵嬫満鍙�" prop="startTime">
- <el-input v-model="searchForm.startTime" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <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="sendStatus">
- <el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨">
+ <el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
<el-option label="寰呬笅鍙�" value="0"></el-option>
<el-option label="宸蹭笅鍙�" value="1"></el-option>
- <el-option label="宸插彇娑�" value="2"></el-option>
+ <el-option label="涓嬪彂鎴愬姛" value="2"></el-option>
+ <el-option label="宸插彇娑�" value="3"></el-option>
+ <el-option label="涓嬪彂澶辫触" value="4"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍏徃" prop="sendStatus">
- <el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨鍏徃">
+ <el-form-item label="鍏徃" prop="companyId">
+ <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨鍏徃" @keypress.enter.native="search">
<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-input v-model="searchForm.startTime" placeholder="璇疯緭鍏ラ棬绂佹湁鏁堟湡寮�濮�" @keypress.enter.native="search"></el-input>
+ <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"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
</el-form-item>
- <el-radio-group v-model="searchForm.eventType" size="small">
- <el-radio-button label="褰撳ぉ"></el-radio-button>
- <el-radio-button label="杩�7澶�"></el-radio-button>
- <el-radio-button label="杩�30澶�"></el-radio-button>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
</el-radio-group>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
-<!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>-->
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
@@ -37,8 +48,8 @@
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
<li><el-button type="primary" v-permissions="['business:empower:create']">瀵煎嚭</el-button></li>
- <li><el-button type="primary" v-permissions="['business:empower:create']">绔嬪嵆涓嬪彂</el-button></li>
- <li><el-button type="primary" v-permissions="['business:empower:create']">鍙栨秷涓嬪彂</el-button></li>
+<!-- <li><el-button type="primary" v-permissions="['business:empower:create']">绔嬪嵆涓嬪彂</el-button></li>-->
+<!-- <li><el-button type="primary" v-permissions="['business:empower:create']">鍙栨秷涓嬪彂</el-button></li>-->
</ul>
<el-table
v-loading="isWorking.search"
@@ -89,6 +100,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { timeForMat } from '@/utils/util'
export default {
name: 'Empower',
extends: BaseTable,
@@ -97,10 +109,14 @@
return {
// 鎼滅储
searchForm: {
+ keyWords: '',
+ companyId: '',
startTime: '',
endTime: '',
- sendStatus: ''
- }
+ sendStatus: '',
+ radio: null
+ },
+ time: []
}
},
created () {
@@ -111,6 +127,38 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ changeRadio (e) {
+ if (e === '0') {
+ this.searchForm.startTime = timeForMat(1)[0]
+ this.searchForm.endTime = timeForMat(1)[1]
+ this.time = timeForMat(1)
+ } else if (e === '1') {
+ this.searchForm.startTime = timeForMat(7)[0]
+ this.searchForm.endTime = timeForMat(7)[1]
+ this.time = timeForMat(7)
+ } else if (e === '2') {
+ this.searchForm.startTime = timeForMat(30)[0]
+ this.searchForm.endTime = timeForMat(30)[1]
+ this.time = timeForMat(30)
+ }
+ this.search()
+ },
+ seleTime (e) {
+ this.searchForm.startTime = e[0]
+ this.searchForm.endTime = e[1]
+ this.searchForm.radio = null
+ this.search()
+ },
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.startTime = ''
+ this.searchForm.endTime = ''
+ this.time = []
+ this.searchForm.radio = null
+ this.search()
+ }
}
}
</script>
diff --git a/admin/src/views/business/freezePersonnel.vue b/admin/src/views/business/freezePersonnel.vue
index 9bbe5f7..160a642 100644
--- a/admin/src/views/business/freezePersonnel.vue
+++ b/admin/src/views/business/freezePersonnel.vue
@@ -26,7 +26,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" v-permissions="['business:member:create']">瑙ｅ喕</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws()">瑙ｅ喕</el-button></li>
<li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
</ul>
<el-table
@@ -37,7 +37,7 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="companyId" label="閮ㄩ棬" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="閮ㄩ棬" min-width="100px"></el-table-column>
<el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
<el-table-column prop="visitsLastDate" label="鏈�鍚庝竴娆￠棬绂佹椂闂�" min-width="100px"></el-table-column>
<el-table-column prop="userActionType1" label="鍐荤粨鏃堕棿" min-width="100px"></el-table-column>
@@ -48,7 +48,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']">瑙ｅ喕</el-button>
+ <el-button type="text" @click="thaw([{id: row.id}])" icon="el-icon-edit" v-permissions="['business:member:update']">瑙ｅ喕</el-button>
</template>
</el-table-column>
</el-table>
@@ -86,7 +86,7 @@
},
created () {
this.config({
- module: '浜哄憳淇℃伅琛�',
+ module: '鍐荤粨浜哄憳',
api: '/business/block',
'field.id': 'id',
'field.main': 'id'
@@ -95,6 +95,28 @@
this.getfindCompanyTreePage()
},
methods: {
+ thaws () {
+ if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ const ids = this.tableData.selectedRows.map(item => {
+ return { id: item.id }
+ })
+ this.thaw(ids)
+ },
+ thaw (ids) {
+ this.$confirm('纭畾瑙ｅ喕姝ょ敤鎴峰悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ updateRemoveStatusById(ids)
+ .then(res => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ }).catch(() => {
+
+ })
+ },
changeCompanyId (e) {
this.searchForm.companyId = e[e.length - 1]
},
@@ -102,9 +124,7 @@
getfindCompanyTreePage () {
findCompanyTreePage(1)
.then(res => {
- console.log(res)
this.options = res
- // this.search()
})
}
}
diff --git a/admin/src/views/business/laborSource.vue b/admin/src/views/business/laborSource.vue
index 7575406..305de49 100644
--- a/admin/src/views/business/laborSource.vue
+++ b/admin/src/views/business/laborSource.vue
@@ -68,18 +68,17 @@
getData () {
getLaborConfigDTO({})
.then(res => {
- this.form.id = res.id
- this.form.checkVisit = res.LaborConfigParam.checkVisit
+ this.form.checkVisit = res.laborConfigParam.checkVisit
this.form.description = res.description
- this.form.healthCard = res.LaborConfigParam.healthCard
- this.form.isAnswer = res.LaborConfigParam.isAnswer
- this.form.reservationWay = res.LaborConfigParam.reservationWay
+ this.form.healthCard = res.laborConfigParam.healthCard
+ this.form.isAnswer = res.laborConfigParam.isAnswer
+ this.form.reservationWay = res.laborConfigParam.reservationWay
this.form.theme = res.theme
})
},
submit () {
updateLaborConfigDTO({
- LaborConfigParam: {
+ laborConfigParam: {
isAnswer: this.form.isAnswer,
healthCard: this.form.healthCard,
checkVisit: this.form.checkVisit,
diff --git a/admin/src/views/business/parks.vue b/admin/src/views/business/parks.vue
index 9817b0b..f0beb14 100644
--- a/admin/src/views/business/parks.vue
+++ b/admin/src/views/business/parks.vue
@@ -2,16 +2,16 @@
<TableLayout :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鍋滆溅搴撳悕绉�" prop="title">
- <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ュ仠杞﹀簱鍚嶇О" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鍋滆溅搴撳悕绉�" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ仠杞﹀簱鍚嶇О" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎵�灞炲仠杞﹀簱" prop="title">
- <el-select v-model="searchForm.title" placeholder="璇烽�夋嫨">
+ <el-form-item label="鎵�灞炲仠杞﹀簱" prop="parentHkId">
+ <el-select v-model="searchForm.parentHkId" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ v-for="item in list"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -30,15 +30,15 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="createDate" label="鍋滆溅搴撳悕绉�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鎵�灞炲仠杞﹀簱" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="鍋滆溅搴撳悕绉�" min-width="100px"></el-table-column>
+ <el-table-column prop="parentName" label="鎵�灞炲仠杞﹀簱" min-width="100px"></el-table-column>
+ <el-table-column prop="parkCreateDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="parkEditDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
>
</pagination>
</template>
@@ -49,6 +49,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { findList } from '@/api/business/parks'
export default {
name: 'Parks',
extends: BaseTable,
@@ -57,9 +58,10 @@
return {
// 鎼滅储
searchForm: {
- title: ''
+ name: '',
+ parentHkId: ''
},
- options: []
+ list: []
}
},
created () {
@@ -70,6 +72,16 @@
'field.main': 'id'
})
this.search()
+ this.getfindList()
+ },
+ methods: {
+ getfindList () {
+ findList({})
+ .then(res => {
+ this.list = res
+ console.log(res)
+ })
+ }
}
}
</script>
diff --git a/admin/src/views/business/strandedPersonnel.vue b/admin/src/views/business/strandedPersonnel.vue
index 0ea6dd6..904b9a6 100644
--- a/admin/src/views/business/strandedPersonnel.vue
+++ b/admin/src/views/business/strandedPersonnel.vue
@@ -5,27 +5,13 @@
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヨ瀹㈠悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍏徃鍚嶇О" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
+ <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="code">
- <el-select v-model="searchForm.code" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐢ㄦ埛绫诲瀷" prop="companyId">
- <el-select v-model="searchForm.code" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <el-form-item label="鐢ㄦ埛绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="1"></el-option>
+ <el-option label="鍔冲姟" value="0"></el-option>
</el-select>
</el-form-item>
<section>
@@ -35,19 +21,19 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" v-permissions="['business:member:create']">绂诲満</el-button></li>
- </ul>
+<!-- <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">-->
+<!-- <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绂诲満</el-button></li>-->
+<!-- </ul>-->
<el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ @selection-change="handleSelectionChange"
>
- <el-table-column type="selection" width="55"></el-table-column>
+<!-- <el-table-column type="selection" width="55"></el-table-column>-->
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="company_id" label="鍏徃" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鍏徃" min-width="100px"></el-table-column>
<el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type === 0">鍔冲姟璁垮</span>
@@ -55,26 +41,31 @@
<span v-if="row.type === 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
- <el-table-column prop="idcard_id" label="鍏ュ満鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="edit_date" label="鎺堟潈鍒版湡鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="idcard_id" label="瓒呮椂鏃堕暱" min-width="100px"></el-table-column>
- <el-table-column prop="idcard_id" label="鐘舵��" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:member:update', 'business:member:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
+ <el-table-column prop="inDate" label="鍏ュ満鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="endtime" label="鎺堟潈鍒版湡鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="timeOut" label="瓒呮椂鏃堕暱" min-width="100px"></el-table-column>
+ <el-table-column label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']">绂诲巶</el-button>
+ <span v-if="row.outStatus === 0">鏈秴鏃�</span>
+ <span v-else-if="row.timeOut === 1">宸茶秴鏃�</span>
+ <span v-else-if="row.timeOut === 2">鍗冲皢瓒呮椂</span>
</template>
</el-table-column>
+<!-- <el-table-column-->
+<!-- v-if="containPermissions(['business:member:update', 'business:member:delete'])"-->
+<!-- label="鎿嶄綔"-->
+<!-- min-width="120"-->
+<!-- fixed="right"-->
+<!-- >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="thaw(row.id)">绂诲巶</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
<pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
>
</pagination>
</template>
@@ -85,6 +76,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { findAllList } from '@/api/system/common'
export default {
name: 'strandedPersonnel',
extends: BaseTable,
@@ -93,23 +85,58 @@
return {
// 鎼滅储
searchForm: {
- companyId: '',
+ companyName: '',
name: '',
- code: '',
status: 2,
- type: 1
+ type: '1'
},
- options: []
+ user: []
}
},
created () {
this.config({
module: '浜哄憳淇℃伅琛�',
- api: '/business/member',
+ api: '/business/strandedPersonnel',
'field.id': 'id',
'field.main': 'id'
})
this.search()
+ this.getUser()
+ },
+ methods: {
+ // thaws () {
+ // if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ // const ids = this.tableData.selectedRows.map(item => {
+ // return { id: item.id }
+ // })
+ // this.thaw(ids)
+ // },
+ // thaw (ids) {
+ // this.$confirm('纭畾绉婚櫎姝ょ敤鎴峰悧?', '鎻愮ず', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning'
+ // }).then(() => {
+ // // updateRemoveStatusById(ids)
+ // // .then(res => {
+ // // this.$message.success('鎿嶄綔鎴愬姛')
+ // // this.search()
+ // // })
+ // }).catch(() => {
+ //
+ // })
+ // },
+ getUser () {
+ findAllList({})
+ .then(res => {
+ this.user = res.map(item => {
+ return {
+ name: item.realname,
+ id: item.id
+ }
+ })
+ })
+ }
}
}
</script>
diff --git a/admin/src/views/business/visitorManagement.vue b/admin/src/views/business/visitorManagement.vue
index 9ae6170..47fad08 100644
--- a/admin/src/views/business/visitorManagement.vue
+++ b/admin/src/views/business/visitorManagement.vue
@@ -34,7 +34,12 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎬у埆" min-width="100px"></el-table-column>
+ <el-table-column prop="phone" label="鎬у埆" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.sex === 1">鐢�</span>
+ <span v-if="row.sex === 2">濂�</span>
+ </template>
+ </el-table-column>
<el-table-column label="璇佷欢绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.idcardType === 0">韬唤璇�</span>
@@ -42,9 +47,9 @@
<span v-if="row.idcardType === 2">鎶ょ収</span>
</template>
</el-table-column>
- <el-table-column prop="idcardNo" label="韬唤璇佸彿" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardDecode" label="韬唤璇佸彿" width="150px"></el-table-column>
<el-table-column prop="companyName" label="鍏徃" min-width="100px"></el-table-column>
- <el-table-column prop="visitTimes" label="鎷滆娆℃暟" min-width="100px"></el-table-column>
+ <el-table-column prop="visitsCount" label="鎷滆娆℃暟" min-width="100px"></el-table-column>
<el-table-column prop="lastVisitDate" label="鏈�鍚庢嫓璁挎椂闂�" min-width="100px"></el-table-column>
</el-table>
<pagination
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index 6dfe77f..b0675bd 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -68,18 +68,17 @@
getData () {
getVisitConfigDTO({})
.then(res => {
- this.form.id = res.id
- this.form.checkVisit = res.VisitConfigParam.checkVisit
+ this.form.checkVisit = res.visitConfigParam.checkVisit
this.form.description = res.description
- this.form.healthCard = res.VisitConfigParam.healthCard
- this.form.isAnswer = res.VisitConfigParam.isAnswer
- this.form.reservationWay = res.VisitConfigParam.reservationWay
+ this.form.healthCard = res.visitConfigParam.healthCard
+ this.form.isAnswer = res.visitConfigParam.isAnswer
+ this.form.reservationWay = res.visitConfigParam.reservationWay
this.form.theme = res.theme
})
},
submit () {
updateVisitConfig({
- VisitConfigParam: {
+ visitConfigParam: {
isAnswer: this.form.isAnswer,
healthCard: this.form.healthCard,
checkVisit: this.form.checkVisit,
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 239a1ab..db138a5 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -48,20 +48,18 @@
<el-table-column prop="reason" label="鎷滆浜嬬敱" min-width="100px"></el-table-column>
<el-table-column label="鎷滆鏃堕棿" min-width="170px">
<template slot-scope="{row}">
- <span>璧凤細{{row.starttime}}</span>
+ <span>璧凤細{{row.starttime}}</span><br/>
<span>姝細{{row.endtime}}</span>
</template>
</el-table-column>
<el-table-column label="闅忚浜哄憳" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.visitsList && row.visitsList.length > 0">{{row.visitsList.length}}</span>
- <span>0</span>
+ <span>{{row.memberNum}}</span>
</template>
</el-table-column>
<el-table-column label="闅忚杞﹁締" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.carNos">{{row.carNos.split(',').length}}</span>
- <span>0</span>
</template>
</el-table-column>
<el-table-column prop="status" fixed="right" label="鐘舵��" min-width="100px">
@@ -78,12 +76,12 @@
<el-table-column
v-if="containPermissions(['business:visits:update', 'business:visits:delete'])"
label="鎿嶄綔"
- min-width="190"
+ min-width="100"
fixed="right"
>
<template slot-scope="{row}">
<el-button type="text" @click="$refs.OperaVisitsDesWindow.open('璇︽儏', row.id)" v-permissions="['business:visits:update']">鏌ョ湅璇︽儏</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">鏌ヨ瀹℃壒缁撴灉</el-button>
+<!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">鏌ヨ瀹℃壒缁撴灉</el-button>-->
</template>
</el-table-column>
</el-table>
diff --git a/admin/vue.config.js b/admin/vue.config.js
index f1d1370..7a891e9 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -11,9 +11,11 @@
proxy: {
[process.env.VUE_APP_API_PREFIX]: {
// http://192.168.0.130:10013
- // 192.168.0.110:10013 192.168.0.110:10013
+ // 192.168.0.110:10013
// http://192.168.0.101:10013
- // http://192.168.0.132:10013
+ // http://192.168.0.132:10013 浠诲悍
+ // http://192.168.0.110:10013 纾婄
+ // http://192.168.0.133:10013 甯呭摜
target: 'http://192.168.0.132:10013',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.3