feat:FOTON release
This commit is contained in:
+634
-634
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,77 +1,77 @@
|
||||
<!--未符合项整改-->
|
||||
<template>
|
||||
<div id="non-cnfomity" >
|
||||
<div class="non-content">
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick" style="height: 100%">
|
||||
<el-tab-pane label="未符合项整改数据库" name="database">
|
||||
<rectification-database></rectification-database>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="重点问题项管控" name="keynote">
|
||||
<key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</div>
|
||||
<div id="non-cnfomity" >
|
||||
<div class="non-content">
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick" style="height: 100%">
|
||||
<el-tab-pane label="未符合项整改数据库" name="database">
|
||||
<rectification-database></rectification-database>
|
||||
</el-tab-pane>
|
||||
<!-- <el-tab-pane label="重点问题项管控" name="keynote">-->
|
||||
<!-- <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>-->
|
||||
<!-- </el-tab-pane>-->
|
||||
</el-tabs>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import keyIssues from "@/pages/regulatoryRepository/nonConfomity/pages/keyIssues";
|
||||
import rectificationDatabase from "@/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase";
|
||||
export default {
|
||||
name: 'NonConfomity',
|
||||
components: {
|
||||
keyIssues,
|
||||
rectificationDatabase,
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
activeName: 'database',
|
||||
keynoteActiveName: 'cause'
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleClick(tab, event) {
|
||||
import keyIssues from "@/pages/regulatoryRepository/nonConfomity/pages/keyIssues";
|
||||
import rectificationDatabase from "@/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase";
|
||||
export default {
|
||||
name: 'NonConfomity',
|
||||
components: {
|
||||
keyIssues,
|
||||
rectificationDatabase,
|
||||
},
|
||||
getActiveName(){
|
||||
if (this.$route.query.activeName){
|
||||
this.activeName = this.$route.query.activeName
|
||||
data () {
|
||||
return {
|
||||
activeName: 'database',
|
||||
keynoteActiveName: 'cause'
|
||||
}
|
||||
if (this.$route.query.keynoteActiveName){
|
||||
this.keynoteActiveName = this.$route.query.keynoteActiveName
|
||||
},
|
||||
methods: {
|
||||
handleClick(tab, event) {
|
||||
},
|
||||
getActiveName(){
|
||||
if (this.$route.query.activeName){
|
||||
this.activeName = this.$route.query.activeName
|
||||
}
|
||||
if (this.$route.query.keynoteActiveName){
|
||||
this.keynoteActiveName = this.$route.query.keynoteActiveName
|
||||
}
|
||||
console.log('35',this.keynoteActiveName)
|
||||
}
|
||||
console.log('35',this.keynoteActiveName)
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getActiveName()
|
||||
},
|
||||
watch: {},
|
||||
mounted () {}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getActiveName()
|
||||
},
|
||||
watch: {},
|
||||
mounted () {}
|
||||
}
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
#non-cnfomity {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background-color: #FFFFFF;
|
||||
.non-content {
|
||||
padding: 0 10px;
|
||||
#non-cnfomity {
|
||||
height: 100%;
|
||||
/deep/ .el-tabs {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background-color: #FFFFFF;
|
||||
.non-content {
|
||||
padding: 0 10px;
|
||||
height: 100%;
|
||||
.el-tabs__content {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
.el-tab-pane {
|
||||
height: 100%;
|
||||
/deep/ .el-tabs {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
.el-tabs__content {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
.el-tab-pane {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.el-tabs__nav {
|
||||
margin-left:20px;
|
||||
}
|
||||
}
|
||||
.el-tabs__nav {
|
||||
margin-left:20px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -127,10 +127,10 @@
|
||||
:label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))"
|
||||
width="200">
|
||||
<template slot-scope="scope">
|
||||
<!-- <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>-->
|
||||
<!-- <span v-if="selectIndex === 'laws'">{{ getLawsState(scope.row.statecode) }}</span>-->
|
||||
<div :class="selectIndex === 'enterprise' || selectIndex === 'laws' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
|
||||
(scope.row.textStatusBussName || scope.row.lawsTextStateName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''">
|
||||
{{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}</div>
|
||||
{{ selectIndex === 'stand'|| (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN') ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.lawsTextStateName : scope.row.textStatusBussName) }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -217,7 +217,7 @@
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)" v-if="scope.row.collectId">取消收藏</el-dropdown-item>
|
||||
<el-dropdown-item :command="beforeHandleCommand('d',scope.row)" v-else>收藏</el-dropdown-item>
|
||||
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
|
||||
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
<!-- <el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>-->
|
||||
@@ -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 = []
|
||||
|
||||
+15
-14
@@ -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`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user