From 7003e7df93bc2f01a85ac14562b035dfa6d49b44 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 22 Nov 2021 09:35:01 +0800 Subject: [PATCH 01/24] feat:new --- package-lock.json | 193 +++++++++++++++++++++------------------------- 1 file changed, 88 insertions(+), 105 deletions(-) diff --git a/package-lock.json b/package-lock.json index eee858d4b..5a5bd04ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3596,23 +3596,6 @@ "upath": "^1.1.1" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4558,94 +4541,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.5.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", - "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "optional": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -13608,6 +13503,94 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz", + "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", + "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz", + "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", + "dev": true, + "optional": true + }, + "hash-sum": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz", + "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687952028&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz", + "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-router": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", From 4e0f398ad7c545c6b0278fa59e52b117263cb720 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 22 Nov 2021 09:41:51 +0800 Subject: [PATCH 02/24] feat:FOTON release --- src/components/navMenu/index.vue | 1268 +++--- .../processCenter/pages/newProcess/index.vue | 1119 +++-- .../nonConfomity/index.vue | 122 +- .../searchCenter/pages/advancedSearch.vue | 3826 ++++++++--------- .../searchCenter/pages/standardSearch.vue | 32 +- src/sysConfig/index.js | 29 +- 6 files changed, 3167 insertions(+), 3229 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5c6a3d765..94c9695c4 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -1,34 +1,34 @@ diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index 2fbd07e11..e70d082ba 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -1,77 +1,77 @@ diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 3f55f76e4..b9c174ee1 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -7,9 +7,9 @@
{{ $t("m.generalSearch") }}{{ $t("m.advancedSearch") }} + class="senior">{{ $t("m.advancedSearch") }}
@@ -27,8 +27,8 @@ {{ $t("m.clearQuery") }}
- - + +
@@ -39,9 +39,9 @@ {{ $t("m.standAll") }} - + {{ $t("m.enterpriseStandard") }} @@ -75,11 +75,11 @@ - + @@ -144,10 +144,10 @@ - - - - + + + + @@ -462,16 +462,16 @@ - - + + @@ -832,11 +832,11 @@ - - - - - + + + + + @@ -938,23 +938,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
@@ -974,8 +974,8 @@
+ v-if="!kindtext && this.selectIndex === 'INLAND_STAND' && this.buyRoleFlag === 0 && (this.resultData === null || this.resultData.length === 0)" + class="toBuyClass"> {{ $t("m.noQueryResult") }}！ @@ -984,50 +984,50 @@
+ tooltip-effect="dark" + border + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" + :data="resultData" + style="width: 100%" + v-loading="tableLoading"> + align="center" + type="index" + width="50"> + align="center" + :label="$t('m.itemNumber')" + show-overflow-tooltip + v-if="selectIndex === 'items'"> + align="center" + :label="$t('m.entryName')" + v-if="selectIndex === 'items'"> + align="center" + :label="$t('m.newModelImplementationDate')" + v-if="selectIndex === 'items'" + width="140"> + align="center" + :label="$t('m.implementationDateOfProductionVehicle')" + v-if="selectIndex === 'items'" + width="140"> + align="center" + :label="$t('m.clauseRequirements')" + v-if="selectIndex === 'items'" + width="200"> + align="center" + :label="$t('m.applicableModels')" + v-if="selectIndex === 'items'" + width="200"> + align="center" + :label="$t('m.issueTime')" + v-if="selectIndex !== 'items'" + width="130"> + align="center" + :label="selectIndex === 'INLAND_LAWS' ? '新车实施日期' :$t('m.putTime')" + width="130"> + align="center" + width="180" + :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')"> -
@@ -1235,1238 +1235,981 @@ diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index de91fb48c..f376503e4 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -127,10 +127,10 @@ :label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))" width="200"> 取消收藏 收藏 - + @@ -388,10 +388,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - { - label: '国内外政策', - value: 'laws' - }, + // { + // label: '国内外政策', + // value: 'laws' + // }, { label: '企业标准', value: 'enterprise' @@ -420,10 +420,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - { - label: '国内外政策', - value: 'laws' - }, + // { + // label: '国内外政策', + // value: 'laws' + // }, { label: '企业标准', value: 'enterprise' @@ -760,10 +760,10 @@ label: '海外标准法规', value: 'bussstand' }, - { - label: '国内外政策', - value: 'laws' - }, + // { + // label: '国内外政策', + // value: 'laws' + // }, { label: '企业标准', value: 'enterprise' @@ -1099,7 +1099,7 @@ "JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN", "ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"]; const bussStandVerify = ["Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M", - "Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"]; + "Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"]; if(data[key]){ console.log(data[key]) const list = [] diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 23bedc3ed..6485c1a23 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,16 +6,17 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -// const devIp = '192.168.10.249' -const devIp = '62.234.136.153' -// const devInterfacePORT = '9999' -const devInterfacePORT = '8033' +// const devIp = '192.168.10.248' +// const devIp = '62.234.136.153' +// const devInterfacePORT = '8033' +const devIp = '10.19.11.243' +const devInterfacePORT = '4304' // 配置 idm 认证 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' // 配置 前端服务 -const devWebUrl = 'http://62.234.136.153:8038/#/' +const devWebUrl = 'https://srms.foton.com.cn/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'dev' +const webLoginType = 'idm' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' @@ -38,10 +39,10 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '62.234.136.153' -const prodInterfacePORT = '8033' -// const prodIp = 'slrs.foton.com.cn' -// const prodInterfacePORT = '' +// const prodIp = '62.234.136.153' +// const prodInterfacePORT = '8033' +const prodIp = 'srms.foton.com.cn' +const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp @@ -49,13 +50,13 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT module.exports = { - baseUrl: 'http://' + serverIP + ':' + interfacePORT, + baseUrl: 'https://' + serverIP + ':' + interfacePORT, webLoginType: webLoginType, ssoLoginUrlDev: ssoLogin + devWebUrl, ssoLoginUrl: ssoLogin, devWebUrl: devWebUrl, - serverUrl: 'http://' + serverIP, // 服务器IP地址 - interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, + serverUrl: 'https://' + serverIP, // 服务器IP地址 + interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 @@ -64,5 +65,5 @@ module.exports = { webSocket: webSocket + ':' + devInterfacePORT + '/websocket/socketServer', // webSocket连接 enterprise: enterprise, // GQ广汽 SJZX数据中心 theme: theme, // 主题 - processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` + processInterfaceURL: `https://${serverIP}:${processPort}/bat-wkflow` } From 3557110552aabe5c8dc3fc82512e046a3b60982c Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Fri, 26 Nov 2021 09:12:56 +0800 Subject: [PATCH 03/24] feat:FOTON release --- src/components/navMenu/index.vue | 788 ++++++++----------------------- 1 file changed, 205 insertions(+), 583 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 30e44c74c..01799fdb3 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -1,34 +1,34 @@