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 00000000..e1ca16c3 Binary files /dev/null and b/src/assets/images/projectadd/go.png differ diff --git a/src/assets/images/projectadd/pickUp.png b/src/assets/images/projectadd/pickUp.png new file mode 100644 index 00000000..27a12c9d Binary files /dev/null and b/src/assets/images/projectadd/pickUp.png differ diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue index 87ef5560..935f71c2 100644 --- a/src/components/drawers/AddLevelAddStu.vue +++ b/src/components/drawers/AddLevelAddStu.vue @@ -1021,17 +1021,17 @@ export default { state.selectedRowKeys2 = selectedRowKeys; }; - const getMousePosition = () => { + 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 @@
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要添加此组织吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+