+
![]()
-
+
-
-
外部标准化协会入会流程
+ 标准征求意见流程
+
![]()
-
+
-
-
外部标准化协会参会流程
+ 标准清单发布/更新流程
+
![]()
-
-
-
-
+
-
-
政策征求意见流程
+ 标准合规评估流程
+
![]()
-
-
-
-
+
-
-
重点认证标准/政策合规性项目审查流程
+ 未符合项整改流程
+
![]()
-
+
-
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">
{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsNumber : scope.row.numbershow}}
+ align="center"
+ :label="$t('m.itemNumber')"
+ show-overflow-tooltip
+ v-if="selectIndex === 'items'">
{{ scope.row.itemsNum
}}
+ align="center"
+ :label="$t('m.entryName')"
+ v-if="selectIndex === 'items'">
{{ scope.row.itemsName
}}
+ align="center"
+ :label="$t('m.newModelImplementationDate')"
+ v-if="selectIndex === 'items'"
+ width="140">
{{ $dateFormat(new Date(scope.row.newcarPutTime), "yyyy-MM-dd") }}
@@ -1036,10 +1036,10 @@
+ align="center"
+ :label="$t('m.implementationDateOfProductionVehicle')"
+ v-if="selectIndex === 'items'"
+ width="140">
{{ $dateFormat(new Date(scope.row.productPutTime), "yyyy-MM-dd") }}
@@ -1048,28 +1048,28 @@
+ align="center"
+ :label="$t('m.clauseRequirements')"
+ v-if="selectIndex === 'items'"
+ width="200">
{{ scope.row.parts
}}
+ align="center"
+ :label="$t('m.applicableModels')"
+ v-if="selectIndex === 'items'"
+ width="200">
{{ scope.row.applyArcticShow }}
{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsName : scope.row.nameshow
@@ -1077,10 +1077,10 @@
+ align="center"
+ :label="$t('m.issueTime')"
+ v-if="selectIndex !== 'items'"
+ width="130">
取消收藏
收藏
-
+
@@ -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`
}
{{ $dateFormat(new Date(scope.row.issueTime), "yyyy-MM-dd") }}
@@ -1089,9 +1089,9 @@
+ align="center"
+ :label="selectIndex === 'INLAND_LAWS' ? '新车实施日期' :$t('m.putTime')"
+ width="130">
{{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime)), "yyyy-MM-dd") }}
@@ -1100,81 +1100,81 @@
+ 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 efcb33c68..2399ac2a6 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">
-
+
{{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}
-
-
-
-
-
- 查看
-
- 收藏
-
-
- 取消收藏
-
-
-
-
-
-
-
-
-
-
- 查看
-
- 收藏
-
-
- 取消收藏
-
-
-
-
-
-
-
- 查看
-
-
+ align="center"
+ :label="$t('m.action')"
+ width="200">
+
+
+
+
+
+
+
+
+ 查看
- 收藏
+ 收藏
- 取消收藏
+ 取消收藏
- 收藏
-
-
-
+
+
+
+
+
+
+
+
+ 查看
+
+ 收藏
+
+
+ 取消收藏
+
+
+
+
+
+
+
+ 查看
+
+
+
+ 收藏
+
+
+ 取消收藏
+
+ 收藏
+
+
+
- {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}
+ {{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}