From f9114ffadfab1c01198dd980c3afb66d0c44a5ea Mon Sep 17 00:00:00 2001 From: zzw <228544128@qq.com> Date: 星期二, 06 十月 2026 18:22:00 +0800 Subject: [PATCH] fix: limit equipment picker to selected X number --- HANDOFF.md | 124 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/HANDOFF.md b/HANDOFF.md index 3c3b292..57e5666 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -781,3 +781,127 @@ - 閿欒鏃ュ織褰撳墠瑕嗙洊杩涘叆 Spring MVC 鍏ㄥ眬寮傚父澶勭悊鐨勫紓甯革紱鍚姩闃舵寮傚父銆佸紓姝ョ嚎绋嬩腑鏈繘鍏ヨ澶勭悊鍣ㄧ殑寮傚父鏆備笉浼氳嚜鍔ㄨ惤搴撱�� - 涓嶈鎻愪氦 `.codex-run`銆丱ffice 閿佹枃浠舵垨 `emergency-repair-web/public/鏂板缓 鏂囨湰鏂囨。.txt`銆� - 鏈疆浠ｇ爜涓庝氦鎺ヨ褰曚竴骞舵彁浜ゅ苟鎺ㄩ�佸叕鍙� Git 浠撳簱 `main` 鍒嗘敮銆� + +## 20. 鏀跺熬蹇収锛�2026-10-06 鍛ㄤ竴锛岄渶姹� 23-25 绯荤粺閰嶇疆銆佸畬宸ユ煡闃呬笌鑿滃崟鐖惰妭鐐癸級 + +**鏈疆瀹屾垚鍐呭** +- 闇�姹� 23锛氱郴缁熷悕绉板拰鐗堟湰鏀逛负鍏抽敭璇嶉厤缃紝codename 鍒嗗埆涓� `rk_SystemName`銆乣rk_SystemVer`銆傜櫥褰曢〉銆侀〉澶淬�丩ogo 鏇夸唬鏂囨湰鍜屾祻瑙堝櫒鏍囬浣跨敤閰嶇疆鍊硷紱椤靛ご鐗堟湰浣跨敤绾㈣壊鏄剧ず銆� +- 闇�姹� 24锛氭柊澧炩�滃畬宸ヤ俊鎭煡闃呪�濆姛鑳斤紝鑿滃崟 `/completion/query`锛屾帴鍙� `GET /api/work-orders/completion/query`銆傛煡璇㈢粨鏋滄寜鏁呴殰姹囨�伙紝涓�涓晠闅滃睍寮�澶氬紶娲惧伐鍗曪紱鏁呴殰缂栧彿銆乺k_X鍙枫�佽澶囥�佸伐绋嬪悕绉板強鎹熷潖鎯呭喌銆佷笂鎶ュ崟浣嶃�佷笂鎶ユ棩鏈熴�佸簭鍙疯繖 7 鍒椾娇鐢ㄥ崟鍏冩牸绾靛悜鍚堝苟銆傛瘡寮犳淳宸ュ崟鐨勫畬宸ュ鐞嗘儏鍐靛拰鏇存崲鍣ㄦ潗鏀寔澶氭潯鏄庣粏銆� +- 闇�姹� 24 鐨勬煡璇㈡潯浠跺寘鎷叧閿瘝銆佹壙淇崟浣嶃�佸畬宸ョ姸鎬佸拰瀹屽伐鏃ユ湡銆傚叧閿瘝鍖归厤鏁呴殰銆佹淳宸ュ崟銆佸伐绋嬬紪鍙枫�佹壙淇汉鍜屾槑缁嗗唴瀹广�� +- 闇�姹� 25锛氳彍鍗曠鐞嗙紪杈戞椂锛屸�滀笂绾ц彍鍗曗�濇敼涓哄彲缂栬緫绾ц仈閫夋嫨鍣紱缂栬緫鏃舵帓闄ゅ綋鍓嶈彍鍗曞強鍏跺叏閮ㄤ笅绾э紝鎸夐挳绫诲瀷鍙兘閫夋嫨鑿滃崟绫诲瀷鐖惰妭鐐广�� +- 闇�姹� 25 鍚庣鍚屾澧炲姞鐖惰妭鐐瑰瓨鍦ㄦ�с�佽嚜寮曠敤鍜屽惊鐜眰绾ф牎楠岋紝閬垮厤閫氳繃鎺ュ彛鏋勯�犲惊鐜彍鍗曟爲銆� + +**涓昏鏂囦欢** +鍚庣锛� + +- `emergency-repair-server/src/main/java/com/emergencyrepair/business/dto/CompletionFaultQueryItem.java`锛堟柊澧烇級 +- `emergency-repair-server/src/main/java/com/emergencyrepair/business/controller/WorkOrderController.java` +- `emergency-repair-server/src/main/java/com/emergencyrepair/business/service/BusinessService.java` +- `emergency-repair-server/src/main/java/com/emergencyrepair/bootstrap/DataInitializer.java` +- `emergency-repair-server/src/main/java/com/emergencyrepair/system/service/SystemService.java` +- `emergency-repair-server/src/main/java/com/emergencyrepair/system/service/ButtonPermissionCatalog.java` + +鍓嶇锛� + +- `emergency-repair-web/src/views/completion/CompletionQuery.vue`锛堟柊澧烇級 +- `emergency-repair-web/src/views/system/MenuManage.vue` +- `emergency-repair-web/src/components/AppHeader.vue`銆乣Login.vue`銆乣RepairLogo.vue`銆乣layout/AppLayout.vue`銆乣router/index.js`銆乣utils/sensitive.js`銆乣main.js` +- `emergency-repair-web/public/sensitive-words.json`銆乣public/index.html` +- `requirement/鏁忔劅璇嶅瓧鍏�.json` + +**楠岃瘉缁撴灉** +- 鍚庣 `mvn -B -DskipTests compile` 閫氳繃锛涘墠绔� `npm run build` 閫氳繃锛屼粎鏈夋棦鏈夊寘浣撶Н鍛婅銆� +- `node .codex-run/verify-req23-25.js`锛氶〉闈㈡爣棰樺拰椤靛ご浣跨敤鈥滀复鎶慨绠＄悊绯荤粺 / 缃戠粶鐗堚�濓紝鐗堟湰棰滆壊涓� `rgb(255, 107, 107)`锛涘畬宸ユ煡闃呮樉绀烘晠闅� `GZ-2026-012`銆佸鐞嗘儏鍐靛拰鍣ㄦ潗锛涜彍鍗曠紪杈戠埗鑺傜偣鏄剧ず鈥滄晠闅滅鐞嗏�濅笖鍙紪杈戙�� +- 鎺ュ彛瀹炴祴锛氫复鏃跺悓涓�鏁呴殰鎻掑叆涓ゅ紶娲惧伐鍗曞拰涓ゆ潯瀹屽伐璁板綍鍚庯紝`GET /api/work-orders/completion/query?keyword=ZZ-MERGE-TEST-20261006` 杩斿洖 1 涓晠闅溿��2 寮犳淳宸ュ崟锛屾瘡鏉″悇 1 鏉″鐞嗘儏鍐靛拰 1 鏉″櫒鏉愩�� +- 娴忚鍣ㄥ悎骞跺疄娴嬶細椤甸潰鐢熸垚 2 寮犳淳宸ュ崟琛岋紝鏁呴殰缂栧彿鍗曞厓鏍煎彧鍑虹幇 1 娆★紝7 涓晠闅滀俊鎭垪鍧囨湁 `rowspan=2`锛屼袱寮犲崟鍚勮嚜鐨勫鐞嗘儏鍐靛拰鍣ㄦ潗鍧囨甯告樉绀猴紝鏃犵綉缁滃紓甯革紱鎴浘 `.codex-run/completion-query-merge-verified.png`銆備复鏃舵暟鎹簱璁板綍宸叉竻鐞嗐�� +- 鑿滃崟鐖惰妭鐐规帴鍙ｅ疄娴嬶細涓存椂鍒涘缓鐖跺瓙鑿滃崟鎴愬姛锛涙妸鐖惰彍鍗曠Щ鍔ㄥ埌鍏跺瓙鑿滃崟涓嬭繑鍥炩�滀笂绾ц彍鍗曚笉鑳介�夋嫨褰撳墠鑿滃崟鐨勪笅绾р�濓紱鎶婂瓙鑿滃崟绉诲姩鍒板叾浠栫埗鑺傜偣鎴愬姛锛涗复鏃惰彍鍗曞凡娓呯悊銆� + +**褰撳墠杩愯鐘舵�侊紙2026-10-06锛�** +- 鍓嶇 `http://localhost:8082`锛涘悗绔� `http://127.0.0.1:8091`锛汥M8 `127.0.0.1:5236`锛汦dge CDP `9222`銆� +- 鐧诲綍 `admin / admin123`锛涙暟鎹簱 `SYSDBA/SYSDBA`锛屼笟鍔� schema `LX`銆� +- 鍚庣鏃ュ織锛歚.codex-run/backend-20261006-req23-25-v2.out.log`銆乣.codex-run/backend-20261006-req23-25-v2.err.log`銆� + +**鎺ユ墜娉ㄦ剰** +- 瀹屽伐淇℃伅鏌ラ槄褰撳墠鍙眹鎬诲凡缁忓瓨鍦ㄥ畬宸ュ～鎶ヨ褰� `T_COMPLETION_INFO` 鐨勬淳宸ュ崟锛涗粎瀹屽伐澶勭悊浣嗘湭濉姤瀹屽伐淇℃伅鐨勬淳宸ュ崟涓嶄細鍑虹幇鍦ㄦ煡闃呯粨鏋滀腑銆� +- 瀹屽伐鏌ラ槄鎺ュ彛褰撳墠涓�娆¤繑鍥炲叏閮ㄥ尮閰嶇粨鏋滐紝娌℃湁鍒嗛〉锛涙暟鎹噺杩涗竴姝ュ澶ф椂寤鸿澧炲姞鍒嗛〉鎴栧鍑虹瓥鐣ャ�� +- 涓嶈鎻愪氦 `.codex-run`銆丱ffice 閿佹枃浠舵垨 `emergency-repair-web/public/鏂板缓 鏂囨湰鏂囨。.txt`銆� +- 鏈疆浠ｇ爜銆侀渶姹傛枃浠跺拰浜ゆ帴璁板綍涓�骞舵彁浜ゅ苟鎺ㄩ�佸叕鍙� Git 浠撳簱 `main` 鍒嗘敮銆� + +## 21. 鏀跺熬蹇収锛�2026-10-06 鍛ㄤ竴锛岄渶姹� 21 鏉冮檺璁剧疆鑼冨洿鍒囨崲锛� + +**鏈疆瀹屾垚鍐呭** +- 瑙掕壊绠＄悊鈥滄潈闄愯缃�濆脊绐楀鍔犫�滃叏閮� / 宸茶缃�濆垏鎹紝浜や簰鏂瑰紡涓庘�滅敤鎴疯缃�濅繚鎸佷竴鑷淬�� +- 鈥滃叏閮ㄢ�濇樉绀哄畬鏁磋彍鍗曞強鎸夐挳鏉冮檺鏍戯紝淇濈暀鈥滃叏閫夆�濆拰鍘熸湁鏉冮檺鍙嶆樉銆� +- 鈥滃凡璁剧疆鈥濅粎鏄剧ず褰撳墠瑙掕壊宸叉巿鏉冭妭鐐瑰強鍏剁埗绾ц矾寰勶紱娌℃湁宸茶缃潈闄愭椂鏄剧ず绌虹姸鎬佹彁绀恒�� +- 鍒囨崲鑼冨洿鏃朵細淇濈暀褰撳墠灏氭湭淇濆瓨鐨勫嬀閫夌姸鎬侊紝鍒囧洖鈥滃叏閮ㄢ�濆悗鎭㈠瀹屾暣鏍戝強褰撳墠閫変腑鏉冮檺銆� +- 寮圭獥姣忔閲嶆柊鎵撳紑榛樿鍥炲埌鈥滃叏閮ㄢ�濄�� + +**涓昏鏂囦欢** +- `emergency-repair-web/src/views/system/RolePermissionDialog.vue` +- `requirement/鏀硅繘20261003.txt`锛堣ˉ鍏呴渶姹� 21 鐨勮寖鍥村垏鎹㈠彛寰勶級 + +**楠岃瘉缁撴灉** +- 鍓嶇 `npm run build` 閫氳繃锛屼粎鏈夋棦鏈夊寘浣撶Н鍛婅銆� +- `node .codex-run/verify-req21-22.js` 閫氳繃锛氬乏渚ф棤鈥滆彍鍗曟潈闄愮鐞嗏�濓紝瑙掕壊绠＄悊瀛樺湪鈥滄潈闄愯缃�濄�� +- 鍏ㄩ儴瑙嗗浘鏄剧ず 119 涓閫夋銆�13 涓凡鍕鹃�夈��1 涓崐閫夛紱宸茶缃鍥炬樉绀� 14 涓妭鐐癸紝鍧囦负褰撳墠宸茶缃妭鐐规垨鐖剁骇璺緞锛涘垏鍥炲叏閮ㄥ悗鍕鹃�夌姸鎬佹仮澶嶏紝鏃犵綉缁滃紓甯搞�� +- 鎴浘锛歚.codex-run/role-permission-assigned-scope.png`銆� + +**褰撳墠杩愯鐘舵�侊紙2026-10-06锛�** +- 鍓嶇 `http://localhost:8082`锛涘悗绔� `http://127.0.0.1:8091`锛汥M8 `127.0.0.1:5236`锛汦dge CDP `9222`銆� +- 鐧诲綍 `admin / admin123`锛涙暟鎹簱 `SYSDBA/SYSDBA`锛屼笟鍔� schema `LX`銆� + +**鎺ユ墜娉ㄦ剰** +- 涓嶈鎻愪氦 `.codex-run`銆丱ffice 閿佹枃浠舵垨 `emergency-repair-web/public/鏂板缓 鏂囨湰鏂囨。.txt`銆� +- 鏈疆浠ｇ爜銆侀渶姹傛枃浠跺拰浜ゆ帴璁板綍涓�骞舵彁浜ゅ苟鎺ㄩ�佸叕鍙� Git 浠撳簱 `main` 鍒嗘敮銆� +## 22. 鏀跺熬蹇収锛�2026-10-06 鍛ㄤ竴锛岄渶姹� 26 鏃ュ織鏃ユ湡鑼冨洿鍒嗛殧绗︼級 + +**鏈疆瀹屾垚鍐呭** +- 淇鐧诲綍鏃ュ織銆佹搷浣滄棩蹇椼�侀敊璇棩蹇椾笁涓〉闈㈡棩鏈熻寖鍥寸粍浠朵腑闂粹�滆嚦鈥濇樉绀轰笉瀹屾暣鐨勯棶棰樸�� +- 涓変釜椤甸潰鐨� `.el-range-separator` 鍥哄畾涓� `18px` 骞跺眳涓樉绀猴紝閬垮厤 Element UI 榛樿鐧惧垎姣斿搴﹀湪 260px 鏃ユ湡鎺т欢涓鍘嬬缉瑁佸垏銆� + +**涓昏鏂囦欢** +- `emergency-repair-web/src/views/system/LoginLogManage.vue` +- `emergency-repair-web/src/views/system/OperationLogManage.vue` +- `emergency-repair-web/src/views/system/ErrorLogManage.vue` +- `requirement/鏀硅繘20261003.txt`锛堣ˉ鍏呴渶姹� 26锛� + +**楠岃瘉缁撴灉** +- 鍓嶇 `npm run build` 閫氳繃锛屼粎鏈夋棦鏈夊寘浣撶Н鍛婅銆� +- `node .codex-run/verify-req26.js` 閫氳繃锛氫笁涓棩蹇楅〉闈㈠潎鎵惧埌鈥滆嚦鈥濓紝瀹為檯瀹藉害銆乣clientWidth` 鍜� `scrollWidth` 鍧囦负 `18px`锛岃绠楁牱寮忎负 `flex-basis: 18px`銆乣min-width: 18px`銆佸眳涓紝鏃犵綉缁滃紓甯搞�� +- 鎴浘锛歚.codex-run/login-log-date-separator.png`銆乣.codex-run/operation-log-date-separator.png`銆乣.codex-run/error-log-date-separator.png`銆� + +**褰撳墠杩愯鐘舵�侊紙2026-10-06锛�** +- 鍓嶇 `http://localhost:8082`锛涘悗绔� `http://127.0.0.1:8091`锛汥M8 `127.0.0.1:5236`锛汦dge CDP `9222`銆� +- 鐧诲綍 `admin / admin123`锛涙暟鎹簱 `SYSDBA/SYSDBA`锛屼笟鍔� schema `LX`銆� + +**鎺ユ墜娉ㄦ剰** +- 涓嶈鎻愪氦 `.codex-run`銆丱ffice 閿佹枃浠舵垨 `emergency-repair-web/public/鏂板缓 鏂囨湰鏂囨。.txt`銆� +- 鏈疆浠ｇ爜銆侀渶姹傛枃浠跺拰浜ゆ帴璁板綍涓�骞舵彁浜ゅ苟鎺ㄩ�佸叕鍙� Git 浠撳簱 `main` 鍒嗘敮銆� + +## 23. 鏀跺熬蹇収锛�2026-10-06 鍛ㄤ竴锛岄渶姹� 27 璁惧閫夋嫨鑼冨洿锛� + +**鏈疆瀹屾垚鍐呭** +- 鏂板鏁呴殰閫夋嫨 `rk_X鍙穈锛堜骇鍝佺粨鏋勬爲 `side` 绫诲瀷鑺傜偣锛夊悗锛岃澶囬�夋嫨鍣ㄥ彧浠ユ墍閫夎妭鐐逛负鏍瑰睍绀哄叾涓嬬骇锛屼笉鍐嶅悓鏃惰繑鍥炲瀷鍙锋牴鑺傜偣鍜屾暣妫典骇鍝佺粨鏋勬爲銆� +- 璁惧閫夋嫨鍣ㄦ墦寮�閿佸畾鑼冨洿鏃惰嚜鍔ㄥ睍寮�杩斿洖鐨� `side` 鏍硅妭鐐癸紝棣栧睆鐩存帴鏄剧ず绗竴灞傜郴缁熻妭鐐癸紝鍚庣画缁х画鎸夊師閫昏緫鎳掑姞杞姐�� +- `xNo` 涓虹┖鏃朵粛杩斿洖瀹屾暣浜у搧缁撴瀯鏍戯紝涓嶅奖鍝嶄骇鍝佺粨鏋勬爲绠＄悊鍜屼笉鎸� `rk_X鍙穈 绛涢�夌殑璁惧閫夋嫨鍦烘櫙銆� + +**涓昏鏂囦欢** +- `emergency-repair-server/src/main/java/com/emergencyrepair/system/service/SystemService.java` +- `emergency-repair-web/src/components/ProductTreePicker.vue` +- `requirement/鏀硅繘20261003.txt`锛堣ˉ鍏呴渶姹� 27锛� + +**楠岃瘉缁撴灉** +- 鍚庣 `mvn -B -DskipTests compile`銆乣mvn -B -DskipTests package` 閫氳繃锛涘墠绔� `npm run build` 閫氳繃锛屼粎鏈夋棦鏈夊寘浣撶Н鍛婅銆� +- `GET /api/system/tree/product/side-roots?xNo=203` 淇鍚庡彧杩斿洖 1 涓牴鑺傜偣锛歚id=1280000000000009729`銆乣name=203`銆乣layer=side`銆乣level=2`锛沗201 / 203 / 301 / 娴嬭瘯T` 鍒嗗埆鍙繑鍥炲搴旇妭鐐广�� +- `node .codex-run/verify-req27.js` 閫氳繃锛氭牴鑺傜偣鏂囨湰浠呬负 `203`锛岃嚜鍔ㄥ睍寮� 1 涓牴鑺傜偣锛岄灞忔樉绀哄叾涓嬬骇绯荤粺鑺傜偣锛屾棤缃戠粶寮傚父銆� +- 璇锋眰閾捐矾纭锛歚/api/system/tree/product/side-roots?xNo=203` 鍚庣户缁姹� `/api/system/tree/product/children?parentId=1280000000000009729`銆傛埅鍥撅細`.codex-run/req27-side-tree.png`銆� + +**褰撳墠杩愯鐘舵�侊紙2026-10-06锛�** +- 鍓嶇 `http://localhost:8082`锛孭ID `138164`锛涘悗绔� `http://127.0.0.1:8091`锛孭ID `148268`锛汥M8 `127.0.0.1:5236`锛汦dge CDP `9222`銆� +- 鐧诲綍 `admin / admin123`锛涙暟鎹簱 `SYSDBA/SYSDBA`锛屼笟鍔� schema `LX`銆� +- 鍚庣鏃ュ織锛歚.codex-run/backend-20261006-req27.out.log`銆乣.codex-run/backend-20261006-req27.err.log`銆� + +**鎺ユ墜娉ㄦ剰** +- 闇�姹� 26 宸叉彁浜ゅ苟鎺ㄩ�侊紝鎻愪氦 `f651ad5`锛坄fix: show full date range separator in log filters`锛夈�傞渶姹� 27 涓烘湰杞悗缁彁浜ゃ�� +- 涓嶈鎻愪氦 `.codex-run`銆丱ffice 閿佹枃浠舵垨 `emergency-repair-web/public/鏂板缓 鏂囨湰鏂囨。.txt`銆� +- 鏈疆浠ｇ爜銆侀渶姹傛枃浠跺拰浜ゆ帴璁板綍涓�骞舵彁浜ゅ苟鎺ㄩ�佸叕鍙� Git 浠撳簱 `main` 鍒嗘敮銆� -- Gitblit v1.9.1