Merge branch 'FOTON' into 'develop'

# Conflicts:
#   src/pages/processCenter/pages/newProcess/index.vue
This commit is contained in:
王夏晖
2021-12-02 21:53:23 +08:00
10 changed files with 3246 additions and 3039 deletions
+88 -17
View File
@@ -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",
@@ -13784,6 +13767,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",
+6 -4
View File
@@ -1,6 +1,8 @@
<!DOCTYPE html>
<html style="height: 100%">
<head id="vue">
<meta charset="utf-8" http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui"/>
@@ -8,7 +10,7 @@
<meta name="mobile-web-app-capable" content="yes"/>
<title>在线编辑</title>
<!-- 此处配置onlyOffice地址 -->
<script type="text/javascript" src="http://127.0.0.1:9011/web-apps/apps/api/documents/api.js"></script>
<script type="text/javascript" src="https://10.100.5.116:9443/web-apps/apps/api/documents/api.js"></script>
<!-- <script src="js/vue.min.js"></script>-->
<!-- <script type="text/javascript" src="http://172.20.10.5/web-apps/apps/api/documents/api.js"></script>-->
@@ -36,7 +38,7 @@
var filePath = GetQueryValue('filePath')
var fileName = GetQueryValue('fileName')
var fileUrl = GetQueryValue('fileUrl')
var standNo = GetQueryValue('standNo')
var oldFileName = GetQueryValue('oldFileName')
var key = GetQueryValue('key')
// var attId = GetQueryValue('attId')
var fileSuffix = GetQueryValue('fileType')
@@ -100,7 +102,7 @@
"download":true,//是否可以下载
"print":true //是否可以打印
},
"fileType": 'pptx',
"fileType": fileSuffix,
"key": key,
"title": oldFileName,
"url": fileUrl
@@ -108,7 +110,7 @@
"documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
"editorConfig": {
// 此处配置回调地址
"callbackUrl": `127.0.0.1:8080/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
"callbackUrl": `http://10.100.5.116:4202/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
"mode":"edit",
"lang":"zh-CN",
// "customization": {
+5 -4
View File
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html style="height: 100%">
<head id="vue">
<meta charset="utf-8" http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui"/>
@@ -8,7 +9,7 @@
<meta name="mobile-web-app-capable" content="yes"/>
<title>在线预览</title>
<!-- 此处配置onlyOffice地址 -->
<script type="text/javascript" src="http://127.0.0.1:9011/web-apps/apps/api/documents/api.js"></script>
<script type="text/javascript" src="https://10.100.5.116:9443/web-apps/apps/api/documents/api.js"></script>
<!-- <script type="text/javascript" src="http://172.20.10.5/web-apps/apps/api/documents/api.js"></script>-->
@@ -34,7 +35,7 @@
var fileName = GetQueryValue('fileName')
var filePath = GetQueryValue('filePath')
var fileUrl = GetQueryValue('fileUrl')
var standNo = GetQueryValue('standNo')
var oldFileName = GetQueryValue('oldFileName')
var key = GetQueryValue('key')
// var attId = GetQueryValue('attId')
var fileSuffix = GetQueryValue('fileType')
@@ -100,13 +101,13 @@
},
"fileType": fileSuffix,
"key": key,
"title": fileName,
"title": oldFileName,
"url": fileUrl
},
"documentType": documentType,
"editorConfig": {
// 此处配置回调地址
"callbackUrl": `127.0.0.1:8080/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
"callbackUrl": `http://10.100.5.116:4202/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
"mode":"edit",
"lang":"zh-CN",
// "customization": {
+21 -21
View File
@@ -346,26 +346,26 @@ export default {
handlePreview(file) {
const attId = file.response.data.id
if (this.preview) {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.getBusStandFileByAttId(attId)
.then(res => {
this.getBusStandFileByAttId(attId)
.then(res => {
console.log(res)
if(res){
const editFileInfo = res
console.log(editFileInfo)
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else {
const nowTime = new Date().getTime()
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
}
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
const editFileInfo = res
console.log(editFileInfo)
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else {
const nowTime = new Date().getTime()
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
}
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}
// switch (res.convertState) {
// case 'ERROR':
@@ -379,10 +379,10 @@ export default {
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id))
// break
// }
}).catch(e => {
console.log(e)
this.$message.warning('文件不存在,预览失败')
})
}).catch(e => {
console.log(e)
this.$message.warning('文件不存在,预览失败')
})
}
},
File diff suppressed because it is too large Load Diff
+487 -355
View File
@@ -16,9 +16,9 @@
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴水平的主轴main axis和垂直的交叉轴cross axis主轴的开始位置与边框的交叉点叫做main start结束位置叫做main end交叉轴的开始位置叫做cross start结束位置叫做cross end-->
<!-- </div>-->
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴水平的主轴main axis和垂直的交叉轴cross axis主轴的开始位置与边框的交叉点叫做main start结束位置叫做main end交叉轴的开始位置叫做cross start结束位置叫做cross end-->
<!-- </div>-->
</div>
</el-card>
</el-col>
@@ -225,232 +225,382 @@
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
<div class="card-top-right-text">标准调研流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'fc25b770ad3752cdec52f3bd7b35a6a1'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('20')">
<div class="card-box" @click="handleCreateProcess('3')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">外部标准化协会入会流程</div>
<div class="card-top-right-text">标准征求意见流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'2d0f99ba961c551b1d8cad8ad5223731'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('21')">
<div class="card-box" @click="handleCreateProcess('6')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">外部标准化协会参会流程</div>
<div class="card-top-right-text">标准清单发布/更新流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-col :span="size ? 6 : 8" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('12')">
<div class="card-box" @click="handleCreateProcess('7')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">政策征求意见流程</div>
<div class="card-top-right-text">标准合规评估流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴:水平的主轴(main axis)和垂直的交叉轴(cross axis)。主轴的开始位置(与边框的交叉点)叫做main start,结束位置叫做main end;交叉轴的开始位置叫做cross start,结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-col :span="size ? 6 : 8" v-btn-permission="'a151f5e2ee44f8df81e201b8696fca31'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('13')">
<div class="card-box" @click="handleCreateProcess('8')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">重点认证标准/政策合规性项目审查流程</div>
<div class="card-top-right-text">未符合项整改流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴:水平的主轴(main axis)和垂直的交叉轴(cross axis)。主轴的开始位置(与边框的交叉点)叫做main start,结束位置叫做main end;交叉轴的开始位置叫做cross start,结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-col :span="size ? 6 : 8" v-btn-permission="'2564bd61852551b99e0fe3d49a89b288'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('23')">
<div class="card-box" @click="handleCreateProcess('9')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">企标复审流程</div>
<div class="card-top-right-text">标准解读流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-col :span="size ? 6 : 8" v-btn-permission="'7751d25f72d0a6515e4110ae41837db8'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('24')">
<div class="card-box" @click="handleCreateProcess('10')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">企标废止流程</div>
<div class="card-top-right-text">项目合规评估流程-项目</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-col :span="size ? 6 : 8" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('25')">
<div class="card-box" @click="handleCreateProcess('11')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">企标制修订计划管控</div>
<div class="card-top-right-text">项目清单确认流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="''">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('laws1')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">政策入库流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('17')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">政策课题入会流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('18')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">政策课题参会流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('16')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">外部署名推荐审批流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('15')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">加入标准化协会信息提报流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('14')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('20')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">外部标准化协会入会流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('21')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">外部标准化协会参会流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('12')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">政策征求意见流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- &lt;!&ndash; <div class="card-bottom">&ndash;&gt;-->
<!-- &lt;!&ndash; 流程简介: 容器默认存在两根轴:水平的主轴(main axis)和垂直的交叉轴(cross axis)。主轴的开始位置(与边框的交叉点)叫做main start,结束位置叫做main end;交叉轴的开始位置叫做cross start,结束位置叫做cross end。&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
<!-- <el-col :span="size ? 6 : 8" v-btn-permission="">-->
<!-- <el-card shadow="hover">-->
<!-- <div class="card-box" @click="handleCreateProcess('13')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">重点认证标准/政策合规性项目审查流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- &lt;!&ndash; <div class="card-bottom">&ndash;&gt;-->
<!-- &lt;!&ndash; 流程简介: 容器默认存在两根轴:水平的主轴(main axis)和垂直的交叉轴(cross axis)。主轴的开始位置(与边框的交叉点)叫做main start,结束位置叫做main end;交叉轴的开始位置叫做cross start,结束位置叫做cross end。&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </el-col>-->
</div>
</div>
</div>
</template>
<script>
export default {
name: 'NewProcess',
data () {
return {
type: '',
size: true
}
},
methods: {
getImg (num) {
var url = ''
if (num == 0) {
url = require('@/assets/images/shangqi/img/process1.png')
} else if (num == 1) {
url = require('@/assets/images/shangqi/img/process2.png')
} else if (num == 2) {
url = require('@/assets/images/shangqi/img/process3.png')
} else if (num == 3) {
url = require('@/assets/images/shangqi/img/process4.png')
} else if (num == 4) {
url = require('@/assets/images/shangqi/img/process5.png')
} else if (num == 5) {
url = require('@/assets/images/shangqi/img/process6.png')
export default {
name: 'NewProcess',
data () {
return {
type: '',
size: true
}
return url
},
// 新建流程
handleCreateProcess (prcType) {
this.$store.commit('setDetailMap', this.$route.path)
this.$store.commit('setHandleInfo')
switch (prcType) {
case '2':
// 标准调研流程
this.$router.push({
name: 'bzdyStep1'
})
break
case 'laws1':
// 政策入库流程
this.$router.push({
name: 'zcrkStep1'
})
break
case '1':
// 标准入库流程
this.$router.push({
name: 'bzrkStep1'
})
break
case '3':
// 标准征求意见流程
methods: {
getImg (num) {
var url = ''
if (num == 0) {
url = require('@/assets/images/shangqi/img/process1.png')
} else if (num == 1) {
url = require('@/assets/images/shangqi/img/process2.png')
} else if (num == 2) {
url = require('@/assets/images/shangqi/img/process3.png')
} else if (num == 3) {
url = require('@/assets/images/shangqi/img/process4.png')
} else if (num == 4) {
url = require('@/assets/images/shangqi/img/process5.png')
} else if (num == 5) {
url = require('@/assets/images/shangqi/img/process6.png')
}
return url
},
// 新建流程
handleCreateProcess (prcType) {
this.$store.commit('setDetailMap', this.$route.path)
this.$store.commit('setHandleInfo')
switch (prcType) {
case '2':
// 标准调研流程
this.$router.push({
name: 'bzdyStep1'
})
break
case 'laws1':
// 政策入库流程
this.$router.push({
name: 'zcrkStep1'
})
break
case '1':
// 标准入库流程
this.$router.push({
name: 'bzrkStep1'
})
break
case '3':
// 标准征求意见流程
this.$router.push({
name:'bzzqyjStep1'
})
break
case '4':
this.$router.push({
name: 'bzfyStep1'
})
// 标准需求(翻译)申请流程
break
case '5':
this.$router.push({
name: 'bzffStep1'
})
// 标准发放申请流程
break
case '6':
//标准清单发布流程
this.$router.push({
name:'bzqdfbStep1'
})
break
case '7':
//项目评估流程 - 标准
this.$router.push({
name: 'xmpgStep1'
})
break
case '8':
//未符合项整改流程
this.$router.push({
name:'wfhxzgStep1'
})
break
case '9':
// 标准解读流程
this.$router.push({
name:'bzjdStep1'
})
break
case '10':
//项目评估流程- 项目
this.$router.push({
name: 'xmpg2Step1'
})
break
case '11':
// 项目清单确认流程
this.$router.push({
name:'xmqdqrStep1'
})
break
break
case '4':
this.$router.push({
name: 'bzfyStep1'
})
// 标准需求(翻译)申请流程
break
case '5':
this.$router.push({
name: 'bzffStep1'
})
// 标准发放申请流程
break
case '6':
//标准清单发布流程
this.$router.push({
name:'bzqdfbStep1'
})
break
case '7':
//项目评估流程 - 标准
this.$router.push({
name: 'xmpgStep1'
})
break
case '8':
//未符合项整改流程
this.$router.push({
name:'wfhxzgStep1'
})
break
case '9':
// 标准解读流程
this.$router.push({
name:'bzjdStep1'
})
break
case '10':
//项目评估流程- 项目
this.$router.push({
name: 'xmpg2Step1'
})
break
case '11':
// 项目清单确认流程
this.$router.push({
name:'xmqdqrStep1'
})
break
case '12':
// 政策征求意见流程
this.$router.push({
@@ -463,243 +613,225 @@ export default {
name: 'zdrzbzORzchgxxmscStep1'
})
break
case '17':
//政策课题入会流程
this.$router.push({
name: 'zcrhStep1'
})
break
case '18':
//政策课题参会流程
this.$router.push({
name: 'zcchStep1'
})
break
case '19':
//政策课题会后流程
this.$router.push({
name: 'zchhStep1'
})
break
case '16':
//外部署名推荐审批流程
this.$router.push({
name: 'wbsmStep1'
})
break
case '15':
//加入标准化协会信息提报流程
this.$router.push({
name: 'jrbzhxhStep1'
})
break
case '14':
//参与外部标准制修订信息提报流程
this.$router.push({
name: 'cywbbzzxdStep1'
})
break
// 外部标准化协会入会流程
case '20':
this.$router.push({
name: 'bzrhStep1'
})
break
// 外部标准化协会参会流程
case '21':
this.$router.push({
name: 'bzchStep1'
})
break
// 企标复审流程
case '23':
this.$router.push({
name: 'qbfsStep1'
})
break
// 企标废止流程
case '24':
this.$router.push({
name: 'qbfzStep1'
})
break
// 企标制修订计划管控
case '25':
this.$router.push({
name: 'qbzxdjhgkStep1'
})
break
case '17':
//政策课题入会流程
this.$router.push({
name: 'zcrhStep1'
})
break
case '18':
//政策课题参会流程
this.$router.push({
name: 'zcchStep1'
})
break
case '19':
//政策课题会后流程
this.$router.push({
name: 'zchhStep1'
})
break
case '16':
//外部署名推荐审批流程
this.$router.push({
name: 'wbsmStep1'
})
break
case '15':
//加入标准化协会信息提报流程
this.$router.push({
name: 'jrbzhxhStep1'
})
break
case '14':
//参与外部标准制修订信息提报流程
this.$router.push({
name: 'cywbbzzxdStep1'
})
break
// 外部标准化协会入会流程
case '20':
this.$router.push({
name: 'bzrhStep1'
})
break
// 外部标准化协会参会流程
case '21':
this.$router.push({
name: 'bzchStep1'
})
break
}
},
checkPermission(permissionIdArray) {
return permissionIdArray.some(id => {
return this.$hasPermission(id)
})
}
},
checkPermission(permissionIdArray) {
return permissionIdArray.some(id => {
return this.$hasPermission(id)
})
watch: {
$route (newVal) {
this.type = newVal.params.type
}
},
computed: {
/**
* 标准法规管理流程
* @returns {boolean}
*/
bzfggllc() {
const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
return this.checkPermission(idArray)
},
/**
* 政策管理流程
* @returns {boolean}
*/
zcgllc() {
const idArray = ['GFG2G4NGWBXQ5GMS33KU', '3PJAEEHWU6NYDB6MNZ6V']
return this.checkPermission(idArray)
},
/**
* 企标管理流程
* @returns {boolean}
*/
qbgllc() {
const idArray = ['L9AVMSGJPTD8T5SEGK6W', 'JCZTCC97UPRNGFJFC5HJ', 'ZZUF89DR92R8WEZYSHN5', '2PNXPCPW5CAWJHDYFHRY', 'K4KS87V6KFSA35VZFPC3']
return this.checkPermission(idArray)
},
/**
* 标准采购翻译申请流程
* @returns {boolean}
*/
bzcgfysqlc() {
const idArray = ['C2C8BENY5MRSZGP7W5RK', 'WR9C2TYTHD8TTRVJ5LH4']
return this.checkPermission(idArray)
},
/**
* 工作组会议管理流程
* @returns {boolean}
*/
gzzhygllc() {
const idArray = ['7FM6KNU2DCDY7G46RD2E']
return this.checkPermission(idArray)
},
/**
* 标准法规清单管理流程
* @returns {boolean}
*/
bzfgqdgllc() {
const idArray = ['4TR77UXU6RYHZPFHZND9']
return this.checkPermission(idArray)
}
},
mounted () {
let width = document.body.clientWidth
if (width > 1900) {
this.size = true
} else {
this.size = false
}
this.type = this.$route.params.type
}
},
watch: {
$route (newVal) {
this.type = newVal.params.type
}
},
computed: {
/**
* 标准法规管理流程
* @returns {boolean}
*/
bzfggllc() {
const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
return this.checkPermission(idArray)
},
/**
* 政策管理流程
* @returns {boolean}
*/
zcgllc() {
const idArray = ['GFG2G4NGWBXQ5GMS33KU', '3PJAEEHWU6NYDB6MNZ6V']
return this.checkPermission(idArray)
},
/**
* 企标管理流程
* @returns {boolean}
*/
qbgllc() {
const idArray = ['L9AVMSGJPTD8T5SEGK6W', 'JCZTCC97UPRNGFJFC5HJ', 'ZZUF89DR92R8WEZYSHN5', '2PNXPCPW5CAWJHDYFHRY', 'K4KS87V6KFSA35VZFPC3']
return this.checkPermission(idArray)
},
/**
* 标准采购翻译申请流程
* @returns {boolean}
*/
bzcgfysqlc() {
const idArray = ['C2C8BENY5MRSZGP7W5RK', 'WR9C2TYTHD8TTRVJ5LH4']
return this.checkPermission(idArray)
},
/**
* 工作组会议管理流程
* @returns {boolean}
*/
gzzhygllc() {
const idArray = ['7FM6KNU2DCDY7G46RD2E']
return this.checkPermission(idArray)
},
/**
* 标准法规清单管理流程
* @returns {boolean}
*/
bzfgqdgllc() {
const idArray = ['4TR77UXU6RYHZPFHZND9']
return this.checkPermission(idArray)
}
},
mounted () {
let width = document.body.clientWidth
if (width > 1900) {
this.size = true
} else {
this.size = false
}
this.type = this.$route.params.type
}
}
</script>
<style lang="less" scoped>
#NewProcess{
width: 100%;
//height: 100%;
padding: 15px 15px 0;
background: #ffffff;
/deep/.el-card__body {
padding: 0;
}
.el-card {
margin: 25px;
border-radius: 10px;
}
.card-box {
cursor: pointer;
.card-top {
width: 100%;
background: #2d8cf0;
height: 100px;
display: flex;
justify-content: space-between;
.card-top-left {
img {
margin: 10px;
width: 80px;
height: 80px;
}
}
.card-top-right {
width: 250px;
.card-top-right-text {
margin: 40px 0 5px 0;
color: #e6e6e6;
font-size: 18px;
}
.card-top-right-line {
height: 3px;
width: 250px;
background: #e6e6e6;
}
}
#NewProcess{
width: 100%;
//height: 100%;
padding: 15px 15px 0;
background: #ffffff;
/deep/.el-card__body {
padding: 0;
}
.card-bottom {
width: calc(~'100% - 60px');
color: #c1c1c1;
margin: 10px 30px;
line-height: 20px;
font-size: 14px;
height: 100px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
overflow: hidden;
.el-card {
margin: 25px;
border-radius: 10px;
}
}
.card-box:hover {
.card-top {
.card-top-right {
.card-top-right-text {
color: rgb(247, 186, 42);
}
.card-top-right-line {
background: rgb(247, 186, 42);
}
}
}
.card-bottom {
color: #2d8cf0;
}
}
.process-box{
margin-left: -5px;
margin-right: -5px;
padding-top: 20px;
padding-bottom: 20px;
.process-name{
width: 300px;
padding: 40px 0;
margin-bottom: 10px;
text-align: center;
border: 1px dashed #ddd;
border-radius: 5px;
background: #fdfdfd;
font-size: 18px;
font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif;
.card-box {
cursor: pointer;
display: inline-block;
margin-left: 5px;
margin-right: 5px;
.card-top {
width: 100%;
background: #2d8cf0;
height: 100px;
display: flex;
justify-content: space-between;
.card-top-left {
img {
margin: 10px;
width: 80px;
height: 80px;
}
}
.card-top-right {
width: 250px;
.card-top-right-text {
margin: 40px 0 5px 0;
color: #e6e6e6;
font-size: 18px;
}
.card-top-right-line {
height: 3px;
width: 250px;
background: #e6e6e6;
}
}
}
.card-bottom {
width: calc(~'100% - 60px');
color: #c1c1c1;
margin: 10px 30px;
line-height: 20px;
font-size: 14px;
height: 100px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
overflow: hidden;
}
}
.process-name:hover {
transform:translateY(-5px);
border: 1px dashed #2d8cf0;
background: #c6e2ff;
color: #2d8cf0;
.card-box:hover {
.card-top {
.card-top-right {
.card-top-right-text {
color: rgb(247, 186, 42);
}
.card-top-right-line {
background: rgb(247, 186, 42);
}
}
}
.card-bottom {
color: #2d8cf0;
}
}
.process-box{
margin-left: -5px;
margin-right: -5px;
padding-top: 20px;
padding-bottom: 20px;
.process-name{
width: 300px;
padding: 40px 0;
margin-bottom: 10px;
text-align: center;
border: 1px dashed #ddd;
border-radius: 5px;
background: #fdfdfd;
font-size: 18px;
font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif;
cursor: pointer;
display: inline-block;
margin-left: 5px;
margin-right: 5px;
}
.process-name:hover {
transform:translateY(-5px);
border: 1px dashed #2d8cf0;
background: #c6e2ff;
color: #2d8cf0;
}
}
}
}
</style>
@@ -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
+16 -16
View File
@@ -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
View File
@@ -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`
}