From 0d008a06894ae1adc178e45a5b42bf86b3d8dd49 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 1 Jun 2023 09:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/toast.vue                               | 5 ++---
 src/config/getData2.js                                 | 4 +---
 src/pages/modules/login/login.vue                      | 2 +-
 src/pages/modules/systemmanage/developer.vue           | 6 ++++++
 src/pages/modules/systemmanage/role.vue                | 3 +++
 src/pages/modules/teach/teach.vue                      | 4 +++-
 src/pages/modules/vehicleinformation/vehiclestatus.vue | 9 ++++++++-
 src/pages/shells/index/index.vue                       | 7 ++++---
 src/vuex/modules/com.js                                | 2 +-
 9 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/components/toast.vue b/src/components/toast.vue
index ff347af..fa51c83 100644
--- a/src/components/toast.vue
+++ b/src/components/toast.vue
@@ -25,14 +25,13 @@ export default {
   .toast-wrap
     position fixed
     z-index 10001
-    width 100%
-    height 48px
+    width 90%
+    min-height 48px
     text-align center
     left 50%
     top 50%
     transform translate(-50%, -50%)
     .text
-      height 48px
       line-height 18px
       display inline-block
       width auto
diff --git a/src/config/getData2.js b/src/config/getData2.js
index 26c334d..4d08781 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -119,9 +119,7 @@ export const paramEdit = (id, code, name, value, remark) => post('api/param/edit
   remark: remark
 })
 // 1.4 删除参数
-export const paramDelete = (paramsIds) => post('api/param/delete', {
-  paramsIds: paramsIds
-})
+export const paramDelete = (paramsIds) => post('api/param/delete', paramsIds)
 
 // 修改密码
 export const updatePass = (newPass, oldPass) => post('api/users/updatePass', {
diff --git a/src/pages/modules/login/login.vue b/src/pages/modules/login/login.vue
index 4b38238..b0e4a4c 100644
--- a/src/pages/modules/login/login.vue
+++ b/src/pages/modules/login/login.vue
@@ -23,7 +23,7 @@
           </div>
           <div class="login-setup-wraper">
             <div class="setup-info pointer" @click="toSetup">配置信息</div>
-            <router-link to="/home">忘记密码</router-link>
+            <!-- <router-link to="/home">忘记密码</router-link> -->
           </div>
           <div class="login-buttons-wraper">
             <button class="button button--primary button-login" :disabled="disabled" @click="saveLogin">登录</button>
diff --git a/src/pages/modules/systemmanage/developer.vue b/src/pages/modules/systemmanage/developer.vue
index cb3a8d9..0d608ed 100644
--- a/src/pages/modules/systemmanage/developer.vue
+++ b/src/pages/modules/systemmanage/developer.vue
@@ -128,6 +128,7 @@ export default {
 <style lang="stylus" scoped>
 @import '~@style/mixin'
 .tabs_container
+  _wh(100%,100%)
   background #fff
   border 1px solid #dcdfe6
   box-shadow 0 2px 4px 0 rgba(0,0,0,.12), 0 0 6px 0 rgba(0,0,0,.04)
@@ -169,9 +170,14 @@ export default {
   border-right-color: #dcdfe6;
   border-left-color: #dcdfe6;
 .tabs_content
+  _wh(100%, calc(100% - 39px))
   overflow: hidden;
   position: relative;
   padding: 15px;
 .tab_pane
+  _wh(100%,100%)
   _font(16px, 28px, #323232,,)
+  white-space pre-line
+  word-break break-all
+  overflow-y auto
 </style>
diff --git a/src/pages/modules/systemmanage/role.vue b/src/pages/modules/systemmanage/role.vue
index 4f6d74a..0a04cb1 100644
--- a/src/pages/modules/systemmanage/role.vue
+++ b/src/pages/modules/systemmanage/role.vue
@@ -254,6 +254,9 @@ export default {
       }
     },
     toSave () {
+      if (!this.pkId) {
+        return
+      }
       let arr = this.$refs.tree.getCheckedKeys()
       let arr1 = []
       arr.map(el => {
diff --git a/src/pages/modules/teach/teach.vue b/src/pages/modules/teach/teach.vue
index 815775c..db6c7b8 100644
--- a/src/pages/modules/teach/teach.vue
+++ b/src/pages/modules/teach/teach.vue
@@ -13,7 +13,9 @@
   _wh(100%, 100%)
 .iframe
   position absolute
-  top -70px
+  top -160px
   left 0
   _wh(100%, 100%)
+>>>.body-conatiner
+  padding-top 0
 </style>
diff --git a/src/pages/modules/vehicleinformation/vehiclestatus.vue b/src/pages/modules/vehicleinformation/vehiclestatus.vue
index b4b6411..d61c5f7 100644
--- a/src/pages/modules/vehicleinformation/vehiclestatus.vue
+++ b/src/pages/modules/vehicleinformation/vehiclestatus.vue
@@ -16,7 +16,7 @@
       </div>
       <div class="state_wrap">
         <div class="state_tip">传感器状态</div>
-        <div class="state_content">
+        <div class="state_content state_content__h2">
           <div class="state_item_2" :class="result1.stopButton_status === '0' ? 'site_btn_disabled' : 'site_btn_active'">
             <span class="state_item_2_dot"></span>
             <span class="state_item_2_txt">急停按钮</span>
@@ -163,4 +163,11 @@ export default {
   opacity 1
   .state_item_2_dot
     background-color #00c852
+.state_content__h2
+  height auto
+.state_item_3_txt1
+  width 170px
+.state_item_3_txt2
+  width calc(100% - 170px)
+  word-break break-all
 </style>
diff --git a/src/pages/shells/index/index.vue b/src/pages/shells/index/index.vue
index e98bbc4..64d864c 100644
--- a/src/pages/shells/index/index.vue
+++ b/src/pages/shells/index/index.vue
@@ -15,8 +15,8 @@
             <div class="state-item">运行</div>
             <div class="state-line"></div>
             <div class="state-item">自动</div>
-            <div class="state-line"></div>
-            <div class="state-item">中文&nbsp;<i class="icon_dropdown"></i></div>
+            <!-- <div class="state-line"></div> -->
+            <!-- <div class="state-item">中文&nbsp;<i class="icon_dropdown"></i></div> -->
           </div>
         </div>
         <div class="header_user_wraper">
@@ -94,6 +94,7 @@
 import jxTime from '@components/time.vue'
 import jxDialog from '@components/dialog.vue'
 import { updatePass } from '@config/getData2.js'
+import {encrypt} from '../../../main.js'
 export default {
   components: {
     jxTime,
@@ -282,7 +283,7 @@ export default {
         return
       }
       try {
-        let res = await updatePass(this.newpassword1, this.oldpassword)
+        let res = await updatePass(encrypt(this.newpassword1), encrypt(this.oldpassword))
         this.toast(res.desc)
         this.$refs.child.active = false
         this.$refs.child.disabled = false
diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js
index 12e0526..f8d308c 100644
--- a/src/vuex/modules/com.js
+++ b/src/vuex/modules/com.js
@@ -1,7 +1,7 @@
 import * as types from '../types'
 import { getStore, setStore } from '@config/utils.js'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://43.139.166.161:8018' : 'http://43.139.166.16:8018'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://43.139.166.161:8018' : 'http://43.139.166.161:8018'
 const setTime = '5000'
 const state = {
   baseUrl: getStore('baseUrl') || baseUrl,