FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-08-08 17:06:42 +08:00
parent eba187ac81 9112397e7a
commit 7a4a717297
8 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/File.vue
+1
View File
@@ -43,6 +43,7 @@
:class="{'disabled': disabled}"
multiple
drag
:show-file-list="showUploadlist"
:on-success="uploadSuccess"
:before-upload="beforeUpload"
src/components/navMenu/index.vue
+10
View File
@@ -88,6 +88,16 @@ export default {
path: '/domesticStandardsAndRegulations',
menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
},
{
title: '零部件编号申请',
path: '/partCodeApply',
menuId: ''
},
{
title: '标准法规工作组数据统计',
path: '/dataStatisComments',
menuId: ''
},
{
title: '海外标准法规',
path: '/foreignStandardsAndRegulations',
src/pages/regulatoryRepository/dataStatis/index.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "dataStatisComments"
}
</script>
<style scoped>
</style>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+10 -3
View File
@@ -12,8 +12,14 @@
<el-row style="margin-top: 10px">
<el-col :span="5">产品平台1: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
<el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.projectName }}</span></el-col>
<!-- <el-col :span="5" :push="2">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->
<el-col :span="5" :push="2">
<el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
<div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div>
<div v-else></div>
<div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div>
<div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div>
</el-tooltip>
</el-col>
<el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
</el-col>
</el-row>
@@ -449,7 +455,7 @@ export default {
let deleteTagList = []
this.selectList1.forEach(item => {
//项目id-标准id,项目id-标准id
deleteTagList.push( this.proId + '-' + item )
deleteTagList.push(this.proId + '-' + item)
})
this.id = deleteTagList.join(',')
this.$http.post('sarStandProjectLibrary/deleteByIds', {
@@ -726,6 +732,7 @@ export default {
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
this.setMap(this.textStatusMap, res.data.WBZTCLASS)
console.log(this.getLocalPro)
this.showLocalProductData(this.getLocalPro)
}, e => {
})
src/pages/regulatoryRepository/partCodeApply/index.vue
+13
View File
@@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: "partCodeApply"
}
</script>
<style scoped>
</style>
src/pages/searchCenter/pages/standardSearch.vue
+13 -12
View File
@@ -103,8 +103,8 @@
align="center"
:label="$t('m.issueTime')">
<template slot-scope="scope">
<div v-if="scope.row.issue_time !== null && scope.row.issue_time !== undefined">
{{ dateFormat2(scope.row.issue_time) }}
<div v-if="scope.row.issueTime !== null && scope.row.issueTime !== undefined">
{{ dateFormat2(scope.row.issueTime) }}
</div>
<div v-else></div>
</template>
@@ -973,7 +973,7 @@
option.title = '监管类型'
option.index = 12
break
case 'CYSDXX':
case 'WSCYSD':
option.title = '我司参与深度'
option.index = 13
break
@@ -1003,6 +1003,7 @@
})
}
this.searchOriginOptions = this.searchOptions
console.log(this.searchOriginOptions)
this.saveAllSortOptions = res.data.STANDCLASSIFY
this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW
this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组
@@ -1027,20 +1028,20 @@
filterOptions.standSort = originOptions.standSort
filterOptions.standSort.index = 1
// 标准状态
filterOptions.standState = originOptions.standState
filterOptions.standState.title = '标准状态'
filterOptions.standState.index = 2
// filterOptions.standState = originOptions.standState
// filterOptions.standState.title = '标准状态'
// filterOptions.standState.index = 2
// 我司参与状态
filterOptions.CYSD = originOptions.CYSD
filterOptions.CYSD.title = '我司参与深度'
filterOptions.CYSD.index = 3
filterOptions.CYSD.index = 2
// 监管类型
filterOptions.ZRLX = originOptions.ZRLX
filterOptions.ZRLX.title = '监管类型'
filterOptions.ZRLX.index = 4
// filterOptions.ZRLX = originOptions.ZRLX
// filterOptions.ZRLX.title = '监管类型'
// filterOptions.ZRLX.index = 4
// 适用车辆类型
filterOptions.CLLX = originOptions.CLLX
filterOptions.CLLX.index = 5
filterOptions.CLLX.index = 3
// 采标程度
// filterOptions.CBCD = originOptions.CBCD
// filterOptions.CBCD.index = 6
@@ -1322,7 +1323,7 @@
return 'bussBigClass'
case 'ACCESSTYPE':
return 'ZRLX'
case 'CYSDXX':
case 'WSCYSD':
return 'CYSD'
default:
return key
src/router/index.js
+24
View File
@@ -1097,6 +1097,30 @@ const routes = [
menuId: 'A59EFAQ7AC'
}
},
//零部件编号申请
{
path: '/partCodeApply',
name: 'partCodeApply',
component: () =>
import('@/pages/regulatoryRepository/partCodeApply/index'),
meta: {
requireAuth: true,
title: '零部件编号申请',
menuId: ''
}
},
//标准法规工作组数据统计
{
path: '/dataStatisComments',
name: 'dataStatisComments',
component: () =>
import('@/pages/regulatoryRepository/dataStatis/index'),
meta: {
requireAuth: true,
title: '标准法规工作组数据统计',
menuId: ''
}
},
// 标准征求意见
{
path: '/standardForComments',
src/sysConfig/index.js
+2 -2
View File
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '10.96.170.156'
const devIp = 'localhost'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -31,7 +31,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
const prodIp = '62.234.136.153'
const prodInterfacePORT = '8038'
const prodInterfacePORT = '8033'
// 判断环境