Explorar el Código

更新 版本管理逻辑

wzh hace 3 años
padre
commit
c14310d7cc
Se han modificado 2 ficheros con 41 adiciones y 47 borrados
  1. 9 39
      src/components/Header.vue
  2. 32 8
      src/views/index/Versions.vue

+ 9 - 39
src/components/Header.vue

@@ -173,51 +173,21 @@ export default {
       }, 2 * 60 * 1000);
       cloudLogin();
     });
-
-    let vs = [
-      {
-        version: "1.2.13.0",
-        timer: "	2022/2/9",
-        remarks: [
-          "优化船舶轨迹测算算法",
-          "优化船舶预计到港时间测算算法",
-          "优化航次状态预测算法",
-        ],
-      },
-      {
-        version: "1.2.14.0",
-        timer: "	2022/2/11",
-        remarks: ["更新保险保单上传接口", "更新装卸单据展示方式"],
-      },
-      {
-        version: "1.3.0.0	",
-        timer: "2022/2/11",
-        remarks: [
-          "发布浙江物产货主版管理平台",
-          "发布货损数据采集接口",
-          "发布货损智能分析报告",
-        ],
-      },
-      {
-        version: "1.3.4.0	",
-        timer: "2022/2/28",
-        remarks: [
-          "发布汽车装货记录功能",
-          "发布单据识别算法功能",
-          "单据车牌数据、吨位数据拆分功能、生成表报",
-          "智能化数据自动匹配、自动修正算法",
-        ],
-      },
-    ];
     let timelineData = ref([]);
-    // timelineData.value = vs.reverse();
     async function cloudLogin() {
       await AnonymousLogin();
       getAbledVersions();
     }
     async function getAbledVersions() {
-      let res = await v.where({ disabled: false, deleted: __.neq(true) }).get();
-      timelineData.value = res.data.reverse();
+      let res = await v
+        .aggregate()
+        .match({ deleted: __.neq(true) })
+        .sort({
+          createTime: -1,
+        })
+        .limit(10)
+        .end();
+      timelineData.value = res.data;
     }
 
     const size = 20;

+ 32 - 8
src/views/index/Versions.vue

@@ -163,6 +163,15 @@
       </template>
     </el-table-column>
   </el-table>
+  <div style="width: 100%; text-align: right; padding: 43px 0">
+    <el-pagination
+      background
+      layout="prev, pager, next"
+      :total="total"
+      :page-size="pageSize"
+      @current-change="pageChange"
+    ></el-pagination>
+  </div>
 </template>
 
 <script setup>
@@ -181,6 +190,7 @@ let ruleFormRef = ref(null);
 let currentPage = ref(1);
 let pageSize = ref(10);
 let currentVersionId = ref(null);
+let total = ref(0);
 
 function detail(item1) {
   let item = _.cloneDeep(item1);
@@ -253,23 +263,32 @@ async function add() {
 }
 
 async function getAllVersions(listType) {
+  let res1 = await v.where({ deleted: __.neq(true) }).count();
+  total.value = res1.total;
   let res = await v
-    .where({ deleted: __.neq(true) })
+    .aggregate()
+    .match({ deleted: __.neq(true) })
+    .sort({
+      createTime: -1,
+    })
     .skip((currentPage.value - 1) * pageSize.value)
     .limit(pageSize.value)
-    .get();
-  versions.value = res.data.reverse();
+    .end();
+  versions.value = res.data;
   getAbledVersions();
 }
 
 let abledVersions = ref([]);
 async function getAbledVersions() {
   let res = await v
-    .where({ disabled: false, deleted: __.neq(true) })
-    // .skip((currentPage.value - 1) * pageSize.value)
-    // .limit(pageSize.value)
-    .get();
-  abledVersions.value = res.data.reverse();
+    .aggregate()
+    .match({ deleted: __.neq(true) })
+    .sort({
+      createTime: -1,
+    })
+    .limit(10)
+    .end();
+  abledVersions.value = res.data;
   store.commit("setVersions", abledVersions.value);
 }
 
@@ -310,6 +329,11 @@ async function init() {
   getAllVersions();
 }
 
+function pageChange(e) {
+  currentPage.value = e;
+  getAllVersions();
+}
+
 onMounted(() => {
   init();
 });