cxc/rn-bms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

第一期

Browse Source
This commit is contained in:
hh
2021-03-24 15:59:43 +08:00
parent 4d8c510d4d
commit 6255eb9246
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/system/device.js
View File

@ -43,3 +43,4 @@ export function delDevice(deviceId) {
method: 'delete' method: 'delete'
}) })
} }

2
src/views/firmware/firmwareUpdate/index.vue
View File

@ -99,7 +99,7 @@
<el-table :data="nodeOTAHistoryData"> <el-table :data="nodeOTAHistoryData">
<el-table-column align="center" prop="deviceId" label="设备SN"></el-table-column> <el-table-column align="center" prop="deviceId" label="设备SN"></el-table-column>
<el-table-column align="center" prop="nodeId" label="节点SN"></el-table-column> <el-table-column align="center" prop="nodeId" label="节点SN"></el-table-column>
<el-table-column align="center" prop="nowVersion" label="节点当前版本"></el-table-column> <el-table-column align="center" prop="newVersion" label="节点当前版本"></el-table-column>
<el-table-column align="center" prop="oldVersion" label="节点上次版本"></el-table-column> <el-table-column align="center" prop="oldVersion" label="节点上次版本"></el-table-column>
<el-table-column align="center" prop="createTimeStr" label="升级时间"></el-table-column> <el-table-column align="center" prop="createTimeStr" label="升级时间"></el-table-column>
</el-table> </el-table>

8
src/views/login.vue
View File

@ -96,8 +96,10 @@ export default {
codeUrl: "", codeUrl: "",
cookiePassword: "", cookiePassword: "",
loginForm: { loginForm: {
username: "admin", username: "",
password: "admin123", password: "",
// username: "admin",
// password: "admin123",
rememberMe: false, rememberMe: false,
code: "", code: "",
uuid: "", uuid: "",
@ -135,7 +137,7 @@ export default {
this.codeUrl = "data:image/gif;base64," + res.img; this.codeUrl = "data:image/gif;base64," + res.img;
this.loginForm.uuid = res.uuid; this.loginForm.uuid = res.uuid;
// 自动填充验证码 // 自动填充验证码
this.loginForm.code = res.codes.split('@').pop() +''; // this.loginForm.code = res.codes.split('@').pop() +'';
}); });
}, },
getCookie() { getCookie() {

2
src/views/system/user/index.vue
View File

@ -70,7 +70,7 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户编号" align="center" prop="userId" /> <el-table-column label="用户编号" align="center" prop="userId" />
<el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" /> <el-table-column label="用户账号" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" /> <el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" prop="dept.deptName" :show-overflow-tooltip="true" /> <el-table-column label="部门" align="center" prop="dept.deptName" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" prop="phonenumber" width="120" /> <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />

3
vue.config.js
View File

@ -34,7 +34,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://47.115.73.110:8080`, target: `http://192.168.99.118:8080`,
// target: `http://47.115.73.110:8080`,
// target: `http://121.37.250.170:8080`, // target: `http://121.37.250.170:8080`,
// target: `http://192.168.0.129:8080`, // target: `http://192.168.0.129:8080`,
// target: `http://192.168.0.131:8080`, // target: `http://192.168.0.131:8080`,