fix:增加版本号

2025-12-11 03:46:48 +08:00 · 2022-12-19 10:09:54 +08:00
parent b6eaf4c993
commit 8d68f4754e
5 changed files with 79 additions and 36 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,8 @@
                "axios": "^1.1.3",
                "core-js": "^3.26.0",
                "dayjs": "^1.11.6",
-                "element-plus": "^2.2.20",
+                "element-plus": "^2.2.27",
+                "json-bigint": "^1.0.0",
                "vue": "^3.2.45",
                "vue-router": "^4.1.6",
                "vuex": "^4.1.0"
@@ -3968,6 +3969,14 @@
                "node": "*"
            }
        },
+        "node_modules/bignumber.js": {
+            "version": "9.1.1",
+            "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.1.tgz",
+            "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==",
+            "engines": {
+                "node": "*"
+            }
+        },
        "node_modules/binary-extensions": {
            "version": "2.2.0",
            "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -5465,9 +5474,9 @@
            "dev": true
        },
        "node_modules/element-plus": {
-            "version": "2.2.22",
-            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.22.tgz",
-            "integrity": "sha512-gg2g2WOMNpWf0wGesymUvTV0VZDF/4khQKroSNeCV/vWJ/cqssPYdtqfGxTiFRt/f+JpyFkV7O1mo0yzMCzrBg==",
+            "version": "2.2.27",
+            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.27.tgz",
+            "integrity": "sha512-P04HDOZBYDdvlYuleuCZRULzAc5xJVOBfLDK9xWxVo0vyo8ntdaXS5sTU+/76vrNzuO3FhLn9kvrsbiJEVa1jg==",
            "dependencies": {
                "@ctrl/tinycolor": "^3.4.1",
                "@element-plus/icons-vue": "^2.0.6",
@@ -7682,6 +7691,14 @@
                "node": ">=4"
            }
        },
+        "node_modules/json-bigint": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz",
+            "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+            "dependencies": {
+                "bignumber.js": "^9.0.0"
+            }
+        },
        "node_modules/json-parse-better-errors": {
            "version": "1.0.2",
            "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -15310,6 +15327,11 @@
            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
            "dev": true
        },
+        "bignumber.js": {
+            "version": "9.1.1",
+            "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.1.tgz",
+            "integrity": "sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="
+        },
        "binary-extensions": {
            "version": "2.2.0",
            "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -16527,9 +16549,9 @@
            "dev": true
        },
        "element-plus": {
-            "version": "2.2.22",
-            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.22.tgz",
-            "integrity": "sha512-gg2g2WOMNpWf0wGesymUvTV0VZDF/4khQKroSNeCV/vWJ/cqssPYdtqfGxTiFRt/f+JpyFkV7O1mo0yzMCzrBg==",
+            "version": "2.2.27",
+            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.27.tgz",
+            "integrity": "sha512-P04HDOZBYDdvlYuleuCZRULzAc5xJVOBfLDK9xWxVo0vyo8ntdaXS5sTU+/76vrNzuO3FhLn9kvrsbiJEVa1jg==",
            "requires": {
                "@ctrl/tinycolor": "^3.4.1",
                "@element-plus/icons-vue": "^2.0.6",
@@ -18181,6 +18203,14 @@
            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
            "dev": true
        },
+        "json-bigint": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz",
+            "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+            "requires": {
+                "bignumber.js": "^9.0.0"
+            }
+        },
        "json-parse-better-errors": {
            "version": "1.0.2",
            "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,7 +7,16 @@
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <div style="background: #0078FC;height: 150px;width:100%;position: absolute;top:0;z-index: 1"></div>
+  <div
+    style="
+      background: #0078fc;
+      height: 150px;
+      width: 100%;
+      position: absolute;
+      top: 0;
+      z-index: 1;
+    "
+  ></div>
  <div id="container">
    <!-- <div id="nav">
      <router-link
@@ -22,18 +31,18 @@
        {{ item.name }}
      </router-link>
    </div> -->
-    <main style="z-index: 2;">
-      <router-view/>
+    <main style="z-index: 2">
+      <router-view />
    </main>
  </div>
 </template>
 <script setup>
-import {boeRequest} from "@/api/request";
-import {GET_USER_INFO} from "@/api/ThirdApi";
-import {useStore} from "vuex";
-import {onMounted} from "vue";
+import { boeRequest } from "@/api/request";
+import { GET_USER_INFO } from "@/api/ThirdApi";
+import { useStore } from "vuex";
+import { onMounted } from "vue";
 import router from "@/router";
-
+console.log("版本0.9.1------------");
 const store = useStore();
 onMounted(() => {
  getUserInfo();
@@ -50,7 +59,7 @@ function getUserInfo() {
  // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
  // sans-serif;
  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Arial, sans-serif;
+    Microsoft YaHei, Arial, sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  color: #2c3e50;
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -35,7 +35,7 @@
            )"
            :key="index"
          >
-            <div>
+            <div style="width: 70%">
              <div class="coursename">{{ value.name }}</div>
              <div class="coursetag">
                <div class="tag1" style="margin-right: 11px; margin-top: 16px">
@@ -215,7 +215,7 @@
                <div class="progress">
                  <div style="width: 291px">
                    <el-progress
-                      :percentage="data.totalChapterCnt"
+                      :percentage="parseInt(data.totalProgress * 100)"
                      :show-text="false"
                      :stroke-width="8"
                      :color="
@@ -226,7 +226,7 @@
                          3: 'rgba(59, 94, 251, 1)',
                          4: 'rgba(57, 219, 183, 1)',
                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.totalChapterCnt / 20)]
+                        }[parseInt((data.totalProgress * 100) / 20)]
                      "
                    />
                  </div>
@@ -240,10 +240,10 @@
                        3: 'rgba(59, 94, 251, 1)',
                        4: 'rgba(57, 219, 183, 1)',
                        5: 'rgba(57, 219, 183, 1)',
-                      }[parseInt(data.totalChapterCnt / 20)],
+                      }[parseInt((data.totalProgress * 100) / 20)],
                    }"
                  >
-                    {{ data.totalChapterCnt }}%
+                    {{ parseInt(data.totalProgress * 100) }}%
                  </div>
                </div>
              </div>
@@ -254,7 +254,7 @@
                <div class="progress">
                  <div style="width: 291px">
                    <el-progress
-                      :percentage="data.currentChapterCnt"
+                      :percentage="parseInt(data.compulsoryProgress * 100)"
                      :show-text="false"
                      :stroke-width="8"
                      :color="
@@ -265,7 +265,7 @@
                          3: 'rgba(59, 94, 251, 1)',
                          4: 'rgba(57, 219, 183, 1)',
                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.currentChapterCnt / 20)]
+                        }[parseInt((data.compulsoryProgress * 100) / 20)]
                      "
                    />
                  </div>
@@ -284,10 +284,10 @@
                        3: 'rgba(59, 94, 251, 1)',
                        4: 'rgba(57, 219, 183, 1)',
                        5: 'rgba(57, 219, 183, 1)',
-                      }[parseInt(data.currentChapterCnt / 20)],
+                      }[parseInt((data.compulsoryProgress * 100) / 20)],
                    }"
                  >
-                    {{ data.currentChapterCnt }}%
+                    {{ parseInt(data.compulsoryProgress * 100) }}%
                  </div>
                </div>
              </div>
@@ -333,6 +333,7 @@ const returnclick = () => {
 const { data } = useRequest(PROJECT_PROCESS, {
  projectId: projectId || courseId,
 });
+console.log("datadata", data);
 const userInfo = computed(() => store.state.userInfo);

 const activeName = ref("first");
@@ -512,6 +513,9 @@ function whiteTypes(type) {
          font-weight: 500;
          color: #333330;
          line-height: 24px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
        }

        .coursetag {
--- a/src/views/project/ProjectManage.vue
+++ b/src/views/project/ProjectManage.vue
@@ -2,7 +2,7 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-12-18 15:56:03
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-18 21:04:56
+ * @LastEditTime: 2022-12-18 23:02:05
 * @FilePath: /fe-stu/src/views/project/ProjectList.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -118,7 +118,6 @@ import { useRouter } from "vue-router";
 import store from "@/store";
 const projectClassify = [];
 const studyProgress = [];
-const pageNo = ref("");
 const pageSize = ref("");
 const currentPage = ref("");
 const projectTotal = ref("");
@@ -136,12 +135,13 @@ const searchClick = () => {
    beginTime = new Date(searchTime.value[0]).getTime();
    endTime = new Date(searchTime.value[1]).getTime();
  }
+  console.log("beginTime", beginTime, endTime);
  request(PROJECT_LIST, {
-    // beginTime: disDetail.value.discussId,
-    // endTime: replayComment.value.content,
-    // key: projectname.value,
-    // pageNo: pageNo,
-    // pageSize: pageSize,
+    // beginTime: beginTime,
+    // endTime: endTime,
+    key: projectname.value,
+    pageNo: currentPage,
+    pageSize: pageSize,
  }).then(() => {
    commonFetch();
  });
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -242,7 +242,7 @@
                          3: 'rgba(59, 94, 251, 1)',
                          4: 'rgba(57, 219, 183, 1)',
                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.totalProgress)]
+                        }[(parseInt(data.totalProgress) * 100) / 20]
                      "
                    />
                  </div>
@@ -256,7 +256,7 @@
                        3: 'rgba(59, 94, 251, 1)',
                        4: 'rgba(57, 219, 183, 1)',
                        5: 'rgba(57, 219, 183, 1)',
-                      }[parseInt(data.totalProgress)],
+                      }[parseInt((data.totalProgress * 100) / 20)],
                    }"
                  >
                    {{ parseInt(data.totalProgress * 100) }}%
@@ -281,7 +281,7 @@
                          3: 'rgba(59, 94, 251, 1)',
                          4: 'rgba(57, 219, 183, 1)',
                          5: 'rgba(57, 219, 183, 1)',
-                        }[parseInt(data.compulsoryProgress)]
+                        }[parseInt((data.compulsoryProgress * 100) / 20)]
                      "
                    />
                  </div>
@@ -300,7 +300,7 @@
                        3: 'rgba(59, 94, 251, 1)',
                        4: 'rgba(57, 219, 183, 1)',
                        5: 'rgba(57, 219, 183, 1)',
-                      }[parseInt(data.compulsoryProgress)],
+                      }[parseInt((data.compulsoryProgress * 100) / 20)],
                    }"
                  >
                    {{ parseInt(data.compulsoryProgress * 100) }}%