fix(pad): 样式修改

pages/home/content.vue

@@ -294,8 +294,8 @@ export default {
 
       .bg-img {
         position: absolute;
-        right: -20px;
-        bottom: -10px;
+        right: 0px;
+        bottom: 0px;
         width: 160px;
         height: 150px;
         // z-index: -1;

pages/home/home.vue

@@ -23,7 +23,9 @@
       </view>
 
       <view class="button-group">
-        <view class="log-button" @click="lookLog">操作日志</view>
+        <!-- v-if="isAdmin" -->
+        <view 
+          class="log-button" @click="lookLog">操作日志</view>
         <view class="reset-password-button" @click="updatePassword"
           >修改密码？</view
         >
@@ -95,6 +97,11 @@ export default {
       userName: this.$store.state.now_user.user,
     };
   },
+  computed: {
+    isAdmin(){
+      return this.$store.state.now_user.isAdmin
+    }
+  },
   onLoad(options = {}) {
     // options就是路由参数，它是一个对象
     // this.tabIndex = ;
@@ -172,8 +179,11 @@ export default {
       display: flex;
       flex-direction: column;
       align-items: center;
+      justify-content: flex-end;
+      height: 72px;
+    
+      // border: 1px solid;
       .user-img {
-        margin: 12px 0;
         height: 48px;
         width: 48px;
         border-radius: 50%;
@@ -188,7 +198,7 @@ export default {
       }
     }
     .tab-list {
-      flex: 1;
+      height: 58vh;
       display: flex;
       flex-direction: column;
       justify-content: space-around;

pages/inspection/inspFirst.vue

@@ -106,8 +106,8 @@ export default {
         inspectionCode: `JFXJ${moment().format("yyyyMMDDhhmmss")}`,
         recordName: `${moment().format("yyyyMMDDhhmmss")}-机房巡检记录`,
         inspectionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
-        inspectionBy: this.$store.state.now_user.name,
-        inspectionById: this.$store.state.now_user.id,
+        inspectionBy: this.$store.state.now_user.user,
+        inspectionById: this.$store.state.now_user.userId,
         createByName: this.$store.state.now_user.user,
         isException: "", // 是否有异常
         position: "", // 位置

pages/inspectionContent/inspectionContent.vue

@@ -312,6 +312,7 @@ export default {
     //--弹出对话框
     dialogInputConfirm2() {
       const all_data = this.$store.state.all_data;
+      const baseInfo = this.baseInfo
       const detailsInfo = this.detailsInfo;
       const tempAllData = all_data.filter(
         (element) => element.uid != detailsInfo.uid
@@ -336,10 +337,10 @@ export default {
       const log_list = this.$store.state.log_list;
       const logContent = getLogContent(
         LOG_TYPE_ENUM.delete,
-        `${detailsInfo.recordName}(${detailsInfo.inspectionCode})`,
+        `${baseInfo.recordName}(${baseInfo.inspectionCode})`,
         "巡检模块"
       );
-      logContent.inspectionType = detailsInfo.inspectionType;
+      logContent.inspectionType = baseInfo.inspectionType;
       log_list.push(logContent);
       this.$store.commit("SET_LOG_LIST", log_list);
 

pages/login/login.vue

@@ -140,7 +140,7 @@ export default {
               // console.log("--last_time----",userInfo.loginTime)
 
               // 更新用户登陆时间
-              const loginTime = moment().format("yyyy-MM-DD HH:mm:ss");
+              const loginTime = moment().format("yyyy-MM-DD");
               this.personList[key].loginTime = loginTime;
               userInfo.loginTime = loginTime;