111

src/views/dashboard/Analysis.vue

@@ -58,7 +58,8 @@ export default {
     //打开MyIframe弹框
       // this.$refs.MyIframe.editorVisible=true;
     //并传入地址参数
-    this.editorJumpUrlMy = 'http://localhost:4200/#/automatic-logon-list?username=' + username
+    // this.editorJumpUrlMy = 'http://localhost:4200/#/automatic-logon-list?username=' + username
+    this.editorJumpUrlMy = 'http://www.myfitt.cn:18002'
     
     let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
       console.log(flag)

src/views/dashboard/MyToDo.vue

@@ -3,22 +3,22 @@
     <!-- 第一行 -->
     <a-row :gutter="24" class="firstLine">
       <!-- 我的 -->
-      <a-col :xs="24" :sm="24" :md="24" :lg="7" :style="{ marginBottom: '8px', paddingRight: 0 }">
+      <a-col :xs="24" :sm="24" :md="24" :lg="6" :style="{ marginBottom: '8px', paddingRight: 0 }">
         <!-- 等高设置 -->
         <a-card title="我的" style="width: 100%;" :bordered="false" :style="{ marginBottom: '8px', height: '250px' }">
           <a-row :gutter="24">
             <!-- 头像 -->
-            <a-col :xs="24" :sm="24" :md="12" :lg="14">
+            <a-col :xs="24" :sm="24" :md="12" :lg="15">
               <a-row :gutter="24">
-                <a-col :xs="24" :sm="24" :md="12" :lg="8">
-                  <div class="userImg">
+                <a-col :xs="24" :sm="24" :md="12" :lg="7">
+                  <div class="userImg" style="margin-left: -10px;">
                     <img v-if="avatarUrl == '1'" src="../../assets/user.jpg" width="50px;" />
                     <img v-if="avatarUrl == '2'" src="../../assets/user_girl.png" width="50px;" />
                     <img v-if="avatarUrl != '1' && avatarUrl != '2'" :src="avatarUrl" width="50px;" height="52px;" />
                     
                   </div>
                 </a-col>
-                <a-col :xs="24" :sm="24" :md="12" :lg="16">
+                <a-col :xs="24" :sm="24" :md="12" :lg="17">
                   <div class="userInfo">
                     <span>{{ userInfo.realname }}</span>
                     <p>账号：{{ userInfo.username }}</p>
@@ -29,7 +29,7 @@
             </a-col>
 
             <!-- 数量 -->
-            <a-col :xs="24" :sm="24" :md="12" :lg="10" class="msgBox">
+            <a-col :xs="24" :sm="24" :md="12" :lg="9" class="msgBox">
               <span> {{ todoList.length }}</span>
               <p>我的待办</p>
               <span>{{ msgTotal }}</span>
@@ -49,7 +49,7 @@
       <!-- 按钮 -->
       <!-- 技能博物馆 -->
       <!-- <a-col :xs="24" :sm="24" :md="24" :lg="6" :style="{ marginBottom: '8px',    width: '33%' }"> -->
-      <a-col :xs="24" :sm="24" :md="24" :lg="6" :style="{ marginBottom: '8px',}">
+      <a-col :xs="24" :sm="24" :md="24" :lg="7" :style="{ marginBottom: '8px',}">
         <!-- 等高设置 -->
         <a-card title="常用流程" :bordered="false" style="height: 250px;">
           <!-- <div v-for="(item, index) in activeKeyAll.slice(5, 10)" :key="index" class="oaBig"> -->