From 9e26f62f8153095c94f53bd58f6e00bda15a9b31 Mon Sep 17 00:00:00 2001 From: liulujian Date: Tue, 16 Jun 2026 02:23:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E7=BC=A9=E6=94=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/styles/home-figma-variables.less | 41 +-------- .../src/pages/index/utils/home-figma-scale.js | 2 - .../pages/index/utils/portal-figma-scale.js | 1 - txw-mhzc/sql/import_hydt_data.sql | 83 +++++++++++++++++++ txw-yygl-web/package.json | 14 ++-- .../src/pages/index/api/gxzx/index.js | 18 ++-- .../src/pages/index/views/gxfb/tfwgj.vue | 2 +- .../src/pages/index/views/gxfb/tfwxq.vue | 2 +- .../src/pages/index/views/lsjy/index.vue | 2 +- .../src/pages/index/views/lsjy/lsjy.vue | 2 +- txw-yygl-web/vue.config.js | 19 +++++ 11 files changed, 123 insertions(+), 63 deletions(-) create mode 100644 txw-mhzc/sql/import_hydt_data.sql diff --git a/txw-mhzc-web/src/pages/index/styles/home-figma-variables.less b/txw-mhzc-web/src/pages/index/styles/home-figma-variables.less index f0558e2..0717e98 100644 --- a/txw-mhzc-web/src/pages/index/styles/home-figma-variables.less +++ b/txw-mhzc-web/src/pages/index/styles/home-figma-variables.less @@ -991,47 +991,8 @@ html.portal-figma-scale-active.portal-market-figma-scale-active { } } -// 顶栏与首页共用 html.portal-figma-scale-active + --home-figma-scale +// 顶栏不再参与 Figma 等比缩放，高度统一由 page-layout.less 的 --page-nav-height 控制 .home-figma-scale-nav() { - html.portal-figma-scale-active .nav-box { - height: var(--page-nav-height); - overflow: hidden; - } - - html.portal-figma-scale-active .nav-figma-scale-viewport { - display: flex; - width: 100%; - height: var(--page-nav-height); - overflow: hidden; - justify-content: center; - } - - html.portal-figma-scale-active .nav-figma-scale-stage { - width: @home-design-width; - height: @home-nav-height; - flex-shrink: 0; - transform: scale(var(--home-figma-scale, 1)); - transform-origin: top center; - margin-bottom: var(--home-figma-nav-stage-margin-bottom, 0); - } - - html.portal-figma-scale-active .nav-figma-scale-stage .page-nav-inner { - width: @home-content-width; - max-width: @home-content-width; - margin-left: auto; - margin-right: auto; - padding-left: 0; - padding-right: 0; - box-sizing: border-box; - } - - html.portal-figma-scale-active .nav-figma-scale-stage .nav-inner, - html.portal-figma-scale-active .nav-figma-scale-stage .menu-box, - html.portal-figma-scale-active .nav-figma-scale-stage .option-wrapper, - html.portal-figma-scale-active .nav-figma-scale-stage .option-box { - height: @home-nav-height; - min-height: @home-nav-height; - } } // ----------------------------------------------------------------------------- diff --git a/txw-mhzc-web/src/pages/index/utils/home-figma-scale.js b/txw-mhzc-web/src/pages/index/utils/home-figma-scale.js index 9e270d8..a6c7638 100644 --- a/txw-mhzc-web/src/pages/index/utils/home-figma-scale.js +++ b/txw-mhzc-web/src/pages/index/utils/home-figma-scale.js @@ -88,7 +88,6 @@ export function applyHomeFigmaScaleToRoot(viewportWidth, viewportHeight) { root.style.removeProperty('--home-figma-visual-height'); root.style.removeProperty('--home-section-min-h'); root.style.removeProperty('--home-news-section-min-h'); - root.style.removeProperty('--page-nav-height'); return result; } @@ -103,7 +102,6 @@ export function applyHomeFigmaScaleToRoot(viewportWidth, viewportHeight) { root.style.setProperty('--home-figma-visual-height', `${Math.ceil(result.designHeight * result.scale)}px`); root.style.setProperty('--home-section-min-h', `${result.sectionDesignHeight}px`); root.style.setProperty('--home-news-section-min-h', `${result.newsSectionDesignHeight}px`); - root.style.setProperty('--page-nav-height', `${result.navHeightPx}px`); root.style.setProperty('--home-figma-nav-stage-margin-bottom', `${HOME_FIGMA_NAV_HEIGHT * (result.scale - 1)}px`); return result; } diff --git a/txw-mhzc-web/src/pages/index/utils/portal-figma-scale.js b/txw-mhzc-web/src/pages/index/utils/portal-figma-scale.js index 84fffd7..6aa1e3b 100644 --- a/txw-mhzc-web/src/pages/index/utils/portal-figma-scale.js +++ b/txw-mhzc-web/src/pages/index/utils/portal-figma-scale.js @@ -110,7 +110,6 @@ function applySharedPortalScaleVars(root, result) { root.classList.add('portal-figma-scale-active'); root.style.setProperty('--home-figma-scale', String(result.scale)); root.style.setProperty('--portal-shell-min-design-height', `${result.shellMinDesignHeight}px`); - root.style.setProperty('--page-nav-height', `${result.navHeightPx}px`); root.style.setProperty('--home-figma-nav-stage-margin-bottom', `${HOME_FIGMA_NAV_HEIGHT * (result.scale - 1)}px`); root.style.removeProperty('--home-figma-hero-design-height'); diff --git a/txw-mhzc/sql/import_hydt_data.sql b/txw-mhzc/sql/import_hydt_data.sql new file mode 100644 index 0000000..0ffabca --- /dev/null +++ b/txw-mhzc/sql/import_hydt_data.sql @@ -0,0 +1,83 @@ +-- ============================================= +-- 行业动态表 txw_mhzc_hydtb 数据导入 +-- 编码: utf8mb4 +-- ============================================= + +SET NAMES utf8mb4; +SET CHARACTER SET utf8mb4; + +INSERT INTO txw_mhzc_hydtb (uuid, bt, tp, nr, wx_nr, fbsj, lx, lx_mc, lxr, yy_lj, zt, llcs, lrrq) +VALUES +-- ========== 国家政策 (gjzc) ========== + +('e8a17f3d2c4b4a6e9d1f5072b83c6a91', + '国家发展改革委等部门印发《关于开展重点行业节能降碳改造攻坚三年行动的通知》', + NULL, + '为全面贯彻党的二十大和二十届历次全会精神，贯彻落实中央经济工作会议和政府工作报告部署，加大节能降碳改造攻坚力度，着力扩大有效投资、培育绿色发展动能，支撑实现碳达峰目标，国家发展改革委等部门近日联合印发《关于开展重点行业节能降碳改造攻坚三年行动的通知》（发改环资〔2026〕698号，以下简称《通知》）。', + NULL, + '2026-06-15 00:00:00', + 'gjzc', + '国家政策', + '中华人民共和国国家发展和改革委员会', + 'https://www.ndrc.gov.cn/xxgk/jd/jd/202606/t20260615_1405864.html', + '1', + 0, + NOW()), + +('a4c62e81f7d945b38e2a9176d0f5c3b2', + '国家发展改革委与老挝有关部门签署合作文件', + NULL, + '2026年6月5日，在中国和老挝两党两国最高领导人见证下，郑栅洁主任与老挝副总理、财政部部长兼老中合作委员会主席山迪帕·丰威汉签署《中华人民共和国国家发展和改革委员会与老挝人民民主共和国老中合作委员会关于推动绿色产业发展合作的谅解备忘录》。', + NULL, + '2026-06-08 00:00:00', + 'gjzc', + '国家政策', + '中华人民共和国国家发展和改革委员会', + 'https://www.ndrc.gov.cn/xwdt/xwfb/202606/t20260608_1405748.html', + '1', + 0, + NOW()), + +('b7d59f04e1a8427c9f3b8265c0d4e7a3', + '国家能源局召开民营企业座谈会', + NULL, + '5月25日，国家能源局召开能源领域民营企业座谈会，围绕强化企业科技创新主体地位，鼓励和支持民营企业开展能源科技创新，听取意见建议。来自风电、太阳能、储能、氢能、数智化等领域的企业负责人参加座谈会。', + NULL, + '2026-06-01 00:00:00', + 'gjzc', + '国家政策', + '中华人民共和国国家发展和改革委员会', + 'https://www.ndrc.gov.cn/fzggw/wld/wanghongzhi/zyhd/202606/t20260601_1405576.html', + '1', + 0, + NOW()), + +-- ========== 行业资讯 (hyzx) ========== + +('c1e84a72b6d349f08e5c9372a1d4b6f8', + '第四届碳博会：携手勾勒"低碳更新、绿色新生"城市发展新图景', + NULL, + '日前，第四届上海国际碳中和博览会·第二届城市更新绿色引力活动在上海新国际博览中心举行。本次活动以"聚光绿色实践 赋能城市新生"为主题，现场汇聚科研机构、城市更新运营主体、绿色低碳技术企业及设计单位等两百余位业内嘉宾，围绕高密度城区改造、存量建筑升级、绿色技术落地与低碳长效运营等核心议题展开探讨，共话行业发展新方向。', + NULL, + '2026-06-13 00:00:00', + 'hyzx', + '行业资讯', + '上观新闻', + 'https://www.shobserver.cn/staticsg/res/html/web/newsDetail.html?id=1127736&v=2.2&sid=67', + '1', + 0, + NOW()), + +('d2f95b83c7e045a19f6d0483b2c5e7f9', + '覆盖碳排放量约占全球六成，我国碳市场夯实绿色低碳发展主动权', + NULL, + '在"十五五"开局起步的关键节点，全国碳排放权交易市场（以下简称"全国碳市场"）作为实现碳达峰、碳中和目标的核心政策工具，正发挥着日益重要的战略作用。', + NULL, + '2026-06-09 00:00:00', + 'hyzx', + '行业资讯', + '人民日报', + 'https://www.cets.org.cn/hjywt/7382.jhtml', + '1', + 0, + NOW()); diff --git a/txw-yygl-web/package.json b/txw-yygl-web/package.json index ec2c0db..ceb13cf 100644 --- a/txw-yygl-web/package.json +++ b/txw-yygl-web/package.json @@ -4,13 +4,13 @@ "version": "0.1.0-alpha.0", "private": true, "scripts": { - "dev": "vue-cli-service serve", - "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": "vue-cli-service build", - "build:site:dev": "vue-cli-service build --mode development", - "build:site:test": "vue-cli-service build --mode test", + "dev": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve", + "dev:mock": "cross-env NODE_OPTIONS=--openssl-legacy-provider VUE_APP_MOCK=true nodemon -x vue-cli-service serve", + "serve": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve", + "build:site": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build", + "build": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build", + "build:site:dev": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build --mode development", + "build:site:test": "cross-env NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build --mode test", "lint": "vue-cli-service lint", "lint:style": "vue-cli-service lint:style", "changelog": "conventional-changelog -p custom-config -i CHANGELOG.md -s -r 0", diff --git a/txw-yygl-web/src/pages/index/api/gxzx/index.js b/txw-yygl-web/src/pages/index/api/gxzx/index.js index d219b8b..496d0a4 100644 --- a/txw-yygl-web/src/pages/index/api/gxzx/index.js +++ b/txw-yygl-web/src/pages/index/api/gxzx/index.js @@ -51,7 +51,7 @@ export default { //////////////////////////////////////////// getGxSqList(params) { return fetchSso({ - url: `${basurl}/gxzx/gxdt/getGxSqList`, + url: `${basurl}/mhzc/gxdt/getGxSqList`, method: 'post', loading: true, data: JSON.stringify(params), @@ -60,7 +60,7 @@ export default { }, getGxxx(params) { return fetchSso({ - url: `${basurl}/gxzx/gxdt/getGxxx?gxuuid=${params}`, + url: `${basurl}/mhzc/gxdt/getGxxx?gxuuid=${params}`, method: 'get', loading: true, headers, @@ -68,7 +68,7 @@ export default { }, gxsp(params) { return fetchSso({ - url: `${basurl}/gxzx/gxdt/gxsp`, + url: `${basurl}/mhzc/gxdt/gxsp`, method: 'post', loading: true, data: JSON.stringify(params), @@ -78,7 +78,7 @@ export default { /////////////////////////////////////////////// gxsj(params) { return fetchSso({ - url: `${basurl}/gxzx/gxdt/gxsj`, + url: `${basurl}/mhzc/gxdt/gxsj`, method: 'post', loading: true, data: JSON.stringify(params), @@ -89,7 +89,7 @@ export default { //绿色交易查询 queryZcxxList(params) { return fetchSso({ - url: `${basurl}/gxzx/lsjy/queryZcxxList`, + url: `${basurl}/mhzc/lsjy/queryZcxxList`, method: 'post', loading: true, data: JSON.stringify(params), @@ -99,7 +99,7 @@ export default { //绿色交易上下架 zcsxj(params) { return fetchSso({ - url: `${basurl}/gxzx/lsjy/zcsxj`, + url: `${basurl}/mhzc/lsjy/zcsxj`, method: 'post', loading: true, data: JSON.stringify(params), @@ -109,7 +109,7 @@ export default { //绿色交易审批 zcSp(params) { return fetchSso({ - url: `${basurl}/gxzx/lsjy/zcSp`, + url: `${basurl}/mhzc/lsjy/zcSp`, method: 'post', loading: true, data: JSON.stringify(params), @@ -119,7 +119,7 @@ export default { //绿色交易详情 queryZcxxxq(params) { return fetchSso({ - url: `${basurl}/gxzx/lsjy/queryZcxxxq?zcid=${params}`, + url: `${basurl}/mhzc/lsjy/queryZcxxxq?zcid=${params}`, method: 'get', loading: true, headers, @@ -128,7 +128,7 @@ export default { //绿色交易删除 deleteGxxx(params) { return fetchSso({ - url: `${basurl}/gxzx/lsjy/delete/${params}`, + url: `${basurl}/mhzc/lsjy/delete/${params}`, method: 'post', loading: true, headers, diff --git a/txw-yygl-web/src/pages/index/views/gxfb/tfwgj.vue b/txw-yygl-web/src/pages/index/views/gxfb/tfwgj.vue index f318858..81a7b78 100644 --- a/txw-yygl-web/src/pages/index/views/gxfb/tfwgj.vue +++ b/txw-yygl-web/src/pages/index/views/gxfb/tfwgj.vue @@ -376,7 +376,7 @@ export default { try { const res = await api.getGxSqList(params); this.list = res.data?.records || []; - this.pagination.total = res.data?.total; + this.pagination.total = Number(res.data?.total) || 0; } catch (err) { this.list = []; this.pagination.total = 0; diff --git a/txw-yygl-web/src/pages/index/views/gxfb/tfwxq.vue b/txw-yygl-web/src/pages/index/views/gxfb/tfwxq.vue index 123dcb8..2912087 100644 --- a/txw-yygl-web/src/pages/index/views/gxfb/tfwxq.vue +++ b/txw-yygl-web/src/pages/index/views/gxfb/tfwxq.vue @@ -372,7 +372,7 @@ export default { try { const res = await api.getGxSqList(params); this.list = res.data?.records || []; - this.pagination.total = res.data?.total; + this.pagination.total = Number(res.data?.total) || 0; } catch (err) { this.list = []; this.pagination.total = 0; diff --git a/txw-yygl-web/src/pages/index/views/lsjy/index.vue b/txw-yygl-web/src/pages/index/views/lsjy/index.vue index d07d085..63c28b9 100644 --- a/txw-yygl-web/src/pages/index/views/lsjy/index.vue +++ b/txw-yygl-web/src/pages/index/views/lsjy/index.vue @@ -262,7 +262,7 @@ export default { try { const res = await api.queryZcxxList(params); this.list = res.data?.list || []; - this.pagination.total = res.data?.total; + this.pagination.total = Number(res.data?.total) || 0; } catch (err) { this.list = []; this.pagination.total = 0; diff --git a/txw-yygl-web/src/pages/index/views/lsjy/lsjy.vue b/txw-yygl-web/src/pages/index/views/lsjy/lsjy.vue index 4edaed5..9b6a6ea 100644 --- a/txw-yygl-web/src/pages/index/views/lsjy/lsjy.vue +++ b/txw-yygl-web/src/pages/index/views/lsjy/lsjy.vue @@ -369,7 +369,7 @@ export default { try { const res = await api.queryZcxxList(params); this.list = res.data?.list || []; - this.pagination.total = res.data?.total; + this.pagination.total = Number(res.data?.total) || 0; } catch (err) { this.list = []; this.pagination.total = 0; diff --git a/txw-yygl-web/vue.config.js b/txw-yygl-web/vue.config.js index 1d70a07..c143e34 100644 --- a/txw-yygl-web/vue.config.js +++ b/txw-yygl-web/vue.config.js @@ -280,6 +280,25 @@ module.exports = { 'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS', 'Access-Control-Allow-Headers': 'X-Requested-With, content-type, Authorization', }, + proxy: { + '^/sso': { + // 老栈 target 走 cciw.com.cn 生产 (历史行为保留)。 + target: 'https://www.cciw.com.cn', + changeOrigin: true, + }, + + '^/mhzc': { + // 老栈 target 走 cciw.com.cn 生产 (历史行为保留)。 + target: 'https://www.cciw.com.cn', + changeOrigin: true, + }, + + '^/yygl': { + // 老栈 target 走 cciw.com.cn 生产 (历史行为保留)。 + target: 'https://www.cciw.com.cn', + changeOrigin: true, + }, + }, // proxy: { // // '/api': { // // // target: 'http://dzswj.mhnsrd.jcsj.tax.cn/sbzx/api/cxssb', // 云测试环境