修改显示

src/layout/components/Navbar.vue

@@ -31,8 +31,8 @@
         <template v-for="route in permission_routes">
           <app-link
             v-if="!route.hidden"
-            :to="route.path"
             :key="route.id"
+            :to="route.path"
             class="indexlayout-top-menu-li"
             :class="{ active: getTopMenuActive === route.path }"
           >
@@ -45,7 +45,7 @@
                 height: 76px;
               "
             >
-              <i :class="[route.meta.icon, 'menuSize']"></i>
+              <i :class="[route.meta.icon, 'menuSize']" />
               <span style="line-height: 1.2">{{ route.meta.title }}</span>
             </div>
           </app-link>
@@ -54,25 +54,25 @@
     </div>
     <div class="right-menu">
       <el-tooltip
+        v-if="tenantForm.tenantId == 1"
         style="display: flex"
         effect="dark"
-        v-if="tenantForm.tenantId == 1"
         content="点击进入商城系统"
         placement="bottom"
       >
         <div class="msginfo right-position" @click="gotoMall">
-          <i class="icon_admin_mall operationSize"></i>
+          <i class="icon_admin_mall operationSize" />
         </div>
       </el-tooltip>
       <el-tooltip
+        v-if="tenantForm.tenantId == 1"
         style="display: flex"
         effect="dark"
-        v-if="tenantForm.tenantId == 1"
         content="点击进入OA系统"
         placement="bottom"
       >
         <div class="msginfo right-position" @click="gotoOa">
-          <i class="icon_admin_oa operationSize"></i>
+          <i class="icon_admin_oa operationSize" />
         </div>
       </el-tooltip>
 
@@ -131,11 +131,11 @@
         placement="bottom"
       >
         <div
-          class="msginfo right-position"
           v-permission="'/journal'"
+          class="msginfo right-position"
           @click="gotoRecode"
         >
-          <i class="icon_admin_message operationSize"></i>
+          <i class="icon_admin_message operationSize" />
         </div>
       </el-tooltip>
       <el-tooltip
@@ -146,11 +146,11 @@
       >
         <el-badge :is-dot="noReadNum > 0 ? true : false" class="item">
           <div class="msginfo right-position" @click="gotoChart">
-            <i class="icon_admin_chart operationSize"></i>
+            <i class="icon_admin_chart operationSize" />
           </div>
         </el-badge>
       </el-tooltip>
-      <div class="left-menu" v-if="organNameList && organNameList.length > 0">
+      <div v-if="organNameList && organNameList.length > 0" class="left-menu">
         <el-popover
           placement="top-start"
           width="300"
@@ -159,15 +159,16 @@
         >
           <div class="popover-container">
             <el-tag
-              class="navbar_tag"
-              type="info"
               v-for="item in organNameList"
               :key="item"
-              >{{ item }}</el-tag
+              class="navbar_tag"
+              type="info"
             >
+              {{ item }}
+            </el-tag>
           </div>
           <span slot="reference" class="msginfo right-position">
-            <i class="icon_admin_orgin operationSize"></i>
+            <i class="icon_admin_orgin operationSize" />
           </span>
         </el-popover>
       </div>
@@ -210,32 +211,36 @@
               </div>
             </div>
           </div>
-          <div class="tenantService" v-if="!tenantStatus">
+          <div v-if="!tenantStatus" class="tenantService">
             <div class="serviceName">
-              <p class="name">{{ tenantInfo.serverName }}</p>
+              <p class="name">
+                {{ tenantInfo.serverName }}
+              </p>
               <div
-                class="serviceRenew"
-                @click="onRenew"
                 v-if="
                   $helpers.permission('/ productService') &&
                     $helpers.permission('/serviceRenew')
                 "
+                class="serviceRenew"
+                @click="onRenew"
               >
                 立即续费
               </div>
             </div>
-            <div class="serviceTime" v-if="tenantInfo.validRemaining > 0">
+            <div v-if="tenantInfo.validRemaining > 0" class="serviceTime">
               剩余{{ tenantInfo.validRemaining }}天（{{
                 tenantInfo.expiryDateEnd
               }}）到期
             </div>
-            <div class="serviceTime" v-else>已过期</div>
+            <div v-else class="serviceTime">
+              已过期
+            </div>
           </div>
           <!-- divided -->
           <el-dropdown-item v-if="tenantStatus" @click.native="onTenantChange">
-            <i class="icon_admin_tenant userSize"></i>
+            <i class="icon_admin_tenant userSize" />
             <span class="dropdown-text">{{ tenantName }}</span>
-            <i style="margin-left: 3px" class="icon_admin_change userSize"></i>
+            <i style="margin-left: 3px" class="icon_admin_change userSize" />
           </el-dropdown-item>
           <el-dropdown-item
             @click.native="
@@ -245,21 +250,21 @@
               }
             "
           >
-            <i class="icon_admin_edit userSize"></i>
+            <i class="icon_admin_edit userSize" />
             <span class="dropdown-text">修改密码</span>
           </el-dropdown-item>
           <el-dropdown-item
-            @click.native="accountStatus = true"
             v-if="$helpers.permission('employee/simpleUpdate')"
+            @click.native="accountStatus = true"
           >
-            <i class="icon_admin_account userSize"></i>
+            <i class="icon_admin_account userSize" />
             <span class="dropdown-text">账号设置</span>
           </el-dropdown-item>
           <el-dropdown-item
             style="border-top: 1px solid #e5e5e5"
             @click.native="logout"
           >
-            <i class="icon_admin_exit userSize"></i>
+            <i class="icon_admin_exit userSize" />
             <span class="dropdown-text">安全退出</span>
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -275,10 +280,10 @@
       :close-on-click-modal="false"
     >
       <el-form
+        ref="pwdForm"
         :model="resetForm"
         label-position="right"
         label-width="100px"
-        ref="pwdForm"
       >
         <el-form-item label="手机号" prop="phone">
           <div>{{ this.$store.getters.phone }}</div>
@@ -300,7 +305,7 @@
             type="password"
             style="width: 180px"
             autocomplete="off"
-          ></el-input>
+          />
         </el-form-item>
         <el-form-item
           label="再次输入"
@@ -319,7 +324,7 @@
             type="password"
             style="width: 180px"
             autocomplete="off"
-          ></el-input>
+          />
         </el-form-item>
         <el-form-item
           label="验证码"
@@ -334,17 +339,19 @@
             style="width: 180px"
             autocomplete="off"
             :maxlength="6"
-          ></el-input>
-          <el-button :disabled="isDisable" @click="getCode">{{
-            btnName
-          }}</el-button>
+          />
+          <el-button :disabled="isDisable" @click="getCode">
+            {{ btnName }}
+          </el-button>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="resetVisible = false" v-if="!nocloseable"
-          >取 消</el-button
-        >
-        <el-button type="primary" @click="submitResetPassWord">确 定</el-button>
+        <el-button v-if="!nocloseable" @click="resetVisible = false">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="submitResetPassWord">
+          确 定
+        </el-button>
       </div>
     </el-dialog>
 
@@ -357,10 +364,10 @@
       :close-on-click-modal="false"
     >
       <el-form
+        ref="smsForm"
         :model="smsCodeForm"
         label-position="right"
         label-width="100px"
-        ref="smsForm"
       >
         <el-row :gutter="12">
           <el-col :span="16">
@@ -376,37 +383,42 @@
                 placeholder="请输入验证码"
                 :maxlength="4"
                 auto-complete="off"
-              ></el-input> </el-form-item
-          ></el-col>
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <div @click="updateIdentifyingCode">
-              <el-image :src="identifyingCode" class="smsImg"></el-image>
+              <img :src="identifyingCode" class="smsImg" />
             </div>
 
-            <span @click="updateIdentifyingCode" class="imgChange">
+            <span class="imgChange" @click="updateIdentifyingCode">
               看不清？换一换
             </span>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="smsCodeVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitSendSms">确 定</el-button>
+        <el-button @click="cancelSendSms">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="submitSendSms">
+          确 定
+        </el-button>
       </div>
     </el-dialog>
 
     <el-dialog
+      v-if="tenantVisible"
       title="切换机构"
       width="500px"
       append-to-body
-      v-if="tenantVisible"
       :visible.sync="tenantVisible"
     >
       <el-form
+        ref="tenantForm"
         :model="tenantForm"
         label-position="right"
         label-width="100px"
-        ref="tenantForm"
       >
         <el-form-item
           label="选择机构"
@@ -427,24 +439,28 @@
               :key="index"
               :label="item.name"
               :value="item.id"
-            ></el-option>
+            />
           </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="tenantVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitTenant">确 定</el-button>
+        <el-button @click="tenantVisible = false">
+          取 消
+        </el-button>
+        <el-button type="primary" @click="submitTenant">
+          确 定
+        </el-button>
       </div>
     </el-dialog>
 
     <el-dialog
+      v-if="accountStatus"
       title="账号设置"
       append-to-body
       :visible.sync="accountStatus"
-      v-if="accountStatus"
       width="650px"
     >
-      <user-model @close="accountStatus = false"></user-model>
+      <user-model @close="accountStatus = false" />
     </el-dialog>
     <!-- <portal-target name="AppMain" ref="target">
       <instructions ref="instructions" @checkShow="checkShow" />
@@ -465,6 +481,13 @@ import { sendSmsCode } from "./api";
 import axios from "axios";
 import userModel from "./modal/userModal";
 export default {
+  components: {
+    AppLink,
+    userModel
+    // instructions,
+    // Breadcrumb,
+    // Hamburger
+  },
   data() {
     let tenantConfig = sessionStorage.getItem("tenantConfig");
     tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {};
@@ -499,14 +522,6 @@ export default {
       nocloseable: false
     };
   },
-
-  components: {
-    AppLink,
-    userModel
-    // instructions,
-    // Breadcrumb,
-    // Hamburger
-  },
   computed: {
     ...mapGetters([
       "sidebar",
@@ -527,6 +542,18 @@ export default {
       return baseTenantId < 0 ? true : false;
     }
   },
+  watch: {
+    resetVisible(val) {
+      if (!val) {
+        this.resetForm = {
+          phone: "",
+          authCode: "",
+          password: "",
+          password2: ""
+        };
+      }
+    }
+  },
   mounted() {
     if (this.$store.getters.pwdflag) {
       // this.$confirm("当前账号存在安全风险是否修改密码", "提示", {
@@ -684,6 +711,7 @@ export default {
       //       }
       //     });
       // }
+      this.smsCodeForm.code = "";
       this.updateIdentifyingCode();
       this.smsCodeVisible = true;
     },
@@ -713,7 +741,10 @@ export default {
       this.identifyingCode = `${origin}/api-web/code/getLoginImage?phone=${
         this.$store.getters.phone
       }&toen=${new Date().getTime()}`;
-      console.log(this.identifyingCode, "identifyingCode");
+    },
+    cancelSendSms() {
+      this.smsCodeVisible = false;
+      this.smsCodeForm.code = "";
     },
     // 发送验证码
     submitSendSms() {
@@ -743,18 +774,6 @@ export default {
         }
       });
     }
-  },
-  watch: {
-    resetVisible(val) {
-      if (!val) {
-        this.resetForm = {
-          phone: "",
-          authCode: "",
-          password: "",
-          password2: ""
-        };
-      }
-    }
   }
 };
 </script>

src/layout/components/api.js

@@ -19,8 +19,9 @@ export function operationLog(data) {
  */
 export function sendSmsCode(data) {
   return request2({
-    url: api + `/code/sendSms`,
+    url: api + `/code/sendSmsCode`,
     method: "POST",
-    data
+    requestType: "form",
+    data: data
   });
 }