From 17e24ae408f806faff766086f7a4f9c19802b5da Mon Sep 17 00:00:00 2001 From: lixg Date: Mon, 14 Nov 2022 10:12:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E6=9D=83=E5=8F=8A=E6=9F=A5=E7=9C=8B=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 27 + package.json | 1 + src/assets/images/projectadd/go.png | Bin 0 -> 264 bytes src/assets/images/projectadd/pickUp.png | Bin 0 -> 275 bytes src/components/drawers/AddLevelAddStu.vue | 6 +- src/components/drawers/CorPowerlist.vue | 11 +- src/components/drawers/Ownership.vue | 20 +- src/components/drawers/PowerList.vue | 8 +- src/components/drawers/ProjPowerList.vue | 16 +- src/components/drawers/ProjectOwn.vue | 1337 +++++++++++-------- src/components/drawers/StuAdd.vue | 1305 ++++++++++++------ src/views/certificate/CertificateCenter.vue | 6 +- src/views/learningpath/LevelAddDetail.vue | 29 +- 13 files changed, 1719 insertions(+), 1047 deletions(-) create mode 100644 src/assets/images/projectadd/go.png create mode 100644 src/assets/images/projectadd/pickUp.png diff --git a/package-lock.json b/package-lock.json index be3fa8d8..aeae90d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "axios": "^1.1.3", "core-js": "^3.8.3", "element-plus": "^2.2.17", + "element-resize-detector": "^1.2.4", "html2canvas": "^1.4.1", "jquery": "^3.6.1", "qrcode.vue": "^3.3.3", @@ -3536,6 +3537,11 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, + "node_modules/batch-processor": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/batch-processor/-/batch-processor-1.0.0.tgz", + "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA==" + }, "node_modules/big.js": { "version": "5.2.2", "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz", @@ -4934,6 +4940,14 @@ "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" }, + "node_modules/element-resize-detector": { + "version": "1.2.4", + "resolved": "https://registry.npmmirror.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz", + "integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==", + "dependencies": { + "batch-processor": "1.0.0" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -14162,6 +14176,11 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, + "batch-processor": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/batch-processor/-/batch-processor-1.0.0.tgz", + "integrity": "sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA==" + }, "big.js": { "version": "5.2.2", "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz", @@ -15332,6 +15351,14 @@ } } }, + "element-resize-detector": { + "version": "1.2.4", + "resolved": "https://registry.npmmirror.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz", + "integrity": "sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==", + "requires": { + "batch-processor": "1.0.0" + } + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", diff --git a/package.json b/package.json index faa48370..64e53703 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "axios": "^1.1.3", "core-js": "^3.8.3", "element-plus": "^2.2.17", + "element-resize-detector": "^1.2.4", "html2canvas": "^1.4.1", "jquery": "^3.6.1", "qrcode.vue": "^3.3.3", diff --git a/src/assets/images/projectadd/go.png b/src/assets/images/projectadd/go.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ca16c34d7781ac5bfb0133f4cb64e4a51dcc86 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^AT|#N8<337)>#0g7>k44ofy`glX(f`9P)H=4ABVg zy||Z;(NTo;LGhjmP74EW^twG%q6W<6n{fM;R zKIdmz-n*Sg<{zD1Y$MCCC8yEx%5C=<$_5hyHoAU`|0p|8KPFzXb%ytf_gy*mkJKv; zIxlt6k#tVaj@bRsyyCCrLV;|7MpK>n=NCPU`1qlNw{zv$#VkSZ*V?K&C%7gh@UEV? zHr79rkz45O+C=3diS!jZNi#ZEyyMv||G3co7Wa!t=l|Ic_M25QCERo3?fp~;^b7-o Mr>mdKI;Vst03bJJPx#%}GQ-R47x8kTFjJK@@~%HsR-3Q?fKhLrf?zHjo^fi-7_=qp_f{fyPi!pUaP+ zpfP(E78Vrzp&N41BY0U1ublVg&CDat9G>FryZQj0a>t93iGnuMh{T(KyWDXd1zVXO zNlaq=~Uy-0W_a1$Iqqh%_w==D%RQ Z%pNXrJq { + const getClientHeight = () => { state.screenHeight = document.body.clientHeight; }; onMounted(() => { // console.log("11111", 1); - window.addEventListener("resize", getMousePosition, false); + window.addEventListener("resize", getClientHeight, false); // judgeUrl(); }); onUnmounted(() => { - window.removeEventListener("resize", getMousePosition, false); + window.removeEventListener("resize", getClientHeight, false); }); return { ...toRefs(state), diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue index d39314ef..e972af16 100644 --- a/src/components/drawers/CorPowerlist.vue +++ b/src/components/drawers/CorPowerlist.vue @@ -1,5 +1,5 @@ + + diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue index 735d851f..89507bf4 100644 --- a/src/components/drawers/StuAdd.vue +++ b/src/components/drawers/StuAdd.vue @@ -3,7 +3,7 @@ :visible="Stuvisible" class="drawerStyle stuadd" placement="right" - width="70%" + width="85%" @after-visible-change="afterVisibleChange" >
@@ -67,23 +67,28 @@
-->
- BOE组织树
+ + - +
-
+
@@ -155,53 +163,34 @@ -->
- BOE组织树
+ + - - - - + @@ -211,7 +200,7 @@ >
-
+
-
姓名：
+
受众名称：
-
-
-
-
- +
+
+
+ +
+
搜索
-
搜索
-
-
-
- +
+
+ +
+
重置
-
重置
+ -
+
-
+
@@ -300,27 +291,190 @@
已选
-
6
-
人
+
-
+
全部清除
快速选人
-
- -
- {{ item.name }} -
+
+
+
+ +
+
{{ item.name }}
+
+
+
+
+
+
+ 查看更多 + +
+
+
+
收起
添加组织
+
+
+
+ +
+
{{ item.value }}
+
+
+
+
+
+
+ 查看更多 + +
+
+
+
收起
+
+
受众关联
+
+
+
+ +
+
{{ item.name }}
+
+
+
+
+
+
+ 查看更多 + +
+
+
+
收起
+
+
@@ -328,11 +482,44 @@
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要添加此组织吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +