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" "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": { "commander": {
"version": "2.20.3", "version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "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", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz",
"integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" "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": { "vue-router": {
"version": "3.4.0", "version": "3.4.0",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz",
+6 -4
View File
@@ -1,6 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html style="height: 100%"> <html style="height: 100%">
<head id="vue"> <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 http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui"/> 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"/> <meta name="mobile-web-app-capable" content="yes"/>
<title>在线编辑</title> <title>在线编辑</title>
<!-- 此处配置onlyOffice地址 --> <!-- 此处配置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 src="js/vue.min.js"></script>-->
<!-- <script type="text/javascript" src="http://172.20.10.5/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>-->
@@ -36,7 +38,7 @@
var filePath = GetQueryValue('filePath') var filePath = GetQueryValue('filePath')
var fileName = GetQueryValue('fileName') var fileName = GetQueryValue('fileName')
var fileUrl = GetQueryValue('fileUrl') var fileUrl = GetQueryValue('fileUrl')
var standNo = GetQueryValue('standNo') var oldFileName = GetQueryValue('oldFileName')
var key = GetQueryValue('key') var key = GetQueryValue('key')
// var attId = GetQueryValue('attId') // var attId = GetQueryValue('attId')
var fileSuffix = GetQueryValue('fileType') var fileSuffix = GetQueryValue('fileType')
@@ -100,7 +102,7 @@
"download":true,//是否可以下载 "download":true,//是否可以下载
"print":true //是否可以打印 "print":true //是否可以打印
}, },
"fileType": 'pptx', "fileType": fileSuffix,
"key": key, "key": key,
"title": oldFileName, "title": oldFileName,
"url": fileUrl "url": fileUrl
@@ -108,7 +110,7 @@
"documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation "documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
"editorConfig": { "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", "mode":"edit",
"lang":"zh-CN", "lang":"zh-CN",
// "customization": { // "customization": {
+5 -4
View File
@@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html style="height: 100%"> <html style="height: 100%">
<head id="vue"> <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 http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui"/> 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"/> <meta name="mobile-web-app-capable" content="yes"/>
<title>在线预览</title> <title>在线预览</title>
<!-- 此处配置onlyOffice地址 --> <!-- 此处配置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>--> <!-- <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 fileName = GetQueryValue('fileName')
var filePath = GetQueryValue('filePath') var filePath = GetQueryValue('filePath')
var fileUrl = GetQueryValue('fileUrl') var fileUrl = GetQueryValue('fileUrl')
var standNo = GetQueryValue('standNo') var oldFileName = GetQueryValue('oldFileName')
var key = GetQueryValue('key') var key = GetQueryValue('key')
// var attId = GetQueryValue('attId') // var attId = GetQueryValue('attId')
var fileSuffix = GetQueryValue('fileType') var fileSuffix = GetQueryValue('fileType')
@@ -100,13 +101,13 @@
}, },
"fileType": fileSuffix, "fileType": fileSuffix,
"key": key, "key": key,
"title": fileName, "title": oldFileName,
"url": fileUrl "url": fileUrl
}, },
"documentType": documentType, "documentType": documentType,
"editorConfig": { "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", "mode":"edit",
"lang":"zh-CN", "lang":"zh-CN",
// "customization": { // "customization": {
+74 -74
View File
@@ -1,7 +1,7 @@
<!--左侧导航菜单 liuyan --> <!--左侧导航菜单 liuyan -->
<template> <template>
<div class="nav-menu v-class" :class="{'is-collapse': isCollapse}"> <div class="nav-menu v-class" :class="{'is-collapse': isCollapse}">
<!-- <div class="nav-menu-header" style="height: 65px; background-color: #4788c0;"> <!-- <div class="nav-menu-header" style="height: 65px; background-color: #4788c0;">
<div class="header-left"> <div class="header-left">
<div class="logo"> <div class="logo">
<img :src="logo" height="58" width="149" /> <img :src="logo" height="58" width="149" />
@@ -76,8 +76,8 @@
</div> </div>
</template> </template>
<script> <script>
import { mapGetters, mapMutations } from 'vuex' import { mapGetters, mapMutations } from 'vuex'
export default { export default {
name: 'NavMenu', name: 'NavMenu',
data () { data () {
return { return {
@@ -116,11 +116,11 @@ export default {
// path: '/partCodeApply', // path: '/partCodeApply',
// menuId: 'ad9db496772c075f78495382b7581fe9' // menuId: 'ad9db496772c075f78495382b7581fe9'
// }, // },
{ // {
title: '工作组数据统计', // title: '工作组数据统计',
path: '/dataStatisComments', // path: '/dataStatisComments',
menuId: '' // menuId: ''
}, // },
{ {
title: '海外法规', title: '海外法规',
path: '/foreignStandardsAndRegulations', path: '/foreignStandardsAndRegulations',
@@ -132,11 +132,11 @@ export default {
menuId: '2b25c67f10abbbadf37d60daaaec54d3' menuId: '2b25c67f10abbbadf37d60daaaec54d3'
}, },
{ // {
title: '国内外政策', // title: '国内外政策',
path: '/foreignRegulationsDatabase', // path: '/foreignRegulationsDatabase',
menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' // menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
}, // },
// // // { // // // {
// // // title: '标准制修订管理', // // // title: '标准制修订管理',
// // // path: '/demo2One' // // // path: '/demo2One'
@@ -182,10 +182,10 @@ export default {
path: '/nonConfomity', path: '/nonConfomity',
menuId: '0119abd677e0204e061eb0f0b8cafda0' menuId: '0119abd677e0204e061eb0f0b8cafda0'
}, },
{ // {
title: '工作组', // title: '工作组',
path: '/workingGroup', // path: '/workingGroup',
}, // },
// { // {
// title: '备案产品标准库', // title: '备案产品标准库',
// path: '/enterpriseStandardFiling', // path: '/enterpriseStandardFiling',
@@ -196,11 +196,11 @@ export default {
path: '/standInvolveProject', path: '/standInvolveProject',
menuId: '8a9c87fe06244fb9d55e78fb281f625b' menuId: '8a9c87fe06244fb9d55e78fb281f625b'
}, },
{ // {
title: '企标制修订计划', // title: '企标制修订计划',
path: '/enterpriseStandardPlan', // path: '/enterpriseStandardPlan',
// menuId: '8a9c87fe06244fb9d55e78fb281f625b' // // menuId: '8a9c87fe06244fb9d55e78fb281f625b'
} // }
// { // {
// title: '动态信息', // title: '动态信息',
// path: '/information', // path: '/information',
@@ -254,7 +254,7 @@ export default {
{ {
title: '标准化活动日历', title: '标准化活动日历',
path: '/standCalendar', path: '/standCalendar',
menuId: '' menuId: '0ea66e3dd36873082b6851f69e92c8be'
}, },
// { // {
// title: '标准比对库', // title: '标准比对库',
@@ -342,11 +342,11 @@ export default {
// path: '/convertDocView', // path: '/convertDocView',
// menuId: '3F52K25546' // menuId: '3F52K25546'
// }, // },
{ // {
title: '菜单管理', // title: '菜单管理',
path: '/menuManage', // path: '/menuManage',
menuId: '87b8b4f5817a7829696e63185c744d52' // menuId: '87b8b4f5817a7829696e63185c744d52'
}, // },
{ {
title: '链接管理', title: '链接管理',
path: '/linkManage', path: '/linkManage',
@@ -509,14 +509,14 @@ export default {
} }
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
/deep/.el-menu--popup > div { /deep/.el-menu--popup > div {
border-radius: 5px; border-radius: 5px;
} }
.el-menu--collapse { .el-menu--collapse {
.is-active { .is-active {
background-color: #697178 !important; background-color: #697178 !important;
.shangqi-icon { .shangqi-icon {
@@ -524,8 +524,8 @@ export default {
} }
color: #697178 !important; color: #697178 !important;
} }
} }
.nav-menu { .nav-menu {
width: 58px; width: 58px;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
@@ -584,58 +584,58 @@ export default {
background: #4788c0 !important; background: #4788c0 !important;
color: #fff !important; color: #fff !important;
} }
} }
.has-no-read{ .has-no-read{
position: relative; position: relative;
top:-15px; top:-15px;
left:10px left:10px
} }
/*.el-menu--collapse {*/ /*.el-menu--collapse {*/
/* .shangqi-icon {*/ /* .shangqi-icon {*/
/* color: #4091FF !important;*/ /* color: #4091FF !important;*/
/* }*/ /* }*/
/* .is-active /deep/.shangqi-icon {*/ /* .is-active /deep/.shangqi-icon {*/
/* color: #4091FF !important;*/ /* color: #4091FF !important;*/
/* }*/ /* }*/
/* /deep/.el-submenu__title i {*/ /* /deep/.el-submenu__title i {*/
/* color: #fff;*/ /* color: #fff;*/
/* }*/ /* }*/
/* /deep/.el-submenu__title i {*/ /* /deep/.el-submenu__title i {*/
/* color: #fff;*/ /* color: #fff;*/
/* }*/ /* }*/
/*}*/ /*}*/
.is-active /deep/.shangqi-icon { .is-active /deep/.shangqi-icon {
color: #fff; color: #fff;
} }
/deep/.el-submenu__title i { /deep/.el-submenu__title i {
color: #fff; color: #fff;
} }
.nav-menu /deep/.el-submenu__title i { .nav-menu /deep/.el-submenu__title i {
color: #fff; color: #fff;
} }
.nav-menu{ .nav-menu{
background-color: #697178; background-color: #697178;
scrollbar-width: none; scrollbar-width: none;
-ms-overflow-style: none; /* IE 10+ */ -ms-overflow-style: none; /* IE 10+ */
} }
.nav-menu::-webkit-scrollbar { .nav-menu::-webkit-scrollbar {
display: none; /* Chrome Safari */ display: none; /* Chrome Safari */
} }
.nav-menu-popper .el-menu .el-menu-item { .nav-menu-popper .el-menu .el-menu-item {
color: #fff !important; color: #fff !important;
} }
.nav-menu-popper .el-menu .el-menu-item.is-active { .nav-menu-popper .el-menu .el-menu-item.is-active {
background-color: #fff !important; background-color: #fff !important;
color: #4788c0 !important; color: #4788c0 !important;
font-weight: bold; font-weight: bold;
} }
.nav-menu-popper .el-menu .el-menu-item:hover { .nav-menu-popper .el-menu .el-menu-item:hover {
background-color: #697178 !important; background-color: #697178 !important;
color: #fff !important; color: #fff !important;
font-weight: bold; font-weight: bold;
} }
.el-menu-item { .el-menu-item {
span { span {
margin-left: 5px; margin-left: 5px;
font-weight: normal; font-weight: normal;
@@ -666,8 +666,8 @@ export default {
background-image: url("~assets/images/shangqi/sideBar/liucheng.png"); background-image: url("~assets/images/shangqi/sideBar/liucheng.png");
} }
} }
} }
.el-submenu { .el-submenu {
.is-opened { .is-opened {
background-color: red; background-color: red;
} }
@@ -716,8 +716,8 @@ export default {
/deep/.el-menu { /deep/.el-menu {
/*padding-left: 18px;*/ /*padding-left: 18px;*/
} }
} }
.el-menu--collapse{ .el-menu--collapse{
width: 100%; width: 100%;
.shangqi-icon{ .shangqi-icon{
width: 24px; width: 24px;
@@ -731,6 +731,6 @@ export default {
} }
} }
} }
} }
</style> </style>
+234 -102
View File
@@ -16,9 +16,9 @@
<div class="card-top-right-line"></div> <div class="card-top-right-line"></div>
</div> </div>
</div> </div>
<!-- <div class="card-bottom">--> <!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴:水平的主轴(main axis)和垂直的交叉轴(cross axis)。主轴的开始位置(与边框的交叉点)叫做main start,结束位置叫做main end;交叉轴的开始位置叫做cross start,结束位置叫做cross end。--> <!-- 流程简介: 容器默认存在两根轴:水平的主轴(main axis)和垂直的交叉轴(cross axis)。主轴的开始位置(与边框的交叉点)叫做main start,结束位置叫做main end;交叉轴的开始位置叫做cross start,结束位置叫做cross end。-->
<!-- </div>--> <!-- </div>-->
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
@@ -225,130 +225,280 @@
<img :src="getImg(Math.floor(Math.random() * 6))"> <img :src="getImg(Math.floor(Math.random() * 6))">
</div> </div>
<div class="card-top-right"> <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 class="card-top-right-line"></div>
</div> </div>
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="size ? 6 : 8"> <el-col :span="size ? 6 : 8" v-btn-permission="'fc25b770ad3752cdec52f3bd7b35a6a1'">
<el-card shadow="hover"> <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">
<div class="card-top-left"> <div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))"> <img :src="getImg(Math.floor(Math.random() * 6))">
</div> </div>
<div class="card-top-right"> <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 class="card-top-right-line"></div>
</div> </div>
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="size ? 6 : 8"> <el-col :span="size ? 6 : 8" v-btn-permission="'2d0f99ba961c551b1d8cad8ad5223731'">
<el-card shadow="hover"> <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">
<div class="card-top-left"> <div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))"> <img :src="getImg(Math.floor(Math.random() * 6))">
</div> </div>
<div class="card-top-right"> <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 class="card-top-right-line"></div>
</div> </div>
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col> </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"> <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">
<div class="card-top-left"> <div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))"> <img :src="getImg(Math.floor(Math.random() * 6))">
</div> </div>
<div class="card-top-right"> <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 class="card-top-right-line"></div>
</div> </div>
</div> </div>
<!-- <div class="card-bottom">--> </div>
<!-- 流程简介: 容器默认存在两根轴:水平的主轴(main axis)和垂直的交叉轴(cross axis)。主轴的开始位置(与边框的交叉点)叫做main start,结束位置叫做main end;交叉轴的开始位置叫做cross start,结束位置叫做cross end。--> </el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'a151f5e2ee44f8df81e201b8696fca31'">
<el-card shadow="hover">
<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-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'2564bd61852551b99e0fe3d49a89b288'">
<el-card shadow="hover">
<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-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'7751d25f72d0a6515e4110ae41837db8'">
<el-card shadow="hover">
<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-line"></div>
</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
<el-card shadow="hover">
<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-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>-->
</div> <!-- <div class="card-top-right">-->
</el-card> <!-- <div class="card-top-right-text">政策入库流程</div>-->
</el-col> <!-- <div class="card-top-right-line"></div>-->
<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>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴:水平的主轴(main axis)和垂直的交叉轴(cross axis)。主轴的开始位置(与边框的交叉点)叫做main start,结束位置叫做main end;交叉轴的开始位置叫做cross start,结束位置叫做cross end。-->
<!-- </div>--> <!-- </div>-->
</div> <!-- </div>-->
</el-card> <!-- </div>-->
</el-col> <!-- </el-card>-->
<el-col :span="size ? 6 : 8" v-btn-permission=""> <!-- </el-col>-->
<el-card shadow="hover"> <!-- <el-col :span="size ? 6 : 8" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">-->
<div class="card-box" @click="handleCreateProcess('23')"> <!-- <el-card shadow="hover">-->
<div class="card-top"> <!-- <div class="card-box" @click="handleCreateProcess('17')">-->
<div class="card-top-left"> <!-- <div class="card-top">-->
<img :src="getImg(Math.floor(Math.random() * 6))"> <!-- <div class="card-top-left">-->
</div> <!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<div class="card-top-right"> <!-- </div>-->
<div class="card-top-right-text">企标复审流程</div> <!-- <div class="card-top-right">-->
<div class="card-top-right-line"></div> <!-- <div class="card-top-right-text">政策课题入会流程</div>-->
</div> <!-- <div class="card-top-right-line"></div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-card> <!-- </div>-->
</el-col> <!-- </el-card>-->
<el-col :span="size ? 6 : 8" v-btn-permission=""> <!-- </el-col>-->
<el-card shadow="hover"> <!-- <el-col :span="size ? 6 : 8" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">-->
<div class="card-box" @click="handleCreateProcess('24')"> <!-- <el-card shadow="hover">-->
<div class="card-top"> <!-- <div class="card-box" @click="handleCreateProcess('18')">-->
<div class="card-top-left"> <!-- <div class="card-top">-->
<img :src="getImg(Math.floor(Math.random() * 6))"> <!-- <div class="card-top-left">-->
</div> <!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<div class="card-top-right"> <!-- </div>-->
<div class="card-top-right-text">企标废止流程</div> <!-- <div class="card-top-right">-->
<div class="card-top-right-line"></div> <!-- <div class="card-top-right-text">政策课题参会流程</div>-->
</div> <!-- <div class="card-top-right-line"></div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-card> <!-- </div>-->
</el-col> <!-- </el-card>-->
<el-col :span="size ? 6 : 8" v-btn-permission=""> <!-- </el-col>-->
<el-card shadow="hover"> <!-- <el-col :span="size ? 6 : 8">-->
<div class="card-box" @click="handleCreateProcess('25')"> <!-- <el-card shadow="hover">-->
<div class="card-top"> <!-- <div class="card-box" @click="handleCreateProcess('16')">-->
<div class="card-top-left"> <!-- <div class="card-top">-->
<img :src="getImg(Math.floor(Math.random() * 6))"> <!-- <div class="card-top-left">-->
</div> <!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<div class="card-top-right"> <!-- </div>-->
<div class="card-top-right-text">企标制修订计划管控</div> <!-- <div class="card-top-right">-->
<div class="card-top-right-line"></div> <!-- <div class="card-top-right-text">外部署名推荐审批流程</div>-->
</div> <!-- <div class="card-top-right-line"></div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-card> <!-- </div>-->
</el-col> <!-- </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> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'NewProcess', name: 'NewProcess',
data () { data () {
return { return {
@@ -511,24 +661,6 @@ export default {
name: 'bzchStep1' name: 'bzchStep1'
}) })
break 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
} }
}, },
checkPermission(permissionIdArray) { checkPermission(permissionIdArray) {
@@ -601,10 +733,10 @@ export default {
} }
this.type = this.$route.params.type this.type = this.$route.params.type
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
#NewProcess{ #NewProcess{
width: 100%; width: 100%;
//height: 100%; //height: 100%;
padding: 15px 15px 0; padding: 15px 15px 0;
@@ -700,6 +832,6 @@ export default {
color: #2d8cf0; color: #2d8cf0;
} }
} }
} }
</style> </style>
@@ -6,17 +6,17 @@
<el-tab-pane label="未符合项整改数据库" name="database"> <el-tab-pane label="未符合项整改数据库" name="database">
<rectification-database></rectification-database> <rectification-database></rectification-database>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="重点问题项管控" name="keynote"> <!-- <el-tab-pane label="重点问题项管控" name="keynote">-->
<key-issues :keynoteActiveName="keynoteActiveName"></key-issues> <!-- <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>-->
</el-tab-pane> <!-- </el-tab-pane>-->
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import keyIssues from "@/pages/regulatoryRepository/nonConfomity/pages/keyIssues"; import keyIssues from "@/pages/regulatoryRepository/nonConfomity/pages/keyIssues";
import rectificationDatabase from "@/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase"; import rectificationDatabase from "@/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase";
export default { export default {
name: 'NonConfomity', name: 'NonConfomity',
components: { components: {
keyIssues, keyIssues,
@@ -46,10 +46,10 @@ export default {
}, },
watch: {}, watch: {},
mounted () {} mounted () {}
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
#non-cnfomity { #non-cnfomity {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -73,5 +73,5 @@ export default {
.el-tabs__nav { .el-tabs__nav {
margin-left:20px; margin-left:20px;
} }
} }
</style> </style>
+48 -48
View File
@@ -27,8 +27,8 @@
{{ $t("m.clearQuery") }} {{ $t("m.clearQuery") }}
</el-button> </el-button>
</div> </div>
<!-- <el-button type="primary" @click="exportSearchResult" v-if="!kindtext" style="position: absolute;right:0px;width: 98px;background:#3391CE;border-color:#3391CE;">{{ $t("m.export") }}--> <!-- <el-button type="primary" @click="exportSearchResult" v-if="!kindtext" style="position: absolute;right:0px;width: 98px;background:#3391CE;border-color:#3391CE;">{{ $t("m.export") }}-->
<!-- </el-button>--> <!-- </el-button>-->
</div> </div>
<div class="search-condition showWidth" v-if="kindtext"> <div class="search-condition showWidth" v-if="kindtext">
<div class="search-content"> <div class="search-content">
@@ -39,9 +39,9 @@
<el-radio label="INLAND_STAND"> <el-radio label="INLAND_STAND">
<span>{{ $t("m.standAll") }}</span> <span>{{ $t("m.standAll") }}</span>
</el-radio> </el-radio>
<el-radio label="INLAND_LAWS"> <!--<el-radio label="INLAND_LAWS">
<span>{{ $t("m.lawsAll") }}</span> <span>{{ $t("m.lawsAll") }}</span>
</el-radio> </el-radio>-->
<el-radio label="BUSINESS_STAND"> <el-radio label="BUSINESS_STAND">
<span>{{ $t("m.enterpriseStandard") }}</span> <span>{{ $t("m.enterpriseStandard") }}</span>
</el-radio> </el-radio>
@@ -832,11 +832,11 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex" justify="space-around" class="code-row-bg"> <el-row type="flex" justify="space-around" class="code-row-bg">
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- <el-form-item label="文件上传人员" prop="nameShow">--> <!-- <el-form-item label="文件上传人员" prop="nameShow">-->
<!-- <el-input v-model="standForm.nameShow" clearable></el-input>--> <!-- <el-input v-model="standForm.nameShow" clearable></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用车型" prop="standNumber"> <el-form-item label="适用车型" prop="standNumber">
<el-select v-model="standForm.SYCXCLASS" filterable clearable> <el-select v-model="standForm.SYCXCLASS" filterable clearable>
@@ -938,23 +938,23 @@
</el-row> </el-row>
<el-row type="flex" justify="space-around" class="code-row-bg"> <el-row type="flex" justify="space-around" class="code-row-bg">
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- <el-form-item label="宣贯记录" prop="standNumber">--> <!-- <el-form-item label="宣贯记录" prop="standNumber">-->
<!-- <el-input v-model="standForm.standNumber" clearable--> <!-- <el-input v-model="standForm.standNumber" clearable-->
<!-- placeholder="根据宣贯记录查找"--> <!-- placeholder="根据宣贯记录查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>--> <!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row type="flex" justify="space-around" class="code-row-bg">--> <!-- <el-row type="flex" justify="space-around" class="code-row-bg">-->
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- <el-form-item label="上传时间" prop="nameShow">--> <!-- <el-form-item label="上传时间" prop="nameShow">-->
<!-- <el-input v-model="standForm.nameShow" clearable placeholder="根据上传时间查找"--> <!-- <el-input v-model="standForm.nameShow" clearable placeholder="根据上传时间查找"-->
<!-- @keyup.enter.native="btnSearch"></el-input>--> <!-- @keyup.enter.native="btnSearch"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- </el-col>--> <!-- </el-col>-->
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
@@ -1131,7 +1131,7 @@
> >
取消收藏 取消收藏
</el-dropdown-item> </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-menu>
</el-dropdown> </el-dropdown>
@@ -1172,7 +1172,7 @@
取消收藏 取消收藏
</el-dropdown-item> </el-dropdown-item>
<el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button> <el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
<!-- <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>--> <!-- <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>-->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -1235,12 +1235,12 @@
</template> </template>
<script> <script>
import "../../../assets/zTree/js/jquery.ztree.core.js"; import "../../../assets/zTree/js/jquery.ztree.core.js";
import "../../../assets/zTree/js/jquery.ztree.excheck.js"; import "../../../assets/zTree/js/jquery.ztree.excheck.js";
import "../../../assets/zTree/js/jquery.ztree.exedit.js"; import "../../../assets/zTree/js/jquery.ztree.exedit.js";
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
export default { export default {
name: "advancedSearch", name: "advancedSearch",
components: { components: {
TreeSelectNew TreeSelectNew
@@ -2709,22 +2709,22 @@ export default {
destroyed() { destroyed() {
// 检索中心特殊处理 // 检索中心特殊处理
} }
}; };
</script> </script>
<style lang="less"> <style lang="less">
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/ .yellowClass{ /deep/ .yellowClass{
color: #E6A23C !important; color: #E6A23C !important;
} }
/deep/ .redClass{ /deep/ .redClass{
color: #F56C6C !important; color: #F56C6C !important;
} }
#advancedSearch { #advancedSearch {
background: #fff; background: #fff;
@borderColor: #BFBFBF; @borderColor: #BFBFBF;
height: auto !important; height: auto !important;
@@ -3117,17 +3117,17 @@ export default {
height: 40px height: 40px
} }
} }
} }
.showWidth { .showWidth {
width: 100% !important; width: 100% !important;
} }
.ivu-select-dropdown { .ivu-select-dropdown {
max-width: none; max-width: none;
} }
.celect-btn-box { .celect-btn-box {
/deep/ button.el-button.el-button--default { /deep/ button.el-button.el-button--default {
padding: 5px 18px; padding: 5px 18px;
} }
@@ -3135,5 +3135,5 @@ export default {
/deep/ .el-button + .el-button { /deep/ .el-button + .el-button {
padding: 5px 18px; padding: 5px 18px;
} }
} }
</style> </style>
+14 -14
View File
@@ -127,7 +127,7 @@
:label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))" :label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))"
width="200"> width="200">
<template slot-scope="scope"> <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' : <div :class="selectIndex === 'enterprise' || selectIndex === 'laws' ? (scope.row.textStatusBussName === '参考' ? 'yellowClass' :
(scope.row.textStatusBussName || scope.row.lawsTextStateName === '作废' || scope.row.textStatusBussName === '被代替' ? 'redClass' : '')) : ''"> (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>
@@ -217,7 +217,7 @@
<el-dropdown-menu slot="dropdown"> <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('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('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-menu>
</el-dropdown> </el-dropdown>
<!-- <el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>--> <!-- <el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>-->
@@ -388,10 +388,10 @@
label: '海外标准法规', // value没改 label: '海外标准法规', // value没改
value: 'bussstand' value: 'bussstand'
}, },
{ // {
label: '国内外政策', // label: '国内外政策',
value: 'laws' // value: 'laws'
}, // },
{ {
label: '企业标准', label: '企业标准',
value: 'enterprise' value: 'enterprise'
@@ -420,10 +420,10 @@
label: '海外标准法规', // value没改 label: '海外标准法规', // value没改
value: 'bussstand' value: 'bussstand'
}, },
{ // {
label: '国内外政策', // label: '国内外政策',
value: 'laws' // value: 'laws'
}, // },
{ {
label: '企业标准', label: '企业标准',
value: 'enterprise' value: 'enterprise'
@@ -760,10 +760,10 @@
label: '海外标准法规', label: '海外标准法规',
value: 'bussstand' value: 'bussstand'
}, },
{ // {
label: '国内外政策', // label: '国内外政策',
value: 'laws' // value: 'laws'
}, // },
{ {
label: '企业标准', label: '企业标准',
value: 'enterprise' value: 'enterprise'
+15 -14
View File
@@ -6,16 +6,17 @@
// 服务器地址 // 服务器地址
// const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
// const devInterfacePORT = '10005' // const devInterfacePORT = '10005'
// const devIp = '192.168.10.249' // const devIp = '192.168.10.248'
const devIp = '62.234.136.153' // const devIp = '62.234.136.153'
// const devInterfacePORT = '9999' // const devInterfacePORT = '8033'
const devInterfacePORT = '8033' const devIp = '10.19.11.243'
const devInterfacePORT = '4304'
// 配置 idm 认证 // 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' 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 (测试环境登录) // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'dev' const webLoginType = 'idm'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload' const simpleFilePath = 'att/attFile/upload'
@@ -38,10 +39,10 @@ const processPort = '17210'
*****************************************************************/ *****************************************************************/
// 生产环境配置 // 生产环境配置
const prodIp = '62.234.136.153' // const prodIp = '62.234.136.153'
const prodInterfacePORT = '8033' // const prodInterfacePORT = '8033'
// const prodIp = 'slrs.foton.com.cn' const prodIp = 'srms.foton.com.cn'
// const prodInterfacePORT = '' const prodInterfacePORT = ''
// 判断环境 // 判断环境
const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp 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 const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT
module.exports = { module.exports = {
baseUrl: 'http://' + serverIP + ':' + interfacePORT, baseUrl: 'https://' + serverIP + ':' + interfacePORT,
webLoginType: webLoginType, webLoginType: webLoginType,
ssoLoginUrlDev: ssoLogin + devWebUrl, ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLoginUrl: ssoLogin, ssoLoginUrl: ssoLogin,
devWebUrl: devWebUrl, devWebUrl: devWebUrl,
serverUrl: 'http://' + serverIP, // 服务器IP地址 serverUrl: 'https://' + serverIP, // 服务器IP地址
interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址
@@ -64,5 +65,5 @@ module.exports = {
webSocket: webSocket + ':' + devInterfacePORT + '/websocket/socketServer', // webSocket连接 webSocket: webSocket + ':' + devInterfacePORT + '/websocket/socketServer', // webSocket连接
enterprise: enterprise, // GQ广汽 SJZX数据中心 enterprise: enterprise, // GQ广汽 SJZX数据中心
theme: theme, // 主题 theme: theme, // 主题
processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` processInterfaceURL: `https://${serverIP}:${processPort}/bat-wkflow`
} }