diff --git a/package-lock.json b/package-lock.json index eee858d4b..ad441bac7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4646,6 +4646,94 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.3.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz", + "integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==", + "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.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true, + "optional": true + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "optional": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "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.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index c3f3fc7b0..9daf74e57 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -54,3 +54,33 @@ export function meetingByMonth (params) { params }) } + +export function addUn (closeState, standId,standName,standSerialNumber, itemsNum,itemsName, productType, productLine, + productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, qaEngineerName, + authEngineerName, dutyEngineerName, planCloseTime) { + const data = { + closeState, + standSerialNumber, //标准号 + standName, //标准名称 + standId, + itemsNum, //条款号 + itemsName, //条款名称 + productType, + productLine, //产品线 + productName, //项目名称 + reason, //不合规项目 + responsibleUnit, //责任部门 + dutyEngineer, //责任工程师 + authEngineer, //认证工程师 + qaEngineer, //质量工程师 + qaEngineerName, + authEngineerName, + dutyEngineerName, + planCloseTime, //计划关闭时间 + } + return axios({ + url: 'api/sarStandUnqualified/sar-stand-unqualified/addOne', + method: 'post', + data + }) +} diff --git a/src/assets/styles/navMenu.less b/src/assets/styles/navMenu.less index f5eeff979..30ebe9e02 100644 --- a/src/assets/styles/navMenu.less +++ b/src/assets/styles/navMenu.less @@ -14,7 +14,7 @@ font-weight: 600; } .el-submenu__title, .el-menu-item{ - font-size: 15px; + font-size: 14px; background-color: transparent !important; &::before{ content: ''; diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 0e0b6cc72..919158cb7 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -706,7 +706,7 @@ export default { } .el-menu-item { padding-left: 29px !important; - font-size: 15px; + font-size: 14px; font-weight: normal; height: 40px; line-height: 40px; diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 066759cb2..8d9373769 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -3,7 +3,9 @@
- {{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情 + {{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情 + +
@@ -57,6 +59,7 @@ />
-
快捷入口
+
快捷入口
  • - {{ item.prcName }} + {{ item.prcName }}
    • @@ -1284,8 +1284,7 @@ export default { display: inline-block; margin: 15px; color: #333333; - font-size: 16px; - font-weight: bold; + font-size: 14px; } .more { float: right; diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 88d0b73a1..ee56d41a2 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -186,8 +186,8 @@ export default { padding: 0; } .footer { - height: 90px; - line-height: 44px; + height: 70px; + line-height: 33px; //margin-top: 0.3vh; //line-height: 5.2vh; background: #FFFFFF; diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue index 43ef1da5b..b8a4545bd 100644 --- a/src/pages/localTool/standContrast/index.vue +++ b/src/pages/localTool/standContrast/index.vue @@ -92,6 +92,14 @@ label="比对类型" align="center"> + + + + + { + this.spinShow = true + this.$http.post('lawss/sarStandCompareHis/fullTextComparison', { + leftStandard:this.selectedSplitStandList[0].id, + rightStandard: this.selectedSplitStandList2[0].id, + }, { + _this: this + }, res => { + this.spinShow = false + this.$message.warning(res.data) + this.$router.push('/standContrast') + }, e => { + }) + }) + // this.$router.push({ + // name: 'TextComparison', + // query: { + // infoIdLeft: this.selectedSplitStandList[0].id, + // infoIdRight: this.selectedSplitStandList2[0].id, + // rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]), + // rowDataRight: JSON.stringify(this.selectedSplitStandList2[0]) + // } + // }) }, addFileStandPageChange (page) { this.addFilePage = page diff --git a/src/pages/localTool/standContrast/pages/seeDatalis.vue b/src/pages/localTool/standContrast/pages/seeDatalis.vue index 8d6c9e98b..2d0e4b1c2 100644 --- a/src/pages/localTool/standContrast/pages/seeDatalis.vue +++ b/src/pages/localTool/standContrast/pages/seeDatalis.vue @@ -182,7 +182,7 @@ export default { }, page () { this.spinShow = true - this.$http.get('lawss/sarItemsCompareHis/page', { + this.$http.get('lawss/sarStandItemsCompareHis/page', { page: this.splitInfoPage, pageSize: this.splitInfoPageSize, standHisId: JSON.parse(this.$route.query.row).id diff --git a/src/pages/localTool/standContrast/pages/textComparison.vue b/src/pages/localTool/standContrast/pages/textComparison.vue index 5980108ce..3b08bbd59 100644 --- a/src/pages/localTool/standContrast/pages/textComparison.vue +++ b/src/pages/localTool/standContrast/pages/textComparison.vue @@ -93,7 +93,6 @@
    -
    @@ -109,7 +108,6 @@
    - 数据加载中……
    @@ -517,7 +515,7 @@ export default { return el.offsetTop - el.parentNode.offsetTop; } const offsetTop = getElementTop(domId) - /*$('#contentLeft').children('.wrap-right').animate({scrollTop: offsetTop},500)*/ + $('#contentLeft').children('.wrap-right').animate({scrollTop: offsetTop},500) }, handleRightTreeClick(treeId, treeNode) { @@ -530,7 +528,7 @@ export default { return el.offsetTop - el.parentNode.offsetTop; } const offsetTop = getElementTop(domId) - /*$('#contentRight').children('.wrap-right').animate({scrollTop: offsetTop},500)*/ + $('#contentRight').children('.wrap-right').animate({scrollTop: offsetTop},500) } }, components: { diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index 669fd8666..baf52ffe1 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -65,22 +65,22 @@ align="center" > - - + + + + + + + + + + + + + + + + @@ -713,6 +713,7 @@ diff --git a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue index 3f36f249a..99059bd95 100644 --- a/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue +++ b/src/pages/regulatoryRepository/dataStatis/pages/reviseCost.vue @@ -295,7 +295,6 @@ export default { }, e => { }) } else { - console.log(this.formShowData.meetTime) meetEdit(this.formShowData).then(res => { if (res.ok) { this.$message.success('编辑成功') diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 81b42bad3..29f30c7e9 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1,390 +1,390 @@ + + + + + + +
    +
    + 保存 + + 提交 + + 取消 +
    + + + + + + + + + + 清空查询 + + + + + + + + + + + + + + + + + + + +
    + 取消 + 确定 +
    +     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + 取消 + + 提交 + +
    +     + + + + +
    点击或拖拽上传文件
    +     +     + + +
    +
    +
    + + + + {{ opt.label }} + + + + + + + + + 查询 + + + + + 清空 + + + +
    +
    +
    + - - - - - - - - - - - - - - - - - -
    - 加载中... - -
    -
    - 提交 - - 取消 - -
    -     - - - - - - - - - - - - - -
    - 提交 - - 取消 - -
    -     - - -
    - - -
    -
    - 提交 - - 取消 -
    -     - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - 提交 - - 取消 - -
    -     - - - - - - - -

    - 导入失败 -

    -
    -

    -
    -
    - 确认 - -
    -     - + + + + + + + + + + + + +
    + 提交 + + 取消 + +
    +     + + +
    + + +
    +
    + 提交 + + 取消 +
    +     + + +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + 提交 + + 取消 + +
    +     + + + + + + + +

    + 导入失败 +

    +
    +

    +
    +
    + 确认 + +
    +     + - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - - - - - - - - - - - - - - - - {{ opt.label }} - - - - - - - - - - - - -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - -
    - - - -
    - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - - - - - - - - - + + +
    + + + + +
    + + + + + + + + + + + + + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + + + + + + + + + + + + + + + + {{ opt.label }} + + + + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + + + + + + + + + - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - {{ opt.label }} - - - - - - - - - -
    - - - -
    - - - - - - - - - - - - - - + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + {{ opt.label }} + + + + + + + + + +
    + + + +
    + + + + + + + + + + + + + + - - - - - - - - - - - - -
    - - - - - - - -     + + + + + + + + + + + + +
    + + + + + + + + +
    +
    + 搜索 + + 取消 + +
    +
    -
    - 搜索 - - 取消 - -
    -     - - - - 导入中... - - - -
    -
    -
    -
    - - - - - - + @confirm="isTreeOk" + > + 导入中... + + + +
    +
    +
    +
    + + + + + + + + + +
    +
    +
    + 数据加载中…… +
    + 取消 + 转换 +
    -
    -
    - 数据加载中…… -
    - 取消 - 转换 -
    -
    - -
    +     + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 19a730c07..29dc85311 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -228,12 +228,12 @@ - - {{ opt.label }} @@ -242,7 +242,7 @@ - {{ opt.label }} @@ -485,6 +485,8 @@ export default { pageSize: this.$store.getters.userInfo.configContent, // 查询条件 localProTableSearch: { + projectClassification: '', + projectStatus: '', validFlag: 0, // 项目编号 projectNumber: "", diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue index 3d92486ad..924ab2531 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProject.vue @@ -3,12 +3,12 @@
    - +
    - +
    @@ -30,7 +30,7 @@ export default { return { skill: false, project: false, - tabValue: '', + tabValue: 'standInvolveProjectDetail', menuName: [ "项目评估结果", "技术评估结果"] } }, @@ -53,12 +53,12 @@ export default { } } }); - if(this.skill === true){ - this.tabValue = "technologyInvolveProject" - return; - }else if(this.project === true){ + if (this.project === true) { this.tabValue = "standInvolveProjectDetail" return; + } else if (this.skill === true) { + this.tabValue = "technologyInvolveProject" + return; } } } diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index a51c91f57..10dc6566b 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -159,24 +159,24 @@ width="55" align="center"> - - - - - - + + + + + + + + + + + + + + + + + +     - - - - - - + + + + + + 查询 @@ -33,24 +33,24 @@
    + type="selection" + width="55" + align="center">