提交

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/EditingTasks.vue

@@ -8,9 +8,7 @@
               <div class="le">
                 <div class="imgfor">
                   <div class="fort" style="color: #333333; font-size: 16px">
-                    {{
+                    {{ basicData.growthName }}
-                      basicData.growthName
-                    }}
                   </div>
                   <div class="fort">创建时间：{{ basicData?.createTime }}</div>
                 </div>
@@ -57,7 +55,7 @@
                   :activeKey="activeKey"
                   :infoType="2"
                   @dataListUp="dataListUp"
-                  @refresh="getListTask"
+                  @refresh="getListTask(1)"
                 >
                   <div class="itcon">
                     <div class="img">
@@ -234,6 +232,26 @@
                     </div>
                   </div>
                 </div>
+                <div class="tableBox">
+                  <div
+                    class="pa"
+                    style="display: flex; justify-content: flex-end"
+                  >
+                    <a-pagination
+                      v-if="total > 1"
+                      :showSizeChanger="true"
+                      show-quick-jumper
+                      :hideOnSinglePage="false"
+                      :pageSize="pageSize"
+                      :current="pageNum"
+                      :show-total="(total) => `共 ${total} 条`"
+                      :total="total"
+                      layout="total, sizes, prev, pager, next, jumper"
+                      class="pagination"
+                      @change="getListTask"
+                    />
+                  </div>
+                </div>
               </div>
               <!-- 无数据样式 -->
               <div v-else class="notable">
@@ -284,7 +302,7 @@ const activeKey = ref("1");
 // tabs切换
 const tabsChange = (val) => {
   console.log(val);
-  getListTask();
+  getListTask(1);
 };
 const courseRef = ref({});
 const editTaskForType = (ele) => {
@@ -333,19 +351,28 @@ onMounted(() => {
   getListTask();
 });
 const dataListUp = (val) => {
-  getListTask();
+  getListTask(1);
 };
 const listDatas = ref([]);
 const spinning = ref(false);
-const getListTask = () => {
+const pageSize = ref(10);
+const pageNum = ref(1);
+const total = ref(0);
+const getListTask = (num) => {
+  if (num) {
+    pageNum.value = num;
+  }
   spinning.value = true;
   notPublishedTaskList({
     growthId: growId,
     type: activeKey.value,
+    pageSize: pageSize.value,
+    pageNum: pageNum.value,
   })
     .then((res) => {
       if (res.data.code === 200) {
         listDatas.value = res.data.data.records;
+        total.value = res.data.data.total;
       }
       spinning.value = false;
     })
@@ -404,7 +431,33 @@ const withdraw = (element) => {
   flex-direction: column;
   min-width: 933px;
   background-color: rgba(245, 247, 250, 1);
+  .tableBox {
+    margin-top: 21px;
+    margin-bottom: 20px;
+    .ant-checkbox-wrapper {
+      align-items: center;
+      margin-top: -2px;
+    }
 
+    .ant-table-selection-column {
+      padding: 0px !important;
+      padding-left: 60px !important;
+    }
+
+    .ant-table-thead > tr > th {
+      background-color: rgba(239, 244, 252, 1);
+    }
+
+    th.h {
+      background-color: #eff4fc !important;
+    }
+
+    .ant-table-tbody
+      > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      > td {
+      background: #f6f9fd;
+    }
+  }
   .right {
     flex: 1;
     // background-color: #fff;
@@ -684,50 +737,6 @@ const withdraw = (element) => {
           }
         }
 
-        .tableBox {
-          margin-top: 21px;
-          margin-bottom: 20px;
-
-          .chosen {
-            background-color: #f2f6fc;
-            opacity: 1;
-          }
-
-          .ghost {
-            // background-color: red;
-            opacity: 0;
-          }
-
-          .classify {
-            margin-left: 10px !important;
-            padding-left: 9px !important;
-          }
-
-          .ant-checkbox-wrapper {
-            align-items: center;
-            margin-top: -2px;
-          }
-
-          .ant-table-selection-column {
-            padding: 0px !important;
-            padding-left: 60px !important;
-          }
-
-          .ant-table-thead > tr > th {
-            background-color: rgba(239, 244, 252, 1);
-          }
-
-          th.h {
-            background-color: #eff4fc !important;
-          }
-
-          .ant-table-tbody
-            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-            > td {
-            background: #f6f9fd;
-          }
-        }
-
         .xwid {
           position: relative;
           margin-top: 30px;
@@ -779,107 +788,6 @@ const withdraw = (element) => {
                 }
               }
             }
-
-            .talk {
-              margin-top: 24px;
-              margin-bottom: 11px;
-              width: 100%;
-              height: 50px;
-              background: #f5faff;
-              border: 1px solid #4ea6ff;
-              // opacity: 0.22;
-              display: flex;
-              align-items: center;
-
-              .im {
-                width: 14px;
-                height: 15px;
-                margin-left: 27px;
-                margin-top: -3px;
-              }
-
-              .xu {
-                height: 100%;
-                line-height: 50px;
-                margin-left: 13px;
-
-                .yi {
-                  color: #4f5156;
-                  font-size: 14px;
-                }
-
-                .zon {
-                  color: #999ba3;
-                  font-size: 14px;
-                  margin-left: 34px;
-                }
-
-                .th {
-                  color: #4ea6ff;
-                }
-              }
-            }
-
-            .tableBox {
-              margin-block-end: 20px;
-
-              .classify {
-                margin-left: 11px !important;
-                padding-left: 9px !important;
-              }
-
-              .ant-checkbox-wrapper {
-                align-items: center;
-                margin-top: -2px;
-              }
-
-              .ant-table-selection-column {
-                padding: 0px !important;
-                padding-left: 38px !important;
-              }
-
-              .ant-table-thead > tr > th {
-                background-color: rgba(239, 244, 252, 1);
-              }
-
-              th.h {
-                background-color: #eff4fc !important;
-              }
-
-              .ant-table-tbody
-                > tr:hover:not(.ant-table-expanded-row):not(
-                  .ant-table-row-selected
-                )
-                > td {
-                background: #f6f9fd;
-              }
-
-              .pa {
-                left: 0;
-                width: 100%;
-                // height: 20px;
-                // background-color: red;
-                display: flex;
-                justify-content: center;
-                position: absolute;
-                bottom: 0px;
-              }
-            }
-
-            .tablebox1 {
-              margin-bottom: 80px;
-
-              .pa {
-                left: 0;
-                width: 100%;
-                // height: 20px;
-                // background-color: red;
-                display: flex;
-                justify-content: center;
-                position: absolute;
-                bottom: 0px;
-              }
-            }
           }
         }
 

src/views/growthpath/PathManage.vue

@@ -489,23 +489,7 @@
                     </div>
                   </template>
                 </Draggable>
-                <!-- <div class="tableBox">
+                
-                  <div class="pa">
-                    <a-pagination
-                      v-if="total > 1"
-                      :showSizeChanger="true"
-                      show-quick-jumper
-                      :hideOnSinglePage="false"
-                      :pageSize="pageSize"
-                      :current="pageNum"
-                      :show-total="(total) => `共 ${total} 条`"
-                      :total="total"
-                      layout="total, sizes, prev, pager, next, jumper"
-                      class="pagination"
-                      @change="getListTask"
-                    />
-                  </div>
-                </div> -->
               </div>
               <!-- 有数据-->
               <div style="display: flex; height: 20px"></div>

vue.config.js

@@ -18,15 +18,15 @@ module.exports = defineConfig({
             overlay: false,// 解决代码抛出异常
         },
         proxy: {
-            "/professional": {
+            // "/professional": {
-                target: 'http://192.168.150.97:32002',
+            //     target: 'http://192.168.150.97:32002',
-                // target: 'http://192.168.237.141:32002',
+            //     // target: 'http://192.168.237.141: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, //表示是否改变原域名