Merge branch 'compulsory_professional_skills_copy' into test20250220

src/api/configGrowth.js

@@ -18,8 +18,8 @@ import { boeRequest } from "@/api/request";
 //   "application/x-www-form-urlencoded";
 axios.defaults.withCredentials = true;
 const http = axios.create({
-    // baseURL: '/growth',
+    baseURL: '/growth',
-    baseURL: process.env.VUE_APP_BASE_API_GROWTH,
+    // baseURL: process.env.VUE_APP_BASE_API_GROWTH,
     timeout: 1000 * 15,
     // headers: { "Content-Type": "multipart/form-data" },
     headers: { "Content-Type": "application/json" },

src/views/growthpath/GrowthAddPath.vue

@@ -562,7 +562,6 @@ export default {
         key: "stdPositionName",
         align: "center",
         ellipsis: true,
-        width: 400,
         customRender: ({ record }) => {
           return record.stdPosition
             ? `${record.stdPositionName}（${record.stdPosition}）`
@@ -574,22 +573,25 @@ export default {
         dataIndex: "qualsLevelDesr",
         key: "qualsLevelDesr",
         align: "center",
+        width:120,
         ellipsis: true,
       },
       {
         title: "完成人数/总人数",
         align: "center",
         ellipsis: true,
+        width:140,
         customRender: ({ record }) => {
           return `${record.comLearnNum}/${record.learnNum}`;
         },
       },
       {
-        title: "必修|选修",
+        title: "必修丨选修",
         align: "center",
         ellipsis: true,
+        width:110,
         customRender: ({ record }) => {
-          return `${record.requiredTaskNum}|${record.elePublishedNum}`;
+          return `${record.requiredTaskNum}丨${record.elePublishedNum}`;
         },
       },
       {
@@ -597,6 +599,7 @@ export default {
         dataIndex: "ratio",
         key: "ratio",
         align: "center",
+        width:90,
         ellipsis: true,
         customRender: ({ record }) => {
           return `${record.ratio * 100}%`;
@@ -607,6 +610,7 @@ export default {
         dataIndex: "isPublished",
         key: "isPublished",
         align: "center",
+        width:80,
         ellipsis: true,
         customRender: ({ record }) => {
           return record.isPublished ? "已发布" : "未发布";

src/views/growthpath/GrowthPath.vue

@@ -550,7 +550,6 @@ export default {
         key: "stdPositionName",
         align: "center",
         ellipsis: true,
-        width: 400,
         customRender: ({ record }) => {
           return record.stdPosition
             ? `${record.stdPositionName}（${record.stdPosition}）`
@@ -562,11 +561,13 @@ export default {
         dataIndex: "qualsLevelDesr",
         key: "qualsLevelDesr",
         align: "center",
+        width:120,
         ellipsis: true,
       },
       {
         title: "完成人数/总人数",
         align: "center",
+        width:140,
         ellipsis: true,
         customRender: ({ record }) => {
           return `${record.comLearnNum}/${record.learnNum}`;
@@ -575,6 +576,7 @@ export default {
       {
         title: "必修|选修",
         align: "center",
+        width:110,
         ellipsis: true,
         customRender: ({ record }) => {
           return `${record.requiredTaskNum}|${record.elePublishedNum}`;
@@ -584,6 +586,7 @@ export default {
         title: "完成比例",
         dataIndex: "ratio",
         key: "ratio",
+        width:90,
         align: "center",
         ellipsis: true,
         customRender: ({ record }) => {
@@ -595,6 +598,7 @@ export default {
         dataIndex: "isPublished",
         key: "isPublished",
         align: "center",
+        width:80,
         ellipsis: true,
         customRender: ({ record }) => {
           return record.isPublished ? "已发布" : "未发布";

vue.config.js

@@ -18,16 +18,16 @@ module.exports = defineConfig({
             overlay: false,// 解决代码抛出异常
         },
         proxy: {
-            "/professional": {
+            // "/professional": {
-                target: 'http://192.168.31.211:32002',
+            //     target: 'http://192.168.31.211:32002',
-                // target: 'http://192.168.50.195:32002',
+            //     // target: 'http://192.168.50.195:32002',
-                // target: 'http://192.168.86.195:32002',
+            //     // target: 'http://192.168.86.195:32002',
-                changeOrigin: true,
-            },
-            // "/growth": {
-            //     target: 'https:' + process.env.VUE_APP_BOE_API_URL,
             //     changeOrigin: true,
             // },
+            "/growth": {
+                target: 'https:' + process.env.VUE_APP_BOE_API_URL,
+                changeOrigin: true,
+            },
             "/manageApi": {
                 target: 'https:' + process.env.VUE_APP_PROXY_URL,
                 changeOrigin: true, //表示是否改变原域名