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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Superman_Main
2021-12-08 17:47:42 +08:00
parent 315cdcc37e 3835bf30d1
commit e28c0de082
11 changed files with 89 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/roleTree/index.vue
+36 -19
View File
@@ -143,26 +143,33 @@
}
}),
checkChange2 (row, type, c) {
if (type) {
this.nodeList.push(row.id)
if (this.checkBox) {
} else {
for (let a = 0; a < this.nodeList.length; a ++) {
if (row.id === this.nodeList[a]) {
this.nodeList.splice(a, 1)
if (type) {
this.nodeList.push(row.id)
} else {
for (let a = 0; a < this.nodeList.length; a ++) {
if (row.id === this.nodeList[a]) {
this.nodeList.splice(a, 1)
}
}
}
}
},
checkChange (row, type, c) {
if (type) {
this.nodeList.push(row.id)
if (this.checkBox) {
} else {
for (let a = 0; a < this.nodeList.length; a ++) {
if (row.id === this.nodeList[a]) {
this.nodeList.splice(a, 1)
if (type) {
this.nodeList.push(row.id)
} else {
for (let a = 0; a < this.nodeList.length; a ++) {
if (row.id === this.nodeList[a]) {
this.nodeList.splice(a, 1)
}
}
}
}
},
handleTreeDrawerCancel () {
this.filterText = ''
@@ -200,17 +207,27 @@
this.open1 = true
},
drawerCheck (data) {
if (this.checkBox) {
if (this.checkBox) { // 单选
// 单选判断
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if(getlist.length == 1) {
this.roleRow = getlist[0]
} else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0]
let getlist = this.$refs.tree.getCheckedNodes()
if (getlist.length > 1) {
this.$refs.tree.setCheckedKeys([])
this.$refs.tree.setCheckedKeys([data.id])
this.roleList = [data]
} else if (getlist.length === 0) {
this.roleList = [{}]
} else if (getlist.length === 1) {
this.roleList = [data]
}
this.roleList = [this.roleRow]
} else {
// var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
// if(getlist.length == 1) {
// this.roleRow = getlist[0]
// } else {
// this.$refs.tree.setCheckedKeys([data.id])
// this.roleRow = this.$refs.tree.getCheckedNodes()[0]
// }
// this.roleList = [this.roleRow]
} else { // 多选
this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
}
},
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -3713,7 +3713,7 @@ export default {
& > p {
min-height: 42px;
line-height: 43px;
/*border-bottom: 1px solid #E5E5E5;*/
border-bottom: 1px solid #E5E5E5;
}
}
}
src/pages/home2/components/empennage/index.vue
+2 -2
View File
@@ -7,7 +7,7 @@
</div>
<div style="display: inline-block;width: 80%;text-align: center">
<el-row>
<span v-for="(item, index) in linkListFirst" :key="index">
<span v-for="(item, index) in linkListFirst" :key="index" v-if="index < 5">
<el-col :span="4">
<!-- <img
style="height: 10px;width: 10px;margin-bottom: 3px"
@@ -27,7 +27,7 @@
</span>
</el-row>
<el-row style="margin-bottom: 10px;">
<span v-for="(item, index) in linkListSecond" :key="index">
<span v-for="(item, index) in linkListSecond" :key="index" v-if="index< 5">
<el-col :span="4">
<!-- <img
style="height: 10px;width: 10px;margin-bottom: 3px"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+3 -16
View File
@@ -217,8 +217,8 @@
width="150"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
</template>
</el-table-column>
<el-table-column
@@ -229,7 +229,7 @@
width="150"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj }}</span>
</template>
</el-table-column>
<el-table-column
@@ -338,9 +338,6 @@
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -349,11 +346,6 @@
width="210px"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<!-- <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
@@ -361,11 +353,6 @@
align="center"
width="210px"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+3 -16
View File
@@ -194,8 +194,8 @@
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
</template>
</el-table-column>
<el-table-column
@@ -205,7 +205,7 @@
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj }}</span>
</template>
</el-table-column>
<el-table-column
@@ -311,9 +311,6 @@
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -322,11 +319,6 @@
width="210px"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<!-- <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>-->
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
@@ -334,11 +326,6 @@
align="center"
width="210px"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>-->
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+3 -16
View File
@@ -251,8 +251,8 @@
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime }}</span>
</template>
</el-table-column>
<el-table-column
@@ -262,7 +262,7 @@
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.zccssrqgj }}</span>
</template>
</el-table-column>
<el-table-column
@@ -369,9 +369,6 @@
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -380,11 +377,6 @@
width="210px"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<!-- <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
@@ -392,11 +384,6 @@
align="center"
width="210px"
label="新车型实施日期">
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+4
View File
@@ -2982,6 +2982,7 @@ export default {
this.sarConfigStandSearch.replaceStandNum = ''
this.selectConfiguraStand()
}
this.searchBtnClick()
},
// 高级检索
selectMoreBtn() {
@@ -3707,6 +3708,9 @@ export default {
res.data.list[i].ZCCSSRQ = res.data.list[i].zccssrq
res.data.list[i].SSRQ = res.data.list[i].ssrq
}
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.standCommonlySearch.page !== 1) {
this.pageChange(1)
}
this.stahndinfoList = res.data.list
this.total = res.data.count
} else {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+17 -7
View File
@@ -14,12 +14,12 @@
placeholder="标准/政策名称查找"
clearable></el-input>
</el-form-item>
<el-form-item label="类型" class="search-item search-item-last">
<el-select v-model="sarProject.position" placeholder="请选择标准性质">
<el-option value="1" label="国内"></el-option>
<el-option value="2" label="海外"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="类型" class="search-item search-item-last">-->
<!-- <el-select v-model="sarProject.position" placeholder="请选择标准性质">-->
<!-- <el-option value="1" label="国内"></el-option>-->
<!-- <el-option value="2" label="海外"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'f3ea8cde1a7116aa7ba56ff33a19189f'">查询</el-button>
</el-form-item>
@@ -208,12 +208,13 @@
label="解读内容">
<el-table-column
show-overflow-tooltip
v-if="itemType"
prop="coreTechnicalRequirement"
label="核心技术要求(简述、请勿抄写标准)">
</el-table-column>
<el-table-column
show-overflow-tooltip
v-if="sarProject.position === '1'"
v-if="sarProject.position === '1' && !itemType"
prop="comparedWithPrevious"
label="相对于上一版本变化点">
</el-table-column>
@@ -258,6 +259,8 @@
name: "technologyInvolveProject",
data () {
return {
itemType: false,
interpretationTime: '',
riskDegreeModal: false,
editData: {},
riskDegree: '',
@@ -392,6 +395,7 @@
}, // 外层清空条件查询
handleProjectCompliance (row) {
this.standId = row.standId
this.interpretationTime = row.interpretationTime
this.querySarProStateZero()
},
querySarProStateZeroBtn(){
@@ -405,6 +409,7 @@
form.standId = this.standId
form.current = this.sarProStateTotalPage
form.size = this.sarProStatePageSize
form.interpretationTime = this.interpretationTime
this.$http.get('sarStandardComplianceAssessResult/interpretation', form, {
_this: this,
loading: 'loading'
@@ -412,6 +417,11 @@
if (res.ok) {
this.sarProStateListDatas = res.data.records
this.sarProStateTotal = res.data.total
if (res.data.records[0].coreTechnicalRequirement) {
this.itemType = true
} else {
this.itemType = false
}
}
})
this.showSarProStateModal = true
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+18 -10
View File
@@ -426,11 +426,11 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="projectNumber" label="项目编号" style="width: 100%; margin-right:10px"
<el-form-item prop="productId" label="项目编号" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.projectNumber"
v-model="addForm.productId"
placeholder="请输入项目编号"
/>
</el-form-item>
@@ -612,7 +612,7 @@ export default {
itemsNum: "", //条款号
itemsName: "", //条款名称
productType: "",
projectNumber: "",
productId: "",
productLine: "", //产品线
productName: "", //项目名称
reason: "", //不合规项目
@@ -644,7 +644,7 @@ export default {
productName: [
{ required: true, message: "请输入项目名称", trigger: "change" }
],
projectNumber: [
productId: [
{ required: true, message: "请输入项目编号", trigger: "change" }
],
reason: [
@@ -700,7 +700,10 @@ export default {
// 选择责任部门
nodeListZRBM: [],
modalshowflagZRBM: false
modalshowflagZRBM: false,
// 储存项目id
projectId: '',
};
},
methods: {
@@ -893,7 +896,7 @@ export default {
submit() {
const id = this.addForm.id;
const closeState = this.addForm.closeState;
const standId = this.addForm.productId // 此处standId储存项目下的标准的id
const standId = this.addForm.standId
const standSerialNumber = this.addForm.standSerialNumber;
const standName = this.addForm.standName;
const itemsNum = this.addForm.itemsNum;
@@ -901,7 +904,7 @@ export default {
const productType = this.addForm.productType;
const productLine = this.addForm.productLine;
const productName = this.addForm.productName;
const productId = this.addForm.projectNumber;
const productId = this.addForm.productId;
const reason = this.addForm.reason;
const responsibleUnit = this.addForm.responsibleUnit;
const dutyEngineer = this.addForm.dutyEngineer;
@@ -1013,7 +1016,12 @@ export default {
projectEdit(row) {
this.drawerTitle = "编辑";
this.addForm = row
let productId = row.standId
this.ProjectDatas.forEach(item =>{
if(item.projectNumber === row.productId) {
this.projectId = item.id
}
})
let productId = this.projectId
this.getProjectData()
this.getStandData(productId)
this.serialNumber = false
@@ -1094,13 +1102,12 @@ export default {
/** 项目名称change事件 */
handleChange(val) {
console.log(val);
if (this.drawerTitle === '编辑') {
this.addForm.standName = ''
this.addForm.standSerialNumber = ''
}
this.addForm.productId = val.id
this.addForm.projectNumber = val.projectNumber
this.addForm.productId = val.projectNumber
this.addForm.productLine = val.productLine
this.addForm.productName = val.projectName
this.addForm.productType = val.projectPlatfor
@@ -1110,6 +1117,7 @@ export default {
},
/** 标准号change事件 */
standChange(item) {
this.addForm.standId = item.standId
this.addForm.standName = item.standName
this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
},
src/sysConfig/index.js
+2 -2
View File
@@ -16,7 +16,7 @@ const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&
// 配置 前端服务
const devWebUrl = 'https://srms.foton.com.cn/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'idm'
const webLoginType = 'dev'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -65,5 +65,5 @@ module.exports = {
webSocket: webSocket + ':' + devInterfacePORT + '/websocket/socketServer', // webSocket连接
enterprise: enterprise, // GQ广汽 SJZX数据中心
theme: theme, // 主题
processInterfaceURL: `https://${serverIP}:${processPort}/bat-wkflow`
processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow`
}
webstorm.config.js
-1
View File
@@ -1,3 +1,2 @@
const webpackConfig = require('@vue/cli-service/webpack.config.js')
module.exports = webpackConfig
}