系统修改

2025-09-11 14:05:59 +08:00 · 2025-09-11 14:05:59 +08:00 · e22640f6c6
parent 7823d77aeb
commit e22640f6c6
23 changed files with 111 additions and 107 deletions
--- a/.env.development
+++ b/.env.development
@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 工程档案资料移交管理系统
+VUE_APP_TITLE = 档案预归档管理系统

 # 开发环境配置
 ENV = 'development'

-# 工程档案资料移交管理系统/开发环境
+# 档案预归档管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'

 # 路由懒加载
--- a/.env.production
+++ b/.env.production
@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 工程档案资料移交管理系统
+VUE_APP_TITLE = 档案预归档管理系统

 # 生产环境配置
 ENV = 'production'

-# 工程档案资料移交管理系统/生产环境
+# 档案预归档管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
--- a/.env.staging
+++ b/.env.staging
@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 工程档案资料移交管理系统
+VUE_APP_TITLE = 档案预归档管理系统

 BABEL_ENV = production

@ -8,5 +8,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'

-# 工程档案资料移交管理系统/测试环境
+# 档案预归档管理系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "ruoyi",
  "version": "3.9.0",
-  "description": "工程档案资料移交管理系统",
+  "description": "档案预归档管理系统",
  "author": "bonus",
  "license": "MIT",
  "scripts": {
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/favicon.ico2
+++ b/public/favicon.ico2
--- a/public/styles/theme-chalk/favicon.ico
+++ b/public/styles/theme-chalk/favicon.ico
--- a/src/api/data-collect/data-set-manage.js
+++ b/src/api/data-collect/data-set-manage.js
@ -3,8 +3,8 @@ import request from '@/utils/request'
 // 获取左侧树列表接口
 export function getLeftTreeListAPI(data) {
    return request({
-        url: '/smartArchives/***',
-        method: 'POST',
+        url: '/smartArchives/data/classify/listAll',
+        method: 'GET',
        data: data,
    })
 }
@ -12,7 +12,7 @@ export function getLeftTreeListAPI(data) {
 // 获取数据列表接口
 export function getListDataSetAPI(data) {
    return request({
-        url: '/smartArchives/***',
+        url: '/smartArchives/data/Collect/list',
        method: 'GET',
        params: data,
    })
--- a/src/assets/images/login-background.jpg
+++ b/src/assets/images/login-background.jpg
--- a/src/assets/images/login-background2.jpg
+++ b/src/assets/images/login-background2.jpg
--- a/src/assets/images/pay.png
+++ b/src/assets/images/pay.png
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */

-$base-sidebar-width: 200px;
+$base-sidebar-width: 250px;

 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@ -96,7 +96,7 @@ export default {
  line-height: 50px;
  margin-left: 8px;
  .no-redirect {
-    color: #97a8be;
+    color: #fff;
    cursor: text;
  }
 }
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@ -9,13 +9,13 @@
      <template v-if="device!=='mobile'">
        <search id="header-search" class="right-menu-item" />

-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->

-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="文档地址" effect="dark" placement="bottom">
          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->

        <screenfull id="screenfull" class="right-menu-item hover-effect" />

@ -115,7 +115,8 @@ export default {
  height: 50px;
  overflow: hidden;
  position: relative;
-  background: #fff;
+  // background: #fff;
+  background: #006e6afe;
  box-shadow: 0 1px 4px rgba(0,21,41,.08);

  .hamburger-container {
@ -127,7 +128,7 @@ export default {
    -webkit-tap-highlight-color:transparent;

    &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: #006E6B50
    }
  }

@ -159,7 +160,8 @@ export default {
      padding: 0 8px;
      height: 100%;
      font-size: 18px;
-      color: #5a5e66;
+      // color: #5a5e66;
+      color: #fff;
      vertical-align: text-bottom;

      &.hover-effect {
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@ -57,7 +57,8 @@ export default {
  width: 100%;
  height: 50px;
  line-height: 50px;
-  background: #2b2f3a;
+  // background: #2b2f3a;
+  background: #006E6B !important;
  text-align: center;
  overflow: hidden;

@ -75,7 +76,7 @@ export default {
    & .sidebar-title {
      display: inline-block;
      margin: 0;
-      color: #fff;
+      color: #fff !important;
      font-weight: 600;
      line-height: 50px;
      font-size: 14px;
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -11,9 +11,9 @@ import { generateRequestSignature } from '@/utils/crypto-js'

 const systemConfig = {
    requestConfig: {
-        encryptRequest: process.env.VUE_APP_ENV === 'production' ? true : false,
-        checkIntegrity: process.env.VUE_APP_ENV === 'production' ? true : false,
-        encryptResponse: process.env.VUE_APP_ENV === 'production' ? true : false,
+        encryptRequest: process.env.VUE_APP_ENV === 'production' ? true : true,
+        checkIntegrity: process.env.VUE_APP_ENV === 'production' ? true : true,
+        encryptResponse: process.env.VUE_APP_ENV === 'production' ? true : true,
    },
 }

--- a/src/views/data-collect/data-set-manage/components/left-tree.vue
+++ b/src/views/data-collect/data-set-manage/components/left-tree.vue
@ -4,31 +4,18 @@
        <el-card style="min-height: calc(100vh - 125px)">
            <el-row :gutter="20" style="display: flex; align-items: center">
                <el-col :span="16">
-                    <el-input
-                        v-model="filterText"
-                        placeholder="输入关键字"
-                        @keyup.enter.native="onHandleSearch"
-                    >
+                    <el-input v-model="filterText" placeholder="输入关键字" @keyup.enter.native="onHandleSearch">
                    </el-input>
                </el-col>
                <el-col :span="8">
-                    <el-button
-                        type="primary"
-                        size="small"
-                        @click="onHandleSearch"
-                    >
-                        搜索
+                    <el-button type="primary" size="small" @click="onHandleSearch">
+                        查询
                    </el-button>
                </el-col>
            </el-row>

-            <el-tree
-                ref="leftTreeRef"
-                :data="treeDataList"
-                default-expand-all
-                class="left-tree-list"
-                @node-click="onHandleNodeClick"
-            >
+            <el-tree ref="leftTreeRef" :data="filteredTreeData" default-expand-all class="left-tree-list"
+                @node-click="onHandleNodeClick" :filter-node-method="filterNode">
            </el-tree>
        </el-card>
    </div>
@ -43,43 +30,21 @@ export default {
            treeDataList: [
                {
                    label: '数据汇集管理',
-                    id: 1,
-                    children: [
-                        {
-                            label: '数据汇集1',
-                            id: 11,
-                        },
-                        {
-                            label: '数据汇集2',
-                            id: 12,
-                        },
-                        {
-                            label: '数据汇集3',
-                            id: 13,
-                        },
-                        {
-                            label: '数据汇集4',
-                            id: 14,
-                        },
-                        {
-                            label: '数据汇集5',
-                            id: 15,
-                        },
-                        {
-                            label: '数据汇集6',
-                            id: 16,
-                        },
-                        {
-                            label: '数据汇集7',
-                            id: 17,
-                        },
-                        {
-                            label: '数据汇集8',
-                            id: 18,
-                        },
-                    ],
+                    id: 0,
+                    children: [],
                },
            ],
+            filterText: '',
+            originalTreeData: [], // 保存原始数据
+        }
+    },
+    computed: {
+        // 过滤后的树数据
+        filteredTreeData() {
+            if (!this.filterText) {
+                return this.treeDataList
+            }
+            return this.filterTreeData(this.treeDataList)
        }
    },
    methods: {
@ -92,16 +57,46 @@ export default {
        // 获取左侧树列表
        async getLeftTreeList() {
            const res = await getLeftTreeListAPI()
-            // this.treeDataList = res.data
+            const transformedData = res.rows.map(item => ({
+                id: item.id,
+                label: item.dataTypeName
+            }));
+            this.treeDataList[0].children = transformedData
+            // 保存原始数据
+            this.originalTreeData = JSON.parse(JSON.stringify(this.treeDataList))
        },
        // 搜索
        onHandleSearch() {
-            // console.log(this.filterText)
-            // this.getLeftTreeList()
+            this.$refs.leftTreeRef.filter(this.filterText)
+        },
+        // 树节点过滤方法
+        filterNode(value, data) {
+            if (!value) return true
+            return data.label.indexOf(value) !== -1
+        },
+        // 递归过滤树数据
+        filterTreeData(treeData) {
+            const result = []
+            for (const node of treeData) {
+                const newNode = { ...node }
+                if (node.children && node.children.length > 0) {
+                    const filteredChildren = this.filterTreeData(node.children)
+                    if (filteredChildren.length > 0) {
+                        newNode.children = filteredChildren
+                        result.push(newNode)
+                    } else if (node.label.indexOf(this.filterText) !== -1) {
+                        // 如果父节点匹配，保留所有子节点
+                        result.push(node)
+                    }
+                } else if (node.label.indexOf(this.filterText) !== -1) {
+                    result.push(newNode)
+                }
+            }
+            return result
        },
    },
    created() {
-        // this.getLeftTreeList()
+        this.getLeftTreeList()
    },
 }
 </script>
--- a/src/views/data-collect/data-set-manage/components/right-table.vue
+++ b/src/views/data-collect/data-set-manage/components/right-table.vue
@ -52,13 +52,13 @@
 </template>

 <script>
-import { getListDataSetClassAPI } from '@/api/data-collect/data-set-manage'
+import { getListDataSetAPI } from '@/api/data-collect/data-set-manage'
 export default {
    name: 'RightTable',
    props: {
        selectedNodeId: {
            type: [Number, String],
-            default: null,
+            default: 0,
        },
    },
    data() {
@ -82,17 +82,18 @@ export default {
        },

        // 获取数据列表
-        async getListDataSetClassFun(id) {
-            // const res = await getListDataSetClassAPI({
-            //     id,
-            //     ...this.queryParams,
-            // })
+        async getListDataSetClassFun(node) {
+            const res = await getListDataSetAPI({
+                dataClassifyId: node
+            })
+            console.log(res);
+            
            // this.tableData = res.rows
            // this.total = res.total

            // 动态添加表格列和数据源

-            const num = Math.floor(Math.random() * 6) + 1
+            /* const num = Math.floor(Math.random() * 6) + 1
            const num2 = Math.floor(Math.random() * 6) + 1
            for (let i = 0; i < num; i++) {
                this.columns.push({
@ -107,7 +108,7 @@ export default {
                    obj[this.columns[j].prop] = `字段${j + 1}的值`
                }
                this.tableData.push(obj)
-            }
+            } */
        },
    },

@ -117,9 +118,9 @@ export default {
            handler(newVal) {
                this.columns = []
                this.tableData = []
-                this.getListDataSetClassFun(newVal.id)
+                this.getListDataSetClassFun(newVal)
            },
-            immediate: true,
+            immediate: true, // 表示立即执行
        },
    },
 }
--- a/src/views/data-collect/data-set-manage/index.vue
+++ b/src/views/data-collect/data-set-manage/index.vue
@ -24,13 +24,12 @@ export default {
    data() {
        return {
            // 选中的节点ID
-            selectedNodeId: null,
+            selectedNodeId: 0,
        }
    },
    methods: {
        // 节点点击事件
        handleNodeClick(data) {
-            console.log(data)
            this.selectedNodeId = data.id
        },
    },
--- a/src/views/login.vue
+++ b/src/views/login.vue
@ -1,6 +1,7 @@
 <template>
  <div class="login">
    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+      <h3 class="title">欢迎登录</h3>
      <h3 class="title">{{title}}</h3>
      <el-form-item prop="username">
        <el-input
@ -56,7 +57,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
-      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
+      <span></span>
    </div>
  </div>
 </template>
@ -162,23 +163,28 @@ export default {
  justify-content: center;
  align-items: center;
  height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
+  // background-image: url("../assets/images/login-background.jpg");
+  // background-size: cover;
+  background: url("../assets/images/login-background.jpg") no-repeat left center;
 }
 .title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+  margin: 0px auto 20px auto;
+  font-weight: bold;
+  text-align: left;
+  color: #060F2E;
+  font-size: 28px;
 }

 .login-form {
  border-radius: 6px;
  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+  width: 550px;
+  // padding: 25px 25px 5px 25px;
  z-index: 1;
+  margin-left: 58%;
  .el-input {
    height: 38px;
+    margin: 5px 0;
    input {
      height: 38px;
    }
--- a/src/views/system/white/prop/whiteForm.vue
+++ b/src/views/system/white/prop/whiteForm.vue
@ -186,7 +186,7 @@ export default {
                // 若与原值相同则不触发校验错误，直接通过
                if (previous !== undefined && value === previous) return callback()
                if (!value) return callback(new Error('单个IP地址不能为空'))
-                //if (!isIPv4(value)) return callback(new Error('请输入合法的IPv4地址，如 192.168.1.1'))
+                if (!isIPv4(value)) return callback(new Error('请输入合法的IPv4地址，如 192.168.1.1'))
            }
            callback()
        },
@ -195,7 +195,7 @@ export default {
                const previous = this.form.ipRangeStartDesNew
                if (previous !== undefined && value === previous) return callback()
                if (!value) return callback(new Error('IP网段起始地址不能为空'))
-                //if (!isIPv4(value)) return callback(new Error('请输入合法的IPv4地址，如 192.168.1.1'))
+                if (!isIPv4(value)) return callback(new Error('请输入合法的IPv4地址，如 192.168.1.1'))
                const end = this.form.ipRangeEndDes
                if (end && isIPv4(end) && !isIPv4RangeOrder(value, end)) {
                    return callback(new Error('起始地址不能大于结束地址'))
@ -208,7 +208,7 @@ export default {
                const previous = this.form.ipRangeEndDesNew
                if (previous !== undefined && value === previous) return callback()
                if (!value) return callback(new Error('IP网段结束地址不能为空'))
-                //if (!isIPv4(value)) return callback(new Error('请输入合法的IPv4地址，如 192.168.1.100'))
+                if (!isIPv4(value)) return callback(new Error('请输入合法的IPv4地址，如 192.168.1.100'))
                const start = this.form.ipRangeStartDes
                if (start && isIPv4(start) && !isIPv4RangeOrder(start, value)) {
                    return callback(new Error('结束地址不能小于起始地址'))
--- a/vue.config.js
+++ b/vue.config.js
@ -7,10 +7,10 @@ function resolve(dir) {

 const CompressionPlugin = require('compression-webpack-plugin')

-const name = process.env.VUE_APP_TITLE || '工程档案资料移交管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '档案预归档管理系统' // 网页标题

 // const baseUrl = 'http://localhost:8080' // 后端接口
-const baseUrl = 'http://192.168.0.60:8080' // 后端接口-福
+const baseUrl = 'http://192.168.0.39:8080' // 后端接口-福

 const port = process.env.port || process.env.npm_config_port || 80 // 端口