第一期

src/api/system/device.js

@@ -42,4 +42,5 @@ export function delDevice(deviceId) {
         url: '/system/device/' + deviceId,
         method: 'delete'
     })
-}
+}
+

src/views/firmware/firmwareUpdate/index.vue

@@ -99,7 +99,7 @@
       <el-table :data="nodeOTAHistoryData">
         <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="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="createTimeStr" label="升级时间"></el-table-column>
       </el-table>

src/views/login.vue

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

src/views/system/user/index.vue

@@ -70,7 +70,7 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <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="dept.deptName" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />