登录样式修改

vite-element-template/.env

@@ -1,2 +0,0 @@
-VITE_APP_COMPANY=asdzxcasdzxc
-

vite-element-template/.env.development

@@ -1,6 +1,6 @@
 # base api
 VITE_APP_BASE_API=/api
 VITE_APP_WVP_API=/wvp
-VITE_APP_PLAY_PORT=8090
-VITE_APP_BASE_URL=http://192.168.0.129:8890/cc-admin
+VITE_APP_PLAY_API=/play
+VITE_APP_BASE_URL=http://192.168.0.151:2694/cc-admin
 VITE_APP_WVP_URL=http://127.0.0.1:18899

vite-element-template/.env.production

@@ -1,4 +1,3 @@
-# base api
-VITE_APP_BASE_API=/cc-admin
-
-VITE_APP_BASE_URL=http://222.128.25.216:4050
+VITE_APP_BASE_API=/api
+VITE_APP_WVP_API=/wvp
+VITE_APP_PLAY_API=/play

vite-element-template/src/components/common/player.vue

@@ -1,44 +1,101 @@
 <template>
   <div
-ref="container" class="container"
-    style="width: 100%; height: 100%; background-color: #000000; margin: 0 auto" @dblclick="fullscreenSwich">
+    ref="container"
+    class="container"
+    style="width: 100%; height: 100%; background-color: #000000; margin: 0 auto"
+    @dblclick="fullscreenSwich"
+  >
     <div id="buttonsBox" class="buttons-box">
       <div class="buttons-box-left">
-        <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
-        <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i>
+        <i
+          v-if="!playing"
+          class="iconfont icon-play jessibuca-btn"
+          @click="playBtnClick"
+        ></i>
+        <i
+          v-if="playing"
+          class="iconfont icon-pause jessibuca-btn"
+          @click="pause"
+        ></i>
         <i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i>
       </div>
       <div class="buttons-box-right">
-        <i class="iconfont icon-shuaxin11 jessibuca-btn" @click="playBtnClick"></i>
-        <i v-if="!fullscreen" class="iconfont icon-weibiaoti10 jessibuca-btn" @click="fullscreenSwich"></i>
-        <i v-if="fullscreen" class="iconfont icon-weibiaoti11 jessibuca-btn" @click="fullscreenSwich"></i>
+        <i
+          class="iconfont icon-shuaxin11 jessibuca-btn"
+          @click="playBtnClick"
+        ></i>
+        <i
+          v-if="!fullscreen"
+          class="iconfont icon-weibiaoti10 jessibuca-btn"
+          @click="fullscreenSwich"
+        ></i>
+        <i
+          v-if="fullscreen"
+          class="iconfont icon-weibiaoti11 jessibuca-btn"
+          @click="fullscreenSwich"
+        ></i>
       </div>
     </div>
     <div v-if="ptzControl" class="ptzControl" @dblclick.stop>
       <div class="control-wrapper">
         <template>
           <div
-ref="tooltipWrap" class="control-btn control-top" @mousedown="ptzCamera('up')"
-            @mouseup="ptzCamera('stop')">
-            <el-tooltip class="item" effect="dark" content="向上移动" placement="top-start">
+            ref="tooltipWrap"
+            class="control-btn control-top"
+            @mousedown="ptzCamera('up')"
+            @mouseup="ptzCamera('stop')"
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="向上移动"
+              placement="top-start"
+            >
               <i class="el-icon-caret-top"></i>
             </el-tooltip>
             <div class="control-inner-btn control-inner"></div>
           </div>
-          <div class="control-btn control-left" @mousedown="ptzCamera('left')" @mouseup="ptzCamera('stop')">
-            <el-tooltip class="item" effect="dark" content="向左移动" placement="left-start">
+          <div
+            class="control-btn control-left"
+            @mousedown="ptzCamera('left')"
+            @mouseup="ptzCamera('stop')"
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="向左移动"
+              placement="left-start"
+            >
               <i class="el-icon-caret-left"></i>
             </el-tooltip>
             <div class="control-inner-btn control-inner"></div>
           </div>
-          <div class="control-btn control-bottom" @mousedown="ptzCamera('down')" @mouseup="ptzCamera('stop')">
-            <el-tooltip class="item" effect="dark" content="向下移动" placement="bottom-start">
+          <div
+            class="control-btn control-bottom"
+            @mousedown="ptzCamera('down')"
+            @mouseup="ptzCamera('stop')"
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="向下移动"
+              placement="bottom-start"
+            >
               <i class="el-icon-caret-bottom"></i>
             </el-tooltip>
             <div class="control-inner-btn control-inner"></div>
           </div>
-          <div class="control-btn control-right" @mousedown="ptzCamera('right')" @mouseup="ptzCamera('stop')">
-            <el-tooltip class="item" effect="dark" content="向右移动" placement="right-start">
+          <div
+            class="control-btn control-right"
+            @mousedown="ptzCamera('right')"
+            @mouseup="ptzCamera('stop')"
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="向右移动"
+              placement="right-start"
+            >
               <i class="el-icon-caret-right"></i>
             </el-tooltip>
             <div class="control-inner-btn control-inner"></div>
@@ -51,22 +108,65 @@ ref="tooltipWrap" class="control-btn control-top" @mousedown="ptzCamera('up')"
         </template>
 
         <div
-style="position: absolute; left: 8.25rem; top: 0rem; color: #78aee4" @mousedown="ptzCamera('zoomin')"
-          @mouseup="ptzCamera('stop')">
-          <el-tooltip class="item" effect="dark" content="放大" placement="right">
-            <i class="el-icon-zoom-in control-zoom-btn" style="font-size: 1.875rem"></i>
+          style="position: absolute; left: 8.25rem; top: 0rem; color: #78aee4"
+          @mousedown="ptzCamera('zoomin')"
+          @mouseup="ptzCamera('stop')"
+        >
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="放大"
+            placement="right"
+          >
+            <i
+              class="el-icon-zoom-in control-zoom-btn"
+              style="font-size: 1.875rem"
+            ></i>
           </el-tooltip>
         </div>
         <div
-style="position: absolute; left: 8.25rem; top: 4rem; font-size: 1.875rem; color: #78aee4"
-          @mousedown="ptzCamera('zoomout')" @mouseup="ptzCamera('stop')">
-          <el-tooltip class="item" effect="dark" content="缩小" placement="right">
+          style="
+            position: absolute;
+            left: 8.25rem;
+            top: 4rem;
+            font-size: 1.875rem;
+            color: #78aee4;
+          "
+          @mousedown="ptzCamera('zoomout')"
+          @mouseup="ptzCamera('stop')"
+        >
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="缩小"
+            placement="right"
+          >
             <i class="el-icon-zoom-out control-zoom-btn"></i>
           </el-tooltip>
         </div>
-        <el-tooltip class="item" effect="dark" content="移动速度控制" placement="top">
-          <div class="contro-speed" style="position: absolute; left: 100px; top: 0rem; width: 1rem; height: 7rem">
-            <el-slider v-model="controSpeed" vertical height="6rem" :max="100" type="vertical"></el-slider>
+        <el-tooltip
+          class="item"
+          effect="dark"
+          content="移动速度控制"
+          placement="top"
+        >
+          <div
+            class="contro-speed"
+            style="
+              position: absolute;
+              left: 100px;
+              top: 0rem;
+              width: 1rem;
+              height: 7rem;
+            "
+          >
+            <el-slider
+              v-model="controSpeed"
+              vertical
+              height="6rem"
+              :max="100"
+              type="vertical"
+            ></el-slider>
           </div>
         </el-tooltip>
       </div>
@@ -147,7 +247,10 @@ export default {
       let dom = this.$refs.container;
       let width = dom.parentNode.clientWidth;
       let height = (9 / 16) * width;
-      const clientHeight = Math.min(document.body.clientHeight, document.documentElement.clientHeight);
+      const clientHeight = Math.min(
+        document.body.clientHeight,
+        document.documentElement.clientHeight
+      );
       if (height > clientHeight) {
         height = clientHeight;
         width = (16 / 9) * height;
@@ -208,7 +311,15 @@ export default {
     async play() {
       const ipAndPort = getCurrentIPAndPortOrDomain();
       // 使用原有系统的播放地址
-      this.videoUrl = "ws://" + ipAndPort + "/play/" + this.video.deviceId + '_' + this.video.channelId + ".live.flv";
+      this.videoUrl =
+        "ws://" +
+        ipAndPort +
+        import.meta.env.VITE_APP_PLAY_API +
+        "/" +
+        this.video.deviceId +
+        "_" +
+        this.video.channelId +
+        ".live.flv";
       this.create();
       jessibucaPlayer[this._uid].on("play", () => {
         this.playing = true;
@@ -248,7 +359,7 @@ export default {
       this.fullscreen = !isFull;
       this.ptzControl = false;
       if (isFull) {
-        this.$emit('outFullscreen', this.index);
+        this.$emit("outFullscreen", this.index);
       }
     },
     isFullscreen() {
@@ -267,11 +378,11 @@ export default {
       if (this.isEzvizDevice) {
         // 萤石云设备的云台控制
         setChannelPTZ({
-          deviceType: 'ezviz',
+          deviceType: "ezviz",
           accessToken: this.accessToken,
           deviceSerial: this.deviceSerial,
           direction: command,
-          speed: this.controSpeed
+          speed: this.controSpeed,
         });
       } else {
         // 原有系统的云台控制
@@ -809,12 +920,12 @@ export default {
     font-size: 11px;
 
     &.status-pending {
-      background-color: #E6A23C;
+      background-color: #e6a23c;
       color: #fff;
     }
 
     &.status-processing {
-      background-color: #409EFF;
+      background-color: #409eff;
       color: #fff;
     }
   }

vite-element-template/src/components/explosion/clean.vue

@@ -140,7 +140,7 @@
                   taskProcess:"",
                   taskPerson:"",
                   taskTime:"",
-                  actived:"",
+                  actived:"1",
                   creatorName:"",
                   createTime:"",
                   updatorName:"",

vite-element-template/src/components/explosion/data.vue

@@ -178,6 +178,7 @@ v-model="form.rangeDown"
         <el-col :span="12">
           <el-form-item label="报警保持时间（秒）" prop="alarmTime">
             <el-input
+              type="number"
               v-model="form.alarmTime"
               placeholder="请输入报警保持时间"
             />
@@ -375,7 +376,7 @@ export default {
     },
     handleSignalTypeChange(value) {
       this.form.alarmValue = "";
-      this.form.alarmTime = "";
+      this.form.alarmTime = null;
       this.form.alarmDataRepeatedly = "";
       this.form.thresholdUpLimit = "";
       this.form.thresholdUpUpLimit = "";

vite-element-template/src/components/explosion/dust.vue

@@ -16,13 +16,13 @@
       label-position="right"
       label-width="130px"
     >
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="企业ID" prop="companyinfoId">
             <el-input v-model="form.companyinfoId" placeholder="请输入企业ID" />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
 
       <el-row :gutter="20">
         <el-col :span="12">
@@ -173,7 +173,7 @@ export default {
       dialogVisible: false,
       loading: false,
       form: {
-        companyinfoId: "",
+        companyinfoId: "1",
         industryType: "",
         dustTechnology: "",
         dustType: "",

vite-element-template/src/components/explosion/equip.vue

@@ -33,11 +33,11 @@
       </el-row>
 
       <el-row :gutter="20">
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="企业ID" prop="companyinfoId">
             <el-input v-model="form.companyinfoId" placeholder="请输入企业ID" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item label="场所编码" prop="placeCode">
             <el-input
@@ -257,7 +257,7 @@ export default {
         id: "",
         equipCode: "",
         equipName: "",
-        companyinfoId: "",
+        companyinfoId: "1",
         placeCode: "",
         equipType: "",
         equipFactory: "",

vite-element-template/src/layout/components/Navbar.vue

@@ -2,29 +2,26 @@
   <div class="navbar">
     <!-- <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
     <breadcrumb class="breadcrumb-container" /> -->
-      <span class="time">{{ getCurrentTime() }}</span>
-      <div class="title">
-        粉尘涉爆安全生产风险监控预警系统
-      </div>
+    <span class="time">{{ time }}</span>
+    <div class="title">粉尘涉爆安全生产风险监控预警系统</div>
     <div class="right-menu">
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
-          <span class="user-name">长钢钢铁集团公司</span>
+          <span class="user-name">{{
+            appStore.companyInfo.enterpriseName || "管理员"
+          }}</span>
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
           <router-link to="/">
-            <el-dropdown-item>
-              Home
-            </el-dropdown-item>
+            <el-dropdown-item> 首页 </el-dropdown-item>
           </router-link>
 
-
-          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
+          <!-- <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
             <el-dropdown-item>Docs</el-dropdown-item>
-          </a>
+          </a> -->
           <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">退出</span>
+            <span style="display: block">退出</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
@@ -55,44 +52,79 @@
 </template>
 
 <script>
-
-
-import { useAppStore,useSettingsStore,useUserStore } from '@/store'
-import dayjs from 'dayjs'
+import { useAppStore, useSettingsStore, useUserStore } from "@/store";
+import dayjs from "dayjs";
 export default {
-  components: {
-
-  },
-  data(){
+  components: {},
+  data() {
     return {
-      appStore:useAppStore(),
-      settingsStore:useSettingsStore(),
-      userStore:useUserStore()
-    }
+      appStore: useAppStore(),
+      settingsStore: useSettingsStore(),
+      userStore: useUserStore(),
+      time: "",
+      url: {
+        list: "/tb/dustCompanyinfo/list",
+        add: "/tb/dustCompanyinfo/add",
+        edit: "/tb/dustCompanyinfo/edit",
+        copy: "/tb/dustCompanyinfo/copy",
+        delete: "/tb/dustCompanyinfo/delete",
+        deleteBatch: "/tb/dustCompanyinfo/deleteBatch",
+        exportXlsUrl: "/tb/dustCompanyinfo/exportXls",
+        importExcelUrl: "/tb/dustCompanyinfo/importExcel",
+      },
+    };
   },
   computed: {
-    sidebar(){return this.appStore.sidebar},
-    avatar(){return this.userStore.avatar},
+    sidebar() {
+      return this.appStore.sidebar;
+    },
+    avatar() {
+      return this.userStore.avatar;
     },
-  mounted(){
-
+  },
+  mounted() {
+    let timer = setInterval(() => {
+      this.time = this.getCurrentTime();
+    }, 1000);
+    this.$once("hook:beforeDestroy", () => {
+      clearInterval(timer);
+    });
+    this.getCompanyInfo();
   },
   methods: {
     toggleSideBar() {
-      this.appStore.toggleSideBar()
+      this.appStore.toggleSideBar();
     },
     async logout() {
-      await     this.userStore.logout()
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+      await this.userStore.logout();
+      this.$router.push(`/login?redirect=${this.$route.fullPath}`);
     },
     getCurrentTime() {
       //YYYY-MM-DD HH:mm:ss 星期X
-     let weekday = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六']
-     let week = weekday[dayjs().day()]
-      return dayjs().format('YYYY-MM-DD HH:mm:ss') + ' ' + week
-    }
+      let weekday = [
+        "星期日",
+        "星期一",
+        "星期二",
+        "星期三",
+        "星期四",
+        "星期五",
+        "星期六",
+      ];
+      let week = weekday[dayjs().day()];
+      return dayjs().format("YYYY-MM-DD HH:mm:ss") + " " + week;
+    },
+    getCompanyInfo() {
+      // 实现获取公司信息的逻辑
+      this.$axios.get(this.url.list).then((res) => {
+        let arr = res.result.records;
+        let companyInfo = arr.find((item) => item.id === "1");
+        if (companyInfo) {
+          this.appStore.companyInfo = companyInfo;
         }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -101,20 +133,20 @@ export default {
   overflow: hidden;
   position: relative;
   background-color: rgb(4, 0, 79);
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
-  background-image: url('/NavBackground.png');
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  background-image: url("/NavBackground.png");
   background-size: 100% 100%;
   color: #fff;
   background-repeat: no-repeat;
 
   border-bottom: 1px solid rgb(3, 36, 107);
-  .time{
+  .time {
     margin-left: 50px;
     height: 100%;
     line-height: 50px;
     float: left;
   }
-  .title{
+  .title {
     position: absolute;
     width: 100%;
     text-align: center;
@@ -132,11 +164,11 @@ export default {
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
 
@@ -163,10 +195,10 @@ export default {
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }
@@ -183,7 +215,7 @@ export default {
           vertical-align: middle;
           object-fit: cover;
         }
-        .user-name{
+        .user-name {
           color: #fff;
           vertical-align: middle;
           display: inline-block;

vite-element-template/src/router/index.js

@@ -163,11 +163,11 @@ export function addRoutes(menu) {
               component: () => import("@/views/explosion/perception/data.vue"),
               meta: { title: "点位管理", icon: "el-icon-s-home" },
             },
-            {
-              path: "/perception/config",
-              component: () => import("@/views/explosion/perception/config.vue"),
-              meta: { title: "配置管理", icon: "el-icon-s-home" },
-            },
+            // {
+            //   path: "/perception/config",
+            //   component: () => import("@/views/explosion/perception/config.vue"),
+            //   meta: { title: "配置管理", icon: "el-icon-s-home" },
+            // },
 
           ],
         },

vite-element-template/src/store/modules/app.js

@@ -14,6 +14,7 @@ export const useAppStore = defineStore('appStore', {
     company: import.meta.env.VITE_APP_COMPANY,
     windowHeight: 0,
     windowWidth: 0,
+    companyInfo: {},
   }),
   actions: {
     toggleSideBar() {

vite-element-template/src/views/explosion/information/company.vue

@@ -80,10 +80,12 @@
 </template>
 
 <script>
+import { useAppStore } from "@/store";
 export default {
   name: "Company",
   data() {
     return {
+      appStore: useAppStore(),
       data: [
         {
           label: "企业名称",
@@ -329,6 +331,7 @@ export default {
         let companyInfo = arr.find((item) => item.id === "1");
         if (companyInfo) {
           this.companyInfo = companyInfo;
+          this.appStore.companyInfo = companyInfo;
         }
       });
     },

vite-element-template/src/views/explosion/information/dust.vue

@@ -82,11 +82,6 @@
       ></el-table-column>
       <el-table-column
         align="center"
-        label="企业"
-        prop="companyinfoId"
-      ></el-table-column>
-      <el-table-column
-        align="center"
         label="粉尘涉爆企业行业类型"
         prop="industryType"
       >

vite-element-template/src/views/explosion/information/equip.vue

@@ -92,11 +92,11 @@
         label="设备名称"
         prop="equipName"
       ></el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         align="center"
         label="企业id"
         prop="companyinfoId"
-      ></el-table-column>
+      ></el-table-column> -->
       <el-table-column
         align="center"
         label="场所编码"

vite-element-template/src/views/login/login.vue

@@ -1,41 +1,46 @@
 <template>
   <div class="login-container">
-    <div class="login_pic1"></div>
+    <div class="login_pic1">
+      <div class="login-title">
+        粉尘涉爆安全生产风险监控预警系统
+        <div class="login-subtitle">
+          Work Safety Risk Monitoring and Early Warning System for Dust
+          Explosions
+        </div>
+      </div>
+    </div>
     <div class="pcpage_warp">
       <div class="pcpage">
-        <!-- 登录 -->
         <div v-show="register" class="register">
-          <div class="login_sign_in">登录</div>
-          <!-- <div class="login_new_user">
-            <span>新用户</span><span @click="clickRegister">点击注册</span>
-          </div> -->
+          <div class="login_sign_in">风险监控预警系统</div>
           <div class="login_form">
             <el-form ref="form" :model="form" :rules="loginRules">
               <el-form-item label="" prop="username">
                 <el-input
+                  size="large"
                   v-model="form.username"
                   placeholder="用户名"
                 ></el-input>
               </el-form-item>
               <el-form-item label="" class="login_input" prop="password">
                 <el-input
+                  size="large"
                   v-model="form.password"
                   show-password
                   placeholder="密码"
                 ></el-input>
               </el-form-item>
               <el-form-item label="" class="login_input" prop="captcha">
+                <div style="display: flex; align-items: center;">
                   <el-input
+                    size="large"
                     v-model="form.captcha"
                     placeholder="验证码"
+                    style="flex: 1; margin-right: 12px;"
                     @keyup.enter.native="loginJump"
-                >
-                <!-- <template slot="append"><img :src="Base64Img" style="height: 24px" @click="getImgCode()" /></template> -->
-              </el-input>
-              </el-form-item>
-
-               <el-form-item label="">
-                <img :src="Base64Img" @click="getImgCode()" />
+                  ></el-input>
+                  <img :src="Base64Img" @click="getImgCode()" style="height: 40px; cursor: pointer; border-radius: 6px; box-shadow: 0 2px 8px rgba(0,0,0,0.08); margin-left: 8px;" />
+                </div>
               </el-form-item>
 
               <el-form-item>
@@ -60,7 +65,7 @@
 
 <script>
 import { login } from "@/api/user.js";
-import { v1 as uuid_v1 } from "uuid"
+import { v1 as uuid_v1 } from "uuid";
 import { Base64 } from "js-base64";
 // import { sm3, sm4 } from 'sm-crypto'
 
@@ -85,13 +90,13 @@ export default {
 
       register: true, //登录
       PasswordType: "", // 密码类型
-      Base64Img:'',
+      Base64Img: "",
       form: {
         // 登录
         username: "", //手机号
         password: "", //密码
-        captcha:"",
-        checkKey:"",
+        captcha: "",
+        checkKey: "",
         type: "", //记住密码
         agree: false, //登录即同意
       },
@@ -128,7 +133,7 @@ export default {
       this.form.password = Base64.decode(getLocalStorage("password"));
     }
 
-    this.getImgCode()
+    this.getImgCode();
   },
 
   methods: {
@@ -152,8 +157,8 @@ export default {
           let data = {};
           data.username = this.form.username;
           data.password = this.form.password;
-          data.captcha = this.form.captcha
-          data.checkKey = this.form.checkKey
+          data.captcha = this.form.captcha;
+          data.checkKey = this.form.checkKey;
           // data.flag = false
 
           login(data)
@@ -161,7 +166,9 @@ export default {
               if (res.code === 200) {
                 this.loading = false;
                 setLocalStorage("token", res.result.token);
-                this.publicStore.getInfo().then((res) => {
+                this.publicStore
+                  .getInfo()
+                  .then((res) => {
                     if (this.redirect === "") {
                       this.$router.push({
                         path: "/",
@@ -171,7 +178,8 @@ export default {
                         path: this.redirect,
                       });
                     }
-                }).catch((err) => {
+                  })
+                  .catch((err) => {
                     this.loading = false;
                     this.$message.warning(err.message);
                   });
@@ -221,23 +229,53 @@ export default {
 
   .login_pic1 {
     flex: 1;
-    background: url("./image/login_bk.jpg") no-repeat;
+    background: url("./image/login_bk_new.jpg") no-repeat;
     background-size: cover;
+    position: relative;
+
+    .login-title {
+      position: absolute;
+      top: 30%;
+      left: 8%;
+      color: #fff;
+      font-size: 48px;
+      font-weight: bold;
+      line-height: 1.2;
+      z-index: 2;
+
+      .login-subtitle {
+        margin-top: 24px;
+        font-size: 22px;
+        font-weight: normal;
+        color: #fff;
+        opacity: 0.85;
+      }
+    }
   }
 
   .pcpage_warp {
     width: 500px;
     height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #f7f9fa;
+    box-shadow: 0 4px 24px rgba(0,0,0,0.08);
+    border-radius: 16px;
 
     .pcpage {
       overflow: auto;
       box-sizing: border-box;
       width: 100%;
       height: 100%;
-      padding: 65px 10% 0;
+      padding: 0 10% 0;
       text-align: left;
-      background-color: #343a40;
-
+      background-color: #fff;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-radius: 16px;
+      box-shadow: 0 4px 24px rgba(0,0,0,0.08);
       .login_content {
         margin-bottom: 98px;
         cursor: pointer;
@@ -258,97 +296,31 @@ export default {
       }
       // 登录
       .register {
-        padding-bottom: 175px;
-
         .login_sign_in {
           margin-bottom: 45px;
-          color: #fff;
+          color: #000;
           font-weight: 700;
           font-size: 32px;
         }
 
-        .login_new_user {
-          margin-bottom: 35px;
-
-          span {
-            margin-right: 5px;
-            color: #fff;
-            font-size: 18px;
-          }
-
-          span:last-child {
-            color: #169bd5;
-            font-size: 18px;
-            text-decoration: underline;
-            cursor: pointer;
-          }
-        }
-
         .login_form {
-          width: 100%;
-          // margin-bottom: 273px;
-
+          width: 360px;
+          margin: 0 auto;
           .login_input {
-            margin-bottom: 22px;
-          }
-
-          .form_type {
-            color: #b8d7d7;
-
-            ::v-deep .el-checkbox__label {
-              font-size: 18px;
-            }
-          }
-
-          .form_agree {
-            color: #b8d7d7;
-
-            ::v-deep .el-checkbox__label {
-              font-size: 18px;
-            }
-          }
-
-          .form_cbims {
-            color: #169bd5;
-            font-size: 18px;
-            text-align: left;
-            text-decoration: underline;
-            cursor: pointer;
+            margin-bottom: 28px;
           }
-
           .form_button {
-            width: 180px;
+            width: 100%;
             margin-top: 20px;
             margin-bottom: 8px;
             font-size: 18px;
-          }
-          .ForgetPassword {
-            color: white;
-            float: right;
-            margin-top: 20px;
-            cursor: pointer;
-          }
-
-          .login_type {
-            margin-bottom: 22px;
-          }
-
-          .form_authentication {
-            margin-bottom: 75px;
-            color: #169bd5;
-            font-size: 18px;
-            text-decoration: underline;
-            cursor: pointer;
-          }
-
-          .form_party {
-            color: #fff;
-            font-size: 22px;
+            border-radius: 8px;
+            box-shadow: 0 2px 8px rgba(0,0,0,0.08);
           }
         }
       }
     }
   }
 }
+
 </style>
-@/utils/storage.js