Просмотр исходного кода

个人中心变为标签,修改loading加载状态

“yueshang” 1 год назад
Родитель
Сommit
017b740d55
3 измененных файлов с 16 добавлено и 12 удалено
  1. 7 6
      index.html
  2. BIN
      src/assets/images/loadingGlobal.png
  3. 9 6
      src/layout/indexCommon.vue

+ 7 - 6
index.html

@@ -48,7 +48,7 @@
 				margin: -75px 0 0 -75px;
 				border-radius: 50%;
 				border: 3px solid transparent;
-				border-top-color: #FFF;
+				/* border-top-color: #FFF; */
 				-webkit-animation: spin 2s linear infinite;
 				-ms-animation: spin 2s linear infinite;
 				-moz-animation: spin 2s linear infinite;
@@ -92,7 +92,7 @@
 			}
 
 
-			@-webkit-keyframes spin {
+			/* @-webkit-keyframes spin {
 				0% {
 					-webkit-transform: rotate(0deg);
 					-ms-transform: rotate(0deg);
@@ -118,7 +118,7 @@
 					-ms-transform: rotate(360deg);
 					transform: rotate(360deg);
 				}
-			}
+			} */
 
 
 			#loader-wrapper .loader-section {
@@ -126,7 +126,7 @@
 				top: 0;
 				width: 51%;
 				height: 100%;
-				background: #7171C6;
+				background: #fff;
 				z-index: 1000;
 				-webkit-transform: translateX(0);
 				-ms-transform: translateX(0);
@@ -183,7 +183,7 @@
 
 			#loader-wrapper .load_title {
 				font-family: 'Open Sans';
-				color: #FFF;
+				color: #000;
 				font-size: 19px;
 				width: 100%;
 				text-align: center;
@@ -207,7 +207,8 @@
 	<body>
 		<div id="app">
 			<div id="loader-wrapper">
-				<div id="loader"></div>
+				<!-- <div id="loader"></div> -->
+				<img id="loader" src="/src/assets/images/loadingGlobal.png" alt="">
 				<div class="loader-section section-left"></div>
 				<div class="loader-section section-right"></div>
 				<div class="load_title">正在加载系统资源,请耐心等待</div>

BIN
src/assets/images/loadingGlobal.png


+ 9 - 6
src/layout/indexCommon.vue

@@ -27,9 +27,9 @@
               </div>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <router-link to="/user/profile">
+                  <!-- <router-link to="/user/profile">
                     <el-dropdown-item>个人中心</el-dropdown-item>
-                  </router-link>
+                  </router-link> -->
                   <el-dropdown-item divided command="logout">
                     <span>退出登录</span>
                   </el-dropdown-item>
@@ -76,7 +76,7 @@
                 <template #label>
                   <div class="tab_pane" @click="paneClick(item)">
                     <div class="tab_text">{{ item.label }}</div>
-                    <img v-if="item.label != '首页'" src="@/assets/images/close.png" @click="closeTab(item, index, $event)"
+                    <img v-if="item.label != '首页' && item.label != '个人中心'" src="@/assets/images/close.png" @click="closeTab(item, index, $event)"
                       alt="" />
                   </div>
                   <!-- <router-link
@@ -251,7 +251,8 @@ const iFrameData = ref(JSON.parse(sessionStorage.getItem('fileTabData')) || [
 let tabIndex = 2;
 const editableTabsValue = ref(JSON.parse(sessionStorage.getItem('editableTabsValue')) || "/index");
 // const editableTabsValue = ref("/index");
-const editableTabs = ref(JSON.parse(sessionStorage.getItem('tabData')) || [{ label: '首页', path: '/reindex' }]);
+// const editableTabs = ref(JSON.parse(sessionStorage.getItem('tabData')) || [{ label: '首页', path: '/reindex' },{ label: '个人中心', path: '/user/profile' }]);
+const editableTabs = ref([{ label: '首页', path: '/reindex' },{ label: '个人中心', path: '/user/profile' }]);
 
 // const removeTab = (targetName) => {
 //   const tabs = editableTabs.value;
@@ -495,10 +496,10 @@ const clickPath = (index, items) => {
   items = toRaw(items);
   localStorage.setItem("inChat", items.path == "/index" ? 1 : 0)
   // toFileData.value = null
-  console.log("clickPathitems", items);
   // editableTabs.value = arr;
   isSwitchFileIframe.value = false
   const arr = toRaw(editableTabs.value);
+  console.log('editableTabs.value', editableTabs.value)
   if (!arr.some((item) => item.label == items.label)) {
     editableTabs.value.push({
       label: items.label,
@@ -512,7 +513,6 @@ const clickPath = (index, items) => {
   }
   editableTabsValue.value = items.path;
   isAlive.value = true;
-  // console.log("editableTabs", editableTabs.value);
 };
 const clickTab = (item) => {
   let url = toRaw(item)
@@ -844,6 +844,7 @@ const iframeSize = (id) => {
 // 监听和保存标签信息
 const setTabLocal = (data) => {
   // console.log('setTabLocal',data);
+  console.log('data====', data)
   sessionStorage.setItem('tabData', JSON.stringify(data))
 }
 const setFileTabLocal = (data) => {
@@ -867,6 +868,7 @@ watch(() => iFrameData.value, (newValue, oldValue) => {
 watch(() => editableTabs.value, (newValue, oldValue) => {
   // console.log('editableTabs 发生改变了', newValue, oldValue);
   setTabLocal(toRaw(newValue))
+  console.log('editableTabs.valuewatch', editableTabs.value)
 }, {
   immediate: true,
   deep: true
@@ -878,6 +880,7 @@ watch(() => editableTabsValue.value, (newValue, oldValue) => {
   if (!regExp.test(editableTabsValue.value)) {
     isAlive.value = false;
   }
+  console.log('first  editableTabsValue.value', editableTabsValue.value)
 }, {
   immediate: true,
   deep: true