From 6a0dd76bbe4c472802c9c21ec32b363b4a29e4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 26 Aug 2021 13:39:22 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step2.vue | 687 +++++++++--------- .../pages/creatProcess/bzzqyj/step3.vue | 31 +- .../pages/creatProcess/xmpg/step3.vue | 36 +- .../pages/creatProcess/xmpg2/step1-12.vue | 2 +- 4 files changed, 399 insertions(+), 357 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index fb8005d12..313e30fb3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -1,337 +1,376 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 0ff0abfea..b3e076e97 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -208,6 +208,7 @@ { - this.saveLoading = false - this.$message.success('保存成功') - }).catch(e => { - this.saveLoading = false - }) + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "3"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.json, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, handleSubmit() { if (this.data.length < 1) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 35ad69a7f..a4255e8e0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -452,24 +452,24 @@ export default { }, //保存事件 - handleSave() { - this.saveLoading = true; - let _formData = new FormData(); - _formData.append("id", this.bpnId || ""); - _formData.append("prcType", "5"); - _formData.append('taskIds', this.taskIds) - _formData.append("json", JSON.stringify({ - form: this.listForm, - commentText: this.commentText - })); - saveTaskForPub(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); - }, + // handleSave() { + // this.saveLoading = true; + // let _formData = new FormData(); + // _formData.append("id", this.bpnId || ""); + // _formData.append("prcType", "5"); + // _formData.append('taskIds', this.taskIds) + // _formData.append("json", JSON.stringify({ + // form: this.listForm, + // commentText: this.commentText + // })); + // saveTaskForPub(_formData).then(res => { + // this.saveLoading = false; + // this.$message.success("保存成功"); + // this.bpnId = res.result; + // }).catch(e => { + // this.saveLoading = false; + // }); + // }, //提交事件 handleSubmit() { this.listForm.breakdownList.forEach(item => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index f90bc40ff..ba3f729f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -2,7 +2,7 @@
- +
基础信息
From d7d5068f4f94d4acce7a06153ebd8803fca55e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 26 Aug 2021 13:50:19 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1-9.vue | 406 ++++++++++++++++++ .../pages/processDetail/index.vue | 3 + src/router/index.js | 9 + 3 files changed, 418 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue new file mode 100644 index 000000000..ee4045a82 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -0,0 +1,406 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 61c5784cd..ec904a42a 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -225,6 +225,9 @@ export default { //标准调研流程 }else if(prcType === '2'){ this.toProcessDetail('bzdyStep1-9',row) + }else if(prcType === '3'){ + //标准征求意见 + this.toProcessDetail('bzzqyjStep1-9',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/router/index.js b/src/router/index.js index 5669438e8..27c5a2d7f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -745,6 +745,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzzqyjStep1-9', + name: 'bzzqyjStep1-9', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzdyStep4', name: 'bzdyStep4', From 98a08f62b657cf72b867baba3850577dd9271a85 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 26 Aug 2021 14:25:33 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E7=9A=84=E8=B7=B3=E8=BD=AC=EF=BC=8C=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E5=BF=83=E7=9A=84=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/wfhxzg/step1.vue | 5 ++++- .../processCenter/pages/creatProcess/wfhxzg/step4.vue | 9 +++++---- .../processCenter/pages/creatProcess/wfhxzg/step5.vue | 5 +++++ .../processList/tabComponents/processCenter/index.vue | 8 +++++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index a974c66a6..286b3a83d 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -380,7 +380,10 @@ export default { }, // 批量删除按钮table，选择数据 selectedDelete(val) { - this.deleteDataList = val + this.deleteDataList = [] + for (let i = 0; i < val.length; i++) { + this.deleteDataList.push(val[i].id); + } }, // 点击批量删除事件 deleteList() { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 1e94a8294..58698f842 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -308,11 +308,12 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - let listJSON = JSON.parse(JSON.stringify(item.responUserList)) - if (listJSON.length !== undefined) { - this.dataList = listJSON[0].standardInfoList - } else { + if (item.responUserList !== undefined) { + let listJSON = JSON.parse(JSON.stringify(item.responUserList)) this.dataList = [listJSON][0].standardInfoList + } else { + let listJSONInfo = item.info + this.dataList = [listJSONInfo] } this.dataList.forEach(item => { if (item.fileText.length !== 0) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 19ce38b54..49fecb77b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -196,6 +196,7 @@
+ + Date: Thu, 26 Aug 2021 14:37:27 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B2=20=E6=89=B9=E9=87=8F=E5=88=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BAstep5=20uname=3D>userName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 690d3e50f..a4b8cd042 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -569,7 +569,7 @@ export default { this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; + json.prcCreateUserName = this.$store.getters.userInfo.userName; json.standId = this.listForm.standId; this.$refs["listForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 65545af80..7ad7547ab 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -570,7 +570,7 @@ export default { this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; + json.prcCreateUserName = this.$store.getters.userInfo.userName; json.standId = this.listForm.standId; this.$refs["listForm"].validate((valid) => { if (valid) { From 801555fc0b17a8f8e00545b1f0527d6218ceaefa Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 26 Aug 2021 15:14:08 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=20=E9=93=BE=E6=8E=A5=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E9=93=BE=E6=8E=A5=EF=BC=8C?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=EF=BC=8C=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=AF=A5=E9=93=BE=E6=8E=A5=E7=9A=84=E5=90=8D=E7=A7=B0=E4=BC=9A?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home1/components/empennage/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/home1/components/empennage/index.vue b/src/pages/home1/components/empennage/index.vue index fc4e71fc0..f330a0010 100644 --- a/src/pages/home1/components/empennage/index.vue +++ b/src/pages/home1/components/empennage/index.vue @@ -3,7 +3,10 @@
  • - + + + +
  • 更多链接> From 0837818745444ba0c7af61829f239df4575d586b Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 26 Aug 2021 16:44:21 +0800 Subject: [PATCH 06/13] =?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=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step5-1.vue | 480 ++++++++++++++++++ .../pages/creatProcess/wfhxzg/step5.vue | 1 - .../pages/processDetail/index.vue | 4 +- src/router/index.js | 9 + 4 files changed, 491 insertions(+), 3 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue new file mode 100644 index 000000000..ae036fbb8 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue @@ -0,0 +1,480 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 49fecb77b..8d0acf0d1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -196,7 +196,6 @@
import('@/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue'), + meta: { + requireAuth: true, + title: '未符合项整改/更新流程' + } + }, { path: '/bzrkStep1', name: 'bzrkStep1', From 44d528dd23c065bca48e990895b5267336ab3fce Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 26 Aug 2021 21:14:55 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localTool/standAutoSplit/pages/itemSplitInfo.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 7acd66034..7a03ff0c2 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -686,6 +686,7 @@ export default { }, data () { return { + editFlag: '', splitStatus: this.$route.query.splitStatus, auditFlag: this.$route.query.auditFlag, splitCheckDialog: false, @@ -769,6 +770,7 @@ export default { busStandCover: '', fileType: '', ZRBM: '', + editFlag: '' }, standItemEOBlank: { id: '', @@ -802,6 +804,7 @@ export default { }, showItemInfoModal: false, selectedList: [], // 选中的table数据的ID + selectedList1: [], selectedAllList: [], // 选中的table数据 infoId: '', itemsPage: 1, @@ -1137,7 +1140,7 @@ export default { this.selectedList = [] this.selectedAllList = data for (let i = 0; i < data.length; i++) { - this.selectedList.push(data[i].id) + this.selectedList.push(data[i].id,data[i].editFlag) } }, // 分页点击后方法 @@ -1403,9 +1406,9 @@ export default { roundButton: false }).then(() => { this.deleteItemsModal = false - this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', { - ids: this.selectedList.join(',') + ids: this.selectedList.join(','), + editFlag: this.selectedList1.join(','), }, { _this: this }, res => { @@ -2069,6 +2072,7 @@ export default { case '删除': this.selectedList = [] this.selectedList.push(command[0].id) + this.selectedList1.push(command[0].editFlag) this.judgebatchDeleteItem() break // case '内容简介': From 83a0fd7c9638b979ea2bb74344656cf6e07ffd33 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 27 Aug 2021 08:55:52 +0800 Subject: [PATCH 08/13] commit --- package-lock.json | 484 ++++--- package.json | 2 +- src/components/navMenu/index.vue | 9 +- src/pages/login/index.vue | 1207 +++++++++-------- .../workingGroup/index.vue | 324 +++++ src/router/index.js | 30 +- src/sysConfig/index.js | 8 +- 7 files changed, 1217 insertions(+), 847 deletions(-) create mode 100644 src/pages/regulatoryRepository/workingGroup/index.vue diff --git a/package-lock.json b/package-lock.json index 0b1644602..eee858d4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,9 +13,13 @@ } }, "@antv/algorithm": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@antv/algorithm/-/algorithm-0.0.6.tgz", - "integrity": "sha512-g/abjTXHwzebghN8QPuk3z5nM/C9Wf1Toq6iHK6lwZXdUMGHxxhuO5RAkkYcR2Vib550zdQy6PLldmAWhgOjQA==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/@antv/algorithm/-/algorithm-0.1.10.tgz", + "integrity": "sha512-x2ZbPkUaR2OQ5/HY46WaJqLLjxarWSsCvGokv8MVzlhOBcgvUIfpHla+l3atmdt2el4W1I0bncxEUs3jVlEjSA==", + "requires": { + "@antv/util": "^2.0.13", + "tslib": "^2.0.0" + } }, "@antv/dom-util": { "version": "2.0.3", @@ -31,16 +35,16 @@ "integrity": "sha512-6C6NJOdoNVptCr5y9BVOhKkCgW7LFs/SpcRyAExUeSjAm0zJqcqNkSIRGsXYhj4PJI+CZICHzGwwiSnIsE68Ug==" }, "@antv/g-base": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/@antv/g-base/-/g-base-0.5.5.tgz", - "integrity": "sha512-Cl3Gup4GBebqz/YeaPJHhF0ZP4lj0C0LdNkNj01jlqy/WGCbhf8CyDFzLE91N346cyzB9Ri2ztGz4pLlvdOLtQ==", + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/@antv/g-base/-/g-base-0.5.9.tgz", + "integrity": "sha512-IAzuCLRmz9cKCWUKR3cKWgLZ/6OQYpTCIOgxAP8Bc+HRw0mu8iC3OTz+tWKGv9L8unpvCvpQd1H+OTTjdg/TpQ==", "requires": { "@antv/event-emitter": "^0.1.1", "@antv/g-math": "^0.1.6", "@antv/matrix-util": "^3.1.0-beta.1", "@antv/path-util": "~2.0.5", "@antv/util": "~2.0.0", - "@types/d3-timer": "^1.0.9", + "@types/d3-timer": "^2.0.0", "d3-ease": "^1.0.5", "d3-interpolate": "^1.3.2", "d3-timer": "^1.0.9", @@ -68,9 +72,9 @@ } }, "@antv/g-canvas": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.5.6.tgz", - "integrity": "sha512-r6f6KqYuNZWunf2Vnf1ACopn8aic6TBFhaN3XuckenhQNqR+/PI/4Mft7z14zo7WH58X2Xs2Npq9awJXBEUzaw==", + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.5.12.tgz", + "integrity": "sha512-iJ/muwwqCCNONVlPIzv/7OL5iLguaKRj2BxNMytUO3TWwamM+kHkiyYEOkS0dPn9h/hBsHYlLUluSVz2Fp6/bw==", "requires": { "@antv/g-base": "^0.5.3", "@antv/g-math": "^0.1.6", @@ -122,19 +126,18 @@ } }, "@antv/g-webgpu": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@antv/g-webgpu/-/g-webgpu-0.5.2.tgz", - "integrity": "sha512-uz8gngKOaFSuQFJR9ktEsYlIx/JQnZFNGcNzNZ9BSiAd8nKWnmsisx1kIJX9CaqzmgHdNfW6tBEYZ5QbrBH3Og==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@antv/g-webgpu/-/g-webgpu-0.5.5.tgz", + "integrity": "sha512-TxtBniINFq1jFGEPo46xjJfrbJbUqkFd5wmsRs3tcg/7J7xoldOP1kEadpI3AJG9knMYdE92VpILw1VPd6DgzQ==", "requires": { - "@antv/g-webgpu-core": "^0.5.2", - "@antv/g-webgpu-engine": "^0.5.2", + "@antv/g-webgpu-core": "^0.5.5", + "@antv/g-webgpu-engine": "^0.5.5", "@webgpu/types": "^0.0.31", "gl-matrix": "^3.1.0", "gl-vec2": "^1.3.0", "hammerjs": "^2.0.8", "inversify": "^5.0.1", "inversify-inject-decorators": "^3.1.0", - "lodash": "^4.17.15", "polyline-miter-util": "^1.0.1", "polyline-normals": "^2.0.2", "probe.gl": "^3.1.1", @@ -142,60 +145,58 @@ } }, "@antv/g-webgpu-core": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@antv/g-webgpu-core/-/g-webgpu-core-0.5.2.tgz", - "integrity": "sha512-ZGMe8YUSs+tUgORuxf9GcFHUKsQNd57Ug2U4JNsbI6gBo//ro/FDqgjiSBxWiO4YVF4Za/Ae+jM/n48mWF+6BA==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@antv/g-webgpu-core/-/g-webgpu-core-0.5.6.tgz", + "integrity": "sha512-DPiH3GkAUiT0Q+LAKeImpI+IOQ/gP2w6HstYKivpFIpBPIvZ/9equM3icVrn1iDfDkZANVXQ1PppcO3xBv1ZTw==", "requires": { "eventemitter3": "^4.0.0", "gl-matrix": "^3.1.0", "inversify": "^5.0.1", "inversify-inject-decorators": "^3.1.0", - "lodash": "^4.17.15", "probe.gl": "^3.1.1", "reflect-metadata": "^0.1.13" } }, "@antv/g-webgpu-engine": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@antv/g-webgpu-engine/-/g-webgpu-engine-0.5.2.tgz", - "integrity": "sha512-GsmJ4xP4a/CVmbhpYiFuqBSyT/wQsoYGqCuEbfxGPxP2cs5MGqQyClh8gjy2TPr80YRuM05oOsH2RUYFw+Tc1g==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@antv/g-webgpu-engine/-/g-webgpu-engine-0.5.6.tgz", + "integrity": "sha512-D311qYUefdEFwLayutIHqucrAY3cAGH3BdnXS37nq+0nsglrHcNP0Ab1YTinn9RihLoY3yXFTLzrYkJHJbZXDg==", "requires": { - "@antv/g-webgpu-core": "^0.5.2", + "@antv/g-webgpu-core": "^0.5.6", "@webgpu/glslang": "^0.0.15", "@webgpu/types": "^0.0.31", "gl-matrix": "^3.1.0", "hammerjs": "^2.0.8", "inversify": "^5.0.1", "inversify-inject-decorators": "^3.1.0", - "lodash": "^4.17.15", "probe.gl": "^3.1.1", "reflect-metadata": "^0.1.13", "regl": "^1.3.11" } }, "@antv/g6": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/@antv/g6/-/g6-4.1.4.tgz", - "integrity": "sha512-J6n1JiiNT2zpqDhiR7BoFG672/KSnyWEdHyNf2u6SwlyP88p1mY9i1hUKhqVyVowOZn3128bhC1Io9N8QvFSBg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@antv/g6/-/g6-4.3.6.tgz", + "integrity": "sha512-droBnC51bY5omyIr7CZu5kwsoMm2f5oRu17N1vjf4bnLcSw+HvORspV9DWPMe9XmqUHFQt5HImjzyPXcTdcbvw==", "requires": { - "@antv/g6-pc": "^0.0.8" + "@antv/g6-pc": "0.3.6" } }, "@antv/g6-core": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@antv/g6-core/-/g6-core-0.0.7.tgz", - "integrity": "sha512-6ixXCqxsrKgovdf14KglKT6dQFb4LbzZgQaMj9s5NsfJWgwN9aYWyU2qbsyWgHkp/AOyW+vef+w2Vlk42qXFwg==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@antv/g6-core/-/g6-core-0.3.6.tgz", + "integrity": "sha512-sYqfBFyM/Fh0oNXhIhDWuw763ebU1zB13VS4ClqCX4Zh66NClH66efflaCiSm0nDFG6HfitUNenzQbMajTsJnA==", "requires": { - "@antv/algorithm": "^0.0.6", + "@antv/algorithm": "^0.1.8", "@antv/dom-util": "^2.0.1", "@antv/event-emitter": "~0.1.0", "@antv/g-base": "^0.5.1", "@antv/g-math": "^0.1.1", "@antv/matrix-util": "^3.1.0-beta.2", "@antv/path-util": "^2.0.3", - "@antv/scale": "^0.3.1", "@antv/util": "~2.0.5", - "ml-matrix": "^6.5.0" + "ml-matrix": "^6.5.0", + "tslib": "^2.1.0" }, "dependencies": { "@antv/matrix-util": { @@ -206,85 +207,65 @@ "@antv/util": "^2.0.9", "gl-matrix": "^3.3.0", "tslib": "^1.10.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" } } }, "@antv/g6-element": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@antv/g6-element/-/g6-element-0.0.6.tgz", - "integrity": "sha512-Vfg5XWyymCO74JSmtuuhp5VMYgucOaViwNnIV+H3JqQ5iruo3VEh7GVtlYUGUU5xXMFKPeDMdwvRZOJKddCvSg==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@antv/g6-element/-/g6-element-0.3.6.tgz", + "integrity": "sha512-PnqxzYkgH/mfuxiGp20LX0SSR8bP/Qz+taMcGyD0myVIq6NiGgvqfhOjriAEVnaL9htldz5+BXth6euePqO5Lg==", "requires": { "@antv/g-base": "^0.5.1", - "@antv/g6-core": "^0.0.7", + "@antv/g6-core": "*", "@antv/util": "~2.0.5" } }, "@antv/g6-pc": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@antv/g6-pc/-/g6-pc-0.0.8.tgz", - "integrity": "sha512-0VY1zrXnzEe0L99zkaGUhE8TRdhlS/TdtMvE3rUiysE1iS5nQX+9lPJxUMpoJMuWZAYJ3X5xQHwyAcyhupsXYQ==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@antv/g6-pc/-/g6-pc-0.3.6.tgz", + "integrity": "sha512-VhdPzRp14DmxZ+JB0A+zOkRRW8PeJTdH4BRIC6O5KmkjP+ASDqqOvV7LCigqb/iykAFyC3WvY6jMMzGY/7NsIg==", "requires": { "@ant-design/colors": "^4.0.5", - "@antv/algorithm": "^0.0.6", + "@antv/algorithm": "^0.1.8", "@antv/dom-util": "^2.0.1", "@antv/event-emitter": "~0.1.0", "@antv/g-base": "^0.5.1", "@antv/g-canvas": "^0.5.2", "@antv/g-math": "^0.1.1", "@antv/g-svg": "^0.5.1", - "@antv/g-webgpu": "^0.5.1", - "@antv/g6-core": "^0.0.7", - "@antv/g6-element": "^0.0.6", - "@antv/g6-plugin": "^0.0.6", - "@antv/hierarchy": "^0.6.2", - "@antv/layout": "^0.0.16", + "@antv/g6-core": "0.3.6", + "@antv/g6-element": "0.3.6", + "@antv/g6-plugin": "0.3.6", + "@antv/hierarchy": "^0.6.7", + "@antv/layout": "^0.1.14", "@antv/matrix-util": "^3.0.4", "@antv/path-util": "^2.0.3", - "@antv/scale": "^0.3.1", "@antv/util": "~2.0.5", "color": "^3.1.3", "d3-force": "^2.0.1", "dagre": "^0.8.5", "insert-css": "^2.0.0", "ml-matrix": "^6.5.0" - }, - "dependencies": { - "color": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz", - "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==", - "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.4" - } - }, - "color-string": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz", - "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==", - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - } } }, "@antv/g6-plugin": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/@antv/g6-plugin/-/g6-plugin-0.0.6.tgz", - "integrity": "sha512-gPFSyzztTPs4phr1YawjI7CEQs686u2atTWt3bqty556ZiXgkDLNNG+ZX/Sh/yrbpr3msPCBM22UiO3p2h9GgA==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@antv/g6-plugin/-/g6-plugin-0.3.6.tgz", + "integrity": "sha512-qpuS8S+KFH3iYsebY3/qKbf8Ks/Hm8hmQdTYwT93YJLZlm7sNSg1/+nfTXpEKbGfyOq8kocSzVvFyS7gluVg8A==", "requires": { "@antv/dom-util": "^2.0.2", "@antv/g-base": "^0.5.1", "@antv/g-canvas": "^0.5.2", "@antv/g-svg": "^0.5.2", - "@antv/g6-core": "^0.0.7", + "@antv/g6-core": "0.3.6", "@antv/matrix-util": "^3.0.4", "@antv/scale": "^0.3.4", "@antv/util": "^2.0.9", @@ -292,19 +273,19 @@ } }, "@antv/hierarchy": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/@antv/hierarchy/-/hierarchy-0.6.6.tgz", - "integrity": "sha512-ivb9j5aJOogjjU9k7WZXWznevMyqgBbP/Xq2rfXsQFLk4ArABt2ewU6a6jndPOiycGDxppZ8kaYjli70i4HluA==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@antv/hierarchy/-/hierarchy-0.6.8.tgz", + "integrity": "sha512-wVzUl+pxny5gyGJ2mkWx8IiEypX6bnMHgr/NILgbxY6shoy0Vf4FhZpI3CY8Ez7bQT6js8fMkB2NymPW7d7i8A==", "requires": { "@antv/util": "^2.0.7" } }, "@antv/layout": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/@antv/layout/-/layout-0.0.16.tgz", - "integrity": "sha512-844gAk6PTVc/5ma1hay1M5Wc6KC5vKVJxBiskPy1IrSoZYUNlwsAUJudejgfWt03Vr4GBpNywMXDIIB7kHitlQ==", + "version": "0.1.18", + "resolved": "https://registry.npmjs.org/@antv/layout/-/layout-0.1.18.tgz", + "integrity": "sha512-mnuVtZLVnUzy09TpqlwsM5vKCMYFbHhZ/Un87gIFRkIFHwg7Uw5dlaRBpFviQ5rVBwuncKMXR7xPOGdlt3OnRg==", "requires": { - "@antv/g-webgpu": "^0.5.1", + "@antv/g-webgpu": "0.5.5", "d3-force": "^2.0.1", "dagre": "^0.8.5", "ml-matrix": "^6.5.0" @@ -330,9 +311,9 @@ } }, "@antv/scale": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/@antv/scale/-/scale-0.3.7.tgz", - "integrity": "sha512-uMIbzC5Ix/fc0D7EJ6Z04bPvR763baQecsbdsReZyd5H/jXWx5Flo07m35nW3quegh0mzaWaW0PmzMiwwNNV6Q==", + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/@antv/scale/-/scale-0.3.12.tgz", + "integrity": "sha512-ov0cQy5VsYUVFTwKZ3/sXcIKJK1msXye6xie6h+1McwvgmM+rZdKvGCbfGIXVmV9JBc9zksa2ke4E0sI0TawjQ==", "requires": { "@antv/util": "~2.0.3", "fecha": "~4.2.0", @@ -340,9 +321,9 @@ } }, "@antv/util": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@antv/util/-/util-2.0.10.tgz", - "integrity": "sha512-cO6F5qyGVdwG21lunhoDhupR+I+eLYAePgDzM2bjU3LwE3akfyymhOlHE8wcONsPEVRLQ3sTOtd+FojO6g01gw==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@antv/util/-/util-2.0.14.tgz", + "integrity": "sha512-iwM4XKRzW7pbBnMnSGKqcNGo3FdDzMGbRojAiMQ2KC0bTwtLEphQ+hYWa1c+O9BuHtcMkVvTVDylHNESL5vE5g==", "requires": { "tslib": "^2.0.3" } @@ -2683,9 +2664,9 @@ "dev": true }, "@probe.gl/stats": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.3.0.tgz", - "integrity": "sha512-CV4c3EgallqZTO88u34/u9L5asL0nCVP1BEkb4qcXlh8Qz2Vmygbyjz1ViQsct6rSi2lJ52lo6W0PnlpZJJvcA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.4.0.tgz", + "integrity": "sha512-Gl37r9qGuiKadIvTZdSZvzCNOttJYw6RcY1oT0oDuB8r2uhuZAdSMQRQTy9FTinp6MY6O9wngGnV6EpQ8wSBAw==", "requires": { "@babel/runtime": "^7.0.0" } @@ -2755,14 +2736,9 @@ } }, "@types/d3-timer": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-1.0.10.tgz", - "integrity": "sha512-ZnAbquVqy+4ZjdW0cY6URp+qF/AzTVNda2jYyOzpR2cPT35FTXl78s15Bomph9+ckOiI1TtkljnWkwbIGAb6rg==" - }, - "@types/estree": { - "version": "0.0.46", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz", - "integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-2.0.1.tgz", + "integrity": "sha512-TF8aoF5cHcLO7W7403blM7L1T+6NF3XMyN3fxyUolq2uOcFeicG/khQg/dGxiCJWoAcmYulYN7LYSRKO54IXaA==" }, "@types/express": { "version": "4.17.11", @@ -2844,7 +2820,8 @@ "@types/node": { "version": "14.14.22", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz", - "integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==" + "integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==", + "dev": true }, "@types/normalize-package-data": { "version": "2.4.0", @@ -3619,6 +3596,23 @@ "upath": "^1.1.1" } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4564,6 +4558,94 @@ } } }, + "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-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -6347,6 +6429,15 @@ "object-visit": "^1.0.0" } }, + "color": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", + "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "requires": { + "color-convert": "^1.9.3", + "color-string": "^1.6.0" + } + }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -6360,6 +6451,15 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, + "color-string": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz", + "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==", + "requires": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "colorette": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", @@ -8511,9 +8611,9 @@ "dev": true }, "fecha": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz", - "integrity": "sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg==" + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz", + "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==" }, "figgy-pudding": { "version": "3.5.2", @@ -9306,9 +9406,9 @@ "integrity": "sha1-610Ql7dUL0x56jBg067gfQU4gPQ=" }, "inversify": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.0.5.tgz", - "integrity": "sha512-60QsfPz8NAU/GZqXu8hJ+BhNf/C/c+Hp0eDc6XMIJTxBiP36AQyyQKpBkOVTLWBFDQWYVHpbbEuIsHu9dLuJDA==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz", + "integrity": "sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==" }, "inversify-inject-decorators": { "version": "3.1.0", @@ -9360,12 +9460,9 @@ } }, "is-any-array": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-any-array/-/is-any-array-0.1.0.tgz", - "integrity": "sha512-6Kkl1RnvfdkmXM6ZlP+kELGBMA74Nq5pSOm9gIKDaPRe9KQlIJzonrOgq0Jzn/iElB6F2/olpLgWYeVySzrSRg==", - "requires": { - "rollup": "^1.31.1" - } + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-any-array/-/is-any-array-1.0.0.tgz", + "integrity": "sha512-0o0ZsgObnylv72nO39P6M+PL7jPUEx39O6BEfZuX36IKPy/RpdudxluAIaRn/LZi5eVPDMlMBaLABzOK6bwPlw==" }, "is-arguments": { "version": "1.0.4", @@ -10292,37 +10389,37 @@ } }, "ml-array-max": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ml-array-max/-/ml-array-max-1.2.0.tgz", - "integrity": "sha512-3UH7XCdjINxbtBWj1EuHMeI242Q3uLuC4rTpSybBWUpGjnG/BefAFxmTolUCuXDM59mJ/G/re80CQbaVIuMjQA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/ml-array-max/-/ml-array-max-1.2.3.tgz", + "integrity": "sha512-49YwnLlAf4/E/VyezUz+SNfSBhPE8JTahxRPuyM9S9Uv+ft5x0C8A4trtkDgrttMxoxbhudTA1yg8zgJZaYtpA==", "requires": { - "is-any-array": "^0.1.0" + "is-any-array": "^1.0.0" } }, "ml-array-min": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ml-array-min/-/ml-array-min-1.2.0.tgz", - "integrity": "sha512-Wgf2+lCndLy1SbeOZSUqlkxD9T1CXPT7CIlNGAZRRQI35wsqvfuNtLNH4qKFx8kNjlq3VGXKOSBHeiXR31vaTA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/ml-array-min/-/ml-array-min-1.2.2.tgz", + "integrity": "sha512-yidQcOHFaGEuVr6FcwAn+QvKXJv1Lxel5fyKrO+aXGJGp97Mt+p8r21WYtikS/PTVbxdSrliQ0UK4wSHYHHgzQ==", "requires": { - "is-any-array": "^0.1.0" + "is-any-array": "^1.0.0" } }, "ml-array-rescale": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/ml-array-rescale/-/ml-array-rescale-1.3.2.tgz", - "integrity": "sha512-kiXwdVCGrer7rLnjR6Q9ZgP6e9rbnmQvYVUMLXyqNg4+zOs+jek8yBupqPZPDr+NvlSE5OuMnfAbP1oA63kHBA==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ml-array-rescale/-/ml-array-rescale-1.3.5.tgz", + "integrity": "sha512-czK+faN7kYrF48SgVQeXGkxUjDEas6BA4EzF4jJNh8UEtzpSvHW3RllZCJCCyrAqeFc+Y/LhgYUzuHFpevM3qA==", "requires": { - "is-any-array": "^0.1.0", - "ml-array-max": "^1.2.0", - "ml-array-min": "^1.2.0" + "is-any-array": "^1.0.0", + "ml-array-max": "^1.2.3", + "ml-array-min": "^1.2.2" } }, "ml-matrix": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.6.0.tgz", - "integrity": "sha512-ca3+z0VwvzmhTQ1KuvUTSQJxDruzbdkfkThp4XptLOGAKbEtedgWfPTsBVicxOf+3NTR69Zqiw8fRFZM747FAQ==", + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/ml-matrix/-/ml-matrix-6.8.0.tgz", + "integrity": "sha512-c29k/gtyzLeNs0vLB2u4hHYcKr8PdyIs4oB0OsVhlgKiHbYyFkC2e98FcUPKhcnzn234jeZk42No+6d4bXBDNg==", "requires": { - "ml-array-rescale": "^1.3.2" + "ml-array-rescale": "^1.3.5" } }, "moment": { @@ -11420,12 +11517,12 @@ } }, "probe.gl": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/probe.gl/-/probe.gl-3.3.0.tgz", - "integrity": "sha512-59E6AEw4N8sU4PKfAl7S2UBYJCOa064WpEFcXfeFOB/36FJtplYY+261DqLjLAvOqRRHiKVEQUBo63PQ3jKeWA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/probe.gl/-/probe.gl-3.4.0.tgz", + "integrity": "sha512-9CLByZATuhuG/Viq3ckfWU+dAhb7dMmjzsyCy4s7ds9ueTejcVRENxL197/XacOK/AN61YrEERB0QnouB0Qc0Q==", "requires": { "@babel/runtime": "^7.0.0", - "@probe.gl/stats": "3.3.0" + "@probe.gl/stats": "3.4.0" } }, "process": { @@ -11886,23 +11983,6 @@ "inherits": "^2.0.1" } }, - "rollup": { - "version": "1.32.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz", - "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==", - "requires": { - "@types/estree": "*", - "@types/node": "*", - "acorn": "^7.1.0" - }, - "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" - } - } - }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -13130,9 +13210,9 @@ "dev": true }, "tslib": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", - "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "tty-browserify": { "version": "0.0.0", @@ -13528,94 +13608,6 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.3.3", - "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz", - "integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=", - "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.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", - "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.1", - "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz", - "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", - "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", - "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626716578584&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz", - "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz", - "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", - "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", - "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.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703455199&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz", - "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", diff --git a/package.json b/package.json index ab87a247b..c2aab178e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "vue-cli-service build" }, "dependencies": { - "@antv/g6": "^4.1.4", + "@antv/g6": "^4.3.6", "@babel/polyfill": "^7.12.1", "animate.css": "^4.1.1", "axios": "^0.21.1", diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 1a187eead..efa342053 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -159,11 +159,10 @@ export default { path: '/nonConfomity', menuId: '0119abd677e0204e061eb0f0b8cafda0' }, - // { - // title: '标准法规工作组', - // path: '/workGroup', - // menuId: 'QYRMD5TUNBP9XXFRNK5S' - // }, + { + title: '工作组', + path: '/workingGroup', + }, // { // title: '备案产品标准库', // path: '/enterpriseStandardFiling', diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index faaa39b35..fd0c12d9e 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -1,605 +1,648 @@ diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue new file mode 100644 index 000000000..6c199d5d5 --- /dev/null +++ b/src/pages/regulatoryRepository/workingGroup/index.vue @@ -0,0 +1,324 @@ + + + + diff --git a/src/router/index.js b/src/router/index.js index 5669438e8..4dcba5d77 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1164,6 +1164,18 @@ const routes = [ menuId: 'PCZKM8TQJAH5UP5EAXTJ' } }, + + // 工作组 + { + path: '/workingGroup', + name: 'workingGroup', + component: () => + import('@/pages/regulatoryRepository/workingGroup/index'), + meta: { + requireAuth: true, + title: '工作组', + } + }, // 标准涉及项目 { path: '/standInvolveProject', @@ -2000,15 +2012,15 @@ router.onError((error) => { }) router.beforeEach((to, from, next) => { - // let toName = to.name - // let token = store.state.token - // // 返回值为登录状态 - // if ((token === null || token === '') && (toName !== 'Login' && to.meta.requireAuth)) { - // router.push({ - // name: 'Login' - // }) - // } - // // 流程页面权限判断 + console.log(111); + let toName = to.name + let token = store.state.token + console.log(toName); + // 返回值为登录状态 + if ((token === null || token === '') && (toName !== 'Login' && to.meta.requireAuth)) { + return next('/Login') + } + // 流程页面权限判断 // const processCenter = to.name === 'ProcessCenter' || (to.meta.parentPath && to.meta.parentPath === '/processCenter') // if (processCenter) { // if (to.meta.process) { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d3cd25a02..1155aea99 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -4,10 +4,10 @@ * @date: 2018-09-04 17:47:46 */ // 服务器地址 -const devIp = '10.96.10.171' -const devInterfacePORT = '9999' -// const devIp = '10.5.103.101' +// const devIp = '192.168.1.159' // const devInterfacePORT = '9999' +const devIp = '62.234.136.153' +const devInterfacePORT = '8038' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' @@ -31,7 +31,7 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 const prodIp = '62.234.136.153' -const prodInterfacePORT = '8033' +const prodInterfacePORT = '8038' // 判断环境 From 50528d15452c1272f7ff8f06815652cd86ae54e0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 27 Aug 2021 09:26:03 +0800 Subject: [PATCH 09/13] commit --- src/pages/login/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index fd0c12d9e..75a53fcc6 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -55,10 +55,10 @@ }, // 点击登录按钮事件 signin () { - let username = getCookie(); - console.log(username); - window.location.href = "http://testsso1.foton.com.cn/logout?service=http://127.0.0.1"; - return + // let username = getCookie(); + // console.log(username); + // window.location.href = "http://testsso1.foton.com.cn/logout?service=http://127.0.0.1"; + // return if (this.username === '') { this.$message.warning('用户名不能为空') } else if (this.password === '') { From 6c95afef259d6d2fef60b535b3a83da238737da3 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 27 Aug 2021 10:47:40 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=8B=86=E5=88=86=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=B8=AD=E5=B7=B2=E5=AE=8C=E6=88=90=E5=92=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=B8=AD=E9=83=BD=E8=83=BD=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 7acd66034..d2209ab25 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -97,7 +97,7 @@ 属性 - 编辑 + 编辑 编辑 复制 删除 From 79af2c523b7789e00ed1542b06fbc9ea7f87cf7a Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 27 Aug 2021 14:05:12 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E6=B5=81=E7=A8=8B=E7=9A=84=E7=AC=AC6?= =?UTF-8?q?=E6=AD=A5=E7=9A=84=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step6.vue | 207 +++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index f5de1e3ca..8401257ba 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -42,6 +42,12 @@ +
+
+ 批量编辑 + +
+
+ + + + + + + + + + +
@@ -331,6 +348,73 @@ @submit="handleSubmit" > + +
+ + 在研产品 + + + + + + + + + + + + + +
+ 在产产品 + + + + + + + + + + + + + + +
+
+ 确定 + 取消 +
+
@@ -349,6 +433,27 @@ export default { }, data() { return { + batchEditForm: { + // 在研产品 + // 合规 + complianceReasons :'', + // 不合规 + noCompliance :'', + // 应对措施 + countermeasures :'', + // 完成时间 + completionTime :'', + + // 在产产品 + // 合规 + zcComplianceReasons :'', + // 不合规 + zcNoCompliance:'', + // 应对措施 + zcCountermeasures:'', + // 完成时间 + zcCompletionTime:'' + }, hasChildren: true, active: "1", loading: false, @@ -398,6 +503,83 @@ export default { }; }, methods: { + //批量编辑确定按钮事件 + saveBatchEditForm() { + + // console.log(this.selectList) + for( let a = 0; a < this.dataList.length; a++) { + for ( let b = 0; b < this.selectList.length; b++) { + if (this.dataList[a].id === this.selectList[b]) { + //合规 + this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons + //不合规 + this.dataList[a].noCompliance = this.batchEditForm.noCompliance + //应对措施 + this.dataList[a].countermeasures = this.batchEditForm.countermeasures + //完成时间 + this.dataList[a].completionTime = this.batchEditForm.completionTime + //合规 + this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons + //不合规 + this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance + //应对措施 + this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures + //完成时间 + this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime + }else { + for (let i=0;i 0) { + //合规 + this.batchEditForm.complianceReasons = '' + //不合规 + this.batchEditForm.noCompliance = '' + //应对措施 + this.batchEditForm.countermeasures = '' + //完成时间 + this.batchEditForm.completionTime = '' + //合规 + this.batchEditForm.zcComplianceReasons = '' + //不合规 + this.batchEditForm.zcNoCompliance = '' + //应对措施 + this.batchEditForm.zcCountermeasures = '' + //完成时间 + this.batchEditForm.zcCompletionTime = '' + this.modalshowflag = true + } else { + this.$message.warning('请选择要编辑的数据') + } + }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({ @@ -525,7 +707,11 @@ export default { }, //标准表格选择框改变 selectStandChange(data) { - this.selectList = data; + this.selectList = []; + for (let i = 0; i < data.length; i++) { + this.selectList.push(data[i].id); + } + }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { @@ -605,6 +791,25 @@ export default { height: calc(~'100% - 103px'); overflow: auto; + .tableTitle { + margin-bottom: 10px; + height: 30px; + line-height: 30px; + position: relative; + font-size: 13px; + font-weight: bold; + + .tableButton { + position: absolute; + right: 0; + top: 0; + } + + .accessStandardsAndRegulations { + height: 100%; + } + } + .accessStandardsAndRegulations { height: 100%; } From 98c40803d83ff3e988e661ec961573811714aafa Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 27 Aug 2021 14:43:27 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8B=86=E5=88=86=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzjd/step1.vue | 1785 +++++++++-------- 1 file changed, 909 insertions(+), 876 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 9339d3260..fb0665afc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -1,903 +1,936 @@ From add1b5831e193f777e2ff7c5ff90579b5a66a1a9 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 27 Aug 2021 14:44:09 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E8=B7=B3=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 31 +++++++++++++++++-------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index f2d7528f7..59df5b758 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -47,14 +47,14 @@
国外政策
- + @@ -112,14 +112,14 @@
国外政策
 - + @@ -170,12 +170,12 @@ > @@ -236,12 +236,12 @@ > @@ -492,6 +492,17 @@ export default { }, e => { }); }, + //点击查看详情 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, //获取政策预警数据(type用于区别分页器切换) getPolicyDate() { this.loading[this.field] = true