修改

马宇豪

2023-10-31 f1f40e9a28fafab5d884630b8900b11060ebe9fc

修改

 .env.development

@@ -1,51 +1,20 @@
# 本地环境
ENV = 'development'

#VITE_API_URL = 'http://192.168.0.35:8008'
#李宇飞接口地址

#VITE_API_URL = 'http://192.168.0.22:8084'
#VITE_API_URL = 'http://192.168.0.27:8084'
#张凤接口地址

#VITE_API_URL = 'http://192.168.0.29:8008'
#VITE_API_URL = 'http://192.168.0.38:8086'
#黄振接口地址

#VITE_API_URL = 'http://192.168.0.5:8084'
#施正红接口地址

VITE_API_URL = 'http://192.168.0.18:8084'
VITE_API_URL = 'http://192.168.0.27:8084'
#戚会山接口地址

#VITE_API_URL = 'http://121.239.169.27:16006/safeplatform'
#VITE_API_URL = 'http://121.239.169.27:16070'
#线上正式环境接口地址

#VITE_API_URL_OUT = 'http://121.239.169.27:16006/safeplatform-out'
#线上正式环境外包接口地址

#VITE_API_URL = 'http://192.168.0.52:8011/safeplatform'
#本地预发接口地址

#VITE_API_URL_OUT = 'http://192.168.0.52:8011/safeplatform-out'
#本地外包预发接口地址


VITE_API_URL_OUT = 'http://192.168.0.50:8009'
#张凤外包接口地址

#VITE_API_URL_OUT = 'http://192.168.0.52:7021/safeplatform-out'


#VITE_API_URL = 'http://192.168.0.52:7021/safeplatform'
#本地测试接口地址

#VITE_API_URL_SOCKET = 'http://192.168.0.52:7021/safeplatform'
#本地测试websocket接口地址

#VITE_API_URL = 'http://192.168.0.29:7008'
#黄振接口test地址

#VITE_API_URL_SOCKET = 'http://192.168.0.29:16107'
#黄振websocket test接口地址

#VITE_API_URL_SOCKET = 'http://192.168.0.29:8018'
#黄振websocket接口地址

 .env.production

@@ -1,22 +1,5 @@
# 线上环境
ENV = 'production'

#内网test环境接口地址
#VITE_API_URL = 'http://192.168.0.52:7021/safeplatform'
#VITE_API_URL_OUT = 'http://192.168.0.52:7021/safeplatform-out'
#VITE_API_URL_SOCKET = 'http://192.168.0.52:7021/safeplatform'

#内网UAT环境接口地址
#VITE_API_URL = 'http://192.168.0.52:8011/safeplatform'
#VITE_API_URL_OUT = 'http://192.168.0.52:8011/safeplatform-out'
#VITE_API_URL_SOCKET = 'http://192.168.0.52:8011/safeplatform'

# 线上UAT预发环境接口地址
#VITE_API_URL = 'http://121.239.169.27:16006/safeplatform'
#VITE_API_URL_OUT = 'http://121.239.169.27:16006/safeplatform-out'
#VITE_API_URL_SOCKET = 'http://121.239.169.27:16006/safeplatform'

# 国泰线上试用环境接口地址
VITE_API_URL = 'http://121.239.169.27:16070'
VITE_API_URL_OUT = 'http://121.239.169.27:16016/safeplatform-out'
VITE_API_URL_SOCKET = 'http://121.239.169.27:16016/safeplatform'
# 科学实验线上环境接口地址
VITE_API_URL = 'http://121.239.169.27:7000'

 package-lock.json

@@ -1609,27 +1609,16 @@
            }
        },
        "node_modules/browserslist": {
            "version": "4.20.3",
            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
            "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
            "version": "4.21.5",
            "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.5.tgz",
            "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
            "dev": true,
            "funding": [
                {
                    "type": "opencollective",
                    "url": "https://opencollective.com/browserslist"
                },
                {
                    "type": "tidelift",
                    "url": "https://tidelift.com/funding/github/npm/browserslist"
                }
            ],
            "peer": true,
            "dependencies": {
                "caniuse-lite": "^1.0.30001332",
                "electron-to-chromium": "^1.4.118",
                "escalade": "^3.1.1",
                "node-releases": "^2.0.3",
                "picocolors": "^1.0.0"
                "caniuse-lite": "^1.0.30001449",
                "electron-to-chromium": "^1.4.284",
                "node-releases": "^2.0.8",
                "update-browserslist-db": "^1.0.10"
            },
            "bin": {
                "browserslist": "cli.js"
@@ -1655,20 +1644,10 @@
            }
        },
        "node_modules/caniuse-lite": {
            "version": "1.0.30001342",
            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz",
            "integrity": "sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==",
            "version": "1.0.30001457",
            "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001457.tgz",
            "integrity": "sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==",
            "dev": true,
            "funding": [
                {
                    "type": "opencollective",
                    "url": "https://opencollective.com/browserslist"
                },
                {
                    "type": "tidelift",
                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
                }
            ],
            "peer": true
        },
        "node_modules/cfb": {
@@ -2001,9 +1980,9 @@
            }
        },
        "node_modules/electron-to-chromium": {
            "version": "1.4.137",
            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
            "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
            "version": "1.4.305",
            "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.305.tgz",
            "integrity": "sha512-WETy6tG0CT5gm1O+xCbyapWNsCcmIvrn4NHViIGYo2AT8FV2qUCXdaB+WqYxSv/vS5mFqhBYnfZAAkVArjBmUg==",
            "dev": true,
            "peer": true
        },
@@ -2451,7 +2430,7 @@
        },
        "node_modules/escalade": {
            "version": "3.1.1",
            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
            "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
            "dev": true,
            "peer": true,
@@ -3497,9 +3476,9 @@
            "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
        },
        "node_modules/node-releases": {
            "version": "2.0.4",
            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
            "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
            "version": "2.0.10",
            "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.10.tgz",
            "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
            "dev": true,
            "peer": true
        },
@@ -4049,9 +4028,9 @@
            "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
        },
        "node_modules/semver": {
            "version": "7.3.7",
            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
            "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
            "version": "7.3.8",
            "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.8.tgz",
            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
            "dev": true,
            "dependencies": {
                "lru-cache": "^6.0.0"
@@ -4419,6 +4398,23 @@
            },
            "engines": {
                "node": ">=4.2.0"
            }
        },
        "node_modules/update-browserslist-db": {
            "version": "1.0.10",
            "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
            "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
            "dev": true,
            "peer": true,
            "dependencies": {
                "escalade": "^3.1.1",
                "picocolors": "^1.0.0"
            },
            "bin": {
                "browserslist-lint": "cli.js"
            },
            "peerDependencies": {
                "browserslist": ">= 4.21.0"
            }
        },
        "node_modules/uri-js": {
@@ -5968,17 +5964,16 @@
            }
        },
        "browserslist": {
            "version": "4.20.3",
            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
            "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
            "version": "4.21.5",
            "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.5.tgz",
            "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
            "dev": true,
            "peer": true,
            "requires": {
                "caniuse-lite": "^1.0.30001332",
                "electron-to-chromium": "^1.4.118",
                "escalade": "^3.1.1",
                "node-releases": "^2.0.3",
                "picocolors": "^1.0.0"
                "caniuse-lite": "^1.0.30001449",
                "electron-to-chromium": "^1.4.284",
                "node-releases": "^2.0.8",
                "update-browserslist-db": "^1.0.10"
            }
        },
        "buffer-from": {
@@ -5995,9 +5990,9 @@
            "dev": true
        },
        "caniuse-lite": {
            "version": "1.0.30001342",
            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz",
            "integrity": "sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==",
            "version": "1.0.30001457",
            "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001457.tgz",
            "integrity": "sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==",
            "dev": true,
            "peer": true
        },
@@ -6253,9 +6248,9 @@
            "requires": {}
        },
        "electron-to-chromium": {
            "version": "1.4.137",
            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
            "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
            "version": "1.4.305",
            "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.305.tgz",
            "integrity": "sha512-WETy6tG0CT5gm1O+xCbyapWNsCcmIvrn4NHViIGYo2AT8FV2qUCXdaB+WqYxSv/vS5mFqhBYnfZAAkVArjBmUg==",
            "dev": true,
            "peer": true
        },
@@ -6506,7 +6501,7 @@
        },
        "escalade": {
            "version": "3.1.1",
            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
            "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
            "dev": true,
            "peer": true
@@ -7335,9 +7330,9 @@
            "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
        },
        "node-releases": {
            "version": "2.0.4",
            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
            "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
            "version": "2.0.10",
            "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.10.tgz",
            "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
            "dev": true,
            "peer": true
        },
@@ -7659,9 +7654,9 @@
            "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
        },
        "semver": {
            "version": "7.3.7",
            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
            "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
            "version": "7.3.8",
            "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.8.tgz",
            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
            "dev": true,
            "requires": {
                "lru-cache": "^6.0.0"
@@ -7929,6 +7924,17 @@
            "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==",
            "devOptional": true
        },
        "update-browserslist-db": {
            "version": "1.0.10",
            "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
            "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
            "dev": true,
            "peer": true,
            "requires": {
                "escalade": "^3.1.1",
                "picocolors": "^1.0.0"
            }
        },
        "uri-js": {
            "version": "4.4.1",
            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",

 postcss.config.js

对比新文件
@@ -0,0 +1,26 @@
// module.exports = {
//     'plugins': {
//         'autoprefixer': {
//             overrideBrowserslist: [
//                 'Android 4.1',
//                 'iOS 7.1',
//                 'Chrome > 31',
//                 'not ie <= 11',  //不考虑IE浏览器
//                 'ff >= 30', //仅新版本用“ff>=30
//                 '> 1%',//  全球统计有超过1%的使用率使用“>1%”;
//                 'last 2 versions', // 所有主流浏览器最近2个版本
//             ],
//             grid: true ,// 开启grid布局的兼容(浏览器IE除外其他都能兼容grid，可以关闭开启)
//         },
//         'postcss-pxtorem': {
//             rootValue: 37.5, //75表示750设计稿，37.5表示375设计稿
//             unitPrecision: 6, // 计算结果保留 6 位小数
//             selectorBlackList: ['.no-rem', 'no-rem'], // 要忽略的选择器并保留为px。
//             propList: ['*'], // 可以从px更改为rem的属性  感叹号开头的不转换
//             replace: true, // 转换成 rem 以后，不保留原来的 px 单位属性
//             mediaQuery: true, // 允许在媒体查询中转换px。
//             minPixelValue: 2, // 设置要替换的最小像素值。
//             exclude: /node_modules/i // 排除 node_modules 文件(node_modules 内文件禁止转换)
//         }
//     }
// }

 src/layout/component/aside.vue

@@ -5,7 +5,7 @@
            <el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef" @mouseenter="onAsideEnterLeave(true)" @mouseleave="onAsideEnterLeave(false)">
                <Vertical :menuList="menuList" />
            </el-scrollbar>
            <div style="font-size: 9px;color: rgba(255,255,255,.4);padding: 10px 20px">技术支持：<br/>苏州国科鸿宇智能科技有限公司</div>
<!--            <div style="font-size: 9px;color: rgba(255,255,255,.4);padding: 10px 20px">技术支持：<br/>苏州国科鸿宇智能科技有限公司</div>-->
        </el-aside>
    </div>
</template>

 src/layout/navBars/breadcrumb/user.vue

@@ -258,7 +258,6 @@
            const res = await menuApi.getMenuAdmin(Cookies.get('projectId') === null ? '' : Cookies.get('projectId'));
            if (res.data.code === '200') {
                state.systemName = res.data.data[1].project.projectName;
                console.log(state.systemName);
            } else {
                console.log('有问题');
            }

 src/router/frontEnd.ts

@@ -65,6 +65,7 @@
    const { userInfos } = storeToRefs(stores);
    let rolesRoutes = setFilterHasRolesMenu(dynamicRoutes, userInfos.value.roles);
    // 添加到 pinia setTagsViewRoutes 中
    console.log((formatFlatteningRoutes(rolesRoutes))[0].children,'设置路由')
    storesTagsView.setTagsViewRoutes(formatTwoStageRoutes(formatFlatteningRoutes(rolesRoutes))[0].children);
}


 src/views/analyse/assessApply/index.ts

@@ -38,16 +38,14 @@
declare interface DangerSourceType {
    disabled: boolean
    dangerList: Array<DangerListType>
    classifyList: Array<Type>
    wasteStorageList: Array<Type>
}


declare interface DangerListType {
    dangerFactor: string
    feature: string
    amount: null | number
    info: string
    riskSource: string
    riskCharacteristic: string
    number: null | number
    description: string
}

declare interface AssessApplyDialogStateType {

 src/views/analyse/assessApply/index.vue

@@ -55,6 +55,11 @@
                            <span>{{scope.row.assessApplyTime?scope.row.assessApplyTime.substring(0,16):'--'}}</span>
                          </template>
                        </el-table-column>
                      <el-table-column prop="status" label="最近评估时间" show-overflow-tooltip>
                        <template #default="scope">
                          <span>{{scope.row.experimentAssessLogs?scope.row.experimentAssessLogs.map(i=>i.assessEndTime.substring(0,16)).join(','): ''}}</span>
                        </template>
                      </el-table-column>
                        <el-table-column prop="stage" label="评估状态">
                          <template #default="scope">
                            <el-tag :type="scope.row.stage == 4?'success':scope.row.stage == 1?'info':''">
@@ -67,7 +72,7 @@
                                <el-button size="small" v-if="scope.row.stage == 3" text type="primary" :icon="Edit" @click="toReport(scope.row)">生成评估报告</el-button>
                                <el-button size="small" text type="primary" :icon="Edit" @click="openRiskDialog(scope.row)">管理实验风险单元</el-button>
                                <el-button size="small" v-if="scope.row.stage == 4 && !scope.row.assessPerson" text type="primary" :icon="View" @click="openReportDialog('提交', scope.row)">提交审批</el-button>
                                <el-button size="small" v-if="scope.row.stage == 4 && !scope.row.assessPerson" text type="primary" :icon="View" @click="openReportDialog('修改', scope.row)">修改</el-button>
                                <el-button size="small" v-if="scope.row.stage == 4 && scope.row.assessPerson" text type="primary" :icon="View" @click="openReportDialog('修改', scope.row)">修改</el-button>
                                <el-button size="small" v-if="scope.row.stage == 4 && scope.row.assessPerson" text type="primary" :icon="Edit" @click="openReportDialog('查看',scope.row)">查看</el-button>
                            </template>
                        </el-table-column>

 src/views/loginPage/loginPage.vue

@@ -15,7 +15,7 @@
                </div>
            </div>
        </div>
        <div class="rights">技术支持：苏州国科鸿宇智能科技有限公司<br/><span>GTXH Intelligent Security Management System V1.0.1</span></div>
<!--        <div class="rights">技术支持：苏州国科鸿宇智能科技有限公司<br/><span>GTXH Intelligent Security Management System V1.0.1</span></div>-->
    </div>
</template>


 src/views/newHome/index.vue

@@ -156,7 +156,7 @@
        </div>
        <div class="bot-rights">
            <img src="../../assets/newMenu/pic_line1.png" />
            <div>技术支持：苏州国科鸿宇智能科技有限公司</div>
<!--            <div>技术支持：苏州国科鸿宇智能科技有限公司</div>-->
            <img src="../../assets/newMenu/pic_line2.png" />
        </div>
    </div>

 yarn.lock

文件太大