diff --git a/devops/minio-data/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/devops/minio-data/.minio.sys/buckets/.bloomcycle.bin/xl.meta new file mode 100644 index 0000000..0f1d8dd Binary files /dev/null and b/devops/minio-data/.minio.sys/buckets/.bloomcycle.bin/xl.meta differ diff --git a/devops/minio-data/.minio.sys/buckets/.usage.json/xl.meta b/devops/minio-data/.minio.sys/buckets/.usage.json/xl.meta new file mode 100644 index 0000000..5c362ba Binary files /dev/null and b/devops/minio-data/.minio.sys/buckets/.usage.json/xl.meta differ diff --git a/devops/minio-data/.minio.sys/config/config.json/xl.meta b/devops/minio-data/.minio.sys/config/config.json/xl.meta new file mode 100644 index 0000000..d88eecd Binary files /dev/null and b/devops/minio-data/.minio.sys/config/config.json/xl.meta differ diff --git a/devops/minio-data/.minio.sys/config/iam/format.json/xl.meta b/devops/minio-data/.minio.sys/config/iam/format.json/xl.meta new file mode 100644 index 0000000..cd3205d Binary files /dev/null and b/devops/minio-data/.minio.sys/config/iam/format.json/xl.meta differ diff --git a/devops/minio-data/.minio.sys/format.json b/devops/minio-data/.minio.sys/format.json new file mode 100644 index 0000000..fa55135 --- /dev/null +++ b/devops/minio-data/.minio.sys/format.json @@ -0,0 +1 @@ +{"version":"1","format":"xl-single","id":"093a4941-8147-4138-b3fe-70e4e14651d6","xl":{"version":"3","this":"f0185256-f990-408e-a72f-8f4c9cb5224b","sets":[["f0185256-f990-408e-a72f-8f4c9cb5224b"]],"distributionAlgo":"SIPMOD+PARITY"}} \ No newline at end of file diff --git a/devops/minio-data/.minio.sys/pool.bin/xl.meta b/devops/minio-data/.minio.sys/pool.bin/xl.meta new file mode 100644 index 0000000..141cd56 Binary files /dev/null and b/devops/minio-data/.minio.sys/pool.bin/xl.meta differ diff --git a/devops/minio-data/.minio.sys/tmp/21222c32-1fb7-4615-9ca0-12f2adb1f9cd b/devops/minio-data/.minio.sys/tmp/21222c32-1fb7-4615-9ca0-12f2adb1f9cd new file mode 100644 index 0000000..e36ee44 Binary files /dev/null and b/devops/minio-data/.minio.sys/tmp/21222c32-1fb7-4615-9ca0-12f2adb1f9cd differ diff --git a/txw-mhzc-web/package.json b/txw-mhzc-web/package.json index 2063255..937214e 100644 --- a/txw-mhzc-web/package.json +++ b/txw-mhzc-web/package.json @@ -8,7 +8,6 @@ "dev:mock": "cross-env VUE_APP_MOCK=true nodemon -x vue-cli-service serve", "serve": "vue-cli-service serve", "build:site": "vue-cli-service build", - "build": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build", "build:site:dev": "vue-cli-service build --mode development", "build:site:test": "vue-cli-service build --mode test", @@ -105,5 +104,6 @@ "ggzc-web": "link:D:\\shanghai\\txw2\\local-nodemodules\\@cssyq\\ggzc-web", "common-front": "link:D:\\shanghai\\txw2\\local-nodemodules\\@gt4\\common-front", "tdesign-gt-vue": "link:D:\\shanghai\\txw2\\local-nodemodules\\@gtff\\tdesign-gt-vue" - } + }, + "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610" } diff --git a/txw-mhzc-web/src/pages/index/views/fwsc/index.vue b/txw-mhzc-web/src/pages/index/views/fwsc/index.vue index 5153855..51d951c 100644 --- a/txw-mhzc-web/src/pages/index/views/fwsc/index.vue +++ b/txw-mhzc-web/src/pages/index/views/fwsc/index.vue @@ -13,6 +13,7 @@
@@ -167,7 +168,8 @@ export default { .banner-section { position: relative; display: flex; - height: 400px; + // height: 400px; + height: 350px; background: linear-gradient(135deg, #003B1A 0%, #009a29 40%, #00d87d 100%); align-items: center; justify-content: center; @@ -181,7 +183,7 @@ export default { right: 0; bottom: 0; background: url('~@/pages/index/assets/home-top-bg1.jpg') center/cover no-repeat; - opacity: 0.15; + // opacity: 0.15; } &::after { @@ -209,15 +211,18 @@ export default { font-weight: 700; line-height: 1.2; letter-spacing: 2px; - color: #fff; + // color: #fff; text-shadow: 0 2px 20px rgba(0, 0, 0, 0.2); + color: #204a0b; } .banner-subtitle { font-size: 20px; font-weight: 400; line-height: 1.8; - color: rgba(255, 255, 255, 0.95); + // color: rgba(255, 255, 255, 0.95); + color: #0A4A17; + text-shadow: 0 0 1px #ffffff, 0 0 3px #ffffff, 0 0 6px #ffffff, 0 0 10px #ffffff; } // 四大服务入口 diff --git a/txw-mhzc-web/src/pages/index/views/home2/assets/title-brush-bar.png b/txw-mhzc-web/src/pages/index/views/home2/assets/title-brush-bar.png new file mode 100644 index 0000000..95670e9 Binary files /dev/null and b/txw-mhzc-web/src/pages/index/views/home2/assets/title-brush-bar.png differ diff --git a/txw-mhzc-web/src/pages/index/views/home2/assets/title-brush-bar.webp b/txw-mhzc-web/src/pages/index/views/home2/assets/title-brush-bar.webp new file mode 100644 index 0000000..bb69691 Binary files /dev/null and b/txw-mhzc-web/src/pages/index/views/home2/assets/title-brush-bar.webp differ diff --git a/txw-mhzc-web/src/pages/index/views/home2/index.vue b/txw-mhzc-web/src/pages/index/views/home2/index.vue index df4a224..e90e7bc 100644 --- a/txw-mhzc-web/src/pages/index/views/home2/index.vue +++ b/txw-mhzc-web/src/pages/index/views/home2/index.vue @@ -1069,16 +1069,26 @@ export default { position: relative; } +/* 标题下笔触装饰(透明底 PNG) */ +.section-title.core-title::after, +.capability-title-bar, +.overseas2-title-bar, +.news-title-bar { + background-color: transparent; + background-image: url('~@/pages/index/views/home2/assets/title-brush-bar.png'); + background-repeat: no-repeat; + background-position: left center; + background-size: 100% 100%; +} + .section-title.core-title::after { - content: ''; - position: absolute; - bottom: 3px; - z-index: 9; - /* left: 44px; */ - width: 128px; - height: 8px; - background: rgba(0, 185, 107, 0.6); - border-radius: 4px; + content: ''; + position: absolute; + top: 3px; + left: 11px; + z-index: 9; + width: 189px; + height: 56px; } .section-title.core-title .title-bar { @@ -1222,12 +1232,14 @@ export default { .capability-title-bar { display: block; - width: 128px; - height: 8px; - background: rgba(0, 185, 107, 0.6); - border-radius: 4px; - margin-top: -14px; - z-index: -1; + content: ''; + position: absolute; + top: 9px; + left: 50px; + z-index: 9; + width: 189px; + height: 56px; + z-index: -1; } .capability-desc { @@ -1351,12 +1363,14 @@ export default { .overseas2-title-bar { display: block; - width: 128px; - height: 8px; - background: rgba(0, 185, 107, 0.6); - border-radius: 4px; - margin-top: -14px; - z-index: -1; + content: ''; + position: absolute; + top: 9px; + left: 50px; + z-index: 9; + width: 189px; + height: 56px; + z-index: -1; } .overseas2-desc { @@ -1499,12 +1513,14 @@ export default { .news-title-bar { display: block; - width: 128px; - height: 8px; - background: rgba(0, 185, 107, 0.6); - border-radius: 4px; - margin-top: -14px; - z-index: -1; + content: ''; + position: absolute; + top: 9px; + left: 50px; + z-index: 9; + width: 189px; + height: 56px; + z-index: -1; } .news-tabs { @@ -2123,7 +2139,7 @@ export default { .section-title.core-title::after { left: 36px; width: 100px; - height: 6px; + height: 32px; } .section-title .title-bar { @@ -2193,8 +2209,8 @@ export default { .capability-title-bar { width: 100px; - height: 6px; - margin-top: -10px; + height: 32px; + margin-top: -22px; } @@ -2389,8 +2405,8 @@ export default { .overseas2-title-bar { width: 100px; - height: 6px; - margin-top: -10px; + height: 32px; + margin-top: -22px; } .overseas2-desc { @@ -2472,8 +2488,8 @@ export default { .news-title-bar { width: 100px; - height: 6px; - margin-top: -10px; + height: 32px; + margin-top: -22px; } .news-tabs { diff --git a/txw-mhzc-web/src/pages/index/views/hyzt/index.vue b/txw-mhzc-web/src/pages/index/views/hyzt/index.vue index 7ccd7cd..138d5a2 100644 --- a/txw-mhzc-web/src/pages/index/views/hyzt/index.vue +++ b/txw-mhzc-web/src/pages/index/views/hyzt/index.vue @@ -68,10 +68,12 @@ export default { .banner { display: flex; width: 100%; - height: 300px; + // height: 300px; + height: 350px; padding: 60px 0; background: url(../../assets/hyzt/banner.png); background-size: cover; + background-position: center; flex-direction: column; align-items: flex-start; justify-content: space-around; diff --git a/txw-mhzc-web/src/pages/index/views/qych/index.vue b/txw-mhzc-web/src/pages/index/views/qych/index.vue index 4a29b4e..c3b1a2b 100644 --- a/txw-mhzc-web/src/pages/index/views/qych/index.vue +++ b/txw-mhzc-web/src/pages/index/views/qych/index.vue @@ -300,7 +300,8 @@ body { /* 顶部标题区(关键修改:垂直布局实现左对齐) */ .header { - height: 380px; + // height: 380px; + height: 350px; padding-top: 120px; margin-bottom: 30px; background: url(../../assets/qych/banner.png); diff --git a/txw-mhzc-web/vue.config.js b/txw-mhzc-web/vue.config.js index 8676034..5e81566 100644 --- a/txw-mhzc-web/vue.config.js +++ b/txw-mhzc-web/vue.config.js @@ -287,30 +287,30 @@ module.exports = { // 会误伤 SPA 路由 /view/mhzc/...,刷新时整页请求被转发到后端导致 Proxy error。必须用 ^ 限定为路径前缀。 proxy: { '^/sso': { - // target: 'http://localhost:9300', + // target: 'http://192.168.110.29:9300', // target: 'http://carbon.liantu.tech', target: 'https://www.cciw.com.cn', // target: 'http://10.23.20.13:94/', changeOrigin: true, }, '^/mhzc': { - // target: 'http://localhost:9300', + target: 'http://192.168.110.29:9300', // target: 'http://carbon.liantu.tech', target: 'https://www.cciw.com.cn', // target: 'http://10.23.20.13:94/', changeOrigin: true, }, '^/gxzx': { - // target: 'http://localhost:9300', + // target: 'http://192.168.110.29:9300', // target: 'http://carbon.liantu.tech', target: 'https://www.cciw.com.cn', // target: 'http://10.23.20.13:94/', changeOrigin: true, }, '^/yygl': { - // target: 'http://localhost:20010', + target: 'http://192.168.110.29:20010', // target: 'http://carbon.liantu.tech', - target: 'https://www.cciw.com.cn', + // target: 'https://www.cciw.com.cn', // target: 'http://10.23.20.13:94/', changeOrigin: true, }, diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/ISsoApi.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/ISsoApi.class index 16e2fac..2b8af0f 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/ISsoApi.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/ISsoApi.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/OAuth2TokenApi.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/OAuth2TokenApi.class index 9e9e863..114c75a 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/OAuth2TokenApi.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/OAuth2TokenApi.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/AccessTokenSessionInfo.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/AccessTokenSessionInfo.class index b2cbf6c..e464a94 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/AccessTokenSessionInfo.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/AccessTokenSessionInfo.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.class index 2363eeb..9c3b0b5 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenCheckRespDTO.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.class index c439045..084b6b0 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenCreateReqDTO.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenRespDTO.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenRespDTO.class index bab525e..f9847f2 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenRespDTO.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/oauth2/dto/OAuth2AccessTokenRespDTO.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/yhxx/SwitchSessionApi.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/yhxx/SwitchSessionApi.class index 364c208..e01a22c 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/yhxx/SwitchSessionApi.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/api/yhxx/SwitchSessionApi.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/configuration/SsoApiConfiguration.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/configuration/SsoApiConfiguration.class index bbde6c3..ddcb79c 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/configuration/SsoApiConfiguration.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/configuration/SsoApiConfiguration.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/constants/SsoApiConstants.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/constants/SsoApiConstants.class index 35fa438..37c19ca 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/constants/SsoApiConstants.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/constants/SsoApiConstants.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/enums/LoginLogTypeEnum.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/enums/LoginLogTypeEnum.class index 29cc9cf..903de33 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/enums/LoginLogTypeEnum.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/enums/LoginLogTypeEnum.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/enums/OAuth2GrantTypeEnum.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/enums/OAuth2GrantTypeEnum.class index df41921..998f51a 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/enums/OAuth2GrantTypeEnum.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/enums/OAuth2GrantTypeEnum.class differ diff --git a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/pojo/yhxx/SwitchCompanyResDTO.class b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/pojo/yhxx/SwitchCompanyResDTO.class index 954e37f..a7bbbd4 100644 Binary files a/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/pojo/yhxx/SwitchCompanyResDTO.class and b/txw-sso/txw-sso-service-api/target/classes/com/css/txw/sso/pojo/yhxx/SwitchCompanyResDTO.class differ diff --git a/微信图片_20260518190355_40_883.png b/微信图片_20260518190355_40_883.png new file mode 100644 index 0000000..95670e9 Binary files /dev/null and b/微信图片_20260518190355_40_883.png differ