提交

src/api/api.js

@@ -134,8 +134,8 @@ export const ROUTER_DETAIL_CHAPTER_LIST = `/stu/router/chapterPcList`
 
 
 /**专业力必修模块 */
-let baseUrl = "/growth"
+// let baseUrl = "/growth"
-// let baseUrl = ""
+let baseUrl = ""
 //查询专业力必修详情
 export const PROFESSIONAL_STUDENT_DETAIL = id => `${baseUrl}/professional/student/studentGrowthDetail/${id}`
 //查询专业力必修详情

src/views/growth/growthList.vue

@@ -112,7 +112,7 @@
                         />
                       </div>
                       <div class="item-time">
-                        <template v-if="value.progress === 0">
+                        <template v-if="value.completionStatus === '0'">
                           <div style="color: #999999">未开始</div>
                         </template>
                         <template v-else>
@@ -167,12 +167,7 @@
                   <div class="box"></div>
                 </div>
                 <!--            todo #路径详情 个人信息缺少img和介绍-->
-                <div
+                <div class="teacheritem">
-                  class="teacheritem"
-                  :style="{
-                    'border-bottom': '1px solid rgba(56, 125, 247, 0.2)',
-                  }"
-                >
                   <img
                     class="peopleimg"
                     :src="userInfo?.avatar ? '/upload' + userInfo?.avatar : ''"
@@ -188,7 +183,7 @@
                   </div>
                 </div>
               </div>
-              <div class="info" style="padding: 20px 0 33px 0">
+              <div class="info" style="padding: 0px 0 33px 0">
                 <div class="title">
                   <img
                     style="width: 18px; height: 17px"
@@ -215,7 +210,7 @@
                   <div class="progressBox">
                     <div>总进度</div>
                     <div class="progress">
-                      <div style="width: 291px">
+                      <div style="flex: 1;">
                         <el-progress
                           :percentage="totalProgress"
                           :show-text="false"
@@ -240,7 +235,7 @@
                   <div class="progressBox">
                     <div>必修进度</div>
                     <div class="progress">
-                      <div style="width: 291px">
+                      <div style="flex: 1;">
                         <el-progress
                           :percentage="requiredProgress"
                           :show-text="false"
@@ -268,7 +263,7 @@
                   <div class="progressBox">
                     <div>选修进度</div>
                     <div class="progress">
-                      <div style="width: 291px">
+                      <div style="flex: 1;">
                         <el-progress
                           :percentage="electiveProgress"
                           :show-text="false"
@@ -867,8 +862,8 @@ function toOffcoursePlanPage(id) {
     }
   }
   .detailR {
-    width: 494px;
+    width: 25%;
-
+    min-width: 400px;
     .detailRB {
       min-height: 459px;
       background: #ffffff;
@@ -899,11 +894,10 @@ function toOffcoursePlanPage(id) {
       }
 
       .info .teacheritem {
-        margin-left: 48px;
-        margin-right: 48px;
-        margin-top: 30px;
         display: flex;
-        // align-items: center;
+        padding-bottom: 5px;
+        margin: 30px 48px 0 48px;
+        border-bottom: 1px solid rgba(56, 125, 247, 0.2);
       }
 
       .info .teacheritem .peopleimg {
@@ -980,6 +974,7 @@ function toOffcoursePlanPage(id) {
         .progress {
           display: flex;
           align-items: center;
+          width: 90%;
         }
 
         .progress .el-progress-bar__outer {
@@ -1019,7 +1014,7 @@ function toOffcoursePlanPage(id) {
     .item-button {
       width: 120px;
       height: 36px;
-      margin-left: 187px;
+      margin-left: 15%;
       cursor: pointer;
       div {
         width: 100%;
@@ -1041,7 +1036,7 @@ function toOffcoursePlanPage(id) {
       color: #0077ec;
     }
     .item-img {
-      width: 300px;
+      width: 24%;
       border-radius: 14px;
       overflow: hidden;
 

src/views/growth/growthRoadmap.vue

@@ -44,6 +44,35 @@
             <div class="tabs-line"></div>
           </div>
         </div>
+        <div style="display: flex">
+          <el-select
+            style="width: 230px"
+            :teleported="false"
+            v-model="queryParams.completionStatus"
+            placeholder="搜索学习状态"
+          >
+            <el-option label="全部" value="3"> </el-option>
+            <el-option label="未开始" value="0"> </el-option>
+            <el-option label="已完成" value="1"> </el-option>
+            <el-option label="进行中" value="2"> </el-option>
+          </el-select>
+          <el-input
+            style="margin-left: 9px; width: 230px"
+            v-model="queryParams.taskName"
+            placeholder="搜索名称"
+            clearable
+          />
+          <el-button
+            icon="Search"
+            style="margin-left: 20px"
+            type="primary"
+            @click="getList"
+            >搜索</el-button
+          >
+          <el-button icon="Refresh" style="margin-left: 20px" @click="refresh"
+            >清除</el-button
+          >
+        </div>
       </div>
       <div class="growth-path-container">
         <div class="growth-name-type">
@@ -57,6 +86,7 @@
           <div
             :style="{ transform: 'scale(' + transformSize + ')' }"
             style="transform-origin: top left"
+            v-loading="loading"
           >
             <template v-if="selectGrowth.template == 1">
               <Roadmap2
@@ -260,6 +290,13 @@ const tabClick = (type, status) => {
   }
   getList();
 };
+
+// 清除
+const refresh = () => {
+  queryParams.taskName = "";
+  queryParams.completionStatus = "";
+  getList();
+};
 // 学习任务列表
 const stageProcessList = ref([]);
 
@@ -623,7 +660,6 @@ function toOffcoursePlanPage(id) {
     height: 80px;
     background: #ffffff;
     padding: 0 80px 0 62px;
-    width: 1920px;
   }
   .growth-name-type {
     display: flex;

vite.config.js

@@ -26,6 +26,7 @@ export default defineConfig(({ command, mode }) =>
 			promiseExportName: '__tla',
 			promiseImportName: i => `__tla_${i}`
 		}),
+		
 		// viteMockServe({
 		//     mockPath: './src/mock/mocks',
 		// })
@@ -36,16 +37,18 @@ export default defineConfig(({ command, mode }) =>
 		]
 	},
 	server: {
+		host: '0.0.0.0',
 		proxy: {
-			// "/professional": {
+			"/professional": {
-			// 	// target: 'http://192.168.16.195:32002',
+				// target: 'http://192.168.16.195:32002',
 				// target: 'http://192.168.150.97:32002',
-			// 	changeOrigin: true,
+				target: 'http://192.168.68.211:32002',
-			//   },
-			'/growth': {
-				target: 'https://u-pre.boe.com',
 				changeOrigin: true,
 			  },
+			// '/growth': {
+			// 	target: 'https://u-pre.boe.com',
+			// 	changeOrigin: true,
+			// },
 			'/file/upload': {
 				target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
 				changeOrigin: true,