Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
F
fk-spider-web
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • 周田
  • fk-spider-web
  • Merge Requests
  • !1

Closed
Opened Sep 04, 2025 by yzh@yezhonghan 
  • Report abuse
Report abuse

feat:完成了状态监控静态页面

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b yzh origin/yzh

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout main
git merge --no-ff yzh

Step 4. Push the result of the merge to GitLab

git push origin main

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 12
  • Commits 11
  • Changes 40
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 周田
    @zhoutian started a discussion on the diff Sep 04, 2025
    src/components/AppLink/index.vue
    11 12 })
    12 13
    13 14 const isExtLink = computed(() => isExternal(props.to))
    15
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      不要就删了

      不要就删了
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on the diff Sep 04, 2025
    src/components/AppLink/index.vue
    11 12 })
    12 13
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      isExtLink 作用,注释

      isExtLink 作用,注释
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on an old version of the diff Sep 04, 2025
    Last updated by yzh Sep 04, 2025
    src/layout/components/Sidebar/SidebarItem.vue
    32 35
    33 36 // 解析路径
    34 37 const resolvePath = (routePath: string) => {
    38 console.log(routePath,'222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222');
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      不要

      不要
    • yzh @yezhonghan

      changed this line in version 2 of the diff

      Sep 04, 2025

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa#3256ad0228be15eee51c9fff30098203952d2d64_38_38)
      Toggle commit list
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on the diff Sep 04, 2025
    src/layout/components/Sidebar/SidebarItem.vue
    74 79
    75 80 return false
    76 81 }
    82
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      不要

      不要
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on an old version of the diff Sep 04, 2025
    Last updated by yzh Sep 04, 2025
    src/layout/components/Sidebar/index.vue
    16 16 const { sidebarLogo } = storeToRefs(settingsStore)
    17 17
    18 18 // 获取所有路由配置,而不仅仅是匹配的路由
    19 // const routes = computed(() => {
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      如果不用就删除,包括下面注释的内容

      如果不用就删除,包括下面注释的内容
    • yzh @yezhonghan

      changed this line in version 2 of the diff

      Sep 04, 2025

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa#34b3e077c48ba58d925d537cffe6f7603746b024_19_17)
      Toggle commit list
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on an old version of the diff Sep 04, 2025
    Last updated by yzh Sep 04, 2025
    src/layout/components/Sidebar/index.vue
    24 // // @ts-ignore - hidden 属性在实际路由对象中存在,但TypeScript类型定义中没有
    25 // return !(item.hidden || (item.meta && item.meta.hidden))
    26 // })
    27
    28 // })
    29
    19 30 const routes = computed(() => {
    20 // 获取路由器中的所有路由
    21 return router.options.routes.filter(item => {
    22 // 过滤掉设置了hidden的路由
    23 // @ts-ignore - hidden 属性在实际路由对象中存在,但TypeScript类型定义中没有
    24 return !(item.hidden || (item.meta && item.meta.hidden))
    25 })
    26 })
    31 // 递归过滤路由,包括子路由
    32 console.log(router.options.routes,'99999999999999999999999');
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      不要

      不要
    • yzh @yezhonghan

      changed this line in version 2 of the diff

      Sep 04, 2025

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa#34b3e077c48ba58d925d537cffe6f7603746b024_32_19)
      Toggle commit list
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on the diff Sep 04, 2025
    src/layout/components/Sidebar/index.vue
    35 62 })
    36 63
    37 64 const isCollapse = computed(() => !sidebar.value.opened)
    65
    66 onMounted(()=>{
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      不要

      不要
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on an old version of the diff Sep 04, 2025
    Last updated by yzh Sep 04, 2025
    src/views/os-dataDisplay/index.vue 0 → 100644
    41 <el-button type="primary" plain @click="handleDetails(scope.row)">
    42 编辑
    43 </el-button>
    44 <el-button type="success" plain @click="handleDetails(scope.row)">
    45 详情
    46 </el-button>
    47 <el-button type="danger" plain @click="handleConfirm(scope.row)">
    48 删除
    49 </el-button>
    50 </template>
    51 </el-table-column>
    52 </el-table>
    53 <div class="pagination w-full flex flex-row-reverse pr-4 m-t-4">
    54 <Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
    55 @pagination="getData" />
    56 <!-- <el-pagination background v-model:current-page="currentPage4" v-model:page-size="pageSize4"
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      没用就不要

      没用就不要
    • yzh @yezhonghan

      changed this line in version 2 of the diff

      Sep 04, 2025

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa#80f3d0dffe7c669002b5bccef48136faf4617bd3_56_56)
      Toggle commit list
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on an old version of the diff Sep 04, 2025
    Last updated by yzh Sep 04, 2025
    src/views/os-preprocessingRecord/index.vue 0 → 100644
    37 <el-button type="primary" plain @click="handleDetails(scope.row)">
    38 编辑
    39 </el-button>
    40 <el-button type="success" plain @click="handleDetails(scope.row)">
    41 详情
    42 </el-button>
    43 <el-button type="danger" plain @click="handleConfirm(scope.row)">
    44 删除
    45 </el-button>
    46 </template>
    47 </el-table-column>
    48 </el-table>
    49 <div class="pagination w-full flex flex-row-reverse pr-4 m-t-4">
    50 <Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
    51 @pagination="getData" />
    52 <!-- <el-pagination background v-model:current-page="currentPage4" v-model:page-size="pageSize4"
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      如果没用就不要

      如果没用就不要
    • yzh @yezhonghan

      changed this line in version 2 of the diff

      Sep 04, 2025

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa#70aec2975d211d8e262916b7d5dc98f93a152abb_52_52)
      Toggle commit list
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on an old version of the diff Sep 04, 2025
    Last updated by yzh Sep 04, 2025
    src/views/os-preprocessingRecord/index.vue 0 → 100644
    104 address3: '0',
    105 address4: '无',
    106 address5: '10s',
    107 address6: '2023-05-13 10:00:00',
    108 }
    109 ])
    110 const pageObj = ref({
    111 total: 10,
    112 pageSize: 10,
    113 pageNo: 1
    114 })
    115 const paginationSize = ref('default')
    116 const disabled = ref(false)
    117 const background = ref(false)
    118 const currentPage4 = ref(4)
    119 const pageSize4 = ref(10)
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      下面几个空的,打印的,没用就不要

      下面几个空的,打印的,没用就不要
    • yzh @yezhonghan

      changed this line in version 2 of the diff

      Sep 04, 2025

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa#70aec2975d211d8e262916b7d5dc98f93a152abb_119_111)
      Toggle commit list
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on an old version of the diff Sep 04, 2025
    Last updated by yzh Sep 04, 2025
    src/views/os-taskInformation/index.vue 0 → 100644
    65 address3: '0',
    66 address4: '无',
    67 address5: '10s',
    68 address6: '2023-05-13 10:00:00',
    69 }
    70 ])
    71 const pageObj = ref({
    72 total: 10,
    73 pageSize: 10,
    74 pageNo: 1
    75 })
    76 const paginationSize = ref('default')
    77 const disabled = ref(false)
    78 const background = ref(false)
    79 const currentPage4 = ref(4)
    80 const pageSize4 = ref(10)
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      上面的,下面的,这几个分页的回调,如果没用,就都删了

      上面的,下面的,这几个分页的回调,如果没用,就都删了
    • yzh @yezhonghan

      changed this line in version 2 of the diff

      Sep 04, 2025

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa#3411ac3423b6a80f0dedb2f975b666c83b262610_80_87)
      Toggle commit list
    Please register or sign in to reply
  • 周田
    @zhoutian started a discussion on an old version of the diff Sep 04, 2025
    Last updated by yzh Sep 04, 2025
    src/views/os-taskInformation/index.vue 0 → 100644
    63 address1: '成功',
    64 address2: '100',
    65 address3: '0',
    66 address4: '无',
    67 address5: '10s',
    68 address6: '2023-05-13 10:00:00',
    69 }
    70 ])
    71 const pageObj = ref({
    72 total: 10,
    73 pageSize: 10,
    74 pageNo: 1
    75 })
    76 const paginationSize = ref('default')
    77 const disabled = ref(false)
    78 const background = ref(false)
    • 周田 @zhoutian commented Sep 04, 2025
      Master

      下面两个变量的命名,不要带 4

      下面两个变量的命名,不要带 4
    • yzh @yezhonghan

      changed this line in version 2 of the diff

      Sep 04, 2025

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa#3411ac3423b6a80f0dedb2f975b666c83b262610_78_87)
      Toggle commit list
    Please register or sign in to reply
  • yzh @yezhonghan

    added 1 commit

    • 4da0d493 - feat:删除不要的

    Compare with previous version

    Sep 04, 2025

    added 1 commit

    • 4da0d493 - feat:删除不要的

    Compare with previous version

    added 1 commit <ul><li>4da0d493 - feat:删除不要的</li></ul> [Compare with previous version](http://gitlab.example.com/zhoutian/fk-spider-web/merge_requests/1/diffs?diff_id=334&start_sha=aafd1af034c57967e8675323245bd2c2fc86f3fa)
    Toggle commit list
  • yzh @yezhonghan

    closed

    Sep 04, 2025

    closed

    closed
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: zhoutian/fk-spider-web!1