diff --git a/package-lock.json b/package-lock.json index 5a5bd04ba..f43598874 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4541,6 +4541,182 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.5.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", + "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", + "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.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "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-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..61866c15e 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -1,56 +1,121 @@ -import axios from '@/common/axiosV2' +import axios from "@/common/axiosV2"; // 查询未整改项列表接口 -export function standUnqualified (data) { +export function standUnqualified(data) { return axios({ - url: '/api/sarStandUnqualified/sar-stand-unqualified', - method: 'get', + url: "/api/sarStandUnqualified/sar-stand-unqualified", + method: "get", params: data - }) + }); } + // 人员菜单列表获取 -export function roleTreeData (data) { +export function roleTreeData(data) { return axios({ - url: '/api/SarInstitution/institution/institutionAndUser', - method: 'get', + url: "/api/SarInstitution/institution/institutionAndUser", + method: "get", params: data - }) + }); } + // 上传文件 -export function uploadFileText (data) { +export function uploadFileText(data) { return axios({ - url: 'api/att/attFile/upload', - method: 'get', + url: "api/att/attFile/upload", + method: "get", params: data - }) + }); } -export function dicTypeData (data) { + +export function dicTypeData(data) { return axios({ - url: 'api/sys/dictype/getDicTypeListCode', - method: 'get', + url: "api/sys/dictype/getDicTypeListCode", + method: "get", params: data - }) + }); } -export function StandardsInfoPage (data) { + +export function StandardsInfoPage(data) { return axios({ - url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak', - method: 'get', + url: "api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageBak", + method: "get", params: data - }) + }); } + // 车型库清单的下拉列表 -export function solostarData (data) { +export function solostarData(data) { return axios({ - url: 'api/sarStandProjectLibrary/solostar', - method: 'get', + url: "api/sarStandProjectLibrary/solostar", + method: "get", params: data - }) + }); } + // 活动日历查询接口 -export function meetingByMonth (params) { +export function meetingByMonth(params) { return axios({ - url: 'api/sapMeetInfo/getMeetingsByMonthType', - method: 'get', + url: "api/sapMeetInfo/getMeetingsByMonthType", + method: "get", params - }) + }); +} + +//未符合项模块新增 +export function addUn( + closeState, standSerialNumber, standName, + itemsNum, itemsName, productType, + productLine, productName, reason, responsibleUnit, + dutyEngineer, authEngineer, qaEngineer, planCloseTime) { + const data = { + closeState, + standSerialNumber, //标准号 + standName, //标准名称 + itemsNum, //条款号 + itemsName, //条款名称 + productType, + productLine, //产品线 + productName, //项目名称 + reason, //不合规项目 + responsibleUnit, //责任部门 + dutyEngineer, //责任工程师 + authEngineer, //认证工程师 + qaEngineer, //质量工程师 + planCloseTime //计划关闭时间 + }; + return axios({ + url: "api/sarStandUnqualified/sar-stand-unqualified/addOne", + method: "post", + data + }); +} + +//未符合项模块编辑 +export function editUn( + closeState, standSerialNumber, standName, + itemsNum, itemsName, productType, + productLine, productName, reason, responsibleUnit, + dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) { + const data = { + closeState, + standSerialNumber, //标准号 + standName, //标准名称 + itemsNum, //条款号 + itemsName, //条款名称 + productType, + productLine, //产品线 + productName, //项目名称 + reason, //不合规项目 + responsibleUnit, //责任部门 + dutyEngineer, //责任工程师 + authEngineer, //认证工程师 + qaEngineer, //质量工程师 + planCloseTime, //计划关闭时间 + id + }; + return axios({ + url: "api/sarStandUnqualified/sar-stand-unqualified/updateOne", + method: "post", + data + }); } diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 017f21a5b..30e44c74c 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -58,9 +58,9 @@ {{ item.title }} @@ -132,6 +132,384 @@ menuId: '2b25c67f10abbbadf37d60daaaec54d3' }, + { + title: '国内外政策', + path: '/foreignRegulationsDatabase', + menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' + }, + // // // { + // // // title: '标准制修订管理', + // // // path: '/demo2One' + // // // }, + { + title: '法规清单', + path: '/accessStandardsAndRegulations', + menuId: '08dbd417864b08426034ca56d1fa3d02' + }, + // // { + // // title: '标准法规清单详情', + // // path: '/details' + // // } + // // // { + // // // title: '试验项目库', + // // // path: '/demo2One' + // // // }, + // // // { + // // // title: '本地产品/项目库', + // // // path: '/localProductsOrProjectLibrary' + // // // }, + { + title: '企业标准', + path: '/enterpriseStandardDatabase', + menuId: '01ed8f752748227777b3572d56ee9ab5' + }, + // { + // title: '企标制修订计划', + // path: '/enterBSysRevPlanManaLib', + // menuId: 'WW7YDHQ9Z679TGMDZMUS' + // }, + // // { + // // title: '子公司标准库', + // // path: '/subsidiaryStandardLibrary' + // // } + /* { + title: '车型/项目库', + path: '/localProductsOrProjectLibrary', + menuId: '42ce39c9f953be65a3e5643a4a2c786f' + },*/ + { + title: '未符合项', + path: '/nonConfomity', + menuId: '0119abd677e0204e061eb0f0b8cafda0' + }, + { + title: '工作组', + path: '/workingGroup', + }, + // { + // title: '备案产品标准库', + // path: '/enterpriseStandardFiling', + // menuId: 'MQBAGJQMSRZDRX3X5AVR' + // }, + { + title: '合规评估', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 + path: '/standInvolveProject', + menuId: '8a9c87fe06244fb9d55e78fb281f625b' + }, + // { + // title: '企标制修订计划', + // path: '/enterpriseStandardPlan', + // // menuId: '8a9c87fe06244fb9d55e78fb281f625b' + // } + // { + // title: '动态信息', + // path: '/information', + // menuId: 'ULUBXHYQB8M3XQ9HS9QG' + // } + ] + }, + { + title: '我的工作', + path: '/processCenter', + 'icon-class': 'el-icon-s-platform', + menuId: '3fadf', + children: [ + { + title: '流程中心', + path: '/processCenter', + menuId: '7455dc97eac2933341e18be659f07e89' + }, + { + title: '新建流程', + path: '/createProcessNew', + menuId: 'b53e6722b33a37c0fa2d87a9b06cca40' + } + ] + }, + { + title: '本地工具', + path: '/localTool', + 'icon-class': 'el-icon-s-tools', + menuId: 'afsd12', + children: [ + // { + // title: '标准预警', + // path: '/standardWarning' + // }, + { + title: 'OCR识别', + path: '/standardRecognition', + menuId: '3db80f62af9d96d6dfc6d429eea4b29b' + }, + { + title: '标准拆分', + path: '/standAutoSplit', + menuId: '0062e261bc65e27e0a968dac67e16a3c' + }, + { + title: '标准比对', + path: '/standContrast', + menuId: '1d83a6278f781419f628e9f5560f5c86' + }, + { + title: '标准化活动日历', + path: '/standCalendar', + menuId: '' + }, + // { + // title: '标准比对库', + // path: '/standardComparisonLibrary', + // menuId: 'AH56UDHHBVF5V7WZFWJQ' + // } + // { + // title: '预警管理', + // path: '/warningManage' + // }, + // { + // title: '动态&通知管理', + // path: '/dynamicInformationManage' + // }, + // { + // title: '标准编号申领', + // path: '/applicationStandardNumber' + // }, + ] + }, + { + title: '标准预警', + path: '/standardWarning', + 'icon-class': 'el-icon-warning', + menuId: 'asfdew33', + isChildren: true // 判断没有子菜单 + }, + // { + // title: '技术要求清单', + // path: '/skillReq', + // children: [ + // { + // title: '技术要求清单查看', + // path: '/SkillReqSee' + // }, + // { + // title: '技术要求清单管理', + // path: '/SkillReqAdd' + // } + // ] + // }, + { + title: '配置管理', + path: '/config', + 'icon-class': 'el-icon-s-operation', + menuId: 'adff323', + children: [ + { + title: '属性管理', + path: '/standLawsAttrManage', + menuId: '72a24657972d286b8b5d80735cf4eee2' + }, + // { + // title: '资料中心管理', + // path: '/dynamicInformationManage', + // menuId: '6V2QZ9STRZ' + // }, + { + title: '机构管理', + path: '/MechanismManage', + menuId: '5a09164da97760846509c5c9dd86b80c' + }, + { + title: '角色管理', + path: '/roleManage', + menuId: 'd73d0e230eafdb2ddefe1c97daf657ea' + }, + { + title: '岗位管理', + path: '/postManage', + menuId: 'd2954be3abaaf2de3dc79add4c8ab8cd' + }, + // { + // title: '用户管理', + // path: '/userManage', + // menuId: 'YRJUEVJVUJ' + // }, + // { + // title: '系统配置管理', + // path: '/warningTimeSetting', + // menuId: 'H2KC6P3PPM' + // }, + // { + // title: '文档转换监控', + // path: '/convertDocView', + // menuId: '3F52K25546' + // }, + // { + // title: '菜单管理', + // path: '/menuManage', + // menuId: '87b8b4f5817a7829696e63185c744d52' + // }, + { + title: '链接管理', + path: '/linkManage', + menuId: 'd3ff92078c53a4d9d1f1a94450fee91e' + }, + // // { + // // title: '保密管理', + // // path: '/convertDocView' + // // }, + // { + // title: '动态信息管理', + // path: '/DynamicInformations', + // menuId: '3C87BSHJUF' + // }, + { + title: '属性配置', + path: '/attributeCustom', + menuId: '9cdb9b40157dd967b664b9af462b960b' + }, + // // { + // // title: '流程分类管理', + // // path: '/processClassificationManage', + // // menuId: 'N323F2UB9FTUV5SD3GTD' + // // }, + // // { + // // title: '流程管理', + // // path: '/processManage', + // // menuId: 'K5KXSS3X9CF7CS8AMFJ5' + // // }, + // { + // title: 'SVPPS', + // path: '/svpps', + // menuId: 'AR52RX586LQHVZSVV83K' + // }, + // { + // title: '企标编号管理体系', + // path: '/enterpriseStandardNumberManagement', + // menuId: '9YSFG39S3CBFUJCEU3QX' + // } + ] + }, + { + title: '个人中心', + path: '/personal', + 'icon-class': 'el-icon-s-check', + menuId: '32143ffasdf', + children: [ + // { + // title: '我的消息', + // path: '/dynamics', + // menuId: 'JCEV4AEV32' + // }, + // { + // title: '我的企标', + // path: '/MyEnterpriseStandard', + // menuId: 'LKU3W23UMEHDM9VLDHGK' + // }, + { + title: '我的收藏', + path: '/collection', + menuId: '63e999c65b1f2b1339119a00eb1d50cf' + }, + // { + // title: '我的浏览', + // path: '/browsing', + // menuId: 'HAEY2A4LMX' + // }, + // { + // title: '已收分享', + // path: '/push', + // menuId: '9F8T7DPYHE' + // }, + // { + // title: '已发分享', + // path: '/forward', + // menuId: 'K45Y9TGKZV2K4XP4CETD' + // }, + // { + // title: '我的问答', + // path: '/questionsAndAnswers', + // menuId: '8VKLZATQQG4NQHXV9UDS' + // }, + { + title: '我的板块', + path: '/plate', + menuId: 'e4a94f03223df6f4ad70732b96f07221' + } + // { + // title: '个人信息', + // path: '/info', + // menuId: '8K7FDHG89G' + // } + ] + }, + // { + // title: '搜索中心', + // path: '/advancedSearch', + // 'icon-class': 'search', + // menuId: '1332FSFAD', + // isChildren: true // 判断没有子菜单 + // }, + // { + // title: '标准比对库', + // path: '/standardComparisonLibrary', + // 'icon-class': 'search', + // menuId: 'Q32VBYVGCAE4XXN3XZ8T', + // isChildren: true // 判断没有子菜单 + // } + // { + // title: '自定义报表', + // path: '/customReport', + // 'icon-class': 'baobiao', + // isChildren: true // 判断没有子菜单 + // } + ] + } + }, + created () { + // 获取当前页的path，赋值没左侧菜单，并展开 + if (this.$route.meta.parentPath) { + this.defaultActive = this.$route.meta.parentPath + } else { + this.defaultActive = this.$route.path + } + }, + mounted () { + }, + methods: { + handleSelect (key, keyPath) { + if (this.$route.path === key) { + this.$router.go(0) + } + }, + handleToggleSideBar () { + this.toggleSideBar(!this.isCollapse) + }, + // 收展按钮 + collapseIcon() { + return this.sideClose ? 'el-icon-arrow-left' : 'el-icon-arrow-right' + // return 'el-icon-arrow-left' + }, + ...mapMutations(['toggleSideBar']) + }, + computed: { + logo () { + // background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat; + // return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png') + return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png') + }, + ...mapGetters(['getDynamicTotal', 'isCollapse']) + }, + watch: { + // 监听路由 重新渲染面包屑 + $route () { + // 获取当前页的path，赋值没左侧菜单，并展开 + if (this.$route.meta.parentPath) { + this.defaultActive = this.$route.meta.parentPath + } else { + this.defaultActive = this.$route.path + } + } + } +} // { // title: '国内外政策', // path: '/foreignRegulationsDatabase', diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index 8e8c3a0ea..35f323421 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -43,6 +43,12 @@ return ""; } }, + type: { + type: String, + default () { + return ""; + } + }, urlChild: { type: String, default () { @@ -169,7 +175,7 @@ if (node.level >= 1) { setTimeout(() => { - this.getChildByList(node.data.id, resolve); + this.getChildByList(node.data.level,node.data.vppsCode, resolve); }, 500); return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。 } @@ -186,8 +192,8 @@ } }) }, - getChildByList( _parentID,resolve) { // 获取子节点请求 - let params = {ids : _parentID}; + getChildByList( level,vppsCode,resolve) { // 获取子节点请求 + let params = {level : level,vppsCode :vppsCode,type : this.type}; this.$http.get(this.urlChild, params, { _this: this }, res => { @@ -200,7 +206,7 @@ }, loadTreeData(resolve) { // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据 - this.$http.get(this.url, '', { + this.$http.get(this.url, {type : this.type}, { _this: this }, res => { if(res.data){ diff --git a/src/main.js b/src/main.js index f96b1fb24..e9c9da873 100644 --- a/src/main.js +++ b/src/main.js @@ -54,15 +54,10 @@ import { mapMutations, mapActions } from 'vuex' // 路由拦截 router.beforeEach(function (to, from, next) { - console.log("auth : to =>", to); - console.log(webLoginType) let toName = to.name let token = store.state.token let path = to.path; let requireAuth = to.meta.requireAuth; - console.log("auth : path =>" + path); - console.log("token : token =>" + token); - console.log("requireAuth : requireAuth =>" + requireAuth); let taskId = to.query.taskIds; let prcId = to.query.prcId; let prcNum = to.query.prcNum; @@ -71,7 +66,6 @@ router.beforeEach(function (to, from, next) { let routerType = to.query.routerType; let param = "taskIds=" + taskId + "&prcId=" + prcId + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType; - console.log(store) let url = window.location.search let code = ""; if(url){ @@ -232,7 +226,6 @@ router.beforeEach(function (to, from, next) { next({path: routerPath + '?' + param2}) } } - console.log("res : res =>", res); }) } if(path === '/loginVerify'){ diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 8d9373769..0cdb3a142 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -1194,7 +1194,6 @@ export default { methods: { child1Func(child1){ const list = [] - console.log(child1) if(child1 && child1.length > 1){ list.push(child1[0]) return list @@ -2157,7 +2156,6 @@ export default { const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values // const relatedPlansRes = await this.queryRelatedPlans() // const relatedPlans = relatedPlansRes.list - console.log(formFieldList) formFieldList.forEach((field) => { displayLocation.forEach((location) => { location.isShowImp = '0' @@ -2194,16 +2192,12 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter ( item => item.label === '过程稿件'); - console.log(list) if(location.label === '基础信息' && list && list.length > 0){ if (!list[0].child) { location['child1'] = [] }else { const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS'); - console.log(childList) - console.log(childList.length) location['child1'] = childList - console.log(location['child1']) } } diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index db012f25f..93343ec41 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -148,7 +148,6 @@ } let list list = res.data.slice(0, c) - console.log(list) this.linkList = list }) } diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index babea2ac8..30ec43941 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -39,7 +39,7 @@
导入 导出 - + 删除 模板下载 批量复制 合并条款 diff --git a/src/pages/localTool/standContrast/pages/contrastDetails.vue b/src/pages/localTool/standContrast/pages/contrastDetails.vue index 49fd02d36..45473ea90 100644 --- a/src/pages/localTool/standContrast/pages/contrastDetails.vue +++ b/src/pages/localTool/standContrast/pages/contrastDetails.vue @@ -372,6 +372,7 @@ export default { }, res => { this.spinShow = false this.$message.warning(res.data) + this.$router.push('/standContrast') }, e => { }) }) 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 e15ec5214..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 @@ @@ -705,11 +1390,12 @@ export default { //} #rectification-dataBase { - /deep/.table-wrap { + /deep/ .table-wrap { .el-table__fixed { height: calc(~'100% - 20px') !important; } } + height: 100%; display: flex; flex-direction: column; @@ -718,6 +1404,7 @@ export default { margin-left: 10px; margin-bottom: 10px; } + .container { flex: 1; overflow: hidden; @@ -744,5 +1431,22 @@ export default { } } } + + .add-form-item { + /deep/ .el-input__inner { + width: 300px; + } + } + + .add-input { + /deep/ .el-input__inner { + width: 370px; + } + } + + .tableFooter { + height: 49px; + float: right; + } }