xujingliang
/
Lin_Ye_Fang_Huo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并代码

master
徐景良 2023-10-10 17:03:33 +08:00
parent 17c9c66d91
commit 0be6d3d657
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.env.prod
View File

@ -16,14 +16,14 @@ VUE_APP_OIDC_SILENTREDIRECTURI = http://demo.openauth.me:1803/silent-renew-oidc.
#VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224 #VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224
# 1240服务器http接口 # 1240服务器http接口
#VUE_APP_BASE_API = http://123.132.248.154:9231/api VUE_APP_BASE_API = http://123.132.248.154:9231/api
#VUE_APP_BASE_IMG_URL = http://123.132.248.154:9231 VUE_APP_BASE_IMG_URL = http://123.132.248.154:9231
#VUE_APP_WEBSOCKET_URL = ws://123.132.248.154:9225/ws VUE_APP_WEBSOCKET_URL = ws://123.132.248.154:9225/ws
# 费县服务器https接口 # 费县服务器https接口
VUE_APP_BASE_API = https://py.hopetrytech.com:7001/api #VUE_APP_BASE_API = https://py.hopetrytech.com:7001/api
VUE_APP_BASE_IMG_URL = https://py.hopetrytech.com:7001 #VUE_APP_BASE_IMG_URL = https://py.hopetrytech.com:7001
VUE_APP_WEBSOCKET_URL = wss://py.hopetrytech.com:7002/ws #VUE_APP_WEBSOCKET_URL = wss://py.hopetrytech.com:7002/ws
#VUE_APP_BASE_API = http://221.2.83.254:7001/api #VUE_APP_BASE_API = http://221.2.83.254:7001/api
#VUE_APP_BASE_IMG_URL = http://221.2.83.254:7001 #VUE_APP_BASE_IMG_URL = http://221.2.83.254:7001

4
src/views/home/widget/socketdiabox.vue
View File

@ -99,10 +99,10 @@ export default {
if(obj.Module){ if(obj.Module){
_this.pointData = [] _this.pointData = []
if(obj.Module == '人员信息' || obj.Module == '对讲机信息'){ if(obj.Module == '人员信息' || obj.Module == '对讲机信息'){
_this.getPointer(obj.Module) // _this.getPointer(obj.Module)
} }
if(obj.Module == '上线' || obj.Module == '下线'){ if(obj.Module == '上线' || obj.Module == '下线'){
_this.getOnLineInfo() // _this.getOnLineInfo()
} }
} }

23
src/views/home/widget/taskDelivery.vue
View File

@ -16,25 +16,20 @@
<div class="inputer"> <div class="inputer">
<span style="float:left;margin-left:12px;">接收人员：</span> <span style="float:left;margin-left:12px;">接收人员：</span>
<div class="" style="float:left;width:420px;"> <div class="" style="float:left;width:420px;">
<!-- <el-select
v-model="checkedUsers"
multiple
filterable
allow-create
default-first-option
size="mini"
style="width:100%;max-height:50px;overflow-y: auto;"
placeholder="请选择任务接收人员">
</el-select> -->
<!-- <el-input size="mini" v-model="listQuery.name" placeholder="请输入搜索人员名称" ></el-input> -->
<el-input size="mini" v-model="listQuery.name" placeholder="请输入搜索人员名称" style="width:330px;"></el-input>
<el-button icon="el-icon-search" type="primary" size="mini" style="margin-left:15px;" @click="getUserList">查询</el-button>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
size="mini" size="mini"
:data="list" :data="list"
tooltip-effect="dark" tooltip-effect="dark"
height="160px" height="200px"
style="width: 100%;margin-top:12px;" style="width: 100%;margin-top:12px;"
row-key="id"
:reserve-selection="true"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
@ -421,4 +416,8 @@
::v-deep .el-table th, .el-table tr{ ::v-deep .el-table th, .el-table tr{
background:none; background:none;
} }
::v-deep .el-table__body-wrapper .is-scrolling-none{
overflow:hidden;
}
</style> </style>