Skip to content
This repository has been archived by the owner on May 4, 2023. It is now read-only.

新增location的管理页面 #20

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

新增location的管理页面 #20

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b30da7a
1. 后台管理中，添加tab
Jun 20, 2019
0999d9d
1. 后台管理中，添加tab
Jun 20, 2019
3f1d2a7
升级vue
Jun 20, 2019
5b52db3
回滚ele和vue版本
Jun 20, 2019
3e69aae
1. 驼峰改为下划线写法
Jun 21, 2019
4ffc2c4
provider_ip 接受值原先为 127.0.0.1 改为 127.0.0.1/24
Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 199 additions & 30 deletions templates/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,114 @@

{% block content %}
<div class="container">
<div style="margin: 10px 0px">
接口 <a href="/api/v1/admins">/api/v1/admins</a>
</div>
<div>
<form class="form-inline" @submit.prevent="addAdmin">
<div class="form-group">
<label style="margin-right: 1em">用户邮箱</label>
<input style="margin-right: 1em" v-model="formEmail" placeholder="email ..." class="form-control">
<button class="btn btn-success">新增管理员</button>
</div>
</form>
<br>
<table class="table">
<thead>
<tr>
<th>邮箱</th>
<th>用户名</th>
<th>上次登录时间</th>
</tr>
</thead>
<tbody>
<tr v-for="u in users">
<td v-text="u.email"></td>
<td v-text="u.username"></td>
<td v-text="u.lastLoggedInAt"></td>
</tr>
</tbody>
</table>
</div>
<el-tabs v-model="tabActiveName" @tab-click="handleGetLocation">
<el-tab-pane label="管理员管理" name="admin">
<div style="margin: 10px 0px">
接口 <a href="/api/v1/admins">/api/v1/admins</a>
</div>
<div>
</div>
<div>
<form class="form-inline" @submit.prevent="addAdmin">
<div class="form-group">
<label style="margin-right: 1em">用户邮箱</label>
<input style="margin-right: 1em" v-model="formEmail" placeholder="email ..." class="form-control">
<button class="btn btn-success">新增管理员</button>
</div>
</form>
<br>
<table class="table">
<thead>
<tr>
<th>邮箱</th>
<th>用户名</th>
<th>上次登录时间</th>
</tr>
</thead>
<tbody>
<tr v-for="u in users">
<td v-text="u.email"></td>
<td v-text="u.username"></td>
<td v-text="u.lastLoggedInAt"></td>
</tr>
</tbody>
</table>
</div>
</el-tab-pane>
<el-tab-pane label="设备-所在地管理" name="dept">
<el-button
size="mini"
type="primary"
@click="openNewLocationDialog"
>新建
</el-button>

<el-table
:data="eqtLocationDatas"
stripe
element-loading-text="大爷稍等片刻哟~~~"
border
style="width: 100%; margin-top: 20px"
size="small"
:header-cell-style="tableHeaderColor"
>
<el-table-column
prop="location"
label="设备所在地 or 所在机器">
</el-table-column>
<el-table-column
prop="providerIP"
label="机器的IP（如果是USB链接的话）">
</el-table-column>
<el-table-column
label="操作">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
circle
@click="openEditLocationDialog(scope.$index, scope.row)"
>
</el-button
>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
circle
@click="handleDeleteLocation(scope.$index, scope.row)"
>
</el-button
>
</template>
</el-table-column>
</el-table>

</el-tab-pane>
</el-tabs>




</div>
<el-dialog :title="locationOperTitle" :visible.sync="dialogTableVisible">
<el-form :model="form">
<el-form-item label="所在地 or 所在机器名称" >
<el-input v-model="form.location"></el-input>
</el-form-item>
<el-form-item label="所在机器IP（USB插在哪个机器上）">
<el-input v-if="locationOperAction === 'new'" v-model="form.providerIP"></el-input>
<el-input v-else :disabled="true" v-model="form.providerIP"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogTableVisible = false">取 消</el-button>
<el-button v-if="locationOperAction === 'new'" type="primary" @click="handleNewLocation">确 定</el-button>
<el-button v-else="locationOperAction === 'edit'" type="primary" @click="handleEditLocation">保 存</el-button>
</div>
</el-dialog>

{% end %}

{% block script %}
Expand All @@ -49,9 +127,20 @@
new Vue({
el: "#app",
data: Object.assign({
locationOperTitle: '',
locationOperAction : '',
dialogTableVisible: false,
tabActiveName: "admin",
formEmail: "",
users: [],
token: "",
form:{
"location": "",
"providerIP":"",
"id":""
},
eqtLocationDatas:[
]
}, ret),
methods: {
addAdmin() {
Expand All @@ -65,7 +154,87 @@
console.log(ret)
this.$message("添加成功")
})
}
},
tableHeaderColor ({row, column, rowIndex, columnIndex}) {
if (rowIndex === 0) {
return 'background-color: #D2E9FF;'
}
},
openNewLocationDialog(){
let that = this
that.locationOperAction = 'new'
that.locationOperTitle = '新建'
that.dialogTableVisible = true
},
openEditLocationDialog(index, row){
let that = this
that.locationOperAction = 'edit'
that.locationOperTitle = '编辑'
that.form.location = row.location
that.form.providerIP = row.providerIP
that.form.id = row.id
that.dialogTableVisible = true
},
handleNewLocation(){
let that = this
$.ajax({
url: "/api/v1/location",
method: "post",
data: JSON.stringify({
location: that.form.location,
providerIP: that.form.providerIP
})
}).then(ret => {
console.log(ret)
this.$message("添加成功")
that.dialogTableVisible = false
that.handleGetLocation({'name':'dept'})
})

},
handleGetLocation(value){
let that = this
if(value.name === 'dept'){
$.ajax({
url: "/api/v1/location",
method: "get"
}).then(ret => {
that.eqtLocationDatas = ret.location
console.log(ret)
})
}
},
handleEditLocation(){
let that = this
$.ajax({
url: "/api/v1/location/" + that.form.providerIP,
method: "put",
data: JSON.stringify({
location: that.form.location,
providerIP: that.form.providerIP
})
}).then(ret => {
console.log(ret)
this.$message("编辑成功")
that.dialogTableVisible = false
that.handleGetLocation({'name':'dept'})
})


},
handleDeleteLocation(index, row){
let that = this
$.ajax({
url: "/api/v1/location/" + row.providerIP,
method: "delete",
}).then(ret => {
console.log(ret)
this.$message("删除成功")
that.handleGetLocation({'name':'dept'})
})

},

}
})
})
Expand Down
57 changes: 32 additions & 25 deletions templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<el-button size="mini" disabled>设备离线</el-button>
</template>
<template v-else-if='"colding" == scope.row.status'>
<el-button disabled :loading="true" size="mini" type="primary">释放中</span>
<el-button disabled :loading="true" size="mini" type="primary">释放中</el-button>
</template>
<template v-else-if='"busy" == scope.row.status'>
<el-button :title="scope.row.userId" style="cursor: not-allowed; background: #f3d19e" size="mini"
Expand Down Expand Up @@ -131,14 +131,10 @@
</template>
</el-table-column>

<el-table-column :sort-method="tableSortBy('department')" sortable label="所属部门">
<template slot-scope="scope">
<!-- <el-input size="mini"></el-input> -->
<atx-edit-inline :readonly="!user.admin" :value="scope.row.department"
@change="updateDeviceDepartment(scope.row.udid, $event)">
</atx-edit-inline>
<!-- <span v-text="prop_propertyId"></span> <i class="fas fa-edit cursor-pointer"></i> -->
</template>
<el-table-column :sort-method="tableSortBy('location')" sortable label="所属部门(机器)" >
<template slot-scope="scope">
<span v-text="scope.row.locationProperties.location || scope.row.locationProperties.providerIP"></span>
</template>
</el-table-column>

<!-- <el-table-column prop="prop_brand" label="品牌"></el-table-column> -->
Expand All @@ -165,6 +161,7 @@
new Vue({
el: "#app",
data: Object.assign({
locationOptions: [],
websocketDisconnected: false,
user: {
name: currentUserName,
Expand All @@ -186,6 +183,7 @@
}, { "devices": ret.devices }),
computed: {
tableData() {
let that = this
let devices = this.orderedDevices.map(v => {
for (const key in v.properties) {
if (v.properties.hasOwnProperty(key)) {
Expand All @@ -196,10 +194,22 @@
v['display_size'] = display.width + "x" + display.height;
return v;
})

const fp = this.filters.platform
if (Object.values(fp).some(b => b)) {
devices = devices.filter(v => fp[v.platform])
}

// 将手机中的location字段，和实际维护的location表做匹配并转换

for(let i=0; i < devices.length; i++){
xuweijiaFrank marked this conversation as resolved.
Show resolved Hide resolved
for(let j=0; j < that.locationOptions.length; j++){
if(devices[i]['locationProperties']['providerIP'] === that.locationOptions[j]['providerIP']){
devices[i]['locationProperties']['location'] = that.locationOptions[j]['location']
}

}
}
return devices;
},
orderedDevices() {
Expand Down Expand Up @@ -340,22 +350,6 @@
}
})
},
updateDeviceDepartment(udid, text) { // admin required
$.ajax({
url: "/api/v1/devices/" + udid,
method: "put",
contentType: "application/json",
data: JSON.stringify({
"department": text,
})
}).fail(ret => {
if (ret.status == 400) {
this.$message.error(ret.responseJSON.description)
} else {
this.$message.error(ret.responseText)
}
})
},
formatTimeUsed() {
// let duration = moment(this.finishedAt) - moment(this.createdAt);
// return moment.utc(duration).format('HH:mm:ss')
Expand Down Expand Up @@ -422,6 +416,17 @@
event.preventDefault()
}
console.log(device.udid)
},
getLocationOptions(){
let that = this
$.ajax({
url: "/api/v1/location",
method: "get"
}).then(ret => {
that.locationOptions = ret.location
console.log(ret)
{#this.$message("获取成功")#}
})
}
},
components: {
Expand Down Expand Up @@ -470,6 +475,8 @@
let wsURL = scheme + "://" + location.host + "/websocket/devicechanges";
let ws = new WebSocket(wsURL);
let refreshKey = null;
this.getLocationOptions()

ws.onopen = (evt) => {
console.log("Websocket Connected")
refreshKey = setInterval(() => {
Expand Down
Loading