From a79f7d80e55319ae1a40954f6a4ce6e382cc1649 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 28 八月 2023 15:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 web_standard/src/views/ext/deviceExt.vue |  140 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 140 insertions(+), 0 deletions(-)

diff --git a/web_standard/src/views/ext/deviceExt.vue b/web_standard/src/views/ext/deviceExt.vue
index aa0b933..3693c36 100644
--- a/web_standard/src/views/ext/deviceExt.vue
+++ b/web_standard/src/views/ext/deviceExt.vue
@@ -268,5 +268,145 @@
 }
 /**
  *  
+
+    鈥滄椿鐫�鍥炴潵灏卞ソ鈥︹�︽椿鐫�鍥炴潵灏卞ソ锛佲�濊�佹潃鎵嬮綈缃楀０闊冲彂棰わ紝閲嶅鐫�璇撮亾銆�
+
+    鍙跺嚒鐪间腑鐑唱娣屽嚭锛岃繖涔堝鐨勪汉锛屼负浠栬�屽咖鑰屾偛鑰屽枩锛岃繛璇濊閮藉湪棰わ紝鍞亹鏄ぇ姊︿竴鍦猴紝鎬庤兘璁╀粬涓嶆劅鍔紵
+
+    绐佺劧锛屼粬鎰熻鍙宠偐鐢熺柤锛屽洖澶翠竴鐪嬶紝榛戠殗姝ｅ湪鍐蹭粬鍛插ぇ鐧界墮銆傜敤鐗瑰埆鐨勬柟寮忚繘琛岄棶鍊欙紝瀵逛粬涓嬩簡榛戝彛锛屼笉杩囨�庝箞鐪嬮兘鏈夌偣瓒佹満鎵撳姭銆佺洍鍙栧湥琛�鐨勬剰鎬濄��
+
+    鈥滆倢鑲夌环杩欎箞绱у共鍚楋紝鎬庝箞涓�绮掕鐝犻兘娌℃湁锛熲�濇灉鐒躲�傝繖澶存�ф牸鎭跺姡鐨勫ぇ鐙楅亾鍑轰簡瀹炴儏锛岃�屽悗鍙堢溂绁炵偨鐑紝鍑戜笂鍓嶆潵涓�鍓儹鍒囩殑鏍峰瓙锛岄亾锛氣�滃け韪繖涔堝骞存槸涓嶆槸鍧犺惤浠欏娲炲簻涓簡锛熸枟鎴樺湥鐨囪鐨勫ソ锛屽疂璐濆湪鎵嬶紝澶╀笅鎴戞湁锛屽厔寮熻闈€�備竴浜轰竴鍗婏紝涓嶆墦鎶樻墸锛佲��
+
+    鐚村瓙闂诲惉椤挎椂婊¤剳闂ㄥ瓙榛戠嚎锛屼粬鐨勮�佺埗浠�涔堟椂鍊欒杩囪繖鏍风殑璇濓紵锛�
+
+    榛戠殗鐨勮劯鐨帤鍒颁簡涓�瀹氱殑澧冪晫锛屼笉鎱屼笉蹇欙紝鎸や笂鍓嶅幓锛屽ぇ榛戠埅瀛愪竴鎵掓媺锛屽氨灏嗚竟涓婄浜嬬殑鍏夊ご鑺辫姳宸偣缁欐寜鍦ㄨ剼搴曚笅銆�
+
+    鈥滄垜鍘伙紒#锟锟�#%鈥︹�︹�濊姳鑺卞皢閭ｅ彧澶ч粦鐖瓙浠庡厜澶翠笂鎼紑锛屽績涓ぇ楠備笌璇呭拻涓嶆銆備絾鏄彛涓婂嵈涔熷彧鑳藉康浣涳紝鍥犱负杩欎綅鐙楀笀浼繕鐪熸槸鎯逛笉璧枫��
+
+    鈥滅瀛愶紝鎴戝氨鐭ラ亾銆備綘涓�瀹氬彲浠ユ椿涓嬫潵锛屼笂鑻嶆湁鐪笺�傗�濆皬闆�鍎挎湁绗戜篃鏈夋唱锛岃交澹拌閬撱��
+
+    澶╀箣鏉戯紝浼椾汉閮芥潵浜嗭紝鍏ㄩ兘鏄晠浜恒��
+
+    鑰岃繖涓夌櫨骞存潵鎷涙敹鐨勪紬澶氬ぉ鍏靛ぉ灏嗗嵈鏃╁凡鍌荤溂锛岃繖涓汉鏄皝锛熶笉鏄湪鍋氭ⅵ鍚э紝澶╁涵涔嬩富鍙跺嚒涓嶆槸鏃╁凡鎴樻浜嗗悧锛屼妇涓栫殕鐭ワ紒
+
+    鈥滅湡鐨勬槸浠栵紝鏄垜浠ぉ搴様鏃ユ垬姝荤殑閭ｄ綅锛熲��
+
+    浼椾汉鍝楃劧锛屽ぉ鍏靛ぉ灏嗛兘瑙夊緱涓嶅彲鎬濊銆傛病鏈夋瘮杩欐洿璁╀汉鎯婅鐨勪簡锛屽彲鏄溂鍓嶇殑浜虹湡鐨勪笌閭ｇ煶鍍忎竴妯′竴鏍枫��
+
+    鈥滃彾鍑♀�︹�︹�濆К绱湀鑴镐笂鎸傛弧浜嗘唱姘达紝璧ょ潃娲佺櫧鏅惰幑鐨勭帀瓒筹紝璺岃穼鎾炴挒锛屽啿浜嗚繃鏉ャ��
+
+    娉按妯＄硦浜嗗ス鐨勫弻鐪硷紝杩樿寰楅偅涓�澶┿�傚彾鍑″媺寮轰竴绗戯紝鍚屽ス鍛婂埆锛岃�屽悗姣呯劧鍐插悜浜嗘槦绌烘椂鐨勬儏鏅��
+
+    璧扮殑鏄偅涔堢殑鍧氬喅锛屼粬鏄庣煡蹇呮杩樻槸鍘讳簡锛岃儗褰卞緢鎸虹洿锛屾病鏈夊洖澶达紝浣嗗ス鍗寸湅鍒颁簡璁稿鐨勪笉鑸嶃��
+
+    鎯虫潵浠栭偅鏃惰偗瀹氱煡閬擄紝鍐嶅洖澶存椂锛屽彲鑳藉氨浼氬繊涓嶄綇鐣欎笅锛屾墍浠ラ偅鑸殑鏋滄柇锛岄偅鑸殑鏃犳儏锛屼竴鍘诲氨鏄棤鍥炶矾銆�
+
+    鏋滅湡濡傛锛屼粬璧颁笂鐨勬槸涓�鏉″鐙�屾敞瀹氫細濡傜儫鑺辫埇缁芥斁鐨勬璺紝鏈�缁堜簬瀹囧畽涓噴鏀捐嚜宸憋紝绮夎韩纰庨锛岃婧呰嚦灏婃垬鍦恒��
+
+    涓�鍒氨鏄笁鐧惧勾锛屼竴鍒氨鏄案杩滐紝浠ュ懡鍋氳祵娉紝璁╁ス瀵瑰鎮叉垰锛屾湜娈嬫湀鑰岃惤娉紝姣忎竴涓湁鏄熻景鐨勫鏅氶兘鏄ス閬ユ湜鏃讹紝璁や负鍙跺嚒灏卞湪閭ｆ槦绌虹殑褰煎哺锛岄粯榛樺湴鍦ㄦ敞瑙嗭紝姝ｅ湪鍔姏鎸ｆ墡锛屼粠榛戞殫涓洖鏉ワ紝缁堜細涓庡ス鐩歌銆�
+
+    涓�姊︿笁鐧惧勾锛岃�屼粖鐪熺殑鐩歌浜嗭紝濂规�曟槸骞诲涓�鍦猴紝濡傞偅涓�涓釜澶滄櫄锛屼粠姊︿腑鎯婇啋锛屾灂杈瑰彧鏈夋唱鐥曪紝渚濈劧瀛ゅ噳銆�
+
+    鈥滀笉鏄ⅵ锛屼笉鏄ⅵ锛屾槸鐪熺殑锛岃繖娆′竴瀹氭槸鐪熺殑銆傗�濆ス棰ゆ姈鐫�锛屽杻鍠冪潃锛岃媿鐧界殑棰滐紝澶卞幓琛�鑹茬殑鎵嬫寚锛岃交瑙﹀彾鍑＄殑鑴搞��
+
+    鈥滄槸鎴戔�︹�︽垜鍥炴潵浜嗭紒鈥濆彾鍑℃姄浣忛偅鍙緢鍑夌殑绾ゆ墜銆�
+
+    濮传鏈堣交鎶氬彾鍑＄殑鑴革紝纭涓嶆槸姊﹀鍚庯紝缁堜簬鏄斁澹板ぇ鍝紝璁╀汉涓轰箣蹇冮吀銆�
+
+    浼椾汉杩庡彾鍑¤繘鍏ヤ簡澶╁涵锛岃繖鐗囧ぉ鍩熻�屼粖寰堝箍琚わ紝鎭掑彜闀垮瓨鐨勫ぇ闄嗘紓娴畤瀹欎腑锛屼竴棰楀張涓�棰楀ぇ鏄熼棯鑰�銆�
+
+    澶╀箣鏉戯紝涓庢潙娌℃湁浜嗗叧绯伙紝鑰屼粖涓�搴у張涓�搴ф诞宀涳紝鑺遍楦熻锛岄鐎戞祦娉夛紝涓�閬撻亾閾惰姃浠庣宀涗笂鍨備笅锛岃惤鍦ㄤ笅鏂圭殑澶у湴涓娿��
+
+    杩欓噷鏅壊寰堢編锛岃�屼篃涓嶅け搴勯噸锛岄偅涓�搴у骇澶╁锛屼竴鐗囩墖宸ㄩ槞锛屽穽宄ㄨ�岀绀淬��
+
+    杞帮紒
+
+    涓�鍙ｅぇ榧庤惤涓嬶紝涓囩墿鍒濆锛屾贩娌屽鍔紝鐜勯粍鍨傝惤锛岀缃╁湪鍙跺嚒鐨勫ご椤朵笂鏂癸紝璁╀粬鐪嬭捣鏉ユ湁涓�绉嶈帿鍚嶇殑姘旈煹銆�
+
+    涓囩墿姣嶆皵榧庡嚭鐜帮紝瀹冨湪鍝�楦ｏ紝鍦ㄩⅳ鍔紝浜庡彾鍑＄殑澶翠笂娌夋诞锛岃〃杈剧鍒笁鐧惧勾鐨勫枩鎬掑搥鎰併��
+
+    鍙跺嚒鎯婅锛屼紬浜轰篃閮介湶鍑烘儕瀹癸紝閭ｉ紟鍙ｅ唴鏈夋櫠鑾圭殑娑蹭綋鍦ㄦ穼锛屼竴鏉℃潯銆佷竴閬撻亾濡傞摱娌抽偅涔堟矇閲嶃��
+
+    鈥滆繖鏄棤绌锋棤灏界殑淇′话涔嬪姏锛佲��
+
+    寰堝浜洪兘闇囨儕锛岃繛浠栦滑杩囧幓閮戒笉鏇炬敞鎰忋��
+
+    鍙湁榛戠殗銆侀綈缃楃瓑灏戞暟鍑犱釜鏇捐鍒拌繃锛屼簬娣卞鏃跺垎锛屽ぇ鍧熷墧閫忥紝瀹涜嫢閽荤煶锛屼粠鏄熺┖涓帴寮曟潵涓濅笣缂曠紩鐨勫厜銆�
+
+    涓�鐬棿锛屼紬浜哄氨鏄庣櫧浜嗘�庝箞鍥炰簨浜嗭紝褰撳勾琛�鎴樿繃鍚庯紝鏄熺┖涓緢澶氫汉閮藉湪蹇垫垬姝荤殑浜烘澃鐨勫ソ锛岃嚜鐒朵細浜х敓鏃犲敖纾呯ご鐨勫康鍔涖��
+
+    鑰屾様鏃ワ紝鍙跺嚒鍦ㄥ鐞嗕俊浠颁箣鍔涙椂锛岄兘鏄洿鎺ユ敞鍏ラ紟涓紝浣嗗嚒鏈夋劅锛屽繀鐒剁撼鍏ュ湪杩欓噷闈€��
+
+    涓夌櫨骞存潵锛屾簮婧愪笉鏂紝鏃犵┓鏃犲敖锛屼絾鍑″湪蹇典粬鍚嶅瓧鐨勪汉鎵�璇炲嚭鐨勫康鍔涖�傞兘璺ㄨ秺鏄熺┖锛岃懍鍏ヤ簡榧庡唴銆�
+
+    杩欐槸婊℃弧涓�榧庣殑蹇靛姏锛屽姹磱鍦ㄦ秾鍔紝鏅惰幑浼奸捇浼兼按銆傝�屼笖杩樹笉鏇炬浣忥紝姣忔棩渚濈劧鏈夋棤褰㈢殑蹇靛姏娑屾潵锛屼細瓒婅仛瓒婂銆�
+
+    鈥滆繖鈥︹�﹂鍏堜簡灏忓崐姝ワ紒鈥濋粦鐨囨儕鍙广��
+
+    姣忎竴浣嶈嚦灏婃垚閬撳悗閮戒細鍚嶅姩瀹囧畽鍏崚锛岃鍚勬棌鏁晱涓庝紶鍞憋紝浠栦滑蹇呯劧浼氬洜姝よ�屾敹闆嗗埌鏃犵┓鐨勫康鍔涳紝鍔犳寔鍦ㄥ櫒鐗╀笂锛屼細璁╁畠閫氬ぉ閫氱銆傝�屽康鍔涗害鍙撼鍏ュ繁韬腑锛屼篃鏈夋棤灏藉鐢ㄣ��
+
+    鑷充簬澶у笣浠埌搴曟�庢牱澶勭悊浜嗕俊浠颁箣鍔涳紝鍒欐槸鍚勪笉鐩稿悓锛屼篃闅句互璇存竻銆�
+
+    鍙跺嚒涓嶆浘鎴愰亾锛屽嵈鏈変簡涓嶇畻灏戠殑淇′话涔嬪姏锛岃繖鍙互璇存槸鏃╄繄鍑轰簡灏忓崐姝ワ紝铏界劧浠栦笉鎰垮�熻繖绉嶅姏閲忥紝浣嗘�绘瘮娌℃湁寮恒��
+
+    鍙跺嚒娲荤潃鍥炴潵浜嗐�傛秷鎭儚鏄暱浜嗙繀鑶�涓�鑸鍚戣繙鏂癸紝闇囧姩浜嗘槦绌猴紝鍥涙柟鐨嗘儕锛�
+
+    鑰屽敮涓�鐪熻矾鍓嶃�傚笣鍏充腑涔熺粓浜庝紶閫掑嚭浜嗘秷鎭紝鎭板ソ璇佸疄浜嗚繖涓�浼犺█锛岃鍚勫煙寮鸿�呴兘鎯婄殑寮犲彛缁撹垖銆�
+
+    鈥滄椿鐫�鈥︹�﹀嚭鐜颁簡锛佲��
+
+    鍚勫湴閮藉湪浼犺鍙跺嚒鐨勫悕锛岃�屼粖浠栨椿鐫�鍐嶇幇浜洪棿锛岃浜轰滑瑙夊緱涓嶅彲鎬濊锛岃繖鏄竴涓杩癸紒
+
+    鍦ㄤ笌鑷冲皧鐨勪竴鎴樹腑锛屼粬鐖嗕綋鑰屼骸锛岃幑鐧介鍧楃矘鐫�琛�涓濆洓灏勶紝鎴樺悗浜轰滑鏇句粠澶у畤瀹欎腑鎴彇鍒拌繖鏍风殑鐪熷疄鐑欏嵃纰庣墖銆�
+
+    杩欑粷涓嶆槸鍋囩殑锛屾�庝箞鍙堟椿浜嗭紵鍚勫湴鍝楃劧銆傝璁虹悍绾凤紝鍙兘褰掔粨涓哄彾鍑＄湡鐨勬槸閫嗗ぉ浜嗭紒
+
+    鏈堝崕濡傛按锛屾槦杈夌伩鐑傦紝鍙跺嚒涓庡К绱湀婕澶╁涵涓紝浜戦浘涓婏紝涓�搴у骇鐞兼ゼ鐜夊畤鐭楃珛銆傜湅璧锋潵鍒嗗椋樻负銆佺伒鍔ㄣ��
+
+    鈥滄櫄瀹村紑濮嬪柦锛佲��
+
+    杩滃浼犳潵鑺辫姳鐨勭牬閿ｅ棑瀛愬０锛屾儕濂囬笩闆�鏃犳暟锛屼粬鍔ㄧ敤浜嗛緳鍚熻檸鍟稿姛锛岄渿鐨勫ぉ搴悇鍦伴兘鍦ㄨ桨楦ｃ��
+
+    澶у鐨囧瓙鍏勫鏉ヤ簡锛屽閫搁鍒颁簡锛屽惔涓ぉ銆佸鎬�浠佷笌鍗佷笁澶у瘒涓椿鐫�鐨勪釜鍒汉椹句复锛屽皬濠峰┓鐒︽�ョ殑椋炴潵浜嗭紝浜洪瓟涓滄柟澶竴鑰佺埛瀛愬嚭鐜颁簡銆佺懚姹犲湥濂宠刀鑷斥�︹��
+
+    澶鐨勪汉锛屾暟涔嬩笉灏斤紝鍑犳棩闂存秷鎭紶閬嶅悇鍦帮紝寰堝鏁呬汉閮借法瓒婃槦绌鸿�屾潵锛�
+
+    鏇剧粡杩介殢杩囧彾鍑＄殑鍗佷簩鍦ｈ�咃紝娲讳笅鏉ョ殑浜虹洰鍓嶅湪涓�鍩熺О灏婁綔绁栵紝浠栦滑鍑犱箮閮藉崟澶勪竴鐗囨槦绌轰腑锛屽紑鎷撶枂鍩燂紝鏄ぉ搴腑鏈�寮哄ぇ鐨勪竴鎵逛汉鐗┿��
+
+    榫欓┈涓�澹板拞鍝紝绗竴鏃堕棿鍛煎敜浼椾汉鍐嶈仛棣栵紝涓�鍚岃笍鏄熺┖鑰屾潵锛岃繖浜涗汉涓�涓釜鏃╁凡濞佸悕璧但銆�
+
+    姣斿榫欓┈锛屽畠鍦ㄦ煇涓�鍩熺洿鎺ュ皝鐜嬩簡锛屾浘浼欏悓榛戠殗涓�璧峰潙璐ユ棤灏藉己鏁岋紝鏇存槸鏇句紮鍚屾寰锋寲浜嗘棤灏藉ぇ鍧熴��
+
+    瀹冪殑濞佸悕锛屽灏戞湁鐐硅浜烘劋鎭ㄣ��
+
+    鍙︿竴涓己鍔跨殑浜虹墿鍒欐槸澶ч箯鐜嬶紝涔熷湪涓�鍩熷皝涓哄ぉ搴殑涓�閮ㄧ鐜嬶紝鎴樺姏鎯婁笘銆傚綋骞村彾鍑′簬鑿╂彁鏍戜笅鎮熼亾锛岃繖鍙ぇ楣忚惤鍦ㄥ彾鍑＄殑鑲╁ご锛屼篃鍥犳鑰屾劅鎮熷嚭浜嗚嚜宸辩殑澶ч箯鐜嬫嫵锛岃�屼粖棰囨湁鎵撶牬鏄熺┖鏃犲鎵嬩箣鍙广��
+
+    鈥滄潵鏉ユ潵锛屽皾灏濇垜鐚庢潵鐨勮繖鏉￠噹榫欙紝鍛崇編姹佸锛屽疄涔冧汉闂存瀬鑷翠匠鑲达紒鈥濅笢鏂归噹**鐫�涓婂崐韬紝浠ラ亾鐏儳鐑や竴鏉￠暱杈句笁鐧句笀鐨勮洘榫欙紝涓婇潰娲掗亶浜嗙伒瀹濆ぉ灏婄殑鍛芥硥绁炴恫锛屾鏃剁儰鐨勯噾榛勬补浜紝棣欐皵鎵戦蓟锛屽紩浜洪鎸囧ぇ鍔ㄣ��
+
+    鈥滃彲鎯滐紝澶皯浜嗭紝涓嶅濉炵墮缂濄�傗�濅汉榄旇�佺埛瀛愬挄鍝濄��
+
+    浼椾汉鐭冲寲銆�
+
+    寰堝浜烘潵姝よ仛棣栵紝浣嗘瘮涔嬩笁鐧惧勾鍓嶇粓鏄皯浜嗕竴浜涳紝閭ｅ満鍔ㄤ贡涓湁澶鐨勪汉姝讳簬闈炲懡锛屽崄涓夊ぇ瀵囧樊鐐圭伃缁濓紝鍙墿涓嬩簡涓や笁浜恒��
+
+    鑰岄偅涓�涓椂浠ｇ殑淇婂溅锛屾洿鏄皯浜嗗お澶氾紝涓嶅皯浜哄啀涔熶笉鍙兘鍑虹幇浜嗭紝杩炰竴浜涘湥鍦伴兘姘歌繙鐨勯櫎鍚嶄簡銆�
+
+    鈥滄潵锛屽皾灏濇垜鐨勯緳槌呴矞姹わ紝缁濆鏄笘闂村ぇ琛ワ紒鈥濋緳椹彨鍤烽亾銆�
+
+    榫欓硡锛屽舰濡傜湡榫欙紝鍙湁涓�灏哄闀匡紝钑村惈澶╁湴绮惧崕锛屾槸涓�绉嶅ぇ琛ヨ嵂锛屼笌涓�浜涚鑽夊悎鍦ㄤ竴璧锋番鐐硷紝鍙互寤跺懡鏁扮櫨骞达紝缁濆鏄笘闂存渶绋�鐝嶇殑涓滆タ銆�
+
+    鐟舵睜鍦ｅコ绁炶壊涓�婊烇紝涓嶄箙鍓嶇懚姹犳柊鍧�涓湁璐间汉鍋疯煚妗冧笉鎴愶紝椤烘墜鐩楄蛋涓�鏉￠緳槌咃紝鑰屼粖鍏冨嚩缁堜簬娴嚭姘撮潰浜嗐��
+
+    鈥滃搸鍛﹀樋锛岃繖涓嶆槸鎴戝伔鐨勶紝鏄粠娈靛痉閭ｉ噷杩涚殑璐э紝鎴戞槸娓呯櫧鐨勶紝浠樺嚭浜嗛緳椹竴鏃忕殑娉曡瘈浠ュ強濡栫殗澶т汉鐨勫崐閮ㄥ彜缁忔墠浜ゆ崲鍒版墜鐨勩�傗�濋緳椹В閲娿��
+
+    鏇剧粡涓庢寰风嫾鐙堜负濂革紝鍋氳繃涓嶅皯澶ф鐨勯粦鐨囨湁鐐瑰績铏氾紝杞Щ璇濋锛岀洴浣忎簡闅忓彾鍑′竴鍚屼粠甯濆叧鍥炴潵鐨勮楦︼紝閬擄細鈥滄垜璇达紝杩欓腑瀛愪笉閿欙紝姣涜繖涔堢孩锛岃窡鐏偔浼肩殑锛岃偗瀹氭槸琛ヨ鍏婚鐨勫湥鍝併�傗��
+
+    琛�楦﹀ぇ鎬掞紝姝ら甫闈炲郊楦紝鑰屼笖韬负澶у湥锛屾�庝箞琚鎴愰鏉愪簡锛屽綋鍦哄樊鐐归椆涓甫椋炵嫍璺炽��
+
+    鈥滃洝鍥￠タ浜嗭紝澶у摜鍝ュ湪鍝噷鈥︹�︹��
+
+    灏卞湪杩欐椂锛屼竴涓笁宀佸乏鍙崇殑灏忓コ瀛╋紝鎶辩潃涓�涓竷濞冨▋锛屼竴杈硅糠绯婄殑鎻夊ぇ鐪间竴杈硅蛋浜嗚繃鏉ワ紝绮捐嚧鐨勫儚涓摲濞冨▋銆�
+
+    姝ｆ槸灏忓洝鍥★紝鎵�鏈変汉閮界煶鍖栵紝灏ゅ叾鏄粦鐨囷紝涓�澹板ぇ鍙悗蹇�熷啿浜嗚繃鍘汇��
  */
 </script>

--
Gitblit v1.9.3