Browse Source

fix style

Karsa 1 year ago
parent
commit
0d20fc8d2b

+ 1 - 1
config/dev.env.js

@@ -5,7 +5,7 @@ module.exports = merge(prodEnv, {
   NODE_ENV:'"development"',
   VUE_APP_API_ROOT:'"/adminapi"',  //
   Domain:'"brilliantstart.cn"',
-  Login:'"http://localhost:8080/login"',
+  Login:'"http://localhost:3030/login"',
   CHART_LINK:'"https://charttest.hzinsights.com/chartshow"',
   VUE_APP_HR_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8391/login"',
   VUE_APP_FINANCIAL_MANAGEMENT_SYSTEM:'"http://8.136.199.33:8618/login"',

+ 1 - 1
src/App.vue

@@ -167,7 +167,7 @@ iframe {
   color: #666 !important;
 }
 .el-form-item__label {
-  font-size: 16px;
+  font-size: 14px;
 }
 .el-collapse-item__header {
   border: none;

+ 6 - 6
src/mixins/theme.js

@@ -17,12 +17,12 @@ export default {
       path: process.env.VUE_APP_HR_MANAGEMENT_SYSTEM,
       icon: require('@/assets/img/home/hr_logo.png')
     },
-    // {
-    //   name: 'CRM',
-    //   key: 'crm',
-    //   path: process.env.VUE_APP_CRM_SYSTEM,
-    //   icon: require('@/assets/img/home/logo_mini.png')
-    // },
+    {
+      name: 'CRM',
+      key: 'crm',
+      path: process.env.VUE_APP_CRM_SYSTEM,
+      icon: require('@/assets/img/home/logo_mini.png')
+    },
   ],
   login_bg: require('@/assets/img/login_bg.png'),//登录页的大图
   login_logo: require('@/assets/img/login_logo.png')

+ 11 - 8
src/views/Home.vue

@@ -213,23 +213,26 @@
             /> -->
             <div class="userinfo">
               <div class="userinfo-fingerpost">
-                <el-button
-                  @click="toOperation('fingerpost')"
-                  type="text"
-                  v-if="isShowRole"
-                  >帮助文档</el-button
-                >
-
                 <el-button
                   @click="linkToOtherMS(item.path)"
                   v-for="item in linkSystems"
                   :key="item.path"
                   type="text"
-                  style="margin-left: 20px;"
+                  style="margin-right: 20px;"
                 >
                   <img :src="item.icon" v-if="item.icon" width="20" height="20" style="vertical-align: middle;">
                   {{item.name}}
                 </el-button>
+
+                <el-tooltip effect="dark" content="帮助文档" placement="bottom">
+                  <div class="icon-box-item" v-if="isShowRole" @click="toOperation('fingerpost')">
+                    <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <path d="M9.24255 14.5C9.24255 14.0858 9.57834 13.75 9.99255 13.75C10.4068 13.75 10.7426 14.0858 10.7426 14.5C10.7426 14.9142 10.4068 15.25 9.99255 15.25C9.57834 15.25 9.24255 14.9142 9.24255 14.5Z" fill="currentColor"/>
+                      <path d="M9.99261 5.00763C8.32056 5.00763 6.96136 6.36682 6.96136 8.03888H8.21136C8.21136 7.05718 9.01092 6.25763 9.99261 6.25763C10.9743 6.25763 11.7739 7.05718 11.7739 8.03888C11.7739 8.71106 11.2183 9.3851 10.4931 9.67971L10.4899 9.68101C9.82793 9.95419 9.36767 10.6052 9.36767 11.3656V12.5H10.6177V11.3656C10.6177 11.1228 10.7618 10.9216 10.9655 10.837C11.9996 10.4161 13.0239 9.37337 13.0239 8.03888C13.0239 6.36682 11.6647 5.00763 9.99261 5.00763Z" fill="currentColor"/>
+                      <path d="M18.7427 10C18.7427 5.16751 14.8252 1.25 9.99268 1.25C5.16019 1.25 1.24268 5.16751 1.24268 10C1.24267 14.8325 5.16018 18.75 9.99267 18.75C14.8252 18.75 18.7427 14.8325 18.7427 10ZM17.4927 10C17.4927 14.1421 14.1348 17.5 9.99267 17.5C5.85054 17.5 2.49267 14.1421 2.49268 10C2.49268 5.85786 5.85054 2.5 9.99268 2.5C14.1348 2.5 17.4927 5.85787 17.4927 10Z" fill="currentColor"/>
+                    </svg>
+                  </div>
+                </el-tooltip>
               </div>
 
               <el-dropdown trigger="click" style="width:130px;">

+ 2 - 2
src/views/Login.vue

@@ -244,8 +244,8 @@ export default {
 
 		.login-icon {
 			position: absolute;
-      top: 30px;
-			right: 30px;
+      top: 40px;
+			right: 40px;
 		}
 		.login-title {
 			color: #333;

+ 1 - 1
src/views/dataEntry_manage/databaseComponents/addTargetDiaBase.vue

@@ -9,7 +9,7 @@
 			<div class="dialog-top">
 				<div>
 					<span>数据来源</span>
-					<el-select v-model="fromType" placeholder="请选择来源" style="width:240px" @change="changeTrade"
+					<el-select v-model="fromType" placeholder="请选择来源" style="width:240px;margin-left:10px" @change="changeTrade"
 						:disabled="haveResult">
 						<el-option v-for="item in fromArr" :key="item" :label="item" :value="item">
 						</el-option>

+ 1 - 1
src/views/dataEntry_manage/thirdBase/lzTargetbase.vue

@@ -3,7 +3,7 @@
     <div class="left-cont minHeight">
       <div class="left-top">
         <el-button
-          style="width: 100%"
+          style="width: 100%;margin-bottom: 10px;"
           type="primary"
           plain
           size="medium"