From c9b96e9fe82cc251bf0466c7a577d77530801bb1 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 8 Dec 2021 10:08:32 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BA=95=E4=B8=8B=E7=B2=97=E7=BA=BF=E6=81=A2=E5=A4=8D=EF=BC=88?= =?UTF-8?q?=E4=B8=8D=E6=81=A2=E5=A4=8D=E5=85=B6=E4=BB=96=E7=9A=84=E7=BA=BF?= =?UTF-8?q?=E5=B0=B1=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index da8f196f2..dd9c0b8d1 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3713,7 +3713,7 @@ export default { & > p { min-height: 42px; line-height: 43px; - /*border-bottom: 1px solid #E5E5E5;*/ + border-bottom: 1px solid #E5E5E5; } } } From 89179b71f7079ddfca777a30aff97d7639fe2be0 Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Wed, 8 Dec 2021 10:15:47 +0800 Subject: [PATCH 02/11] Default Changelist --- src/sysConfig/index.js | 4 ++-- webstorm.config.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 6485c1a23..3e7149052 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -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` } diff --git a/webstorm.config.js b/webstorm.config.js index 765a8e043..b038949a7 100644 --- a/webstorm.config.js +++ b/webstorm.config.js @@ -1,3 +1,2 @@ const webpackConfig = require('@vue/cli-service/webpack.config.js') module.exports = webpackConfig -} \ No newline at end of file From 3b9152e07a3f0fed562ac0a94c43bb7657beb0b7 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 8 Dec 2021 10:18:50 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/rectificationDatabase.vue | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 88d988853..c9c27195f 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -426,11 +426,11 @@ > - @@ -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 }, From a44b2a4a0ab4f9aff6242de4ecaf2f8caf44ed9d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 8 Dec 2021 10:39:40 +0800 Subject: [PATCH 04/11] commit --- .../pages/technologyInvolveProject.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 6f7adfa0b..ccf456ccf 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -173,6 +173,7 @@ style="width: 100%" border :height="sarProStateTableHeight" + :default-sort = "{prop: 'specificItem', order: 'ascending'}" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> @@ -258,6 +261,8 @@ name: "technologyInvolveProject", data () { return { + itemType: false, + interpretationTime: '', riskDegreeModal: false, editData: {}, riskDegree: '', @@ -392,6 +397,7 @@ }, // 外层清空条件查询 handleProjectCompliance (row) { this.standId = row.standId + this.interpretationTime = row.interpretationTime this.querySarProStateZero() }, querySarProStateZeroBtn(){ @@ -405,6 +411,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 +419,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 From e5e8331d491341b9eed2e51b90680fa98cb75d98 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 8 Dec 2021 10:45:24 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=9D=9E=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E9=A1=B5=E7=9A=84=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E7=9A=84=E8=A7=A3=E5=86=B3=E5=8A=9E?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 2dc1394e7..a5f08ad06 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -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 { From f9af97eb92e5927e550ba3dd51c81784d20a4957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 8 Dec 2021 11:14:17 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/empennage/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index 66e7ad0ea..e4bddce2a 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -7,7 +7,7 @@
- + + + + + + 查询 From a5b6b9c75f73d3b44b3c7abaefe17205fb20be40 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 8 Dec 2021 16:54:54 +0800 Subject: [PATCH 09/11] commit --- src/components/roleTree/index.vue | 55 ++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index 64c8f8a1e..c21e09c28 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -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()) } }, From dc5f5386b398d5925652f8495cf60d158e9f696a Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 8 Dec 2021 17:30:06 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E6=96=B0=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=9B=A0=E4=B8=BA=E5=A4=9A=E9=80=89=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 6 +++--- .../accessStandardsAndRegulations/pages/otherAddEit.vue | 6 +++--- .../accessStandardsAndRegulations/pages/projectAddEit.vue | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 0558a4442..a06e24246 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -217,8 +217,8 @@ width="150" label="新车型实施日期"> Date: Wed, 8 Dec 2021 17:41:43 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=92=8C=E6=96=B0=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=9B=A0=E4=B8=BA=E5=A4=9A=E9=80=89=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 13 ------------- .../pages/otherAddEit.vue | 13 ------------- .../pages/projectAddEit.vue | 13 ------------- 3 files changed, 39 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index a06e24246..39bb29fce 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -338,9 +338,6 @@ align="center" width="210px" label="标准实施日期"> - - - - - - - - -