zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

This commit is contained in:
shijing 2022-09-15 16:50:47 +08:00
parent ec11e30e41 e865a3d45a
commit a0c03ac24d
6 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -8,8 +8,8 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
#VUE_APP_WS_API = 'ws://localhost:8000'
VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
VUE_APP_BASEURL = http://127.0.0.1:8000
VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
#VUE_APP_BASEURL = http://127.0.0.1:8000
# 本地端口

23
src/views/ops/log_request.vue
View File

@ -1,13 +1,24 @@
<template>
<el-container>
<el-header>
<div class="left-panel"></div>
<div class="left-panel">
<el-date-picker
v-model="timeRange"
type="datetimerange"
range-separator="至"
start-placeholder="请求时间始"
end-placeholder="请求时间止"
value-format="YYYY-MM-DD HH:mm:ss"
@change="handleQuery"
clearable
/>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input
v-model="query.id"
placeholder="logId"
clearable
@keyup.enter="handleQuery"
></el-input>
<el-button
type="primary"
@ -97,6 +108,7 @@ export default {
data() {
return {
apiObj: this.$API.ops.logs.list,
timeRange: [],
query: {},
logLists: [],
infoDrawer: false,
@ -106,6 +118,13 @@ export default {
mounted() {},
methods: {
handleQuery() {
if(this.timeRange){
this.query.start_request = this.timeRange[0]
this.query.end_request = this.timeRange[1]
}else{
this.query.start_request = null
this.query.end_request = null
}
this.$refs.table.queryData(this.query);
},
resetQuery() {

9
src/views/rpm/rparty.vue
View File

@ -32,7 +32,7 @@
>
<el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="名称" prop="name" width="180"></el-table-column>
<el-table-column label="名称" prop="name" width="220"></el-table-column>
<el-table-column label="信用代码" prop="number" width="180">
</el-table-column>
<el-table-column
@ -50,8 +50,11 @@
></el-table-column> -->
<el-table-column
label="管理员"
prop="admin_username"
></el-table-column>
>
<template #default="scope">
<span v-if="scope.row.admin">{{ scope.row.admin_.name }}-{{scope.row.admin_.phone}}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="left" width="200">
<template #default="scope">

2
src/views/rpm/rpj_show.vue
View File

@ -92,7 +92,7 @@
type="primary"
size="small"
@click="bindCard(scope.row,10)"
v-auth="'visit.update'"
v-auth="'blt_bind.create'"
>绑卡
</el-button>
</template>

2
src/views/vm/visit_detial.vue
View File

@ -94,7 +94,7 @@
type="primary"
size="small"
@click="bindCard(scope.row,10)"
v-auth="'visit.update'"
v-auth="'blt_bind.create'"
>绑卡
</el-button>
</template>

12
src/views/vm/visitor.vue
View File

@ -6,7 +6,6 @@
type="primary"
icon="el-icon-plus"
@click="handleForm('add')"
v-auth="'visit.create'"
></el-button>
<!--
<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
@ -44,27 +43,24 @@
<sc-upload v-model="scope.row.photo" :disabled="true" width="70" height="80"></sc-upload>
</template>
</el-table-column>
<!-- <el-table-column label="操作" fixed="right" align="left" width="170">
<el-table-column label="操作" fixed="right" align="left" width="170">
<template #default="scope">
<el-button
link
type="warning"
size="small"
@click="handleForm('edit', scope.row)"
v-auth="'visit.update'"
>编辑</el-button
@click="handleForm('edit', scope.row)">编辑</el-button
>
<el-popconfirm
title="确定删除该访客吗？"
@confirm="delVisitor(scope.row)"
>
<template #reference>
<el-button link type="danger" size="small"
v-auth="'visit.delete'">删除</el-button>
<el-button link type="danger" size="small">删除</el-button>
</template>
</el-popconfirm>
</template>
</el-table-column> -->
</el-table-column>
</scTable>
</el-main>
</el-container>