人员看板通用与大方修改

.vscode/settings.json

@@ -1,7 +1,42 @@
 {
+    //为了符合eslint的两个空格间隔原则
+    "editor.tabSize": 2,
+    //配置eslint
+    "files.autoSave":"off",
+    "editor.codeActionsOnSave": {
+      "source.fixAll": "explicit",
+      "source.fixAll.eslint": "explicit"
+    },
+    "eslint.run": "onSave",
+     // 控制是否将打开的编辑器显示为预览。预览编辑器将会重用至其被保留(例如，通过双击或编辑)，且其字体样式将为斜体。
+    "workbench.editor.enablePreview": false,
+    "search.exclude": {
+      "**/dist": true,
+      "**/static": true
+    },
     "workbench.colorCustomizations": {
-        "activityBar.background": "#3C2154",
-        "titleBar.activeBackground": "#542E76",
-        "titleBar.activeForeground": "#FDFCFE"
+      "activityBar.background": "#332A3A",
+      "titleBar.activeBackground": "#473B52",
+      "titleBar.activeForeground": "#FBFAFB"
+    },
+    "eslint.enable": true,
+    "editor.codeActionsOnSave": {
+      "source.fixAll": true,
+      "source.fixAll.eslint": true
+    },
+    "editor.formatOnSave": true,
+    //  "rvest.vs-code-prettier-eslint"
+    "editor.defaultFormatter":{
+      "editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
+      "editor.formatOnType": false, // required
+      "editor.formatOnPaste": true, // optional
+      "editor.formatOnSave": false, // optional
+      "editor.formatOnSaveMode": "file", // required to format on save
+      "files.autoSave": "onFocusChange", // optional but recommended
+      "vs-code-prettier-eslint.prettierLast": false // set as "true" to run 'prettier' last not first
+    },
+    "vetur.format.defaultFormatter.js": "prettier-eslint",
+    "[javascript]": {
+      "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
     }
-}
+  }

package-lock.json

@@ -2261,7 +2261,7 @@
     },
     "@types/raf": {
       "version": "3.4.3",
-      "resolved": "https://registry.npmmirror.com/@types/raf/-/raf-3.4.3.tgz",
+      "resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.3.tgz",
       "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==",
       "optional": true
     },
@@ -3906,7 +3906,7 @@
     },
     "base64-arraybuffer": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
       "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
     },
     "base64-js": {
@@ -4369,7 +4369,7 @@
     },
     "btoa": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
       "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
     },
     "buffer": {
@@ -4597,7 +4597,7 @@
     },
     "canvg": {
       "version": "3.0.10",
-      "resolved": "https://registry.npmmirror.com/canvg/-/canvg-3.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz",
       "integrity": "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==",
       "optional": true,
       "requires": {
@@ -5814,7 +5814,7 @@
     },
     "css-line-break": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
       "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
       "requires": {
         "utrie": "^1.0.2"
@@ -6542,7 +6542,7 @@
     },
     "dompurify": {
       "version": "2.5.8",
-      "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-2.5.8.tgz",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.8.tgz",
       "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==",
       "optional": true
     },
@@ -8877,7 +8877,7 @@
     },
     "html2canvas": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
       "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
       "requires": {
         "css-line-break": "^2.1.0",
@@ -10846,7 +10846,7 @@
     },
     "jspdf": {
       "version": "2.5.2",
-      "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-2.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.5.2.tgz",
       "integrity": "sha512-myeX9c+p7znDWPk0eTrujCzNjT+CXdXyk7YmJq5nD5V7uLLKmSXnlQ/Jn/kuo3X09Op70Apm0rQSnFWyGK8uEQ==",
       "requires": {
         "@babel/runtime": "^7.23.2",
@@ -10861,7 +10861,7 @@
       "dependencies": {
         "@babel/runtime": {
           "version": "7.26.9",
-          "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.9.tgz",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",
           "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
           "requires": {
             "regenerator-runtime": "^0.14.0"
@@ -10869,12 +10869,12 @@
         },
         "fflate": {
           "version": "0.8.2",
-          "resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.8.2.tgz",
+          "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
           "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A=="
         },
         "regenerator-runtime": {
           "version": "0.14.1",
-          "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
           "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
         }
       }
@@ -14006,7 +14006,7 @@
     },
     "raf": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
       "optional": true,
       "requires": {
@@ -14490,7 +14490,7 @@
     },
     "rgbcolor": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
       "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==",
       "optional": true
     },
@@ -15474,7 +15474,7 @@
     },
     "stackblur-canvas": {
       "version": "2.7.0",
-      "resolved": "https://registry.npmmirror.com/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz",
       "integrity": "sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ==",
       "optional": true
     },
@@ -15961,7 +15961,7 @@
     },
     "svg-pathdata": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
       "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
       "optional": true
     },
@@ -16356,7 +16356,7 @@
     },
     "text-segmentation": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
       "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
       "requires": {
         "utrie": "^1.0.2"
@@ -17073,7 +17073,7 @@
     },
     "utrie": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
       "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
       "requires": {
         "base64-arraybuffer": "^1.0.2"
@@ -17620,7 +17620,7 @@
     },
     "vue-loader-v16": {
       "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
       "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
       "dev": true,
       "optional": true,
@@ -17632,7 +17632,7 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "optional": true,
@@ -17642,7 +17642,7 @@
         },
         "chalk": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "optional": true,
@@ -17653,7 +17653,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "optional": true,
@@ -17663,21 +17663,21 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true,
           "optional": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true,
           "optional": true
         },
         "loader-utils": {
           "version": "2.0.4",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
           "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
           "dev": true,
           "optional": true,
@@ -17689,7 +17689,7 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "optional": true,

src/views/peopleManages/taskStatistics/index.vue

@@ -1169,7 +1169,7 @@ export default {
                                     ry.zhi_cheng_deng_ji 
                                 FROM
                                     t_ryjbqk AS ry
-                                    JOIN ibps_party_employee AS ee ON ry.parent_id_ = ee.id_ where ee.name_ not like '%系统%' and ee.name_ not like '%金通%' and ee.name_ not like '%管理%' and ee.id_ != '702117247933480960'
+                                    JOIN ibps_party_employee AS ee ON ry.parent_id_ = ee.id_ where ee.name_ not like '%系统%' AND ee.STATUS_ = 'actived' and ee.name_ not like '%金通%' and ee.name_ not like '%管理%' and ee.id_ != '702117247933480960'
                                 ) gy
                                 RIGHT JOIN ibps_party_entity en ON FIND_IN_SET( en.id_, gy.positions_ ) 
                             WHERE
@@ -1209,7 +1209,7 @@ export default {
                                 e.id_ 
                             ) ee
                         WHERE
-                        ee.name_ NOT LIKE '%系统%' 
+                            ee.name_ NOT LIKE '%系统%' 
                             AND ee.STATUS_ = 'actived'
                             AND ee.name_ NOT LIKE '%金通%' 
                             AND ee.name_ NOT LIKE '%管理%' 

src/views/peopleManages/taskStatistics/indexDaFang.vue

@@ -1202,7 +1202,7 @@ export default {
                         ee.name_ NOT LIKE '%系统%' 
                             AND ee.STATUS_ = 'actived'
                             AND ee.name_ NOT LIKE '%金通%' 
-                            AND ee.name_ NOT LIKE '%管理%' 
+                            AND ee.name_ NOT LIKE '%管理%'
                             AND ee.id_ != '702117247933480960'`
             await curdPost('sql', sql).then((res) => {
                 data = res.variables.data
@@ -1295,6 +1295,7 @@ export default {
                                         and name_ not like '%系统%'
                                         and name_ not like '%金通%'
                                         and name_ not like '%管理%'
+                                        AND STATUS_ = 'actived'
                                         and id_ != '702117247933480960'
                                     ) a 
                                 GROUP BY
@@ -1385,7 +1386,7 @@ export default {
                                     ry.zhi_cheng_deng_ji 
                                 FROM
                                     t_ryjbqk AS ry
-                                    JOIN ibps_party_employee AS ee ON ry.parent_id_ = ee.id_ where ee.name_ not like '%系统%' and ee.name_ not like '%金通%' and ee.name_ not like '%管理%' and ee.id_ != '702117247933480960'
+                                    JOIN ibps_party_employee AS ee ON ry.parent_id_ = ee.id_ where ee.name_ not like '%系统%' AND ee.STATUS_ = 'actived' and ee.name_ not like '%金通%' and ee.name_ not like '%管理%' and ee.id_ != '702117247933480960'
                                 ) gy
                                 RIGHT JOIN ibps_party_entity en ON FIND_IN_SET( en.id_, gy.positions_ ) 
                             WHERE
@@ -1432,6 +1433,7 @@ export default {
                                         and name_ not like '%系统%'
                                         and name_ not like '%金通%'
                                         and name_ not like '%管理%'
+                                        AND STATUS_ = 'actived'
                                         and id_ != '702117247933480960'
                                     ) a 
                                 GROUP BY
@@ -1532,6 +1534,7 @@ export default {
                                         and name_ not like '%系统%'
                                         and name_ not like '%金通%'
                                         and name_ not like '%管理%'
+                                        AND STATUS_ = 'actived'
                                         and id_ != '702117247933480960'
                                     ) a 
                                 GROUP BY
@@ -1586,7 +1589,7 @@ export default {
                                     ry.zheng_shu_lei_xin
                                 FROM
                                     t_ryzsb AS ry
-                                    JOIN ibps_party_employee AS ee ON ry.parent_id_ = ee.id_ where ee.name_ not like '%系统%' and ee.name_ not like '%金通%' and ee.name_ not like '%管理%' and ee.id_ != '702117247933480960'
+                                    JOIN ibps_party_employee AS ee ON ry.parent_id_ = ee.id_ where ee.name_ not like '%系统%' AND ee.STATUS_ = 'actived' and ee.name_ not like '%金通%' and ee.name_ not like '%管理%' and ee.id_ != '702117247933480960'
                                 ) gy
                                 RIGHT JOIN ibps_party_entity en ON FIND_IN_SET( en.id_, gy.positions_ ) 
                             WHERE
@@ -1626,6 +1629,7 @@ export default {
                                         and name_ not like '%系统%'
                                         and name_ not like '%金通%'
                                         and name_ not like '%管理%'
+                                        AND STATUS_ = 'actived'
                                         and id_ != '702117247933480960'
                                     ) a 
                                 GROUP BY