+ :key="item.id"> {{ item.name }}
+
+ {{ typeApplicableMap[scope.row.typeApplicable] }}
+
+
+ {{ nylxMap[scope.row.nylx] }}
+
+
+ {{ zrbmMap[scope.row.zrbm] }}
+
+
+ {{ sycpxMap[scope.row.sycpx] }}
+
+
+
@@ -256,6 +276,12 @@ export default {
name: "AccessStandardDetails",
data() {
return {
+ textStatusMap: {},
+ typeApplicableMap: {},
+ nylxMap: {},
+ zrbmMap: {},
+ sycpxMap: {},
+ countryAreaMap: {},
standinfoList: [],
standardFormTotal: 0,
relateDialog: false,
@@ -452,9 +478,8 @@ export default {
},
// 请求上传的文件信息
getFileInfo() {
- console.log(this.sarAccessEO)
this.$http.get("att/attFile/getMultiFileInfos", {
- fileIds: this.sarAccessEO.relateFile
+ fileIds: this.sarAccessEO.fileIds
}, {
_this: this
}, res => {
@@ -474,7 +499,7 @@ export default {
},
// 附件下载事件
fileDownLoad(attId) {
- window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId;
+ window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
},
// 点击查看
handlePreview(item) {
@@ -560,6 +585,17 @@ export default {
doLayout() {
this.$refs.adminTable && this.$refs.adminTable.doLayout();
this.$refs.skillTable && this.$refs.skillTable.doLayout();
+ },
+ // 将文本状态的id与name对应
+ setMap(data){
+ data.forEach(item => {
+ this.$set(this.textStatusMap, item.value, item.label)
+ this.$set(this.typeApplicableMap, item.value, item.label)
+ this.$set(this.nylxMap, item.value, item.label)
+ this.$set(this.zrbmMap, item.value, item.label)
+ this.$set(this.sycpxMap, item.value, item.label)
+ this.$set(this.countryAreaMap, item.value, item.label)
+ })
}
},
mounted() {
@@ -589,6 +625,16 @@ export default {
this.ROLELIST = res.data.ROLELIST;
this.GXHBQOptions = res.data.GXHBQXX;
this.askNatureOptions = res.data.ACCESSTYPE;
+ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+ this.categoryOptions = res.data.NYLXCLASS // 能源类型
+ this.textStatusOptions = res.data.WBZTCLASS
+ this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+ this.setMap(this.textStatusOptions)
+ this.setMap(this.zrbmOptions)
+ this.setMap(this.categoryOptions)
+ this.setMap(this.sycpxOptions)
+ this.setMap(this.energyKindOptions)
+ this.setMap(this.drawerCountryOptions)
this.getGzzOption();
}, e => {
});
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index e2308f462..28e717fee 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -55,6 +55,7 @@
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
+ :on-preview="handleOnPreview"
>
点击上传
@@ -227,6 +228,9 @@
prop="textStatus"
width="120px"
label="文本状态">
+
+ {{ textStatusMap[scope.row.textStatus] }}
+
+
+ {{ typeApplicableMap[scope.row.typeApplicable] }}
+
+
+ {{ nylxMap[scope.row.nylx] }}
+
+
+ {{ zrbmMap[scope.row.zrbm] }}
+
+
+ {{ sycpxMap[scope.row.sycpx] }}
+
+
+
@@ -511,11 +534,17 @@ export default {
// }
// }
return {
+ textStatusMap: {},
+ typeApplicableMap: {},
+ nylxMap: {},
+ zrbmMap: {},
+ sycpxMap: {},
selectSearch : [],
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 4,
+ fileIds: '',
detailedList: '',
detailedListName: '',
energyKind: '',
@@ -1167,7 +1196,7 @@ export default {
this.fileInfoList.map(item => {
relateFile.push(item.id)
})
- sarAccessEO.relateFile = relateFile.join(',')
+ sarAccessEO.fileIds = relateFile.join(',')
}
if (!sarAccessEO.id) {
// 新增
@@ -1584,7 +1613,7 @@ export default {
// 请求上传的文件信息
getFileInfo () {
this.$http.get('att/attFile/getMultiFileInfos', {
- fileIds: this.sarAccessEO.relateFile
+ fileIds: this.$route.query.fileIds
}, {
_this: this
}, res => {
@@ -1678,7 +1707,24 @@ export default {
}, e => {
})
- }
+ },
+ // 将文本状态的id与name对应
+ setMap(data){
+ data.forEach(item => {
+ this.$set(this.textStatusMap, item.value, item.label)
+ this.$set(this.typeApplicableMap, item.value, item.label)
+ this.$set(this.nylxMap, item.value, item.label)
+ this.$set(this.zrbmMap, item.value, item.label)
+ this.$set(this.sycpxMap, item.value, item.label)
+ })
+ },
+ // 点击上传的文件进行下载
+ handleOnPreview(file) {
+ let attId = file.id
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
},
watch: {
// 监听 清单类型
@@ -1714,6 +1760,15 @@ export default {
this.ROLELIST = res.data.ROLELIST
this.GXHBQOptions = res.data.GXHBQXX
this.askNatureOptions = res.data.ACCESSTYPE
+ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+ this.categoryOptions = res.data.NYLXCLASS // 能源类型
+ this.textStatusOptions = res.data.WBZTCLASS
+ this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+ this.setMap(this.textStatusOptions)
+ this.setMap(this.zrbmOptions)
+ this.setMap(this.categoryOptions)
+ this.setMap(this.sycpxOptions)
+ this.setMap(this.energyKindOptions)
this.getGzzOption()
}, e => {
})
@@ -1723,9 +1778,10 @@ export default {
const accessRow = this.getAccessStandardRegRow
this.$nextTick(() => {
this.sarAccessEO.type = accessRow.type
- this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
+ //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
// this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
this.sarAccessEO.detailedListName = accessRow.detailedListName
+ this.sarAccessEO.detailedList = accessRow.detailedList
this.sarAccessEO.id = accessRow.id
this.sarAccessEO.remark = accessRow.remark || ''
this.sarAccessEO.relateFile = accessRow.relateFile
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 567cf4556..db97c6e44 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -55,6 +55,7 @@
:on-remove="delFileInfo"
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
+ :on-preview="handleOnPreview"
>
点击上传
@@ -227,6 +228,9 @@
prop="textStatus"
width="120px"
label="文本状态">
+
+ {{ textStatusMap[scope.row.textStatus] }}
+
+
+ {{ typeApplicableMap[scope.row.typeApplicable] }}
+
+
+ {{ nylxMap[scope.row.nylx] }}
+
+
+ {{ zrbmMap[scope.row.zrbm] }}
+
+
+ {{ sycpxMap[scope.row.sycpx] }}
+
+
+
-
+
下移
@@ -511,11 +535,17 @@ export default {
// }
// }
return {
+ textStatusMap: {},
+ typeApplicableMap: {},
+ nylxMap: {},
+ zrbmMap: {},
+ sycpxMap: {},
selectSearch : [],
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
sortKey: 2,
+ fileIds: '',
projectName: '',
detailedListName: '',
energyKind: '',
@@ -1151,7 +1181,6 @@ export default {
},
// 提交按钮 事件
saveSarAccess () {
- alert()
this.$refs['sarAccessForm'].validate((valid) => {
if (valid) {
let rowlist = []
@@ -1169,7 +1198,7 @@ export default {
this.fileInfoList.map(item => {
relateFile.push(item.id)
})
- sarAccessEO.relateFile = relateFile.join(',')
+ sarAccessEO.fileIds = relateFile.join(',')
}
if (!sarAccessEO.id) {
// 新增
@@ -1215,8 +1244,6 @@ export default {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
- this.$nextTick(() => {
- })
}, e => {
})
@@ -1586,7 +1613,7 @@ export default {
// 请求上传的文件信息
getFileInfo () {
this.$http.get('att/attFile/getMultiFileInfos', {
- fileIds: this.sarAccessEO.relateFile
+ fileIds: this.$route.query.fileIds
}, {
_this: this
}, res => {
@@ -1680,7 +1707,24 @@ export default {
}, e => {
})
- }
+ },
+ // 将文本状态的id与name对应
+ setMap(data){
+ data.forEach(item => {
+ this.$set(this.textStatusMap, item.value, item.label)
+ this.$set(this.typeApplicableMap, item.value, item.label)
+ this.$set(this.nylxMap, item.value, item.label)
+ this.$set(this.zrbmMap, item.value, item.label)
+ this.$set(this.sycpxMap, item.value, item.label)
+ })
+ },
+ // 点击上传的文件进行下载
+ handleOnPreview(file) {
+ let attId = file.id
+ if (attId != null && attId !== "") {
+ window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+ }
+ },
},
watch: {
// 监听 清单类型
@@ -1697,7 +1741,7 @@ export default {
},
mounted () {
this.zqaId =this.$route.query.id;
- // this.getData()
+ //this.getData()
this.getDept()
// 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -1716,6 +1760,15 @@ export default {
this.ROLELIST = res.data.ROLELIST
this.GXHBQOptions = res.data.GXHBQXX
this.askNatureOptions = res.data.ACCESSTYPE
+ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+ this.categoryOptions = res.data.NYLXCLASS // 能源类型
+ this.textStatusOptions = res.data.WBZTCLASS
+ this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+ this.setMap(this.textStatusOptions)
+ this.setMap(this.zrbmOptions)
+ this.setMap(this.categoryOptions)
+ this.setMap(this.sycpxOptions)
+ this.setMap(this.energyKindOptions)
this.getGzzOption()
}, e => {
})
@@ -1725,9 +1778,10 @@ export default {
const accessRow = this.getAccessStandardRegRow
this.$nextTick(() => {
this.sarAccessEO.type = accessRow.type
- this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
+ //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
// this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
this.sarAccessEO.detailedListName = accessRow.detailedListName
+ this.sarAccessEO.projectName = accessRow.projectName
this.sarAccessEO.id = accessRow.id
this.sarAccessEO.remark = accessRow.remark || ''
this.sarAccessEO.relateFile = accessRow.relateFile
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 02e4c0ce2..4fd7cf277 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -357,7 +357,7 @@
- 文本状态
+ 文本状态
@@ -1006,6 +1006,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+
+ {{ opt.label}}
+
+
-
{{ opt.label}}
-
- {{ opt.label}}
+ {{ opt.label}}
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
this.$http.delete("sarResource/ts-resource", {
- menuId: data.id
+ resourceId: data.id
}, res => {
}, e => {
if(e.ok){
@@ -4077,7 +4241,7 @@ export default {
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
- this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+ this.applyArcticOptions = res.data.SYCXCLASS // 适用车型
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
@@ -4085,6 +4249,12 @@ export default {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
+ this.qcdwOptions = res.data.QCDW // 起草单位
+ this.nylxOptions = res.data.NYLXCLASS // 能源类型
+ this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+ this.syzrOptions = res.data.SYRZCLASS // 适用认证
this.getGzzOption()
this.setMap(this.standStateOptions)
console.log(this.standStateOptions, '文本状态')
@@ -4234,6 +4404,9 @@ export default {
text-align: center;
margin-top: 6px;
background: #F9F9F9;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis
}
/deep/.el-input__inner {
height: 30px;
@@ -4242,5 +4415,8 @@ export default {
}
}
}
+.el-date-editor.el-input, .el-date-editor.el-input__inner{
+ width: 190px
+}
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 945faba41..00aa92163 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -231,7 +231,7 @@
取消收藏
编辑
- 分享
+
删除
@@ -3960,6 +3960,7 @@ export default {
this.assemClassOptions = res.data.ASSEMCLASSIFY // 总成分类
this.categoryConfigOptions = res.data.CATEGORY
this.standAttributeList = res.data.RULETYPE
+ this.qcdwOptions = res.data.QCDW
this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index 887a57d07..ea9cb6978 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -142,80 +142,116 @@
align="center">
+ label="条款号">
+ label="条款名称">
@@ -293,6 +329,7 @@ export default {
this.sarProject.country = ''
this.sarProject.standCode=''
this.sarProject.standName = ''
+ this.sarProject.standNumber=''
this.queryStandAndLaws()
}, // 外层清空条件查询
handleProjectCompliance (row) {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index daf87f17a..cbdf615b8 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -264,6 +264,7 @@ name: "technologyInvolveProject",
this.sarProject.country = ''
this.sarProject.standCode=''
this.sarProject.standName = ''
+ this.sarProject.standNumber=''
this.queryStandAndLaws()
}, // 外层清空条件查询
handleProjectCompliance (row) {
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 67456cdbd..d664ec02e 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -167,17 +167,17 @@
label="责任部门">
diff --git a/src/router/index.js b/src/router/index.js
index 8d295b2a8..5c93b42a3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -438,6 +438,15 @@ const routes = [
title: '标准调研流程'
}
},
+ {
+ path: '/bzdyStep1-1',
+ name: 'bzdyStep1-1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准调研流程'
+ }
+ },
{
path: '/bzdyStep2',
name: 'bzdyStep2',
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 2f49323fa..b49eeec52 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
// const devIp = '192.168.10.248'
-const devIp = '192.168.1.108'
+const devIp = '192.168.1.102'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'