Merge branch 'dev_Miaojiale' into dev

dcacef75 · miaojiale · 5e7c0a12 · f9bca93c · dcacef75 · dcacef75
Commit dcacef75 authored Mar 09, 2023 by miaojiale
46 changed files
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
    "core-js": "^3.6.5",
    "crypto-js": "^4.0.0",
    "dayjs": "^1.8.28",
-    "echarts": "^5.1.2",
+    "echarts": "4.8.0",
    "element-ui": "^2.15.2",
    "js-cookie": "^2.2.1",
    "jsbarcode": "^3.11.5",
@@ -33,6 +33,7 @@
    "lodash": "^4.17.15",
    "monaco-editor": "^0.23.0",
    "nprogress": "^0.2.0",
+    "pdfjs-dist": "2.5.207",
    "qrcodejs2": "^0.0.2",
    "qs": "^6.9.4",
    "screenfull": "^5.0.2",

--- a/public/ppt的pdf.pdf
+++ b/public/ppt的pdf.pdf
--- a/public/特约讲师合作协议.pdf
+++ b/public/特约讲师合作协议.pdf
--- a/src/api/patient.js
+++ b/src/api/patient.js
@@ -43,6 +43,15 @@ export function addPatient(data = {}, type = "") {
  })
 }

+// 随访录入
+export function addFollowPatient(data = {}, type = "") {
+  return request({
+    url: `/disease-data/data/patient/follow/${type}`,
+    method: "post",
+    data,
+  })
+}
+
 // 删除草稿
 export function deletePatient(data) {
  return request({

--- a/src/api/qualitycontrol-report.js
+++ b/src/api/qualitycontrol-report.js
+import request from "@/utils/request"
+
+/* 质控报表 */
+
+// 审核员列表
+export function checkerQuality(params = {}) {
+  return request({
+    url: "/disease-data/data/report/checker/quality",
+    method: "get",
+    params,
+  })
+}
+// 管理员列表
+export function adminQuality(params = {}) {
+  return request({
+    url: "/disease-data/data/report/admin/quality",
+    method: "get",
+    params,
+  })
+}
--- a/src/api/screeningAudit.js
+++ b/src/api/screeningAudit.js
@@ -53,11 +53,11 @@ export function saveSysCheckNote(data = {}) {
  })
 }

-// //修改筛查病例审核意见
-// export function putFollowCheckAdvice(data = {}) {
-//   return request({
-//     url: "/disease-data/dataCheck/follow/check/advice",
-//     method: "put",
-//     data,
-//   })
-// }
+//修改筛查病例审核意见
+export function putScreeningCheckAdvice(data = {}) {
+  return request({
+    url: "/disease-data/dataCheck/screening/check/advice",
+    method: "put",
+    data,
+  })
+}
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -175,3 +175,27 @@ export function getLogPage(params = {}) {
    params,
  })
 }
+// 用户管理启用禁用
+export function baseEnable(params = {}) {
+  return request({
+    url: "/cloud-upms/user/base/enable",
+    method: "get",
+    params,
+  })
+}
+// 获取消息列表
+export function getMessage(params = {}) {
+  return request({
+    url: "/disease-data/sys/message/list",
+    method: "get",
+    params,
+  })
+}
+// 获取驳回修改消息
+export function getRefuteMessage(params) {
+  return request({
+    url: `/disease-data/sys/message/remind/${params}`,
+    method: "get",
+    params,
+  })
+}
--- a/src/assets/json/china.json
+++ b/src/assets/json/china.json
+{"type":"FeatureCollection","features":[{"type":"Feature","id":"710000","properties":{"id":"710000","cp":[121.509062,24.044332],"name":"台湾","childNum":6},"geometry":{"type":"MultiPolygon","coordinates":[["@@°Ü¯Û"],["@@ƛĴÕƊÉɼģºðʀ\\ƎsÆNŌÔĚänÜƤɊĂǀĆĴĤǊŨxĚĮǂƺòƌâÔ®ĮXŦţƸZûÐƕƑGđ¨ĭMó·ęcëƝɉlÝƯֹÅŃ^Ó·śŃǋƏďíåɛGɉ¿@ăƑ¥ĘWǬÏĶŁâ"],["@@\\p|WoYG¿¥Ij@¢"],["@@¡@V^RqBbAnTXeRz¤L«³I"],["@@ÆEEkWqë @"],["@@fced"],["@@¯ɜÄèaì¯ØǓIġĽ"],["@@çûĖëĄhòř "]],"encodeOffsets":[[[122886,24033]],[[123335,22980]],[[122375,24193]],[[122518,24117]],[[124427,22618]],[[124862,26043]],[[126259,26318]],[[127671,26683]]]}},{"type":"Feature","id":"130000","properties":{"id":"130000","cp":[114.502461,38.045474],"name":"河北","childNum":3},"geometry":{"type":"MultiPolygon","coordinates":[["@@o~Z]ªrºc_ħ²G¼s`jÎŸnüsÂłNX_M`Ç½ÓnUKĜēs¤©yrý§uģcJe"],["@@U`Ts¿mÂ"],["@@oºƋÄdeVDJj£J|ÅdzÂFt~KŨ¸IÆv|¢r}èonb}`RÎÄn°ÒdÞ²^®lnÐèĄlðÓ×]ªÆ}LiĂ±Ö`^°Ç¶p®đDcŋ`ZÔ¶êqvFÆN®ĆTH®¦O¾IbÐã´BĐɢŴÆíȦpĐÞXR·nndO¤OÀĈƒQgµFo|gȒęSWb©osx|hYhgŃfmÖĩnºTÌSp¢dYĤ¶UĈjlǐpäìë|³kÛfw²Xjz~ÂqbTÑěŨ@|oMzv¢ZrÃVw¬ŧĖ¸f°ÐTªqs{S¯r æÝlNd®²Ğ ǆiGĘJ¼lr}~K¨ŸƐÌWöÆzR¤lêmĞLÎ@¡|q]SvKÑcwpÏÏĿćènĪWlĄkT}J¤~ÈTdpddʾĬBVtEÀ¢ôPĎƗè@~kü\\rÊĔÖæW_§¼F´©òDòjYÈrbĞāøŀG{ƀ|¦ðrb|ÀH`pʞkvGpuARhÞÆǶgĘTǼƹS£¨¡ù³ŘÍ]¿ÂyôEP xX¶¹ÜO¡gÚ¡IwÃé¦ÅBÏ|Ç°N«úmH¯âDùyŜŲIÄuĐ¨D¸dɂFOhđ©OiÃ`ww^ÌkÑH«ƇǤŗĺtFu{Z}Ö@U´ʚLg®¯Oı°Ãw ^VbÉsmAê]]w§RRl£ȭµu¯b{ÍDěïÿȧuT£ġěŗƃĝQ¨fVƋƅna@³@ďyÃ½IĹÊKŭfċŰóxV@tƯJ]eR¾fe|rHA|h~Ėƍl§ÏlTíb ØoÅbbx³^zÃĶ¶Sj®AyÂhðk`«PËµEFÛ¬Y¨Ļrõqi¼Wi°§Ð±´°^[À|ĠO@ÆxO\\ta\\tĕtû{ġȧXýĪÓjùÎRb^ÎfK[ÝděYfíÙTyuUSyŌŏů@Oi½éŅaVcř§ax¹XŻácWU£ôãºQ¨÷Ñws¥qEHÙ|šYQoŕÇyáĂ£MÃ°oťÊP¡mWO¡v{ôvîēÜISpÌhp¨ jdeŔQÖjX³àĈ[n`Yp@UcM`RKhEbpŞlNut®EtqnsÁgAiúoHqCXhfgu~ÏWP½¢G^}¯ÅīGCÑ^ãziMáļMTÃƘrMc|O_¯Ŏ´|morDkO\\mĆJfl@cĢ¬¢aĦtRıÒ¾ùƀ^juųœKUFyƝīÛ÷ąV×qƥV¿aȉd³BqPBmaËđŻģmÅ®V¹d^KKonYg¯XhqaLdu¥Ípǅ¡KąÅkĝęěhq}HyÃ]¹ǧ£Í÷¿qáµ§g¤o^á¾ZE¤i`ĳ{nOl»WÝĔįhgF[¿¡ßkOüš_ūiǱàUtėGyl}ÓM}jpEC~¡FtoQiHkk{Ãmï"]],"encodeOffsets":[[[119712,40641]],[[121616,39981]],[[116462,37237]]]}},{"type":"Feature","id":"140000","properties":{"id":"140000","cp":[111.849248,36.857014],"name":"山西","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@ÞĩÒSra}ÁyWix±Üe´lèßÓǏokćiµVZģ¡coTSË¹ĪmnÕńehZg{gtwªpXaĚThȑp{¶Eh®RćƑP¿£Pmc¸mQÝWďȥoÅîɡųAďä³aÏJ½¥PGąSMEÅruµéYÓŌ_dĒCoÈµ]¯_²ÕjāK~©ÅØ^ÔkïçămÏk]±cÝ¯ÑÃmQÍ~_apm~ç¡qu{JÅŧ·Ls}EyÁÆcI{¤IiCfUcƌÃp§]ě«vD@¡SÀµMÅwuYY¡DbÑc¡h×]nkoQdaMç~eDÛtT©±@¥ù@É¡ZcW|WqOJmĩl«ħşvOÓ«IqăV¥D[mI~Ó¢cehiÍ]Ɠ~ĥqX·eƷn±}v[ěďŕ]_œ`¹§ÕōIo©bs^}Ét±ū«³p£ÿ·Wµ|¡¥ăFÏs×¥ŅxÊdÒ{ºvĴÎêÌɊ²¶ü¨|ÞƸµȲLLúÉƎ¤ϊęĔV`_bªS^|dzY|dz¥pZbÆ£¶ÒK}tĦÔņƠPYznÍvX¶Ěn ĠÔzý¦ª÷ÑĸÙUȌ¸dòÜJð´ìúNM¬XZ´¤ŊǸ_tldI{¦ƀðĠȤ¥NehXnYGR° ƬDj¬¸|CĞKqºfƐiĺ©ª~ĆOQª ¤@ìǦɌ²æBÊTŸʂōĖĴŞȀÆÿȄlŤĒötÎ½î¼ĨXh|ªM¤Ðz"],"encodeOffsets":[[116874,41716]]}},{"type":"Feature","id":"150000","properties":{"id":"150000","cp":[111.670801,41.818311],"name":"内蒙古","childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@¯PqFB|S³C|kñHdiÄ¥sŉÅPóÑÑE^ÅPpy_YtShQ·aHwsOnŉÃs©iqjUSiº]ïW«gW¡ARë¥_sgÁnUI«m]jvV¼euhwqAaW_µj»çjioQR¹ēÃßt@r³[ÛlćË^ÍÉáGOUÛOB±XkÅ¹£k|e]olkVÍ¼ÕqtaÏõjgÁ£§U^RLËnX°ÇBz^~wfvypV ¯ƫĉ˭ȫƗŷɿÿĿƑ˃ĝÿÃǃßËőó©ǐȍŒĖM×ÍEyxþp]ÉvïèvƀnÂĴÖ@V~Ĉv¦wĖtējyÄDXÄxGQuv_i¦aBçw˛wD©{tāmQ{EJ§KPśƘƿ¥@sCTÉ}ɃwƇy±gÑ}T[÷kÐç¦«SÒ¥¸ëBX½HáÅµÀğtSÝÂa[ƣ°¯¦Pï¡]£ġÒk®G²èQ°óMq}EóƐÇ\\@áügQÍu¥FTÕ¿Jû]|mvāÎYua^WoÀa·ząÒot×¶CLƗi¯¤mƎHǊ¤îìɾŊìTdåwsRÖgĒųúÍġäÕ}Q¶¿A[¡{d×uQAMxVvMOmăl«ct[wº_ÇÊjbÂ£ĦS_éQZ_lwgOiýe`YYLq§IÁǳ£ÙË[ÕªuƏ³ÍTs·bÁĽäė[b[ŗfãcn¥îC¿÷µ[ŏÀQōĉm¿Á^£mJVmL[{Ï_£F¥Ö{ŹA}×Wu©ÅaųĳƳhB{·TQqÙIķËZđ©Yc|M¡LeVUóK_QWk_ĥ¿ãZ»X\\ĴuUèlG®ěłTĠğDŃOrÍdÆÍz]±ŭ©Å]ÅÐ}UË¥©TċïxgckfWgi\\ÏĒ¥HkµEë{»ÏetcG±ahUiñiWsɁ·cCÕk]wȑ|ća}wVaĚá G°ùnM¬¯{ÈÐÆA¥ÄêJxÙ¢hP¢ÛºµwWOóFÁz^ÀŗÎú´§¢T¤ǻƺSėǵhÝÅQgvBHouʝl_o¿Ga{ïq{¥|ſĿHĂ÷aĝÇqZñiñC³ª»E`¨åXēÕqÉû[l}ç@čƘóO¿¡FUsAʽīccocÇS}£IS~ălkĩXçmĈŀÐoÐdxÒuL^T{r@¢ÍĝKén£kQyÅõËXŷƏL§~}kq»IHėǅjĝ»ÑÞoå°qTt|r©ÏS¯·eŨĕx«È[eM¿yupN~¹ÏyN£{©għWí»Í¾səšǅ_ÃĀɗ±ąĳĉʍŌŷSÉA±åǥɋ@ë£R©ąP©}ĹªƏj¹erLDĝ·{i«ƫC£µsKCGS|úþXgp{ÁX¿ć{ƱȏñZáĔyoÁhA}ŅĆfdŉ_¹Y°ėǩÑ¡H¯¶oMQqð¡Ë|Ñ`ƭŁX½·óÛxğįÅcQs«tȋǅFù^it«Č¯[hAi©á¥ÇĚ×l|¹y¯YȵƓñǙµïċĻ|Düȭ¶¡oŽäÕG\\ÄT¿Òõr¯LguÏYęRƩɷŌO\\İÐ¢æ^Ŋ ĲȶȆbÜGĝ¬¿ĚVĎgª^íu½jÿĕęjık@Ľ]ėl¥ËĭûÁėéV©±ćn©ȇÍq¯½YÃÔŉÉNÑÅÝy¹NqáʅDǡËñƁYÅy̱os§ȋµʽǘǏƬɱàưN¢ƔÊuľýľώȪƺɂļxZĈ}ÌŉŪĺœĭFЛĽ̅ȣͽÒŵìƩÇϋÿȮǡŏçƑůĕ~Ç¼ȳÐUfdIxÿ\\G zâɏÙOº·pqy£@qþ@Ǟ˽IBäƣzsÂZÁàĻdñ°ŕzéØűzșCìDȐĴĺf®Àľưø@ɜÖÞKĊŇƄ§͑těï͡VAġÑÑ»d³öǍÝXĉĕÖ{þĉu¸ËʅğU̎éhɹƆ̗̮ȘǊ֥ड़ࡰţાíϲäʮW¬®ҌeרūȠkɬɻ̼ãüfƠSצɩςåȈHϚÎKǳͲOðÏȆƘ¼CϚǚ࢚˼ФÔ¤ƌĞ̪Qʤ´¼mȠJˀƲÀɠmǐnǔĎȆÞǠN~ʢĜ¶ƌĆĘźʆȬ˪ĚĒ¸ĞGȖƴƀj`ĢçĶāàŃºēĢĖćYÀŎüôQÐÂŎŞǆŞêƖoˆDĤÕºÑǘÛˤ³̀gńƘĔÀ^ªƂ`ªt¾äƚêĦĀ¼ÐĔǎ¨Ȕ»͠^ˮÊȦƤøxRrŜH¤¸ÂxDÄ|ø˂˜ƮÐ¬ɚwɲFjĔ²Äw°ǆdÀÉ_ĸdîàŎjÊêTĞªŌŜWÈ|tqĢUB~´°ÎFCU¼pĀēƄN¦¾O¶łKĊOjĚj´ĜYp{¦SĚÍ\\T×ªV÷Ší¨ÅDK°ßtŇĔK¨ǵÂcḷ̌ĚǣȄĽFlġUĵŇȣFʉɁMğįʏƶɷØŭOǽ«ƽū¹Ʊő̝Ȩ§ȞʘĖiɜɶʦ}¨֪ࠜ̀ƇǬ¹ǨE˦ĥªÔêFxúQEr´Wrh¤Ɛ \\talĈDJÜ|[Pll̚¸ƎGú´P¬W¦^¦H]prRn|or¾wLVnÇIujkmon£cX^Bh`¥V¦U¤¸}xRj[^xN[~ªxQ[`ªHÆÂExx^wN¶Ê|¨ìMrdYpoRzNyÀDs~bcfÌ`L¾n|¾T°c¨È¢ar¤`[|òDŞĔöxElÖdHÀI`Ď\\Àì~ÆR¼tf¦^¢ķ¶eÐÚMptgjɡČÅyġLûŇV®ÄÈƀĎ°P|ªVVªj¬ĚÒêp¬E|ŬÂc|ÀtƐK f{ĘFĒƌXƲąo½Ę\\¥o}Ûu£çkX{uĩ«āíÓUŅßŢqŤ¥lyň[oi{¦LńðFȪȖĒL¿Ìf£K£ʺoqNwğc`uetOj×°KJ±qÆġmĚŗos¬qehqsuH{¸kH¡ÊRǪÇƌbȆ¢´äÜ¢NìÉʖ¦â©Ġu¦öČ^â£ĂhĖMÈÄw\\fŦ°W ¢¾luŸDw\\̀ʉÌÛMĀ[bÓEn}¶Vcês"]],"encodeOffsets":[[[129102,52189]]]}},{"type":"Feature","id":"210000","properties":{"id":"210000","cp":[123.429096,41.796767],"name":"辽宁","childNum":16},"geometry":{"type":"MultiPolygon","coordinates":[["@@L@@sa"],["@@MnNm"],["@@dc"],["@@eÀC@b"],["@@fXwkbrÄ`qg"],["@@^jtWQ"],["@@~ Y]c"],["@@G`ĔN^_¿ZÃM"],["@@iX¶BY"],["@@YZ"],["@@L_{Epf"],["@@^WqCT\\"],["@@\\[§t|¤_"],["@@m`n_"],["@@Ïxǌ{q_×^Giip"],["@@@é^BntaÊU]x ¯ÄPĲ°hʙK³VÕ@Y~|EvĹsÇ¦L^pÃ²ŸÒG Ël]xxÄ_fT¤Ď¤cPC¨¸TVjbgH²sdÎdHt`B²¬GJję¶[ÐhjeXdlwhðSČ¦ªVÊÏÆZÆŶ®²^ÎyÅÎcPqńĚDMħĜŁHkçvV[ĳ¼WYÀäĦ`XlR`ôLUVfK¢{NZdĒªYĸÌÚJRr¸SA|ƴgŴĴÆbvªØX~źB|¦ÕE¤Ð`\\|KUnnI]¤ÀÂĊnŎR®Ő¿¶\\ÀøíDm¦ÎbŨabaĘ\\ľãÂ¸atÎSƐ´©v\\ÖÚÌǴ¤Â¨JKrZ_ZfjþhPkx`YRIjJcVf~sCN¤ EhæmsHy¨SðÑÌ\\\\ĐRZk°IS§fqŒßýáĞÙÉÖ[^¯ǤŲê´\\¦¬ĆPM¯£»uïpùzExanµyoluqe¦W^£ÊL}ñrkqWňûPUP¡ôJoo·U}£[·¨@XĸDXmÛÝºGUCÁª½{íĂ^cjk¶Ã[q¤LÉö³cux«zZf²BWÇ®Yß½ve±ÃCý£W{Ú^q^sÑ·¨ÍOt¹·C¥GDrí@wÕKţÃ«V·i}xËÍ÷i©ĝɝǡ]{c±OW³Ya±_ç©HĕoƫŇqr³Lys[ñ³¯OSďOMisZ±ÅFC¥Pq{Ã[Pg}\\¿ghćOk^ģÁFıĉĥMoEqqZûěŉ³F¦oĵhÕP{¯~TÍlªNßYÐ{Ps{ÃVUeĎwk±ŉVÓ½ŽJãÇÇ»Jm°dhcÀffdF~ĀeĖd`sx² ®EżĀdQÂd^~ăÔH¦\\LKpĄVez¤NP ǹÓRÆąJSha[¦´ÂghwmBÐ¨źhI|VV|p] Â¼èNä¶ÜBÖ¼L`¼bØæKVpoúNZÞÒKxpw|ÊEMnzEQIZZNBčÚFÜçmĩWĪñtÞĵÇñZ«uD±|Əlĳ¥ãn·±PmÍada CLǑkùó¡³Ï«QaċÏOÃ¥ÕđQȥċƭy³ÃA"]],"encodeOffsets":[[[123686,41445]],[[126019,40435]],[[124393,40128]],[[126117,39963]],[[125322,40140]],[[126686,40700]],[[126041,40374]],[[125584,40168]],[[125453,40165]],[[125362,40214]],[[125280,40291]],[[125774,39997]],[[125976,40496]],[[125822,39993]],[[125509,40217]],[[122731,40949]]]}},{"type":"Feature","id":"220000","properties":{"id":"220000","cp":[125.3245,43.886841],"name":"吉林","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@pä³PClFbbÍzwBGĭZÅi»lYċ²SgkÇ£^Sqd¯R©é£¯S\\cZ¹iűƏCuƍÓXoR}M^o£R}oªUFuuXHlEÅÏ©¤ÛmTþ¤D²ÄufàÀXXÈ±AeyYw¬dvõ´KÊ£\\rµÄlidā]|î©¾DÂVH¹Þ®ÜWnCķ W§@\\¸~¤Vp¸póIO¢VOŇürXql~òÉK]¤¥Xrfkvzpm¶bwyFoúvð¼¤ N°ąO¥«³[éǡű_°Õ\\ÚÊĝþâőàerR¨JYlďQ[ ÏYëÐ§TGztnß¡gFkMāGÁ¤ia ÉÈ¹`\\xs¬dĆkNnuNUuP@vRY¾\\¢GªóĄ~RãÖÎĢùđŴÕhQxtcæëSɽŉíëǉ£ƍG£nj°KƘµDsØÑpyĆ¸®¿bXp]vbÍZuĂ{n^IüÀSÖ¦EvRÎûh@â[ƏÈô~FNr¯ôçR±HÑlĢ^¤¢OðævxsŒ]ÞÁTĠs¶¿âÆGW¾ìA¦·TÑ¬è¥ÏÐJ¨¼ÒÖ¼ƦɄxÊ~StD@Ă¼Ŵ¡jlºWvÐzƦZÐ²CH AxiukdGgetqmcÛ£Ozy¥cE}|¾cZk¿uŐã[oxGikfeäT@SUwpiÚFM©£è^Ú`@v¶eňf heP¶täOlÃUgÞzŸU`l}ÔÆUvØ_Ō¬Öi^ĉi§²ÃB~¡ĈÚEgc|DC_Ȧm²rBx¼MÔ¦ŮdĨÃâYxƘDVÇĺĿg¿cwÅ\\¹¥Yĭl¤OvLjM_a W`zļMž·\\swqÝSAqŚĳ¯°kRē°wx^ĐkǂÒ\\]nrĂ}²ĊŲÒøãh·M{yMzysěnĒġV·°G³¼XÀ¤¹i´o¤ŃÈ`ÌǲÄUĞd\\iÖmÈBĤÜɲDEh LG¾ƀÄ¾{WaYÍÈĢĘÔRîĐj}ÇccjoUb½{h§Ǿ{KƖµÎ÷GĀÖŠåưÎslyiē«`å§H¥Ae^§GK}iã\\c]v©ģZmÃ|[M}ģTɟĵÂÂ`ÀçmFK¥ÚíÁbX³ÌQÒHof{]ept·GŋĜYünĎųVY^ydõkÅZW«WUa~U·SbwGçǑiW^qFuNĝ·EwUtW·Ýďæ©PuqEzwAVXRãQ`©GMehccďÏd©ÑW_ÏYƅ»é\\ɹ~ǙG³mØ©BšuT§Ĥ½¢Ã_Ã½L¡ýqT^rme\\PpZZbyuybQefµ]UhĿDCmûvaÙNSkCwncćfv~YÇG"],"encodeOffsets":[[130196,42528]]}},{"type":"Feature","id":"230000","properties":{"id":"230000","cp":[128.642464,46.756967],"name":"黑龙江","childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@UµNÿ¥īèçHÍøƕ¶Lǽ|g¨|a¾pVidd~ÈiíďÓQġėÇZÎXb½|ſÃH½KFgɱCģÛÇAnjÕc[VĝǱÃËÇ_ £ń³pj£º¿»WH´¯U¸đĢmtĜyzzNN|g¸÷äűÑ±ĉā~mq^[ǁÑďlw]¯xQĔ¯l°řĴrBÞTxr[tŽ¸ĻN_yX`biNKuP£kZĮ¦[ºxÆÀdhĹŀUÈƗCwáZħÄŭcÓ¥»NAw±qȥnD`{ChdÙFć}¢A±Äj¨]ĊÕjŋ«×`VuÓÅ~_kŷVÝyhVkÄãPsOµfgeŇµf@u_Ù ÙcªNªÙEojVxT@ãSefjlwH\\pŏäÀvlY½d{F~¦dyz¤PÜndsrhfHcvlwjF£G±DÏƥYyÏu¹XikĿ¦ÏqƗǀOŜ¨LI|FRĂn sª|C˜zxAè¥bfudTrFWÁ¹Am|ĔĕsķÆF´N}ćUÕ@Áĳſmuçuð^ÊýowFzØÎĕNőǏȎôªÌŒǄàĀÄ˄ĞŀƒʀĀƘŸˮȬƬĊ°Uzouxe]}AyÈW¯ÌmKQ]Īºif¸ÄX|sZt|½ÚUÎ lk^p{f¤lºlÆW A²PVÜPHÊâ]ÎĈÌÜk´\\@qàsĔÄQºpRij¼èi`¶bXrBgxfv»uUi^v~J¬mVp´£´VWrnP½ì¢BX¬hðX¹^TjVriªjtŊÄmtPGx¸bgRsT`ZozÆO]ÒFôÒOÆŊvÅpcGêsx´DR{AEOr°x|íb³Wm~DVjºéNNËÜ˛ɶGxŷCSt}]ûōSmtuÇÃĕNāg»íT«u}ç½BĵÞʣ¥ëÊ¡MÛ³ãȅ¡ƋaǩÈÉQG¢·lG|tvgrrf«ptęŘnÅĢrI²¯LiØsPf_vĠdxM prʹL¤¤eËÀđKïÙVY§]Ióáĥ]ķK¥j|pŇ\\kzţ¦šnņäÔVĂîĪ¬|vW®l¤èØrxm¶ă~lÄƯĄ̈́öȄEÔ¤ØQĄĄ»ƢjȦOǺ¨ìSŖÆƬyQv`cwZSÌ®ü±Ǆ]ŀç¬B¬©ńzƺŷɄeeOĨSfm ĊƀP̎ēz©ĊÄÕÊmgÇsJ¥ƔŊśæÎÑqv¿íUOµªÂnĦÁ_½ä@êí£P}Ġ[@gġ}gɊ×ûÏWXá¢užƻÌsNÍ½ƎÁ§čŐAēeL³àydl¦ĘVçŁpśǆĽĺſÊQíÜçÛġÔsĕ¬Ǹ¯YßċġHµ ¡eå`ļrĉŘóƢFìĎWøxÊkƈdƬv|I|·©NqńRŀ¤éeŊŀàŀU²ŕƀBQ£Ď}L¹Îk@©ĈuǰųǨÚ§ƈnTËÇéƟÊcfčŤ^XmHĊĕË«W·ċëx³ǔķÐċJāwİ_ĸȀ^ôWr°oú¬ĦŨK~ȰCĐ´Ƕ£fNÎèâw¢XnŮeÂÆĶ¾¾xäLĴĘlļO¤ÒĨA¢Êɚ¨®ØCÔ ŬGƠƦYĜĘÜƬDJg_ͥœ@čŅĻA¶¯@wÎqC½Ĉ»NăëKďÍQÙƫ[«ÃígßÔÇOÝáWñuZ¯ĥŕā¡ÑķJu¤E å¯°WKÉ±_d_}}vyõu¬ï¹ÓU±½@gÏ¿rÃ½DgCdµ°MFYxw¿CG£Rƛ½Õ{]L§{qqą¿BÇƻğëܭǊË|c²}Fµ}ÙRsÓpg±QNqǫŋRwŕnéÑÉK«SeYRŋ@{¤SJ}D Ûǖ֍]gr¡µŷjqWÛham³~S«Þ]"]],"encodeOffsets":[[[134456,44547]]]}},{"type":"Feature","id":"320000","properties":{"id":"320000","cp":[119.767413,33.041544],"name":"江苏","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@cþÅPi`ZRu¥É\\]~°Y`µÓ^phÁbnÀşúòaĬºTÖŒbe¦¦{¸ZâćNp©Hr|^mjhSEb\\afv`sz^lkljÄtg¤D¾X¿À|ĐiZȀåB·î}GL¢õcßjayBFµÏC^ĭcÙt¿sğH]j{s©HM¢QnDÀ©DaÜÞ·jgàiDbPufjDk`dPOîhw¡ĥ¥GP²ĐobºrYî¶aHŢ´ ]´rılw³r_{£DB_Ûdåuk|Ũ¯F Cºyr{XFye³Þċ¿ÂkĭB¿MvÛpm`rÚã@Ę¹hågËÖƿxnlč¶Åì½Ot¾dJlVJĂǀŞqvnO^JZż·Q}êÍÅmµÒ]ƍ¦Dq}¬R^èĂ´ŀĻĊIÔtĲyQŐĠMNtR®òLhĚs©»}OÓGZz¶A\\jĨFäOĤHYJvÞHNiÜaĎÉnFQlNM¤B´ĄNöɂtpŬdfåqm¿QûùŞÚb¤uŃJŴu»¹ĄlȖħŴw̌ŵ²ǹǠ͛hĭłƕrçü±Yxcitğ®jű¢KOķCoy`å®VTa_Ā]ŐÝɞï²ʯÊ^]afYǸÃĆēĪȣJđ͍ôƋÄÄÍīçÛɈǥ£ÛmY`ó£Z«§°Ó³QafusNıǅ_k}¢m[ÝóDµ¡RLčiXyÅNïă¡¸iĔÏNÌŕoēdōîåŤûHcs}~Ûwbù¹£¦ÓCtOPrE^ÒogĉIµÛÅʹK¤½phMü`oæŀ"],"encodeOffsets":[[121740,32276]]}},{"type":"Feature","id":"330000","properties":{"id":"330000","cp":[120.153576,29.287459],"name":"浙江","childNum":45},"geometry":{"type":"MultiPolygon","coordinates":[["@@E^dQ]K"],["@@jX^j"],["@@sfbU"],["@@qP\\xz[ck"],["@@R¢FX}°[s_"],["@@Cb\\}"],["@@e|v\\la{u"],["@@v~u}"],["@@QxÂF¯}"],["@@¹nvÞs¯o"],["@@rSkUEj"],["@@biZP"],["@@p[}INf"],["@@À¿"],["@@¹dnb"],["@@rSBnR"],["@@g~h}"],["@@FlEk"],["@@OdPc"],["@@v[u\\"],["@@FjâL~wyoo~sµL\\"],["@@¬e¹aN"],["@@\\nÔ¡q]L³ë\\ÿ®QÖ"],["@@ÊA©[¬"],["@@Kxv"],["@@@hlIk]"],["@@pW{o||j"],["@@Md|_mC"],["@@¢X£ÏylD¼XtH"],["@@hlÜ[LykAvyfw^E¤"],["@@fp¤MusR"],["@@®_ma~LÁ¬Z"],["@@iMxZ"],["@@ZcYd"],["@@Z~dOSo|A¿qZv"],["@@@`EN¡v"],["@@|TY{"],["@@@n@m"],["@@XWkCT\\"],["@@ºwZRkĕWO¢"],["@@X®±GrÆª\\ÔáXq{"],["@@ůTG°ĄLHm°UC"],["@@¤aÜx~}dtüGæţŎíĔcŖpMËÐjē¢·ðĄÆMzjWKĎ¢Q¶À_ê_Bıi«pZgf¤Nrq]§ĂN®«H±yƳí¾×ŸīàLłčŴǝĂíÀBŖÕªÁŖHŗŉåqûõi¨hÜ·ñt»¹ýv_[«¸mYL¯QªmĉÅdMgÇjcº«ę¬K´B«Âącoċ\\xKd¡gěŧ«®á[~ıxu·ÅKsËÉc¢Ù\\ĭƛëbf¹ģSĜkáƉÔĈZB{aMµfzŉfåÂŧįƋǝÊĕġć£g³neą»@¦S®\\ßðChiqªĭiAuAµ_W¥ƣO\\lċĢttC¨£t`PZäuXßBsĻyekOđġĵHuXBµ]×\\°®¬F¢¾pµ¼kŘó¬Wät¸|@L¨¸µrºù³Ù~§WIZW®±Ð¨ÒÉx`²pĜrOògtÁZ}þÙ]¡FKwsPlU[}¦Rvn`hq¬\\nQ´ĘRWb_ rtČFIÖkĦPJ¶ÖÀÖJĈĄTĚòC ²@PúØz©Pî¢£CÈÚĒ±hŖl¬â~nm¨f©iļ«mntuÖZÜÄjL®EÌFª²iÊxØ¨IÈhhst"],["@@o\\VzRZ}y"],["@@@°¡mÛGĕ¨§Ianá[ýƤjfæØLäGr"]],"encodeOffsets":[[[125592,31553]],[[125785,31436]],[[125729,31431]],[[125513,31380]],[[125223,30438]],[[125115,30114]],[[124815,29155]],[[124419,28746]],[[124095,28635]],[[124005,28609]],[[125000,30713]],[[125111,30698]],[[125078,30682]],[[125150,30684]],[[124014,28103]],[[125008,31331]],[[125411,31468]],[[125329,31479]],[[125626,30916]],[[125417,30956]],[[125254,30976]],[[125199,30997]],[[125095,31058]],[[125083,30915]],[[124885,31015]],[[125218,30798]],[[124867,30838]],[[124755,30788]],[[124802,30809]],[[125267,30657]],[[125218,30578]],[[125200,30562]],[[124968,30474]],[[125167,30396]],[[124955,29879]],[[124714,29781]],[[124762,29462]],[[124325,28754]],[[123990,28459]],[[125366,31477]],[[125115,30363]],[[125369,31139]],[[122495,31878]],[[125329,30690]],[[125192,30787]]]}},{"type":"Feature","id":"340000","properties":{"id":"340000","cp":[117.283042,31.26119],"name":"安徽","childNum":3},"geometry":{"type":"MultiPolygon","coordinates":[["@@^iuLX^"],["@@e©Ehl"],["@@°ZÆëĎµmkǀwÌÕæhºgBĝâqÙĊzÖgņtÀÁĂÆáhEz|WzqD¹°Eŧl{ævÜcA`¤C`|´qxĲkq^³³GšµbíZ¹qpa±ď OH¦Ħx¢gPícOl_iCveaOjChß¸iÝbÛªCC¿mRV§¢A|t^iĠGÀtÚsd]ĮÐDE¶zAb àiödK¡~H¸íæAǿYj{ď¿À½W®£ChÃsikkly]_teu[bFaTign{]GqªoĈMYá|·¥f¥őaSÕėNµñĞ«Im_m¿Âa]uĜp Z_§{Cäg¤°r[_YjÆOdý[I[á·¥Q_nùgL¾mvˊBÜÆ¶ĊJhpc¹O]iŠ]¥ jtsggJÇ§w×jÉ©±EFËKiÛÃÕYvsm¬njĻª§emná}k«ŕgđ²ÙDÇ¤í¡ªOy×Où±@DñSęćăÕIÕ¿IµĥOjNÕËT¡¿tNæŇàåyķrĕq§ÄĩsWÆßF¶X®¿mwRIÞfßoG³¾©uyHį{Ɓħ¯AFnuPÍÔzVdàôº^Ðæd´oG¤{S¬ćxã}ŧ×Kǥĩ«ÕOEÐ·ÖdÖsƘÑ¨[Û^Xr¢¼§xvÄÆµ`K§ tÒ´Cvlo¸fzŨð¾NY´ı~ÉĔēßúLÃÃ_ÈÏ|]ÂÏFlg`ben¾¢pUh~ƴĖ¶_r sĄ~cƈ]|r c~`¼{À{ȒiJjz`îÀT¥Û³]u}fïQl{skloNdjäËzDvčoQďHI¦rbtHĔ~BmlRV_ħTLnñH±DL¼Lªl§Ťa¸ĚlK²\\RòvDcÎJbt[¤D@®hh~kt°ǾzÖ@¾ªdbYhüóZ ň¶vHrľ\\ÊJuxAT|dmÀO[ÃÔG·ĚąĐlŪÚpSJ¨ĸLvÞcPæķŨ®mÐálwKhïgA¢ųÆ©Þ¤OÈm°K´"]],"encodeOffsets":[[[121722,32278]],[[119475,30423]],[[119168,35472]]]}},{"type":"Feature","id":"350000","properties":{"id":"350000","cp":[118.306239,26.075302],"name":"福建","childNum":18},"geometry":{"type":"MultiPolygon","coordinates":[["@@zht´]"],["@@aj^~ĆG©O"],["@@ed¨C}}i"],["@@@vPGsQ"],["@@sBzddW]Q"],["@@S¨Q{"],["@@NVucW"],["@@qptBAq"],["@@¸[mu"],["@@Q\\pD]_"],["@@jSwUadpF"],["@@eXª~"],["@@AjvFso"],["@@fT_Çí\\v|ba¦jZÆy°"],["@@IjJi"],["@@wJIx«¼AoNe{M"],["@@K±¡ÓČäeZ"],["@@k¡¹Eh~c®wBkUplÀ¡I~Māe£bN¨gZý¡a±Öcp©PhI¢QqÇGj|¥U g[Ky¬ŏv@OptÉEF\\@ åA¬V{XģĐBycpě¼³Ăp·¤¥ohqqÚ¡ŅLs^Ã¡§qlÀhH¨MCe»åÇGD¥zPO£čÙkJA¼ßėuĕeûÒiÁŧSW¥Qûŗ½ùěcÝ§SùĩąSWó«íęACµeRåǃRCÒÇZÍ¢ź±^dlstjD¸ZpuÔâÃH¾oLUêÃÔjjēò´ĄWƛ^Ñ¥Ħ@ÇòmOw¡õyJyD}¢ďÑÈġfZda©º²z£NjD°Ötj¶¬ZSÎ~¾c°¶ÐmxO¸¢Pl´SL|¥AȪĖMņĲg®áIJČĒü` QF¬h|ĂJ@zµ |ê³È ¸UÖŬŬÀEttĸr]ðM¤ĶĲHtÏ AĬkvsq^aÎbvdfÊòSD´Z^xPsĂrvƞŀjJd×ŘÉ ®AÎ¦ĤdxĆqAZRÀMźnĊ»İÐZ YXæJyĊ²·¶q§·K@·{sXãô«lŗ¶»o½E¡«¢±¨Y®Ø¶^AvWĶGĒĢPlzfļtàAvWYãO_¤sD§ssČġ[kƤPX¦`¶®BBvĪjv©jx[L¥àï[F¼ÍË»ğV`«Ip}ccÅĥZEãoP´B@D¸m±z«Ƴ¿å³BRØ¶Wlâþäą`]Z£Tc ĹGµ¶Hm@_©k¾xĨôȉðX«½đCIbćqK³ÁÄš¬OAwã»aLŉËĥW[ÂGIÂNxĳ¤D¢îĎÎB§°_JGs¥E@¤ućPåcuMuw¢BI¿]zG¹guĮck\\_"]],"encodeOffsets":[[[123250,27563]],[[122541,27268]],[[123020,27189]],[[122916,27125]],[[122887,26845]],[[122808,26762]],[[122568,25912]],[[122778,26197]],[[122515,26757]],[[122816,26587]],[[123388,27005]],[[122450,26243]],[[122578,25962]],[[121255,25103]],[[120987,24903]],[[122339,25802]],[[121042,25093]],[[122439,26024]]]}},{"type":"Feature","id":"360000","properties":{"id":"360000","cp":[115.592151,27.676493],"name":"江西","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@ĢĨƐgļ¼ÂMD~ņªe^\\^§ý©j×cZØ¨zdÒa¶lÒJìõ`oz÷@¤uŞ¸´ôęöY¼HČƶajlÞƩ¥éZ[|h}^U  ¥pĄžƦO lt¸Æ Q\\aÆ|CnÂOjtĚĤdÈF`¶@Ðë ¦ōÒ¨SêvHĢûXD®QgÄWiØPÞìºr¤ǆNĠ¢lĄtZoCƞÔºCxrpĠV®Ê{f_Y`_eq®Aot`@oDXfkp¨|s¬\\DÄSfè©Hn¬^DhÆyøJhØxĢĀLÊƠPżċĄwȠĚ¦G®ǒĤäTŠÆ~Ħw«|TF¡nc³Ïå¹]ĉđxe{ÎÓvOEm°BƂĨİ|Gvz½ª´HàpeJÝQxnÀWEµàXÅĪt¨ÃĖrÄwÀFÎ|ňÓMå¼ibµ¯»åDT±m[r«_gmQu~¥V\\OkxtL E¢Ú^~ýêPóqoě±_Êw§ÑªåƗā¼mĉŹ¿NQYBąrwģcÍ¥BŗÊcØiIƝĿuqtāwO]³YCñTeÉcaubÍ]trluīBÐGsĵıN£ï^ķqss¿FūūVÕ·´Ç{éĈýÿOER_đûIċâJhŅıNȩĕB¦K{Tk³¡OP·wnµÏd¯}½TÍ«YiµÕsC¯iM¤¦¯P|ÿUHvhe¥oFTuõ\\OSsMòđƇiaºćXĊĵà·çhƃ÷Ç{ígu^đgm[×zkKN¶Õ»lčÓ{XSÆv©_ÈëJbVkĔVÀ¤P¾ºÈMÖxlò~ªÚàGĂ¢B±ÌKyáV¼Ã~`gsÙfIƋlę¹e|~udjuTlXµf`¿Jd[\\L²"],"encodeOffsets":[[116689,26234]]}},{"type":"Feature","id":"370000","properties":{"id":"370000","cp":[118.000923,36.275807],"name":"山东","childNum":13},"geometry":{"type":"MultiPolygon","coordinates":[["@@Xjd]{K"],["@@itbFHy"],["@@HlGk"],["@@TGy"],["@@K¬U"],["@@WdXc"],["@@PtOs"],["@@LnXhc"],["@@ppVu]Or"],["@@cdzAUa"],["@@udRhnCI"],["@@oIpR"],["@@Ľč{fzƤîKÎMĮ]ZF½Y]â£ph¶¨râøÀÎǨ¤^ºÄGz~grĚĜlĞÆLĆǆ¢Îo¦cvKbgr°WhmZp L]LºcUÆnżĤÌĒbAnrOA´ȊcÀbƦUØrĆUÜøĬƞEzVL®öØBkŖÝĐĖ¹ŧ̄±ÀbÎÉnb²ĦhņBĖįĦåXćì@L¯´ywƕCéÃµė ƿ¸lµ¾Z|ZWyFY¨Mf~C¿`à_RÇzwƌfQnny´INoƬèôº|sTJULîVjǎ¾ĒØDz²XPn±ŴPè¸ŔLƔÜƺ_TüÃĤBBċÈöA´faM¨{«M`¶d¡ôÖ°mȰBÔjj´PM|c^d¤u¤Û´ä«ƢfPk¶Môl]Lb}su^ke{lCMrDÇ]NÑFsmoõľHyGă{{çrnÓEƕZGª¹Fj¢ïWuøCǷë¡ąuhÛ¡^KxC`C\\bÅxì²ĝÝ¿_NīCȽĿåB¥¢·IŖÕy\\¹kxÃ£Č×GDyÃ¤ÁçFQ¡KtŵƋ]CgÏAùSedcÚźuYfyMmhUWpSyGwMPqŀÁ¼zK¶GY§Ë@´śÇµƕBm@IogZ¯uTMx}CVKï{éƵP_K«pÛÙqċtkkù]gTğwoɁsMõ³ăAN£MRkmEÊčÛbMjÝGuIZGPģãħE[iµBEuDPÔ~ª¼ęt]ûG§¡QMsğNPŏįzs£Ug{đJĿļā³]ç«Qr~¥CƎÑ^n¶ÆéÎR~Ż¸YI] PumŝrƿIā[xeÇ³L¯v¯s¬ÁY~}ťuŁgƋpÝĄ_ņī¶ÏSR´ÁP~¿Cyċßdwk´SsX|t`Ä ÈðAªìÎT°¦Dda^lĎDĶÚY°`ĪŴǒàŠv\\ebZHŖR¬ŢƱùęOÑM³FÛWp["]],"encodeOffsets":[[[123806,39303]],[[123821,39266]],[[123742,39256]],[[123702,39203]],[[123649,39066]],[[123847,38933]],[[123580,38839]],[[123894,37288]],[[123043,36624]],[[123344,38676]],[[123522,38857]],[[123628,38858]],[[118260,36742]]]}},{"type":"Feature","id":"410000","properties":{"id":"410000","cp":[113.665412,33.757975],"name":"河南","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@ýLùµP³swIÓxcŢĞð´E®ÚPtĴXØxÂ¶@«ŕŕQGYfa[şußǩđš_X³ĳÕčC]kbc¥CS¯ëÍB©÷³Si_}mYTt³xlàcČzÀD}ÂOQ³ÐTĨ¯ƗòËŖ[hłŦv~}ÂZ«¤lPÇ£ªÝŴÅR§ØnhctâknÏľŹUÓÝdKuķI§oTũÙďkęĆH¸Ó\\Ä¿PcnS{wBIvÉĽ[GqµuŇôYgûZca©@½Õǽys¯}lgg@C\\£asIdÍuCQñ[L±ęk·ţb¨©kK»KC²òGKmĨS`UQnk}AGēsqaJ¥ĐGRĎpCuÌy ã iMcplk|tRkðev~^´¦ÜSí¿_iyjI|ȑ|¿_»d}q^{Ƈdă}tqµ`Ƴĕg}V¡om½faÇo³TTj¥tĠRyK{ùÓjuµ{t}uËRivGçJFjµÍyqÎàQÂFewixGw½Yŷpµú³XU½ġyłåkÚwZX·l¢Á¢KzOÎÎjc¼htoDHr|J½}JZ_¯iPq{tę½ĕ¦Zpĵø«kQĹ¤]MÛfaQpě±ǽ¾]uFu÷nčÄ¯ADp}AjmcEÇaª³o³ÆÍSƇĈÙDIzËčľ^KLiÞñ[aA²zzÌ÷D|[íÄ³gfÕÞd®|`Ć~oĠƑô³ŊD×°¯CsøÀ«ìUMhTº¨¸ǡîSÔDruÂÇZÖEvPZW~ØÐtĄE¢¦Ðy¸bô´oŬ¬²Ês~]®tªapŎJ¨Öº_Ŕ`Ŗ^Đ\\Ĝu~m²Ƹ¸fWĦrƔ}Î^gjdfÔ¡J}\\n C¦þWxªJRÔŠu¬ĨĨmFdM{\\d\\YÊ¢ú@@¦ª²SÜsC}fNècbpRmlØ^gd¢aÒ¢CZZxvÆ¶N¿¢T@uC¬^ĊðÄn|lGlRjsp¢ED}Fio~ÔN~zkĘHVsǲßjŬŢ`Pûàl¢\\ÀEhİgÞē X¼Pk|m"],"encodeOffsets":[[118256,37017]]}},{"type":"Feature","id":"420000","properties":{"id":"420000","cp":[113.298572,30.684355],"name":"湖北","childNum":3},"geometry":{"type":"MultiPolygon","coordinates":[["@@AB"],["@@lskt"],["@@¾«}{ra®pîÃ\\{øCËyyB±b\\òÝjKL ]ĎĽÌJyÚCƈćÎT´Å´pb©ÈdFin~BCo°BĎÃømv®E^vǾ½Ĝ²RobÜeN^ĺ£R¬lĶ÷YoĖ¥Ě¾|sOr°jY`~I¾®I{GqpCgyl{£ÍÍyPLÂ¡¡¸kWxYlÙæŁĢz¾V´W¶ùŸo¾ZHxjwfxGNÁ³Xéæl¶EièIH ujÌQ~v|sv¶Ôi|ú¢FhQsğ¦SiŠBgÐE^ÁÐ{čnOÂÈUÎóĔÊēĲ}Z³½Mŧïeyp·uk³DsÑ¨L¶_ÅuÃ¨w»¡WqÜ]\\Ò§tƗcÕ¸ÕFÏǝĉăxŻČƟOKÉġÿ×wg÷IÅzCg]m«ªGeçÃTC«[t§{loWeC@ps_Bprf_``Z|ei¡oċMqow¹DƝÓDYpûsYkıǃ}s¥ç³[§cY§HK«Qy]¢wwö¸ïx¼ņ¾Xv®ÇÀµRĠÐHM±cÏdƒǍũȅȷ±DSyúĝ£ŤĀàtÖÿï[îb\\}pĭÉI±Ñy¿³x¯No|¹HÏÛmjúË~TuęjCöAwě¬Rđl¯ ÑbŇTĿ_[IčĄʿnM¦ğ\\É[T·k¹©oĕ@A¾wya¥Y\\¥Âaz¯ãÁ¡k¥ne£ÛwE©Êō¶˓uoj_U¡cF¹[WvP©whuÕyBF`RqJUw\\i¡{jEPïÿ½fćQÑÀQ{°fLÔ~wXgītêÝ¾ĺHd³fJd]HJ²EoU¥HhwQsƐ»Xmg±çve]DmÍPoCc¾_hhøYrŊU¶eD°Č_N~øĹĚ·`z]Äþp¼äÌQv\\rCé¾TnkžŐÚÜa¼ÝƆĢ¶ÛodĔňÐ¢JqPb ¾|J¾fXƐîĨ_Z¯À}úƲN_ĒÄ^ĈaŐyp»CÇÄKñL³ġM²wrIÒŭxjb[n«øæà ^²h¯ÚŐªÞ¸Y²ĒVø}Ā^İ´LÚm¥ÀJÞ{JVųÞŃx×sxxƈē ģMřÚðòIfĊŒ\\Ʈ±ŒdÊ§ĘDvČ_Àæ~Dċ´A®µ¨ØLV¦êHÒ¤"]],"encodeOffsets":[[[113712,34000]],[[115612,30507]],[[113649,34054]]]}},{"type":"Feature","id":"430000","properties":{"id":"430000","cp":[111.782279,28.09409],"name":"湖南","childNum":3},"geometry":{"type":"MultiPolygon","coordinates":[["@@nFTs"],["@@ßÅÆá½ÔXrCOËRïÿĩTooQyÓ[ŅBE¬ÎÓXaį§Ã¸G °ITxpúxÚĳ¥ÏĢ¾edÄ©ĸGàGhM¤Â_U}Ċ}¢pczfþg¤ÇòAVM"],["@@©KA·³CQ±Á«³BUƑ¹AtćOwD]JiØSm¯b£ylXHËÑ±H«C^õľAÅ§¤É¥ïyuǙuA¢^{ÌC´¦ŷJ£^[ª¿ĕ~ƇN skóā¹¿ï]ă~÷O§@Vm¡Qđ¦¢Ĥ{ºjÔª¥nf´~Õo×ÛąMąıuZmZcÒ ĲĪ²SÊǄŶ¨ƚCÖŎªQØ¼rŭ«}NÏürÊ¬mjr@ĘrTW SsdHzƓ^ÇÂyUi¯DÅYlŹu{hT}mĉ¹¥ěDÿë©ıÓ[Oº£¥ótł¹MÕƪ`PDiÛU¾ÅâìUñBÈ£ýhedy¡oċ`pfmjP~kZaZsÐd°wj§@Ĵ®w~^kÀÅKvNmX\\¨aŃqvíó¿F¤¡@ũÑVw}S@j}¾«pĂrªg àÀ²NJ¶¶DôK|^ª°LX¾ŴäPĪ±£EXd^¶ĲÞÜ~u¸ǔMRhsRe`ÄofIÔ\\Ø  ićymnú¨cj ¢»GČìƊÿÐ¨XeĈĀ¾Oð Fi ¢|[jVxrIQ_EzAN¦zLU`cªxOTu RLÄ¢dVi`p˔vŎµªÉF~Ød¢ºgİàw¸Áb[¦Zb¦z½xBĖ@ªpºlS¸Ö\\Ĕ[N¥ˀmĎăJ\\ŀ`ňSÚĖÁĐiOĜ«BxDõĚivSÌ}iùÜnÐºG{p°M´wÀÒzJ²ò¨ oTçüöoÛÿñőĞ¤ùTz²CȆȸǎŪƑÐc°dPÎğË¶[È½u¯½WM¡ÉB·rínZÒ `¨GA¾\\pēXhÃRCüWGġuTé§ŎÑ©ò³I±³}_EÃħg®ęisÁPDmÅ{b[RÅs·kPŽƥóRoOV~]{g\\êYƪ¦kÝbiċƵGZ»Ěõó·³vŝ£ø@pyö_ëIkÑµbcÑ§y×dYØªiþ¨[]f]Ņ©C}ÁN»hĻħƏĩ"]],"encodeOffsets":[[[115640,30489]],[[112543,27312]],[[116690,26230]]]}},{"type":"Feature","id":"440000","properties":{"id":"440000","cp":[113.280637,23.125178],"name":"广东","childNum":24},"geometry":{"type":"MultiPolygon","coordinates":[["@@QdAua"],["@@lxDLo"],["@@sbhNLo"],["@@Ă ā"],["@@WltO[["],["@@Kr]S"],["@@eI]y"],["@@I|Mym"],["@@Û³LS¼Y"],["@@nvºBëui©`¾"],["@@zdÛJw®"],["@@°¯"],["@@a yAª¸ËJIxØ@ĀHAmÃV¡ofuo"],["@@sŗÃÔėAƁZÄ ~°ČPäh"],["@@¶ÝÌvmĞhıQ"],["@@HdSjĒ¢D}waru«ZqadYM"],["@@el\\LqqU"],["@@~rMo\\"],["@@f^C"],["@@øPªoj÷ÍÝħXČx°Q¨ıXNv"],["@@gÇƳo[~tly"],["@@EÆC¿"],["@@OP"],["@@wđógĝ[³¡VÙæÅöMÌ³¹pÁaËýý©D©ÜJŹƕģGą¤{ÙūÇO²«BƱéAÒĥ¡«BhlmtÃPµyU¯ucd·w_bŝcīímGO|KPȏŹãŝIŕŭŕ@Óoo¿ē±ß}ŭĲWÈCőâUâǙIğŉ©IĳE×Á³AówXJþ±ÌÜÓĨ£L]ĈÙƺZǾĆĖMĸĤfÎĵlŨnÈĐtFFĤêk¶^k°f¶g}®Faf`vXŲxl¦ÔÁ²¬Ð¦pqÊÌ²iXØRDÎ}Ä@ZĠsx®AR~®ETtĄZƈfŠŠHâÒÐAµ\\S¸^wĖkRzalŜ|E¨ÈNĀňZTpBh£\\ĎƀuXĖtKL¶G|»ĺEļĞ~ÜĢÛĊrOÙîvd]n¬VÊĜ°RÖpMƂªFbwEÀ©\\¤]ŸI®¥D³|Ë]CöAŤ¦æ´¥¸Lv¼¢ĽBaôF~®²GÌÒEYzk¤°ahlVÕI^CxĈPsBƒºV¸@¾ªR²ĨN]´_eavSivc}p}Đ¼ƌkJÚe th_¸ ºx±ò_xNË²@ă¡ßH©Ùñ}wkNÕ¹ÇO½¿£ĕ]ly_WìIÇª`uTÅxYĒÖ¼kÖµMjJÚwn\\hĒv]îh|ÈƄøèg¸Ķß ĉĈWb¹ƀdéĘNTtP[öSvrCZaGubo´ŖÒÇĐ~¡zCIözx¢PnÈñ @ĥÒ¦]ƞV}³ăĔñiiÄÓVépKG½ÄÓávYoC·sitiaÀyŧÎ¡ÈYDÑům}ý|m[węõĉZÅxUO}÷N¹³ĉo_qtăqwµŁYÙǝŕ¹tïÛUÃ¯mRCºĭ|µÕÊK½Rē ó]GªęAx»HO£|ām¡diď×YïYWªŉOeÚtĐ«zđ¹TāúEá²\\ķÍ}jYàÙÆſ¿Çdğ·ùTßÇţʄ¡XgWÀǇğ·¿ÃOj YÇ÷Qěi"]],"encodeOffsets":[[[117381,22988]],[[116552,22934]],[[116790,22617]],[[116973,22545]],[[116444,22536]],[[116931,22515]],[[116496,22490]],[[116453,22449]],[[113301,21439]],[[118726,21604]],[[118709,21486]],[[113210,20816]],[[115482,22082]],[[113171,21585]],[[113199,21590]],[[115232,22102]],[[115739,22373]],[[115134,22184]],[[113056,21175]],[[119573,21271]],[[119957,24020]],[[115859,22356]],[[116561,22649]],[[116285,22746]]]}},{"type":"Feature","id":"450000","properties":{"id":"450000","cp":[108.320004,22.82402],"name":"广西","childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@H TQ§A"],["@@ĨÊªLƊDÎĹĐCǦė¸zÚGn£¾rªŀÜt¬@ÖÚSx~øOŒŶÐÂæȠ\\ÈÜObĖw^oÞLf¬°bI lTØBÌF£Ć¹gñĤaYt¿¤VSñK¸¤nM¼JE±½¸ñoÜCƆæĪ^ĚQÖ¦^f´QüÜÊz¯lzUĺš@ìp¶n]sxtx¶@~ÒĂJb©gk{°~c°`Ô¬rV\\la¼¤ôá`¯¹LCÆbxEræOv[H[~|aB£ÖsºdAĐzNÂðsÞÆĤªbab`ho¡³F«èVlo¤ÔRzpp®SĪº¨ÖºNĳd`a¦¤F³ºDÎńĀìCĜº¦Ċ~nS|gźvZkCÆj°zVÈÁƔ]LÊFZgčPkini«qÇczÍY®¬Ů»qR×ō©DÕ§ƙǃŵTÉĩ±ıdÑnYYĲvNĆĆØÜ Öp}e³¦m©iÓ|¹ħņ|ª¦QF¢Â¬ʖovg¿em^ucà÷gÕuíÙćĝ}FĻ¼Ĺ{µHKsLSđƃrč¤[AgoSŇYMÿ§Ç{FśbkylQxĕ]T·¶[BÑÏGáşşƇeăYSsFQ}BwtYğÃ@~CÍQ ×WjË±rÉ¥oÏ ±«ÓÂ¥kwWűmcih³K~µh¯e]lµélEģEďsmÇŧē`ãògK_ÛsUʝćğ¶höO¤Ǜn³c`¡y¦CezYwa[ďĵűMę§]XÎ_íÛ]éÛUćİÕBƣ±dy¹T^dûÅÑŦ·PĻþÙ`K¦¢ÍeĥR¿³£[~äu¼dltW¸oRM¢ď\\z}Æzdvň{ÎXF¶°Â_ÒÂÏL©ÖTmu¼ãlīkiqéfA·Êµ\\őDc¥ÝFyÔćcűH_hLÜêĺĐ¨c}rn`½Ì@¸¶ªVLhŒ\\Ţĺk~Ġið°|gtTĭĸ^xvKVGréAébUuMJVÃO¡qĂXËSģãlýà_juYÛÒBG^éÖ¶§EGÅzěƯ¤EkN[kdåucé¬dnYpAyČ{`]þ¯TbÜÈk¡ĠvàhÂƄ¢Jî¶²"]],"encodeOffsets":[[[111707,21520]],[[107619,25527]]]}},{"type":"Feature","id":"460000","properties":{"id":"460000","cp":[109.83119,19.031971],"name":"海南","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@¦Ŝil¢XƦƞòïè§ŞCêɕrŧůÇąĻõ·ĉ³œ̅kÇm@ċȧŧĥĽʉƅſȓÒË¦ŝE}ºƑ[ÍĜȋ gÎfǐÏĤ¨êƺ\\Ɔ¸ĠĎvʄȀÐ¾jNðĀÒRZǆzÐŘÎ°H¨Ƣb²_Ġ "],"encodeOffsets":[[112750,20508]]}},{"type":"Feature","id":"510000","properties":{"id":"510000","cp":[104.065735,30.659462],"name":"四川","childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@LqKr"],["@@[ĻéV£_ţġñpG réÏ·~ąSfy×Í·ºſƽiÍıƣıĻmHH}siaX@iÇ°ÁÃ×t«T¤JJJyJÈ`Ohß¦¡uËhIyCjmÿwZGTiSsOB²fNmsPa{M{õE^Hj}gYpaeu¯oáwHjÁ½M¡pMuåmni{fk\\oÎqCwEZ¼KĝAy{m÷LwO×SimRI¯rKõBS«sFe]fµ¢óY_ÆPRcue°Cbo×bd£ŌIHgtrnyPt¦foaXďxlBowz_{ÊéWiêEGhÜ¸ºuFĈIxf®Y½ĀǙ]¤EyF²ċw¸¿@g¢§RGv»áW`ÃĵJwi]t¥wO½a[×]`ÃiüL¦LabbTÀåc}ÍhÆh®BHî|îºÉk¤Sy£ia©taį·Ɖ`ō¥UhOĝLk}©Fos´JmµlŁuønÑJWÎªYÀïAetTŅÓGË«bo{ıwodƟ½OġÜÂµxàNÖ¾P²§HKv¾]|BÆåoZ`¡Ø`ÀmºĠ~ÌÐ§nÇ¿¤]wğ@srğu~Io[é±¹ ¿ſđÓ@qg¹zƱřaí°KtÇ¤V»Ã[ĩǭƑ^ÇÓ@áťsZÏÅĭƋěpwDóÖáŻneQËq·GCœýS]x·ýq³OÕ¶Qzßti{řáÍÇWŝŭñzÇWpç¿JXĩè½cFÂLiVjx}\\NŇĖ¥GeJA¼ÄHfÈu~¸Æ«dE³ÉMA|bÒćhG¬CMõƤąAvüVéŀ_VÌ³ĐwQj´·ZeÈÁ¨X´Æ¡Qu·»ÕZ³ġqDoy`L¬gdp°şp¦ėìÅĮZ°Iähzĵf²å ĚÑKpIN|Ñz]ń·FU×é»R³MÉ»GM«kiér}Ã`¹ăÞmÈnÁîRǀ³ĜoİzŔwǶVÚ£À]ɜ»ĆlƂ²ĠþTº·àUȞÏʦ¶I«dĽĢdĬ¿»Ĕ×h\\c¬ä²GêëĤł¥ÀǿżÃÆMº}BÕĢyFVvwxBèĻĒ©ĈtCĢɽŠȣ¦āæ·HĽîôNÔ~^¤Ɗu^s¼{TA¼ø°¢İªDè¾Ň¶ÝJ®Z´ğ~Sn|ªWÚ©òzPOȸbð¢|øĞŒQìÛÐ@ĞǎRS¤Á§di´ezÝúØã]HqkIþËQÇ¦ÃsÇ¤[E¬ÉŪÍxXƒ·ÖƁİlƞ¹ª¹|XÊwnÆƄmÀêErĒtD®ċæcQE®³^ĭ¥©l}äQtoŖÜqÆkµªÔĻĴ¡@Ċ°B²Èw^^RsºTĀ£ŚæQPJvÄz^Đ¹Æ¯fLà´GC²dtĀRt¼¤ĦOðğfÔðDŨŁĞƘïPÈ®âbMüÀXZ ¸£@Å»»QÉ]dsÖ×_Í_ÌêŮPrĔĐÕGĂeZÜîĘqBhtO ¤tE[h|YÔZśÎs´xº±Uñt|OĩĠºNbgþJy^dÂY Į]Řz¦gC³R`Āz¢Aj¸CL¤RÆ»@Ŏk\\Ç´£YW}z@Z}Ã¶oû¶]´^NÒ}èNªPÍy¹`S°´ATeVamdUĐwʄvĮÕ\\uÆŗ¨Yp¹àZÂmWh{á}WØǍÉüwga§áCNęÎ[ĀÕĪgÖÉªXøx¬½Ů¦¦[NÎLÜUÖ´òrÙŠxR^JkĳnDX{U~ET{ļº¦PZcjF²Ė@pg¨B{u¨ŦyhoÚD®¯¢ WòàFÎ¤¨GDäz¦kŮPġqË¥À]eâÚ´ªKxīPÖ|æ[xÃ¤JÞĥsNÖ½I¬nĨY´®ÐƐmDŝuäđđEbee_v¡}ìęǊē}qÉåT¯µRs¡M@}ůaa¯wvƉåZw\\Z{åû^"]],"encodeOffsets":[[[108815,30935]],[[110617,31811]]]}},{"type":"Feature","id":"520000","properties":{"id":"520000","cp":[106.713478,26.578343],"name":"贵州","childNum":3},"geometry":{"type":"MultiPolygon","coordinates":[["@@G\\lY£in"],["@@q|mc¯tÏVSÎ"],["@@hÑ£IsNgßHHªķÃh_¹¡ĝÄ§ń¦uÙùgS¯JH|sÝÅtÁïyMDč»eÕtA¤{b\\}G®u\\åPFqwÅaDK°ºâ_£ùbµmÁÛĹM[q|hlaªāI}Ñµ@swtwm^oµDéĽŠyVky°ÉûÛR³e¥]RÕěħ[ƅåÛDpJiVÂF²I»mN·£LbÒYbWsÀbpkiTZĄă¶Hq`ĥ_J¯ae«KpÝx]aĕÛPÇȟ[ÁåŵÏő÷Pw}TÙ@Õs«ĿÛq©½m¤ÙH·yǥĘĉBµĨÕnđ]K©œáGçş§ÕßgǗĦTèƤƺ{¶ÉHÎd¾ŚÊ·OÐjXWrãLyzÉAL¾ę¢bĶėy_qMĔąro¼hĊw¶øV¤w²Ĉ]ÊKx|`ź¦ÂÈdrcÈbe¸`I¼čTF´¼Óýȃr¹ÍJ©k_șl³´_pĐ`oÒh¶pa^ÓĔ}D»^Xy`d[KvJPhèhCrĂĚÂ^Êƌ wZLĠ£ÁbrzOIlMMĪŐžËr×ÎeŦtw|¢mKjSǘňĂStÎŦEtqFT¾Eì¬¬ôxÌO¢ K³ŀºäYPVgŎ¦ŊmŞ¼VZwVlz¤£Tl®ctĽÚó{GAÇge~Îd¿æaSba¥KKûj®_Ä^\\Ø¾bP®¦x^sxjĶI_Ä Xâ¼Hu¨Qh¡À@Ëô}±GNìĎlT¸`V~R°tbÕĊ`¸úÛtÏFDu[MfqGH·¥yAztMFe|R_GkChZeÚ°tov`xbDnÐ{E}ZèxNEÞREn[Pv@{~rĆAB§EO¿|UZ~ìUf¨J²ĂÝÆsªB`s¶fvö¦Õ~dÔq¨¸º»uù[[§´sb¤¢zþF¢ÆÀhÂW\\ıËIÝo±ĭŠ£þÊs}¡R]ěDg´VG¢j±®èºÃmpU[Áëº°rÜbNu¸}º¼`niºÔXĄ¤¼ÔdaµÁ_ÃftQQgR·Ǔv}Ý×ĵ]µWc¤F²OĩųãW½¯K©]{LóµCIµ±Mß¿h©āq¬o½~@i~TUxŪÒ¢@£ÀEîôruńb[§nWuMÆLl¿]x}ĳ½"]],"encodeOffsets":[[[112158,27383]],[[112105,27474]],[[112095,27476]]]}},{"type":"Feature","id":"530000","properties":{"id":"530000","cp":[101.512251,24.740609],"name":"云南","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@[ùx½}ÑRHYīĺûsÍniEoã½Ya²ė{c¬ĝgĂsAØÅwďõzFjw}«Dx¿}Uũlê@HÅF¨ÇoJ´Ónũuą¡Ã¢pÒÅØ TF²xa²ËXcÊlHîAßËŁkŻƑŷÉ©hWæßUËs¡¦}teèÆ¶StÇÇ}Fd£jĈZĆÆ¤Tč\\D}O÷£U§~ŃGåŃDĝ¸Tsd¶¶Bª¤u¢ŌĎo~t¾ÍŶÒtD¦ÚiôözØX²ghįh½Û±¯ÿm·zR¦Ɵ`ªŊÃh¢rOÔ´£Ym¼èêf¯ŪĽncÚbw\\zlvWªâ ¦gmĿBĹ£¢ƹřbĥkǫßeeZkÙIKueT»sVesbaĕ  ¶®dNĄÄpªy¼³BE®lGŭCǶwêżĔÂepÍÀQƞpC¼ŲÈAÎô¶RäQ^Øu¬°_Èôc´¹ò¨PÎ¢hlĎ¦´ĦÆ´sâÇŲPnÊD^¯°Upv}®BPÌªjǬxSöwlfòªvqĸ|`HviļndĜĆhňem·FyÞqóSį¯³X_ĞçêtryvL¤§z¦c¦¥jnŞklD¤øz½ĜàĂŧMÅ|áƆàÊcðÂFÜáŢ¥\\\\ºİøÒÐJĴîD¦zK²ǏÎEh~CDhMn^ÌöÄ©ČZÀaüfɭyœpį´ěFűk]Ôě¢qlÅĆÙa¶~ÄqêljN¬¼HÊNQ´ê¼VØ¸E^ŃÒyM{JLoÒęæe±Ķygã¯JYÆĭĘëo¥Šo¯hcK«z_prC´ĢÖY¼ v¸¢RÅW³Â§fÇ¸Yi³xR´ďUË`êĿUûuĆBƣöNDH«ĈgÑaB{ÊNF´¬c·Åv}eÇÃGB»If¦HňĕM~[iwjUÁKE¾dĪçWIèÀoÈXòyŞŮÈXâÎŚj|àsRyµÖPr´þ ¸^wþTDŔHr¸RÌmfżÕâCôoxĜƌÆĮÐYtâŦÔ@]ÈǮƒ\\Ī¼Ä£UsÈ¯LbîƲŚºyhr@ĒÔƀÀ²º\\êpJ}ĠvqtĠ@^xÀ£È¨mËÏğ}n¹_¿¢×Y_æpÅA^{½Lu¨GO±Õ½ßM¶wÁĢÛPƢ¼pcĲx|apÌ¬HÐŊSfsðBZ¿©XÏÒKk÷Eû¿SrEFsÕūkóVǥŉiTL¡n{uxţÏhôŝ¬ğōNNJkyPaqÂğ¤K®YxÉƋÁ]āęDqçgOgILu\\_gz]W¼~CÔē]bµogpÑ_oď`´³Țkl`IªºÎȄqÔþ»E³ĎSJ»_f·adÇqÇc¥Á_Źw{L^É±ćxU£µ÷xgĉp»ĆqNē`rĘzaĵĚ¡K½ÊBzyäKXqiWPÏÉ¸½řÍcÊG|µƕƣGË÷k°_^ý|_zċBZocmø¯hhcæ\\lMFlư£ĜÆyHF¨µêÕ]HAàÓ^it `þßäkĤÎT~Wlÿ¨ÔPzUCNVv [jâôDôď[}z¿msSh¯{jïğl}šĹ[őgK©U·µË@¾m_~q¡f¹ÅË^»f³ø}Q¡ÖË³gÍ±^Ç\\ëÃA_¿bWÏ[¶ƛé£F{īZgm@|kHǭƁć¦UĔť×ë}ǝeďºȡȘÏíBÉ£āĘPªĳ¶ŉÿy©nď£G¹¡I±LÉĺÑdĉÜW¥}gÁ{aqÃ¥aıęÏZï`"],"encodeOffsets":[[104636,22969]]}},{"type":"Feature","id":"540000","properties":{"id":"540000","cp":[89.132212,30.860361],"name":"西藏","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@ÂhľxŖxÒVºÅâAĪÝȆµę¯Ňa±r_w~uSÕňqOj]ɄQ£ZUDûoY»©M[L¼qãË{VÍçWVi]ë©Ä÷àyƛhÚU°adcQ~Mx¥cc¡ÙaSyFÖkuRýq¿ÔµQĽ³aG{¿FµëªéĜÿª@¬·K·àariĕĀ«V»ŶĴūgèLǴŇƶaftèBŚ£^âǐÝ®M¦ÁǞÿ¬LhJ¾óƾÆºcxwf]Y´¦|QLn°adĊ\\¨oǀÍŎ´ĩĀd`tÊQŞŕ|¨C^©Ĉ¦¦ÎJĊ{ëĎjª²rÐl`¼Ą[t|¦Stè¾PÜK¸dƄı]s¤î_v¹ÎVòŦj£Əsc¬_Ğ´|Ł¦Av¦w`ăaÝaa¢e¤ı²©ªSªÈMĄwÉØŔì@T¤Ę\\õª@þo´xA sÂtŎKzó´ÇĊµ¢r^nĊÆ¬×üG¢³ {âĊ]G~bÀgVjzlhǶfOfdªB]pjTOtĊn¤}®¦Č¥d¢¼»ddY¼t¢eȤJ¤}Ǿ¡°§¤AÐlc@ĝsªćļđAçwxUuzEÖġ~AN¹ÄÅȀŻ¦¿ģŁéì±Hãd«g[Ø¼ēÀcīľġ¬cJµÐʥVȝ¸ßS¹ý±ğkƁ¼ą^ɛ¤Ûÿb[}¬ōõÃ]ËNm®g@Bg}ÍF±ǐyL¥íCIĳÏ÷Ñį[¹¦[âšEÛïÁÉdƅß{âNÆāŨß¾ě÷yC£k´ÓH@Â¹TZ¥¢į·ÌAÐ§®Zcv½Z¹|ÅWZqgW|ieZÅYVÓqdqbc²R@c¥Rã»GeeƃīQ}J[ÒK¬Ə|oėjġĠÑN¡ð¯EBčnwôɍėª²CλŹġǝʅįĭạ̃ūȹ]ΓͧgšsgȽóϧµǛęgſ¶ҍć`ĘąŌJÞä¤rÅň¥ÖÁUětęuůÞiĊÄÀ\\Æs¦ÓRb|Â^řÌkÄŷ¶½÷f±iMÝ@ĥ°G¬ÃM¥n£Øąğ¯ß§aëbéüÑOčk£{\\eµª×MÉfm«Ƒ{Å×Gŏǩãy³©WÑăû··Qòı}¯ãIéÕÂZ¨īès¶ZÈsæĔTŘvgÌsN@îá¾ó@ÙwU±ÉTå»£TđWxq¹Zobs[×¯cĩvėŧ³BM|¹kªħ¥TzNYnÝßpęrñĠĉRS~½ěVVµõ«M££µBĉ¥áºae~³AuĐh`Ü³ç@BÛïĿa©|z²Ý¼D£àč²ŸIûI āóK¥}rÝ_Á´éMaň¨~ªSĈ½½KÙóĿeƃÆB·¬ën×W|Uº}LJrƳlŒµ`bÔ`QÐÓ@s¬ñIÍ@ûws¡åQÑßÁ`ŋĴ{ĪTÚÅTSÄ³Yo|Ç[Ç¾µMW¢ĭiÕØ¿@MhpÕ]jéò¿OƇĆƇpêĉâlØwěsǩĵ¸cbU¹ř¨WavquSMzeo_^gsÏ·¥Ó@~¯¿RiīB\\qTGªÇĜçPoÿfñòą¦óQīÈáPābß{ZŗĸIæÅhnszÁCËìñÏ·ąĚÝUm®óL·ăUÈíoù´Êj°ŁŤ_uµ^°ìÇ@tĶĒ¡ÆM³Ģ«İĨÅ®ğRāðggheÆ¢zÊ©Ô\\°ÝĎz~ź¤PnMĪÖB£kné§żćĆKĒ°¼L¶èâz¨u¦¥LDĘz¬ýÎmĘd¾ßFzhg²Fy¦ĝ¤ċņbÎ@yĄæm°NĮZRÖíJ²öLĸÒ¨Y®ƌÐVàtt_ÚÂyĠz]ŢhzĎ{ÂĢXc|ÐqfO¢¤ögÌHNPKŖUú´xx[xvĐCûĀìÖT¬¸^}Ìsòd´_KgžLĴÀBon|H@Êx¦BpŰŌ¿fµƌA¾zǈRx¶FkĄźRzŀ~¶[´HnªVƞuĒÈ¨ƎcƽÌm¸ÁÈM¦x͊ëÀxǆBú^´W£dkɾĬpw˂ØɦļĬIŚÊnŔa¸~J°îlɌxĤÊÈðhÌ®gT´øàCÀ^ªerrƘd¢İP|Ė ŸWªĦ^¶´ÂLaT±üWƜǀRÂŶUńĖ[QhlLüAÜ\\qRĄ©"],"encodeOffsets":[[90849,37210]]}},{"type":"Feature","id":"610000","properties":{"id":"610000","cp":[108.948024,34.263161],"name":"陕西","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@p¢ȮµûGĦ}Ħðǚ¶òƄjɂz°{ºØkÈęâ¦jªBg\\ċ°s¬]jú EȌǆ¬stRÆdĠİwÜ¸ôW¾ƮłÒ_{Ìû¼jº¹¢GǪÒ¯ĘZ`ºŊecņą~BÂgzpâēòYǠȰÌTÎ¨ÂW|fcă§uF@N¢XLRMº[ğȣſï|¥Jkc`sŉǷY¹W@µ÷Kãï³ÛIcñ·VȋÚÒķø©þ¥yÓğęmWµÎumZyOŅƟĥÓ~sÑL¤µaÅY¦ocyZ{y c]{Ta©`U_Ěē£ωÊƍKùK¶ȱÝƷ§{û»ÅÁȹÍéuĳ|¹cÑdìUYOuFÕÈYvÁCqÓTǢí§·S¹NgV¬ë÷Át°DØ¯C´ŉƒópģ}ċcEËFéGU¥×K§¶³BČ}C¿åċ`wġB·¤őcƭ²ő[Å^axwQOÿEËßŚĤNĔwƇÄńwĪo[_KÓª³ÙnKÇěÿ]ďă_d©·©Ýŏ°Ù®g]±ßå¬÷m\\iaǑkěX{¢|ZKlçhLtŇîŵœè[É@ƉĄEtƇÏ³ħZ«mJ×¾MtÝĦ£IwÄå\\Õ{OwĬ©LÙ³ÙgBƕŀrÌĢŭO¥lãyC§HÍ£ßEñX¡°ÙCgpťzb`wIvA|§hoĕ@E±iYd¥OĻ¹S|}F@¾oAO²{tfÜ¢FǂÒW²°BĤh^Wx{@¬F¸¡ķn£P|ªĴ@^ĠĈæbÔc¶lYi^MicĎ°Â[ävï¶gv@ÀĬ·lJ¸sn|¼u~a]ÆÈtŌºJpþ£KKf~¦UbyäIĺãnÔ¿^ŵMThĠÜ¤ko¼Ŏìąǜh`[tRd²Ĳ_XPrɲlXiL§à¹H°Ȧqº®QCbAŌJ¸ĕÚ³ĺ§ `d¨YjiZvRĺ±öVKkjGȊÄePĞZmļKÀ[`ösìhïÎoĬdtKÞ{¬èÒÒBÔpĲÇĬJŊ¦±J«Y§@·pHµàåVKepWftsAÅqC·¬ko«pHÆuK@oHĆÛķhxenS³àǍrqƶRbzy¸ËÐl¼EºpĤ¼x¼½~Ğà@ÚüdK^mÌSj"],"encodeOffsets":[[110234,38774]]}},{"type":"Feature","id":"620000","properties":{"id":"620000","cp":[103.823557,36.058039],"name":"甘肃","childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@VuUv"],["@@ũEĠtt~nkh`Q¦ÅÄÜdwAb×ĠąJ¤DüègĺqBqj°lI¡ĨÒ¤úSHbjÎB°aZ¢KJO[|A£Dx}NĂ¬HUnrk kp¼Y kMJn[aGáÚÏ[½rc}aQxOgsPMnUsncZsKúvAtÞġ£®ĀYKdnFw¢JE°Latf`¼h¬we|Æbj}GA·~W`¢MC¤tL©Ĳ°qdfObÞĬ¹ttu`^ZúE`[@Æsîz®¡CƳƜG²R¢RmfwĸgÜą G@pzJM½mhVy¸uÈÔO±¨{LfæU¶ßGĂq\\ª¬²I¥IŉÈīoıÓÑAçÑ|«LÝcspīðÍgtë_õ\\ĉñLYnĝgRǡÁiHLlõUĹ²uQjYi§Z_c¨´ĹĖÙ·ŋIaBDR¹ȥr¯GºßK¨jWkɱOqWĳ\\aQ\\sg_ĆǛōëp»£lğÛgSŶN®À]ÓämĹãJaz¥V}Le¤Lýo¹IsŋÅÇ^bz³tmEÁ´a¹cčecÇNĊãÁ\\č¯dNj]jZµkÓdaćå]ğĳ@ ©O{¤ĸm¢E·®«|@Xwg]Aģ±¯XǁÑǳªcwQÚŝñsÕ³ÛV_ý¥\\ů¥©¾÷w©WÕÊĩhÿÖÁRo¸V¬âDb¨hûxÊ×ǌ~Zâg|XÁnßYoº§ZÅŘv[ĭÖʃuďxcVbnUSfB¯³_TzºÎO©çMÑ~M³]µ^püµÄY~y@X~¤Z³[Èōl@®Å¼£QK·Di¡ByÿQ_´D¥hŗy^ĭÁZ]cIzýah¹MĪğPs{ò²Vw¹t³ŜË[Ñ}X\\gsF£sPAgěp×ëfYHāďÖqēŭOÏëdLü\\it^c®RÊº¶¢H°mrY£B¹čIoľu¶uI]vģSQ{UŻÅ}QÂ|Ì°ƅ¤ĩŪU ęĄÌZÒ\\v²PĔ»ƢNHĂyAmƂwVm`]ÈbH`Ì¢²ILvĜH®¤Dlt_¢JJÄämèÔDëþgºƫaʎÌrêYi~ Îİ¤NpÀA¾Ĕ¼bð÷®üszMzÖĖQdȨýv§Tè|ªHÃ¾a¸|Ð ƒwKĢx¦ivr^ÿ ¸l öæfƟĴ·PJv}n\\h¹¶v·À|\\ƁĚN´ĜçèÁz]ġ¤²¨QÒŨTIlªťØ}¼˗ƦvÄùØEÂ«FïËIqōTvāÜŏíÛßÛVj³âwGăÂíNOPìyV³ŉĖýZso§HÑiYw[ß\\X¦¥c]ÔƩÜ·«jÐqvÁ¦m^ċ±R¦΋ƈťĚgÀ»IïĨʗƮ°ƝĻþÍAƉſ±tÍEÕÞāNUÍ¡\\ſčåÒʻĘm ƭÌŹöʥëQ¤µÇcƕªoIýIÉ_mkl³ăƓ¦j¡YzŇi}Msßõīʋ }ÁVm_[n}eıUĥ¼ªI{Î§DÓƻėojqYhĹT©oūĶ£]ďxĩǑMĝq`B´ƃ˺Чç~²ņj@¥@đ´ί}ĥtPńÇ¾V¬ufÓÉCtÓ̻¹£G³]ƖƾŎĪŪĘ̖¨ʈĢƂlɘ۪üºňUðǜȢƢż̌ȦǼĤŊɲĖÂKq´ï¦ºĒǲņɾªǀÞĈĂD½ĄĎÌŗĞrôñnN¼â¾ʄľԆ|Ǆ֦ज़ȗǉ̘̭ɺƅêgV̍ʆĠ·ÌĊv|ýĖÕWĊǎÞ´õ¼cÒÒBĢ͢UĜð͒s¨ňƃLĉÕÝ@ɛƯ÷¿ĽĹeȏĳëCȚDŲyê×Ŗyò¯ļcÂßYtÁƤyAã˾J@ǝrý@¤rz¸oP¹ɐÚyáHĀ[JwcVeȴÏ»ÈĖ}ƒŰŐèȭǢόĀƪÈŶë;Ñ̆ȤМľĮEŔĹŊũ~ËUă{ĻƹɁύȩþĽvĽƓÉ@ēĽɲßǐƫʾǗĒpäWÐxnsÀ^ƆwW©¦cÅ¡Ji§vúF¶¨c~c¼īeXǚ\\đ¾JwÀďksãAfÕ¦L}waoZD½Ml«]eÒÅaÉ²áo½FõÛ]ĻÒ¡wYR£¢rvÓ®y®LFLzĈôe]gx}|KK}xklL]c¦£fRtív¦PĤoH{tK"]],"encodeOffsets":[[[108619,36299]],[[108589,36341]]]}},{"type":"Feature","id":"630000","properties":{"id":"630000","cp":[96.778916,35.623178],"name":"青海","childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@InJm"],["@@CÆ½OŃĦsΰ~Ē³¦@@Ņi±è}ШƄ˹A³r_ĞǒNĪĐw¤^ŬĵªpĺSZgrpiƼĘÔ¨C|ÍJ©Ħ»®VĲ~f\\m `UnÂ~ʌĬàöNt~ňjy¢ZiƔ¥Ąk´nl`JÊJþ©pdƖ®È£¶ìRʦźõƮËnʼėæÑƀĎ[¢VÎĂMÖÝÎF²sƊƀÎBļýƞ¯ʘƭðħ¼Jh¿ŦęΌƇ¥²Q]Č¥nuÂÏri¸¬ƪÛ^Ó¦d¥[Wàx\\ZjÒ¨GtpþYŊĕ´zUOëPîMĄÁxH´áiÜUàîÜŐĂÛSuŎrJðÌ¬EFÁú×uÃÎkrĒ{V}İ«O_ÌËĬ©ÓŧSRÑ±§Ģ£^ÂyèçěM³Ƃę{[¸¿uºµ[gt£¸OƤĿéYõ·kĀq]juw¥DĩƍõÇPéÄ½G©ã¤GuȧþRcÕĕNyyûtøï»a½ē¿BMoį£Íj}éZËqbʍƬh¹ìÿÓAçãnIÃ¡I`ks£CGěUy×Cy@¶ʡÊBnāzGơMē¼±O÷õJËĚăVĪũƆ£¯{ËL½ÌzżVR|ĠTbuvJvµhĻĖHAëáaOÇðñęNwœľ·LmI±íĠĩPÉ×®ÿscB³±JKßĊ«`ađ»·QAmOVţéÿ¤¹SQt]]Çx±¯A@ĉĳ¢Óļ©l¶ÅÛrŕspãRk~¦ª]Į´FRådČsCqđéFn¿ÅƃmÉx{W©ºƝºįkÕƂƑ¸wWūÐ©ÈF£\\tÈ¥ÄRÈýÌJ lGr^×äùyÞ³fjc¨£ÂZ|ǓMĝÏ@ëÜőRĝ÷¡{aïȷPu°ËXÙ{©TmĠ}Y³ÞIňµç½©C¡į÷¯B»|St»]vųs»}MÓ ÿʪƟǭA¡fs»PY¼c¡»¦cċ¥£~msĉPSi^o©AecPeǵkgyUi¿h}aHĉ^|á´¡HØûÅ«ĉ®]m¡qĉ¶³ÈyôōLÁstB®wn±ă¥HSòė£Së@×œÊăxÇN©©T±ª£Ĳ¡fb®Þbb_Ą¥xu¥B{łĝ³«`dƐt¤ťiñÍUuºí`£^tƃĲc·ÛLO½sç¥Ts{ă\\_»kÏ±q©čiìĉ|ÍI¥ć¥]ª§D{ŝŖÉR_sÿc³ĪōƿÎ§p[ĉc¯bKmR¥{³Ze^wx¹dƽÅ½ôIg §Mĕ ƹĴ¿ǣÜÍ]Ý]snåA{eƭ`ǻŊĿ\\ĳŬűYÂÿ¬jĖqßb¸L«¸©@ěĀ©ê¶ìÀEH|´bRľÓ¶rÀQþvl®ÕETzÜdb hw¤{LRdcb¯ÙVgƜßzÃôì®^jUèXÎ|UäÌ»rK\\ªN¼pZCüVY¤ɃRi^rPŇTÖ}|br°qňbĚ°ªiƶGQ¾²x¦PmlŜ[Ĥ¡ΞsĦÔÏâ\\ªÚŒU\\f¢N²§x|¤§xĔsZPòʛ²SÐqF`ªVÞŜĶƨVZÌL`¢dŐIqr\\oäõFÎ·¤»Ŷ×h¹]ClÙ\\¦ďÌį¬řtTӺƙgQÇÓHţĒ´ÃbEÄlbʔC|CŮkƮ[ʼ¬ň´KŮÈΰÌĪ¶ƶlðļATUvdTGº̼ÔsÊDÔveOg"]],"encodeOffsets":[[[105308,37219]],[[95370,40081]]]}},{"type":"Feature","id":"640000","properties":{"id":"640000","cp":[106.278179,37.26637],"name":"宁夏","childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@KëÀęĞ«Oęȿȕı]ŉ¡åįÕÔ«ǴõƪĚQÐZhv K°öqÀÑS[ÃÖHƖčËnL]ûcÙß@ĝ¾}w»»oģF¹»kÌÏ·{zP§B¢íyÅt@@á]Yv_ssģ¼ißĻL¾ġsKD£¡N_X¸}B~HaiÅf{«x»ge_bsKF¯¡IxmELcÿZ¤ĢÝsuBLùtYdmVtNmtOPhRw~bd¾qÐ\\âÙH\\bImlNZ»loqlVmGā§~QCw¤{A\\PKNY¯bFkC¥sks_Ã\\ă«¢ħkJi¯rrAhĹûç£CUĕĊ_ÔBixÅÙĄnªÑaM~ħpOu¥sîeQ¥¤^dkKwlL~{L~hw^ófćKyEKzuÔ¡qQ¤xZÑ¢^ļöÜ¾Ep±âbÊÑÆ^fk¬NC¾YpxbK~¥eÖäBlt¿Đx½I[ĒǙWf»Ĭ}d§dµùEuj¨IÆ¢¥dXªƅx¿]mtÏwßRĶX¢͎vÆzƂZò®ǢÌʆCrâºMÞzÆMÒÊÓŊZÄ¾r°Î®Ȉmª²ĈUªĚîøºĮ¦ÌĘk^FłĬhĚiĀĖ¾iİbjÕ"],["@@mfwěwMrŢªv@G"]],"encodeOffsets":[[[109366,40242]],[[108600,36303]]]}},{"type":"Feature","id":"650000","properties":{"id":"650000","cp":[85.617733,40.792818],"name":"新疆","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@QØĔ²X¨~ǘBºjʐßØvKƔX¨vĊOÃ·¢i@~cĝe_«E}QxgɪëÏÃ@sÅyXoŖ{ô«ŸuXêÎf`C¹ÂÿÐGĮÕĞXŪōŸMźÈƺQèĽôe|¿ƸJR¤ĘEjcUóº¯Ĩ_ŘÁMª÷Ð¥OéÈ¿ÖğǤǷÂFÒzÉx[]Ĥĝœ¦EP}ûƥé¿İƷTėƫœŕƅƱB»Đ±ēO¦E}`cȺrĦáŖuÒª«ĲπdƺÏØZƴwʄ¤ĖGĐǂZĶèH¶}ÚZצʥĪï|ÇĦMŔ»İĝǈì¥Βba¯¥ǕǚkĆŵĦɑĺƯxūД̵nơʃĽá½M»òmqóŘĝčË¾ăCćāƿÝɽ©ǱŅ¹đ¥³ðLrÁ®ɱĕģŉǻ̋ȥơŻǛȡVï¹Ň۩ûkɗġƁ§ʇė̕ĩũƽō^ƕUv£ƁQïƵkŏ½ΉÃŭÇ³LŇʻ«ƭ\\lŭD{ʓDkaFÃÄa³ŤđÔGRÈƚhSӹŚsİ«ĐË[¥ÚDkº^Øg¼ŵ¸£EÍöůŉT¡c_ËKYƧUśĵÝU_©rETÏʜ±OñtYwē¨{£¨uM³x½şL©Ùá[ÓÐĥ Νtģ¢\\śnkOw¥±T»ƷFɯàĩÞáB¹ÆÑUwŕĽw[mG½Èå~Æ÷QyěCFmĭZīŵVÁƿQƛûXS²b½KÏ½ĉS©ŷXĕ{ĕK·¥Ɨcqq©f¿]ßDõU³hgËÇïģÉɋwk¯í}I·œbmÉřīJɥĻˁ×xoɹīlc¤³Xù]ǅA¿w͉ì¥wÇN·ÂËnƾƍdÇ§đ®ƝvUm©³G\\}µĿQyŹlăµEwǇQ½yƋBe¶ŋÀůo¥AÉw@{Gpm¿AĳŽKLh³`ñcËtW±»ÕSëüÿďDu\\wwwù³VLŕOMËGh£õP¡erÏd{ġWÁč|yšg^ğyÁzÙs`s|ÉåªÇ}m¢Ń¨`x¥ù^}Ì¥H«YªƅAÐ¹n~ź¯f¤áÀzgÇDIÔ´AňĀÒ¶ûEYospõD[{ù°]uJqU|Soċxţ[õÔĥkŋÞŭZËºóYËüċrw ÞkrťË¿XGÉbřaDü·Ē÷AÃª[ÄäIÂ®BÕĐÞ_¢āĠpÛÄȉĖġDKwbmÄNôfƫVÉviǳHQµâFùÂœ³¦{YGd¢ĚÜO {Ö¦ÞÍÀP^bƾl[vt×ĈÍEË¨¡Đ~´î¸ùÎhuè`¸HÕŔVºwĠââWò@{ÙNÝ´ə²ȕn{¿¥{l÷eé^eďXj©î\\ªÑòÜìc\\üqÕ[Č¡xoÂċªbØø|¶ȴZdÆÂońéG\\¼C°ÌÆn´nxÊOĨŪƴĸ¢¸òTxÊǪMīĞÖŲÃɎOvʦƢ~FRěò¿ġ~åŊúN¸qĘ[Ĕ¶ÂćnÒPĒÜvúĀÊbÖ{Äî¸~Ŕünp¤ÂH¾ĄYÒ©ÊfºmÔĘcDoĬMŬS¤s²ʘÚžȂVŦ èW°ªB|ĲXŔþÈJĦÆæFĚêYĂªĂ]øªŖNÞüAfɨJ¯ÎrDDĤ`mz\\§~D¬{vJÂ«lµĂb¤pŌŰNĄ¨ĊXW|ų ¿¾ɄĦƐMTòP÷fØĶK¢ȝ˔Sô¹òEð`Ɩ½ǒÂň×äı§ĤƝ§C~¡hlåǺŦŞkâ~}FøàĲaĞfƠ¥Ŕd®U¸źXv¢aƆúŪtŠųƠjdƺƺÅìnrh\\ĺ¯äɝĦ]èpĄ¦´LƞĬ´ƤǬ˼Ēɸ¤rºǼ²¨zÌPðŀbþ¹ļD¢¹\\ĜÑŚ¶ZƄ³àjĨoâȴLÊȮĐĚăÀêZǚŐ¤qȂ\\L¢ŌİfÆs|zºeªÙæ§΢{Ā´ƐÚ¬¨Ĵà²łhʺKÞºÖTiƢ¾ªì°`öøu®Ê¾ãØ"],"encodeOffsets":[[88824,50096]]}},{"type":"Feature","id":"110000","properties":{"id":"110000","cp":[116.405285,39.904989],"name":"北京","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@ĽOÁûtŷmiÍt_H»Ĩ±d`¹{bwYr³S]§§o¹qGtm_SŧoaFLgQN_dV@Zom_ć\\ßcÂ±x¯oœRcfe£o§ËgToÛJíĔóu|wP¤XnO¢ÉŦ¯rNÄā¤zâŖÈRpŢZÚ{GrFt¦Òx§ø¹RóäV¤XdżâºWbwŚ¨Ud®bêņ¾jnŎGŃŶnzÚSeîĜZczî¾i]ÍQaúÍÔiþĩȨWĢü|Ėu[qb[swP@ÅğP¿{\\¥A¨ÏÑ¨j¯X\\¯MKpA³[Hīu}}"],"encodeOffsets":[[120023,41045]]}},{"type":"Feature","id":"120000","properties":{"id":"120000","cp":[117.190182,39.125596],"name":"天津","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@ŬgX§Ü«E¶FÌ¬O_ïlÁgz±AXeµÄĵ{¶]gitgIj·¥îakS¨ÐƎk}ĕ{gBqGf{¿aU^fIư³õ{YıëNĿk©ïËZŏR§òoY×Ógcĥs¡bġ«@dekąI[nlPqCnp{ō³°`{PNdƗqSÄĻNNâyj]äÒD ĬH°Æ]~¡HO¾X}ÐxgpgWrDGpù^LrzWxZ^¨´T\\|~@IzbĤjeĊªz£®ĔvěLmV¾Ô_ÈNW~zbĬvG²ZmDM~~"],"encodeOffsets":[[120237,41215]]}},{"type":"Feature","id":"310000","properties":{"id":"310000","cp":[121.472644,31.231706],"name":"上海","childNum":6},"geometry":{"type":"MultiPolygon","coordinates":[["@@ɧư¬EpƸÁxc"],["@@©ª"],["@@MA"],["@@QpİE§ÉC¾"],["@@bŝÕÕEȣÚƥêImɇǦèÜĠÚÃƌÃ͎ó"],["@@ǜûȬɋŭ×^sYɍDŋŽąñCG²«ªč@h_p¯A{oloY¬j@Ĳ`gQÚhr|ǀ^MĲvtbe´R¯Ô¬¨Yô¤r]ìƬį"]],"encodeOffsets":[[[124702,32062]],[[124547,32200]],[[124808,31991]],[[124726,32110]],[[124903,32376]],[[124438,32149]]]}},{"type":"Feature","id":"500000","properties":{"id":"500000","cp":[107.304962,29.533155],"name":"重庆","childNum":2},"geometry":{"type":"MultiPolygon","coordinates":[["@@vjG~nGŘŬĶȂƀƾ¹¸ØÎezĆT¸}êÐqHðqĖä¥^CÆIj²p\\_ æüY|[YxƊæu°xb®Űb@~¢NQt°¶Sæ Ê~rǉĔëĚ¢~uf`faĔJåĊnÖ]jƎćÊ@£¾a®£Ű{ŶĕFègLk{Y|¡ĜWƔtƬJÑxq±ĢN´òKLÈÃ¼D|s`ŋć]Ã`đMûƱ½~Y°ħ`ƏíW½eI½{aOIrÏ¡ĕŇapµÜƅġ^ÖÛbÙŽŏml½SêqDu[RãË»ÿw`»y¸_ĺę}÷`M¯ċfCVµqŉ÷Zgg`d½pDOÎCn^uf²ènh¼WtƏxRGg¦pVFI±G^Ic´ecGĹÞ½sëĬhxW}KÓeXsbkF¦LØgTkïƵNï¶}Gyw\\oñ¡nmĈzj@Óc£»Wă¹Ój_m»¹·~MvÛaq»ê\\ÂoVnÓØÍ²«bq¿efE Ĝ^Q~ Évýş¤²ĮpEİ}zcĺL½¿gÅ¡ýE¡ya£³t\\¨\\vú»¼§·Ñr_oÒý¥u_n»_At©ÞÅ±ā§IVeëY}{VPÀFA¨ąB}q@|Ou\\FmQFÝMwå}]|FmÏCawu_p¯sfÙgYDHl`{QEfNysB¦zG¸rHeN\\CvEsÐùÜ_·ÖĉsaQ¯}_UxÃđqNH¬Äd^ÝŰR¬ã°wećJE·vÝ·HgéFXjÉê`|ypxkAwWĐpb¥eOsmzwqChóUQl¥F^lafanòsrEvfQdÁUVfÎvÜ^eftET¬ôA\\¢sJnQTjPØxøK|nBzĞ»LYFDxÓvr[ehľvN¢o¾NiÂxGpâ¬zbfZo~hGi]öF||NbtOMn eA±tPTLjpYQ|SHYĀxinzDJÌg¢và¥Pg_ÇzIIII£®S¬ØsÎ¼£N"],["@@ifjN@s"]],"encodeOffsets":[[[109628,30765]],[[111725,31320]]]}},{"type":"Feature","id":"810000","properties":{"id":"810000","cp":[114.173355,22.320048],"name":"香港","childNum":5},"geometry":{"type":"MultiPolygon","coordinates":[["@@AlBk"],["@@mn"],["@@EpFo"],["@@ea¢pl¸Eõ¹hj[]ÔCÎ@lj¡uBX´AI¹[yDU]W`çwZkmcMpÅv}IoJlcafŃK°ä¬XJmÐ đhI®æÔtSHnEÒrÈc"],["@@rMUwAS®e"]],"encodeOffsets":[[[117111,23002]],[[117072,22876]],[[117045,22887]],[[116975,23082]],[[116882,22747]]]}},{"type":"Feature","id":"820000","properties":{"id":"820000","cp":[113.54909,22.198951],"name":"澳门","childNum":1},"geometry":{"type":"Polygon","coordinates":["@@kÊd°å§s"],"encodeOffsets":[[116279,22639]]}}],"UTF8Encoding":true}
\ No newline at end of file
--- a/src/components/DentalTabForm/FormItemSelf.vue
+++ b/src/components/DentalTabForm/FormItemSelf.vue
@@ -408,6 +408,7 @@ export default {
 }

 ::v-deep .el-input-number .el-input__inner {
+  text-align: left;
  padding: 0 2px !important;
 }
 ::v-deep .el-input .el-input__inner {

--- a/src/components/FormComponents/CustomForm/FormItemSelf.vue
+++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue
@@ -152,12 +152,12 @@
                  :disabled="item.disabled"
                  :controls="item.controls ? true : false"
                  :controls-position="item.controlsPosition"
-                  :placeholder="item.placeholder"
+                  :placeholder="item.placeholder || '请输入'"
                  :step="item.step"
                  :precision="item.precision"
                  :min="item.minRows"
                  :max="item.maxRows"
-                  style="display: table-cell"
+                  style="display: table-cell; text-align: left"
                  @blur="handleBlur"
                ></el-input-number>
                <span
@@ -232,7 +232,7 @@
                      v-for="(opt, optIndex) in unionList"
                      :key="optIndex"
                      :label="opt.unionName"
-                      :value="opt.unionNo"
+                      :value="opt.id"
                    ></el-option>
                  </template>
                  <template v-else>
@@ -831,6 +831,13 @@ export default {
                          message: "请选择" + targetItem.label,
                        },
                      ]
+                    } else if (targetItem.type == "upload") {
+                      targetItem.rules = [
+                        {
+                          required: true,
+                          message: "请上传" + targetItem.label,
+                        },
+                      ]
                    } else {
                      targetItem.rules = [
                        {
@@ -862,13 +869,24 @@ export default {
                      if (filterArr.includes(targetItem.column[index].prop)) {
                        return
                      }
-                      if (targetItem.column[index].type == "checkbox") {
+                      if (
+                        targetItem.column[index].type == "checkbox" ||
+                        targetItem.column[index].type == "date" ||
+                        targetItem.column[index].type == "radio"
+                      ) {
                        targetItem.column[index].rules = [
                          {
                            required: true,
                            message: "请选择" + targetItem.column[index].label,
                          },
                        ]
+                      } else if (targetItem.column[index].type == "upload") {
+                        targetItem.rules = [
+                          {
+                            required: true,
+                            message: "请上传" + targetItem.column[index].label,
+                          },
+                        ]
                      } else {
                        targetItem.column[index].rules = [
                          {
@@ -975,7 +993,8 @@ export default {
  }

  ::v-deep .el-input-number .el-input__inner {
-    padding: 0 2px !important;
+    padding: 0 15px !important;
+    text-align: left;
  }

  .el-radio {

--- a/src/components/FormComponents/CustomForm/FormItemText.vue
+++ b/src/components/FormComponents/CustomForm/FormItemText.vue
@@ -28,7 +28,7 @@
          {{ unionName }}
        </span>
        <span v-else style="margin: 0 5px">{{
-          String(form[item.prop]) | getItemText(item.dicData, item.type)
+          form[item.prop] | getItemText(item.dicData, item.type)
        }}</span>
      </span>
      <span v-if="item.append && !item.toothBit" class="append">{{
@@ -65,13 +65,22 @@ export default {
  },
  filters: {
    getItemText(val, list, type) {
-      if (!val) return ""
-      if (["radio", "select", "checkbox", "cascader"].includes(type)) {
+      // 单选改为字符串
+      if (["radio", "select", "cascader"].includes(type)) {
+        return formatDicList(list, String(val), type === "cascader" ? "/" : ",")
+      }
+      // 多选
+      if (["checkbox"].includes(type)) {
        return formatDicList(list, val, type === "cascader" ? "/" : ",")
      }
+      // 返回的数字修改字符串
+      if (typeof val === "number") {
+        return String(val)
+      }
      if (Array.isArray(val) && type.includes("range")) {
        return val.join("-")
      }
+      // if (!val) return ""
      return val
    },
  },
@@ -80,7 +89,7 @@ export default {
      if (v.length > 0 && this.form[this.item.prop]) {
        // console.log("获取到了医联体列表", this.form[this.item.prop])
        this.unionName = v.filter(
-          (e) => e.unionNo == this.form[this.item.prop]
+          (e) => e.id == this.form[this.item.prop]
        )[0].unionName
      }
    },

--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -44,7 +44,7 @@
            v-show="g.display"
            :key="gIndex"
            :name="g.prop"
-            :disabled="!g.arrow"
+            :disabled="true"
            :class="g.prop == '1669858313508_15760' ? 'otherItemClass' : ''"
          >
            <template slot="title">
@@ -493,4 +493,8 @@ export default {
    }
  }
 }
+::v-deep .el-collapse-item.is-disabled .el-collapse-item__header {
+  // color: #bbb;
+  cursor: default;
+}
 </style>
--- a/src/components/FormComponents/directSearch.vue
+++ b/src/components/FormComponents/directSearch.vue
@@ -226,6 +226,15 @@ export default {
      form: {},
    }
  },
+  watch: {
+    formDefaults: {
+      handler(v) {
+        console.log(v)
+        this.initforms()
+      },
+      deep: true,
+    },
+  },
  methods: {
    // 表单赋值
    initforms() {

--- a/src/components/TabComponents/index.vue
+++ b/src/components/TabComponents/index.vue
@@ -100,7 +100,9 @@
                            "
                          >
                            <template v-for="(op, opIndex) in col2.operations">
-                              <template v-if="!op.isHidden || !op.isHidden(scope.row)">
+                              <template
+                                v-if="!op.isHidden || !op.isHidden(scope.row)"
+                              >
                                <el-button
                                  :key="opIndex"
                                  :disabled="
@@ -118,11 +120,11 @@
                                  @click="op.func(scope.row, scope.$index)"
                                >
                                  {{
-                                  op.formatter
-                                  ? op.formatter(scope.row).label
-                                  : op.label
-                                  ? op.label
-                                  : scope.row[col2.value]
+                                    op.formatter
+                                      ? op.formatter(scope.row).label
+                                      : op.label
+                                      ? op.label
+                                      : scope.row[col2.value]
                                  }}
                                </el-button>
                              </template>
@@ -167,9 +169,7 @@
                                "
                              />
                              <span v-else class="tableSpan">
-                                {{
-                                scope.row[col2.value]
-                                }}
+                                {{ scope.row[col2.value] }}
                              </span>
                            </template>
                            <template v-else>
@@ -203,9 +203,7 @@
                                "
                              />
                              <span v-else class="tableSpan">
-                                {{
-                                scope.row[col2.value]
-                                }}
+                                {{ scope.row[col2.value] }}
                              </span>
                            </template>
                          </template>
@@ -292,11 +290,8 @@
                          trigger="click"
                        >
                          <el-button type="primary" :size="size">
-                            {{ op.title || "更多操作"
-                            }}
-                            <i
-                              class="el-icon-arrow-down el-icon--right"
-                            ></i>
+                            {{ op.title || "更多操作" }}
+                            <i class="el-icon-arrow-down el-icon--right"></i>
                          </el-button>
                          <el-dropdown-menu slot="dropdown">
                            <el-dropdown-item
@@ -323,9 +318,9 @@
                              "
                            >
                              {{
-                              child.formatter
-                              ? child.formatter(scope.row).label
-                              : child.label
+                                child.formatter
+                                  ? child.formatter(scope.row).label
+                                  : child.label
                              }}
                            </el-dropdown-item>
                          </el-dropdown-menu>
@@ -347,33 +342,40 @@
                            :inactive-value="op.inactiveValue"
                          ></el-switch>
                        </div>
-                        <!-- 操作文字按钮 -->
-                        <el-button
-                          v-else
-                          :key="opIndex"
-                          :size="size"
-                          :disabled="
-                            op.formatter
-                              ? op.formatter(scope.row).disabled
-                              : false
-                          "
-                          :style="op.style"
-                          :type="
-                            op.formatter
-                              ? op.formatter(scope.row).type
-                              : op.type || ''
-                          "
-                          :icon="op.icon"
-                          @click="op.isIndex ? op.func(scope.row, scope.$index,opIndex) :op.func(scope.row, scope.$index)"
-                        >
-                          {{
-                          op.formatter
-                          ? op.formatter(scope.row).label
-                          : op.label
-                          ? op.label
-                          : scope.row[column.value]
-                          }}
-                        </el-button>
+                        <template v-else>
+                          <template
+                            v-if="
+                              op.formatter &&
+                              op.formatter(scope.row).type == 'none'
+                            "
+                          ></template>
+                          <el-button
+                            v-else
+                            :key="opIndex"
+                            :size="size"
+                            :disabled="
+                              op.formatter
+                                ? op.formatter(scope.row).disabled
+                                : false
+                            "
+                            :style="op.style"
+                            :type="
+                              op.formatter
+                                ? op.formatter(scope.row).type
+                                : op.type || ''
+                            "
+                            :icon="op.icon"
+                            @click="op.func(scope.row, scope.$index)"
+                          >
+                            {{
+                              op.formatter
+                                ? op.formatter(scope.row).label
+                                : op.label
+                                ? op.label
+                                : scope.row[column.value]
+                            }}
+                          </el-button>
+                        </template>
                      </template>
                    </template>
                  </template>
@@ -383,7 +385,9 @@
                        ? column.operations.formatter(scope.row)
                        : column.operations"
                    >
-                      <template v-if="!operate.isHidden || !operate.isHidden(scope.row)">
+                      <template
+                        v-if="!operate.isHidden || !operate.isHidden(scope.row)"
+                      >
                        <el-tooltip
                          v-if="operate.tips"
                          :key="operIndex + Date.parse(new Date())"
@@ -456,9 +460,7 @@
                        "
                      />
                      <span v-else class="tableSpan">
-                        {{
-                        scope.row[column.value]
-                        }}
+                        {{ scope.row[column.value] }}
                      </span>
                    </template>
                    <template v-else>
@@ -492,9 +494,7 @@
                        "
                      />
                      <span v-else class="tableSpan">
-                        {{
-                        scope.row[column.value]
-                        }}
+                        {{ scope.row[column.value] }}
                      </span>
                    </template>
                  </template>
@@ -513,9 +513,7 @@
                      :size="column.size"
                    ></el-date-picker>
                    <span v-else class="tableSpan">
-                      {{
-                      scope.row[column.value]
-                      }}
+                      {{ scope.row[column.value] }}
                    </span>
                  </template>

@@ -566,7 +564,9 @@
                  </template>

                  <template v-if="column.operType === 'checkbox'">
-                    <el-checkbox v-model="scope.row[column.value]"></el-checkbox>
+                    <el-checkbox
+                      v-model="scope.row[column.value]"
+                    ></el-checkbox>
                  </template>

                  <!-- 模糊查询输入 -->
@@ -630,7 +630,8 @@
                      style="float: left"
                      type="primary"
                      @click="column.func(scope.$index)"
-                    >上传</el-button>
+                      >上传</el-button
+                    >
                    <span
                      v-if="scope.row.imgUrl"
                      style="
@@ -641,13 +642,15 @@
                        color: #409eff;
                      "
                      @click="column.enlargeFunc(scope.row.imgUrl)"
-                    >{{ scope.row.imgUrl }}</span>
+                      >{{ scope.row.imgUrl }}</span
+                    >
                    <el-button
                      v-if="scope.row.imgUrl"
                      style="float: left; margin-left: 5px"
                      type="primary"
                      @click="column.delFunc(scope.row, scope.$index)"
-                    >删除</el-button>
+                      >删除</el-button
+                    >
                  </template>
                  <!-- 图片 -->
                  <template v-if="column.operType === 'img'">
@@ -665,16 +668,35 @@

                  <!-- 消息 -->
                  <template v-if="column.operType === 'txt'">
-                    <div :style="column.style1">{{ scope.row[column.value1] }}</div>
-                    <div :style="column.style2">{{ scope.row[column.value2] }}</div>
+                    <div :style="column.style1">
+                      {{ scope.row[column.value1] }}
+                    </div>
+                    <div :style="column.style2">
+                      {{ scope.row[column.value2] }}
+                    </div>
                  </template>
                  <!-- html -->
                  <template v-if="column.type === 'html'">
-                    <div class="highlight" v-html="scope.row[column.value]"></div>
+                    <div
+                      class="highlight"
+                      v-html="scope.row[column.value]"
+                    ></div>
+                  </template>
+                  <template v-if="column.type === 'switch'">
+                    <el-switch
+                      v-model="scope.row[column.value]"
+                      :active-value="1"
+                      :inactive-value="0"
+                      @change="column.func(scope.row, scope.$index)"
+                    ></el-switch>
                  </template>
                  <!-- 展开列表 -->
                  <template v-if="column.tabType === 'expand'">
-                    <el-form label-position="right" class="demo-table-expand" label-width="130px">
+                    <el-form
+                      label-position="right"
+                      class="demo-table-expand"
+                      label-width="130px"
+                    >
                      <template v-for="(expand, index) in column.expandColumns">
                        <el-form-item
                          v-if="!expand.hidden"

--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -38,20 +38,29 @@
      </div>
      <el-popover
        placement="top-start"
-        width="200"
-        trigger="click"
+        width="300"
+        :trigger="messageCount == 0 ? 'none' : 'hover'"
        popper-class="message-pop"
      >
-        <div
-          v-for="(item, index) in messageList"
-          :key="index"
-          class="message-box mb-24"
-        >
-          <div class="top-box mb-12">
-            <span class="blue-dot mt-5 mr-8"></span>
-            <span class="top-text">{{ item.date }}</span>
+        <div class="messageBox">
+          <div
+            v-for="(item, index) in messageList"
+            :key="index"
+            class="message-box mb-24"
+          >
+            <div class="top-box mb-12">
+              <span class="blue-dot mt-5 mr-8"></span>
+              <span class="top-text">{{ item.createTime }}</span>
+            </div>
+            <div
+              class="main-text ml-8"
+              style="cursor: pointer"
+              @click="goSearch(item.bizType)"
+            >
+              {{ item.content }}
+            </div>
          </div>
-          <div class="main-text ml-8">{{ item.message }}</div>
+          <div v-show="loading" v-loading="loading" class="loading"></div>
        </div>
        <template slot="reference">
          <el-badge :value="messageCount" :class-name="'badge'">
@@ -72,24 +81,26 @@

 <script>
 import { mapGetters } from "vuex"
-
+import { getMessage } from "@/api/user"
+import Message from "@/mixins/getMessage"
 import {
  Avatar,
-  Breadcrumb,
+  // Breadcrumb,
  ErrorLog,
-  FullScreenBar,
-  ThemeBar,
+  // FullScreenBar,
+  // ThemeBar,
 } from "@/layouts/components"

 export default {
  name: "NavBar",
  components: {
    Avatar,
-    Breadcrumb,
+    // Breadcrumb,
    ErrorLog,
-    FullScreenBar,
-    ThemeBar,
+    // FullScreenBar,
+    // ThemeBar,
  },
+  mixins: [Message],
  props: {
    curSelectedIndex: {
      type: String,
@@ -100,7 +111,6 @@ export default {
    return {
      pulse: false,
      isDot: true,
-      messageCount: 10,
      screeningList: [
        {
          title: "社区筛查",
@@ -124,16 +134,6 @@ export default {
        { fontSize: "+", label: "A+" },
      ],
      fontSize: localStorage.getItem("fontSize") - 0 || 14,
-      messageList: [
-        {
-          date: "2022-12-12",
-          message: "驳回修改病例【6条】",
-        },
-        {
-          date: "2022-12-12",
-          message: "驳回修改病例【6条】",
-        },
-      ],
    }
  },
  computed: {
@@ -143,11 +143,70 @@ export default {
      device: "settings/device",
      routes: "routes/routes",
      feedBackNumber: "user/feedBackNumber",
+      getMessageFlag: "user/getMessageFlag",
    }),
  },
-  created() {},
-  mounted() {},
+  watch: {
+    curSelectedIndex(v) {
+      this.messageList = []
+      this.pageNum = 1
+      this.getMessage()
+    },
+    getMessageFlag(v) {
+      if (v) {
+        this.messageList = []
+        this.pageNum = 1
+        this.getMessage()
+      }
+    },
+  },
+  created() {
+    // this.getMessage()
+  },
+  mounted() {
+    document
+      .querySelector(".messageBox")
+      .addEventListener("scroll", this.scrolling)
+  },
  methods: {
+    scrolling() {
+      let scrollHeight = document.querySelector(".messageBox").scrollHeight //实际高度
+      let scrollTop = document.querySelector(".messageBox").scrollTop //滚动高度
+      let height = document.querySelector(".messageBox").clientHeight //滚动高度
+      console.log(scrollHeight, scrollTop)
+      if (
+        scrollTop + height + 10 >= scrollHeight &&
+        this.messageList.length < this.messageCount &&
+        !this.loading
+      ) {
+        this.pageNum++
+        this.loading = true
+        this.getMessage()
+      }
+    },
+    goSearch(val) {
+      if (val == "screen") {
+        this.$router.push("/screening/index?checkStatus=2")
+      }
+    },
+    getMessage() {
+      this.loading = true
+      getMessage({
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        patientFrom: this.curSelectedIndex,
+      }).then((res) => {
+        if (res.code == 1) {
+          this.$store.commit("user/setGetMessageFlag", false)
+          this.messageCount = res.data.total
+          this.messageList = [...this.messageList, ...res.data.records]
+          // console.log(res.data.total)
+        } else {
+          this.messageCount = 0
+        }
+        this.loading = false
+      })
+    },
    handleCollapse() {
      this.$store.dispatch("settings/changeCollapse")
    },
@@ -308,6 +367,19 @@ export default {
    }
  }
 }
+.messageBox {
+  padding: 40px 28px 12px;
+  height: 380px;
+  // background: pink;
+  overflow: auto;
+  .loading {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
+}
 // .el-popper {
 //   ::v-deep .popper__arrow {
 //     display: none;
@@ -316,7 +388,7 @@ export default {
 </style>
 <style lang="scss">
 .message-pop {
-  padding: 40px 28px 12px;
+  padding: 0px !important;
  z-index: 10;

  .popper__arrow::after {

--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -174,6 +174,35 @@
        </div>
      </el-dialog>
    </el-dialog>
+    <!-- 自动提醒 -->
+    <el-dialog
+      custom-class="autoDialog"
+      :title="''"
+      :visible.sync="autoFlag"
+      :close-on-click-modal="true"
+      :close-on-press-escape="false"
+      :show-close="true"
+      width="520px"
+    >
+      <div class="innerBody">
+        <div class="title">驳回修改提醒</div>
+        <div class="refuteList">
+          <div
+            v-for="(item, index) in autoDialogList"
+            :key="index"
+            class="rufuteItem"
+          >
+            <div class="title">{{ item.title }}病例数据驳回修改</div>
+            <div class="num">【{{ item.num }}条】</div>
+            <div class="btn">
+              <el-button type="warning" @click="goSearch(item.title)"
+                >去处理</el-button
+              >
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
  </div>
 </template>

@@ -189,6 +218,7 @@ import {
 import { mapGetters, mapActions } from "vuex"
 import { tokenName } from "@/config/settings"
 import Media from "./mixin/Media"
+import { getRefuteMessage } from "@/api/user"

 export default {
  name: "Layout",
@@ -204,6 +234,7 @@ export default {
  data() {
    return {
      modalFlag: false,
+      autoFlag: false,
      innerVisible: false,
      screeningList: [
        {
@@ -272,6 +303,7 @@ export default {
          ],
        },
      ],
+      autoDialogList: [],
    }
  },
  computed: {
@@ -289,9 +321,17 @@ export default {
      }
    },
  },
+  watch: {
+    curSelectedIndex(v) {
+      this.getRefuteMessage()
+    },
+  },
  created() {
    this.selectedIndex = sessionStorage.getItem("selectedIndex") || ""
    this.curSelectedIndex = String(this.selectedIndex) ? this.selectedIndex : ""
+    if (this.curSelectedIndex) {
+      this.getRefuteMessage()
+    }
  },
  mounted() {
    if (!this.selectedIndex) {
@@ -304,7 +344,9 @@ export default {
        : ""
    }
    // console.log(this.curSelectedIndex)
-
+    if (this.curSelectedIndex) {
+      this.getRefuteMessage()
+    }
    this.$nextTick(() => {
      window.addEventListener(
        "storage",
@@ -320,6 +362,37 @@ export default {
    ...mapActions({
      handleFoldSideBar: "settings/foldSideBar",
    }),
+    goSearch(title) {
+      if (title == "筛查") {
+        this.$router.push("/screening/index?checkStatus=2")
+      }
+      this.autoFlag = false
+    },
+    // 获取消息
+    getRefuteMessage() {
+      getRefuteMessage(this.curSelectedIndex)
+        .then((res) => {
+          if (res.code == 1) {
+            this.autoDialogList = []
+            if (res.data.筛查) {
+              this.autoDialogList.push({
+                title: "筛查",
+                num: res.data.筛查 || 0,
+              })
+            }
+            if (res.data.随访) {
+              this.autoDialogList.push({
+                title: "随访",
+                num: res.data.随访 || 0,
+              })
+            }
+            if (this.autoDialogList.length > 0) {
+              this.autoFlag = true
+            }
+          }
+        })
+        .catch()
+    },
    setSelectedIndex() {
      console.log(this.selectedIndex)
      this.curSelectedIndex = this.selectedIndex
@@ -475,6 +548,10 @@ export default {
 ::v-deep .homeDialog .el-dialog__header {
  display: none;
 }
+::v-deep .autoDialog .el-dialog__header {
+  // display: none;
+  padding: 0px;
+}
 .modalContent {
  padding: 60px;
  .title {
@@ -604,6 +681,38 @@ export default {
      }
    }
  }
+  .refuteList {
+    display: flex;
+    justify-content: space-around;
+    .rufuteItem {
+      width: 200px;
+      height: 148px;
+      border-radius: 4px;
+      border: 1px solid #dddddd;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .title {
+        font-size: 16px;
+        margin: 16px 0;
+        font-family: AlibabaPuHuiTiR;
+        color: #333333;
+      }
+      .num {
+        font-size: 16px;
+        font-family: AlibabaPuHuiTiM;
+        color: #4e68ff;
+        margin-bottom: 16px;
+      }
+      .btn {
+        .el-button {
+          width: 100px;
+          background: #ff7900;
+          border-radius: 5px;
+        }
+      }
+    }
+  }
 }
 .submit {
  margin-top: 60px;

--- a/src/mixins/getMessage.js
+++ b/src/mixins/getMessage.js
+import { getMessage } from "@/api/user"
+
+export default {
+  data() {
+    return {
+      messageCount: 0,
+      messageList: [],
+      loading: false,
+      pageNum: 1,
+      pageSize: 6,
+    }
+  },
+  methods: {
+    getMessage() {
+      this.loading = true
+      getMessage({
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        patientFrom: this.curSelectedIndex,
+      }).then((res) => {
+        if (res.code == 1) {
+          this.messageCount = res.data.total
+          this.messageList = [...this.messageList, ...res.data.records]
+          // console.log(res.data.total)
+        } else {
+          this.messageCount = 0
+        }
+        this.loading = false
+      })
+    },
+  },
+}
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -20,6 +20,7 @@ const state = {
  menuList: [],
  group: "",
  feedBackNumber: 0,
+  getMessageFlag: false,
 }
 const getters = {
  accessToken: (state) => state.accessToken,
@@ -28,8 +29,12 @@ const getters = {
  roles: (state) => state.roles,
  menuList: (state) => state.menuList,
  feedBackNumber: (state) => state.feedBackNumber,
+  getMessageFlag: (state) => state.getMessageFlag,
 }
 const mutations = {
+  setGetMessageFlag(state, MessageFlag) {
+    state.getMessageFlag = MessageFlag
+  },
  setAccessToken(state, accessToken) {
    state.accessToken = accessToken
    setAccessToken(accessToken)

--- a/src/utils/loadPdf.js
+++ b/src/utils/loadPdf.js
+import * as PDFJS from "pdfjs-dist/build/pdf"
+export async function loadPDF({ el, fileSrc, scale }, call) {
+  PDFJS.GlobalWorkerOptions.workerSrc = require("./pdf.worker.entry.js")
+  let loadingTask = await PDFJS.getDocument({
+    url: fileSrc,
+    withCredentials: true, // 允许携带cookie
+  })
+
+  loadingTask.promise.then((pdf) => {
+    // 开始加载任务
+    document.getElementById("pdfEle").innerHTML = ""
+    const renderPage = (num) => {
+      let pdfCol = document.querySelector(el)
+      // 遍历每一页PDF
+      pdf.getPage(num).then(async (page) => {
+        let viewPort = page.getViewport({ scale: scale }) // 获取PDF尺寸
+        let div = document.createElement("div") // 用于存放canvas
+
+        div.id = `canvasBox_${num}`
+        div.className = "canvas-box"
+        div.style.position = "relative"
+        div.style.width = viewPort.width + "px"
+        div.style.margin = "0 auto"
+
+        let canvas = document.createElement("canvas") // 创建canvas
+
+        let context = canvas.getContext("2d")
+        // 将canvas的宽和高设置为与PDF视图一样大小
+        canvas.height = viewPort.height
+        canvas.width = viewPort.width
+
+        // setTimeout(() => {
+        //   // 画页码
+        //   context.font = "14px orbitron";
+        //   context.fillStyle = "#333";
+        //   context.save();
+        //   context.beginPath();
+        //   context.line = 2;
+        //   context.textAlign = "center";
+        //   context.textBaseline = "middle";
+        //   // context.fillText(`${i}`, viewPort.width / 2, viewPort.height - 30);
+        //   context.restore();
+        //   context.closePath();
+        // }, 500);
+
+        let renderContext = {
+          canvasContext: context,
+          viewport: viewPort,
+        }
+        // 该函数返回一个当PDF页面成功渲染到界面上时解析的`promise`，我们可以使用成功回调来渲染文本图层。
+        await page.render(renderContext) // 初始化文本图层
+        canvas.className = "canvas"
+        canvas.id = `canvas_${num}`
+
+        call({
+          div: div,
+          pdfCol: pdfCol,
+          canvas: canvas,
+          context: context,
+          scale: scale,
+          index: num,
+          allPage: pdf.numPages,
+        })
+
+        div.appendChild(canvas) // 将canvas放进对应的div中
+        pdfCol.appendChild(div) // 将每一个div放到外面的大盒子中
+        num++
+        if (num <= pdf.numPages) {
+          // console.log(num, pdf.numPages);
+          renderPage(num)
+        }
+      })
+    }
+    renderPage(1)
+  })
+}
--- a/src/utils/pdf.worker.entry.js
+++ b/src/utils/pdf.worker.entry.js
+/* Copyright 2020 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+(typeof window !== "undefined"
+  ? window
+  : {}
+).pdfjsWorker = require("./pdf.worker.js");
--- a/src/utils/pdf.worker.js
+++ b/src/utils/pdf.worker.js
--- a/src/views/Home/HealthPopularization/index.vue
+++ b/src/views/Home/HealthPopularization/index.vue
@@ -10,26 +10,48 @@
        {{ item.name }}
      </li>
    </ul>
-    <div v-if="!showText" class="right_list">
+    <div v-if="!showDetail" v-loading="listLoading" class="right_list">
      <div class="list_title">
        {{ leftBar[activeBar].name }}
      </div>
-      <ul class="list">
-        <li v-for="(item, index) in leftBar[activeBar].list" :key="index">
+      <ul class="list" v-if="tableData.length > 0">
+        <li v-for="(item, index) in tableData" :key="index">
          <div class="leftImg">
-            <img src="~@/assets/img/Home/shenghuo.png" alt="" />
+            <img
+              :src="
+                'https://ds.cixincloud.com/geca-api/disease-data/file/info/' +
+                item.imgPath[0].bucketName +
+                '/' +
+                item.imgPath[0].uuidName
+              "
+              alt=""
+            />
          </div>
          <div class="rightCon">
            <div class="top">
-              <div class="rc_title">{{ item.title }}</div>
-              <div class="rc_date">{{ item.time }}</div>
+              <div class="rc_title">{{ item.articleTitle }}</div>
+              <div class="rc_date">{{ item.createTime }}</div>
            </div>
            <div class="bottom" @click="viewDetail(index)">查看</div>
          </div>
        </li>
      </ul>
+      <el-empty v-else description="暂无数据"></el-empty>
+      <div v-if="pageSize && total > 10" class="pagination-footer">
+        <!-- <span class="description">{{ description }}</span> -->
+        <el-pagination
+          background
+          :current-page="pageIndex"
+          :page-sizes="pageSizes"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        ></el-pagination>
+      </div>
    </div>
-    <div v-if="showText" class="right_content">
+    <div v-if="showDetail" class="right_content">
      <div class="breadcum">
        <div
          v-for="(item, index) in showTitle"
@@ -45,27 +67,17 @@
  </div>
 </template>
 <script>
+import { articleList } from "@/api/operation-management"
+import paginationMixin from "@/components/TabComponents/mixin"
 export default {
+  mixins: [paginationMixin],
  data() {
    return {
      activeBar: 0,
+      listLoading: false,
      leftBar: [
        {
          name: "筛查",
-          list: [
-            {
-              id: 1,
-              title: "筛查数据的科学性",
-              text: "123",
-              time: "2022/06-30",
-            },
-            {
-              id: 2,
-              title: "筛查数据的科学性",
-              text: "1",
-              time: "2022/06-30",
-            },
-          ],
        },
        {
          name: "生活",
@@ -79,6 +91,10 @@ export default {
      ],
      showText: "",
      showTitle: [],
+      showDetail: false,
+      // 分页数据
+      total: 0,
+      tableData: [],
    }
  },
  mounted() {
@@ -86,21 +102,47 @@ export default {
    if (this.$route.query.tabIndex) {
      this.activeBar = this.$route.query.tabIndex
    }
+    this.getArticleList()
  },
  methods: {
+    // 获取健康科普
+    getArticleList() {
+      this.listLoading = true
+      let params = {
+        size: this.pageSize,
+        current: this.pageIndex,
+        moduleType: "4",
+        articleType: this.activeBar - 0 + 1,
+      }
+      articleList(params)
+        .then((res) => {
+          if (res.code == 1) {
+            this.tableData = [...res.data.records]
+            this.total = res.data.total - 0
+            this.listLoading = false
+          }
+        })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
    changeActive(i) {
      this.activeBar = i
+      this.showDetail = false
      this.showText = ""
+      this.getArticleList()
    },
    viewDetail(i) {
-      this.showText = this.leftBar[this.activeBar].list[i].text
+      this.showDetail = true
+      this.showText = this.tableData[i].articleContent
      this.showTitle[0] = this.leftBar[this.activeBar].name
-      this.showTitle[1] = this.leftBar[this.activeBar].list[i].title
+      this.showTitle[1] = this.tableData[i].articleTitle
      console.log(this.showText)
    },
    back(index) {
      if (index == 0) {
        this.showText = ""
+        this.showDetail = false
      }
    },
  },
@@ -125,6 +167,9 @@ export default {
      justify-content: center;
      align-items: center;
      cursor: pointer;
+      &:hover {
+        background: rgba(78, 104, 255, 0.04);
+      }
      // background: rgba(78, 104, 255, 0.1);
    }
    .activeBar {
@@ -175,6 +220,7 @@ export default {
            font-family: Roboto-Regular, Roboto;
            font-weight: 400;
            color: #999999;
+            margin-top: 8px;
          }
          .bottom {
            cursor: pointer;

--- a/src/views/Home/Map/allCode.json
+++ b/src/views/Home/Map/allCode.json
--- a/src/views/Home/Map/china.json
+++ b/src/views/Home/Map/china.json
--- a/src/views/Home/Map/index.vue
+++ b/src/views/Home/Map/index.vue
+<template>
+  <div id="map" ref="areaRankingAll"></div>
+</template>
+<script>
+import * as echarts from "echarts"
+import china from "./china.json"
+import allCode from "./allCode.json"
+export default {
+  data() {
+    return {
+      //线上请求JSON文件数据地址
+      // publicUrl: "https://geo.datav.aliyun.com/areas_v3/bound/",
+      //allCode 区域行政编码信息
+      allCode: allCode,
+      locate: [
+        {
+          name: "安徽",
+          value: [117.29, 32.0581, 50],
+        },
+      ],
+    }
+  },
+  watch: {},
+  mounted() {
+    this.initChart() //初始化地图
+  },
+  methods: {
+    initEcharts(geoJson, name, chart) {
+      // console.log(JSON.stringify(geoJson))
+      let self = this
+      echarts.registerMap(name, geoJson)
+      let option = {
+        title: {
+          text: "", // 地图名称
+        },
+        tooltip: {
+          show: true,
+          formatter: function (params) {
+            if (params.value.length > 1) {
+              return params.name + "：" + params.value[2] + "人"
+            }
+            return `${params.name} ： ${params.value ? params.value : 0}人`
+          },
+          textStyle: { fontSize: 14, fontFamily: "fzzz", color: "#fff" },
+          backgroundColor: "rgba(0,0,0,0.3)",
+          borderColor: "rgba(0,0,0,0.3)",
+        },
+        geo: {
+          show: true,
+          map: name,
+          roam: true,
+          zoom: 1.5,
+          center: [105, 34.0267395887],
+          label: {
+            emphasis: {
+              show: false,
+            },
+          },
+          itemStyle: {
+            normal: {
+              areaColor: "#EDEFFF",
+              borderColor: "#7597FA",
+              borderWidth: 1,
+            },
+            emphasis: {
+              areaColor: "#4E68FF", //悬浮背景
+            },
+          },
+        },
+        series: [
+          //小点
+          {
+            //文字和标志
+            name: "light",
+            type: "scatter",
+            coordinateSystem: "geo",
+            data: this.locate,
+            symbolSize: function (val) {
+              return val[2] / 8
+            },
+            label: {
+              normal: {
+                // formatter: "{b}",
+                formatter: "",
+                position: "right",
+                show: true,
+              },
+              emphasis: {
+                show: true,
+              },
+            },
+            itemStyle: {
+              normal: {
+                color: "#FFCF4E",
+              },
+            },
+          },
+          {
+            type: "map",
+            map: "china",
+            geoIndex: 0,
+            aspectScale: 0.75, //长宽比
+            showLegendSymbol: false, // 存在legend时显示
+            label: {
+              normal: {
+                show: false,
+              },
+              emphasis: {
+                show: false,
+                textStyle: {
+                  color: "#fff",
+                },
+              },
+            },
+            roam: true,
+            itemStyle: {
+              normal: {
+                areaColor: "#031525",
+                borderColor: "#FFFFFF",
+              },
+              emphasis: {
+                areaColor: "#2B91B7",
+              },
+            },
+            animation: false,
+            data: [{ name: "安徽省", value: 50 }],
+          },
+        ],
+      }
+      chart.setOption(option, true) //加个true解决下钻的视角偏移
+      chart.off("click")
+    },
+    //带头函数-初始化
+    initChart() {
+      let chart = echarts.init(this.$refs.areaRankingAll)
+      this.initEcharts(china, "中国", chart)
+    },
+  },
+}
+</script>
+<style lang="scss" scoped></style>
--- a/src/views/Home/PdfDialog/index.vue
+++ b/src/views/Home/PdfDialog/index.vue
+<template>
+  <div>
+    <el-dialog
+      custom-class="pdfDialog"
+      :title="''"
+      :visible.sync="showPdf"
+      :close-on-click-modal="true"
+      :close-on-press-escape="false"
+      :show-close="true"
+      width="70%"
+      :destroy-on-close="true"
+      top="10vh"
+    >
+      <div class="innerBody">
+        <div class="title">{{ curPdf.articleTitle }}</div>
+        <div class="refuteList">
+          <!-- <pdf :src="pdfSrc"></pdf> -->
+          <pdf-view ref="pdfView" :pdf-src="pdfSrc"></pdf-view>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import PdfView from "../PdfView/index"
+export default {
+  components: { PdfView },
+  props: {
+    curPdf: {
+      type: Object,
+    },
+    pdfSrc: String,
+  },
+  data() {
+    return {
+      showPdf: false,
+    }
+  },
+  watch: {
+    showPdf(v) {
+      if (v) {
+        setTimeout(() => {
+          this.$refs.pdfView.loadPDF()
+        }, 250)
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.innerBody {
+  padding: 0 60px 40px;
+  .title {
+    font-size: 24px;
+    font-family: AlibabaPuHuiTiM;
+    color: #333333;
+    text-align: center;
+    margin-bottom: 30px;
+  }
+  .refuteList {
+    height: 600px;
+    overflow: auto;
+  }
+}
+</style>
+<style lang="scss">
+.pdfDialog .el-dialog__header {
+  // display: none;
+  padding: 0px !important;
+}
+</style>
--- a/src/views/Home/PdfView/index.vue
+++ b/src/views/Home/PdfView/index.vue
+<template>
+  <div id="editor">
+    <div v-loading="loadingPdf" class="pdfEle_wrap">
+      <div id="pdfEle"></div>
+    </div>
+    <!-- 页码 -->
+    <div class="pdf-render-pager">
+      <div class="prev-next" @click="goPrevPdf">
+        <i class="el-icon-arrow-left"></i>
+      </div>
+      <input
+        v-model="curPage"
+        type="text"
+        title="输入页码后按enter即可跳至目标页"
+        style="border: 1px solid #ccc; position: relative; z-index: 9999"
+        @keyup.enter="handleChangePage"
+      />
+      <div class="middle">/</div>
+      <div class="totalPage">{{ totalPage }}</div>
+      <div class="prev-next" @click="goNextPdf">
+        <i class="el-icon-arrow-right"></i>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { loadPDF } from "@/utils/loadPdf.js"
+export default {
+  props: {
+    pdfSrc: String,
+  },
+  data() {
+    return {
+      totalPage: 1,
+      curPage: 1,
+      loadingPdf: false,
+      canvasH: 0,
+      scrollEle: "", //元素画布
+      clickFlag: true, //左右跳转
+      timeout: null,
+    }
+  },
+  mounted() {},
+  methods: {
+    loadPDF() {
+      document.getElementById("pdfEle").innerHTML = ""
+      this.canvasH = 0 //高度初始化为0 以此控制分页不显示
+      this.curPage = 1 //页码重置为1
+      this.loadingPdf = true
+      if (process.env.NODE_ENV == "development") {
+        loadPDF(
+          // 特约讲师合作协议
+          { el: "#pdfEle", fileSrc: "/ppt的pdf.pdf", scale: 1 },
+          this.callBackPdf
+        )
+      } else {
+        loadPDF(
+          { el: "#pdfEle", fileSrc: this.pdfSrc, scale: 1 },
+          this.callBackPdf
+        )
+      }
+    },
+    // 加载完成的回调 分页加载
+    callBackPdf(item) {
+      const { index, allPage } = item
+      if (index !== allPage) {
+        return
+      }
+      // console.log(allPage);
+      this.totalPage = item.allPage
+      this.scrollEle = document.querySelector(".pdfEle_wrap")
+      // this.canvasH = item.canvas.height;
+      setTimeout(() => {
+        this.canvasH = item.div.offsetHeight
+      }, 100)
+      this.scrollEle.addEventListener("scroll", (e) => {
+        if (this.timeout != null) {
+          clearTimeout(this.timeout)
+        }
+        this.timeout = setTimeout(() => {
+          if (Math.floor(this.scrollEle.scrollTop / this.canvasH) == 0) {
+            this.curPage = 1
+          }
+          if (
+            Math.floor(this.scrollEle.scrollTop / this.canvasH) > 0 &&
+            Math.floor(this.scrollEle.scrollTop / this.canvasH) + 1 !=
+              this.curPage
+          ) {
+            this.curPage =
+              Math.floor(this.scrollEle.scrollTop / this.canvasH) + 1
+          }
+        }, 100)
+        // this.curPage = Math.floor(this.scrollEle.scrollTop / this.canvasH) <= 0? 1: Math.floor(this.scrollEle.scrollTop / this.canvasH);
+      })
+      this.loadingPdf = false
+    },
+    goPrevPdf() {
+      // 限制一下多次点击
+      if (!this.clickFlag) {
+        return false
+      }
+      this.clickFlag = false
+      if (this.curPage > 1) {
+        // --this.curPage;
+        this.scrollPdfPage(parseInt(this.curPage) - 1)
+        --this.curPage
+      }
+      setTimeout(() => {
+        this.clickFlag = true
+      }, 500)
+    },
+    goNextPdf() {
+      // 限制一下多次点击
+      if (!this.clickFlag) {
+        return false
+      }
+      this.clickFlag = false
+      if (this.curPage < this.totalPage) {
+        // ++this.curPage;
+        this.scrollPdfPage(parseInt(this.curPage) + 1)
+        ++this.curPage
+      }
+      setTimeout(() => {
+        this.clickFlag = true
+      }, 500)
+    },
+    handleChangePage(e) {
+      if (!/^\d+$/.test(e.target.value)) {
+        this.curPage = 1
+      } else {
+        // this.curPage = parseInt(e.target.value) > 0 ? parseInt(e.target.value) : 1;
+        if (parseInt(e.target.value) <= 0) {
+          this.curPage = 1
+        } else if (parseInt(e.target.value) > this.totalPage) {
+          this.curPage = this.totalPage
+        } else {
+          this.curPage = parseInt(e.target.value)
+        }
+      }
+      this.scrollPdfPage(this.curPage)
+    },
+    // pdf滚动
+    scrollPdfPage(page) {
+      console.log(this.scrollEle)
+      this.scrollEle.scrollTo({
+        top: this.canvasH * (page - 1),
+        behavior: "smooth",
+      })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+#editor {
+  height: 600px;
+}
+.pdf-render-pager {
+  width: 100%;
+  color: #333;
+  font-size: 12px;
+  height: 50px;
+  padding: 0 15px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  // box-shadow: 0 -1px 0px 0 rgba(149, 149, 149, 0.25);
+  bottom: 0px;
+  left: 0;
+  z-index: 9999;
+  input {
+    width: 26px;
+    border: none;
+    border-bottom: 1px solid #e4e4e4;
+    text-align: center;
+    font-size: 14px;
+  }
+}
+.pdfEle_wrap {
+  width: 100%;
+  height: 600px;
+  padding: 20px 0;
+  min-height: 50px;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  // text-align:center;
+  position: relative;
+  transition: all 0.3s;
+  background: #e4e4e4;
+  #pdfEle {
+    height: 600px;
+  }
+}
+.prev-next {
+  cursor: pointer;
+  width: 20px;
+  height: 20px;
+  font-size: 18px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.middle {
+  margin: 0 8px;
+}
+</style>
--- a/src/views/Home/ScientificResearch/index.vue
+++ b/src/views/Home/ScientificResearch/index.vue
@@ -10,45 +10,64 @@
        {{ item.name }}
      </li>
    </ul>
-    <div class="right_list">
+    <div v-loading="listLoading" class="right_list">
      <div class="list_title">
        {{ leftBar[activeBar].name }}
      </div>
-      <ul class="list">
-        <li v-for="(item, index) in leftBar[activeBar].list" :key="index">
+      <ul v-if="tableData.length > 0" class="list">
+        <li
+          v-for="(item, index) in tableData"
+          :key="index"
+          title="点击预览pdf"
+          @click="setPdf(item)"
+        >
          <div class="left_text">
            <div class="circle"></div>
-            <div class="title">{{ item.title }}</div>
+            <div class="title">{{ item.articleTitle }}</div>
          </div>

          <div class="rig_date">
-            {{ item.time }}
+            {{ item.createTime }}
          </div>
        </li>
      </ul>
+      <el-empty v-else description="暂无数据"></el-empty>
+      <div v-if="pageSize && total > 10" class="pagination-footer">
+        <!-- <span class="description">{{ description }}</span> -->
+        <el-pagination
+          background
+          :current-page="pageIndex"
+          :page-sizes="pageSizes"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        ></el-pagination>
+      </div>
    </div>
+    <!-- 弹窗 -->
+    <pdf-dialog
+      ref="pdfDialog"
+      :cur-pdf="curPdf"
+      :pdf-src="pdfSrc"
+    ></pdf-dialog>
  </div>
 </template>
 <script>
+import { articleList } from "@/api/operation-management"
+import paginationMixin from "@/components/TabComponents/mixin"
+import PdfDialog from "../PdfDialog/index.vue"
 export default {
+  components: { PdfDialog },
+  mixins: [paginationMixin],
  data() {
    return {
      activeBar: 0,
+      listLoading: false,
      leftBar: [
        {
          name: "筛查技术方案",
-          list: [
-            {
-              title: "筛查数据的科学性",
-              text: "",
-              time: "2022/06-30",
-            },
-            {
-              title: "筛查数据的科学性",
-              text: "",
-              time: "2022/06-30",
-            },
-          ],
        },
        {
          name: "筛查指南",
@@ -60,19 +79,53 @@ export default {
          name: "项目进展与成果",
        },
      ],
+      tableData: [],
+      curPdf: { articleTitle: "测试pdf" },
+      pdfSrc: "",
    }
  },
-  watch: {},
  mounted() {
    if (this.$route.query.tabIndex) {
      this.activeBar = this.$route.query.tabIndex
    }
+    this.getArticleList()
  },
  methods: {
    changeActive(i) {
      this.activeBar = i
+      this.getArticleList()
      // this.$router.replace("/scientificresearch")
    },
+    // 获取科学研究
+    getArticleList() {
+      this.listLoading = true
+      let params = {
+        size: this.pageSize,
+        current: this.pageIndex,
+        moduleType: "5",
+        articleType: this.activeBar - 0 + 1,
+      }
+      articleList(params)
+        .then((res) => {
+          if (res.code == 1) {
+            this.tableData = [...res.data.records]
+            this.total = res.data.total
+            this.listLoading = false
+          }
+        })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    setPdf(item) {
+      this.$refs.pdfDialog.showPdf = true
+      this.curPdf = item
+      this.pdfSrc =
+        "https://ds.cixincloud.com/geca-api/disease-data/file/info/" +
+        item.filePath[0].bucketName +
+        "/" +
+        item.filePath[0].uuidName
+    },
  },
 }
 </script>
@@ -95,6 +148,9 @@ export default {
      justify-content: center;
      align-items: center;
      cursor: pointer;
+      &:hover {
+        background: rgba(78, 104, 255, 0.04);
+      }
      // background: rgba(78, 104, 255, 0.1);
    }
    .activeBar {
@@ -127,9 +183,16 @@ export default {
        justify-content: space-between;
        align-items: center;
        cursor: pointer;
+        &:hover {
+          background: rgba(78, 104, 255, 0.04);
+          .left_text .title {
+            color: #4e68ff;
+          }
+        }
        .left_text {
          display: flex;
          align-items: center;
+
          .circle {
            width: 6px;
            height: 6px;

--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -14,7 +14,11 @@
            :name="index + 1 + ''"
          >
            <ul class="tabslist">
-              <li v-for="(item, index) in noticeList" :key="index">
+              <li
+                v-for="(item, index) in noticeList"
+                :key="index"
+                @click="setPdf(item)"
+              >
                <div class="left">
                  <div class="circle"></div>
                  {{ item.articleTitle }}
@@ -33,7 +37,8 @@
      <div class="flex">
        <div class="left box cenbox">
          <div class="box_title text-center">联盟地图</div>
-          <img class="map" src="~@/assets/img/Home/map.png" alt="" />
+          <!-- <img class="map" src="~@/assets/img/Home/map.png" alt="" /> -->
+          <Map></Map>
        </div>
        <div class="right box tabbox" style="height: 458px">
          <el-tabs v-model="exTab">
@@ -188,14 +193,25 @@
        </el-popover>
      </ul>
    </div>
+    <!-- 弹窗 -->
+    <pdf-dialog
+      ref="pdfDialog"
+      :cur-pdf="curPdf"
+      :pdf-src="pdfSrc"
+    ></pdf-dialog>
  </div>
 </template>
 <script>
 import { getRankTotal, getCurrentQuarter } from "@/api/Home"
 import { articleList } from "@/api/operation-management"
+import Map from "./Map"
+import PdfDialog from "./PdfDialog/index.vue"
 export default {
+  components: { Map, PdfDialog },
  data() {
    return {
+      curPdf: {},
+      pdfSrc: "",
      fixIndex: -1,
      // videoSrc: require("../../../public/aaa.mp4"),
      videoSrc: "",
@@ -205,48 +221,7 @@ export default {
          title: "浙江省典型案例",
        },
      ],
-      exampleList: [
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-      ],
+      exampleList: [],
      tabList: [
        {
          title: "新闻会议",
@@ -258,48 +233,7 @@ export default {
          title: "学术动态",
        },
      ],
-      noticeList: [
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-      ],
+      noticeList: [],
      curTab: "1",
      listLoading: false,
      rangeList: [], // 上报排名
@@ -369,6 +303,15 @@ export default {
    })
  },
  methods: {
+    setPdf(item) {
+      this.$refs.pdfDialog.showPdf = true
+      this.curPdf = item
+      this.pdfSrc =
+        "https://ds.cixincloud.com/geca-api/disease-data/file/info/" +
+        item.filePath[0].bucketName +
+        "/" +
+        item.filePath[0].uuidName
+    },
    handleClick() {
      this.getArticleList(this.curTab)
    },
@@ -508,7 +451,7 @@ export default {
    }
    .cenbox {
      height: 458px;
-      .map {
+      #map {
        width: 100%;
        height: 422px;
        object-fit: contain;

--- a/src/views/audit-detail/components/screenReview.vue
+++ b/src/views/audit-detail/components/screenReview.vue
@@ -86,6 +86,11 @@ export default {
    patientId(v) {
      this.getCurrentFormByType()
    },
+    noData(v) {
+      if (v) {
+        this.jsonList = []
+      }
+    },
  },
  created() {},
  mounted() {},

--- a/src/views/audit-detail/index.vue
+++ b/src/views/audit-detail/index.vue
@@ -5,7 +5,9 @@
        <div class="left">
          <span v-if="!isEmpty">当前审核</span>
          <span v-if="!isEmpty" class="f-b"
-            >【{{ curUnion }}】【剩余{{ auditNum }}】</span
+            >【{{ curUnion }}】<span v-if="!editStatus"
+              >【剩余{{ auditNum }}】</span
+            ></span
          >
        </div>
        <div class="right">
@@ -32,28 +34,42 @@
          @click="showDialog(item.value)"
          >{{ item.text }}</el-button
        >
-        <span v-if="editStatus" class="op">驳回修改建议:胃镜图片不合规</span>
+        <span v-if="editStatus" class="op"
+          >{{
+            checkStatus == "2"
+              ? "驳回修改建议 : "
+              : checkStatus == "4"
+              ? "不合格原因 : "
+              : ""
+          }}
+          {{ checkStatus == "3" ? "" : checkNote }}</span
+        >
      </div>
    </div>
    <div class="p-24 empty"></div>
+    <!-- 编辑提交前弹窗 -->
    <public-dialog ref="editDialog" @onSubmit="onSubmit" @onCancel="onCancel">
      <!-- 修改审核结果 优先触发提示 -->
      <template v-if="!confirmStatus" slot="content">
        <div class="title">温馨提示</div>
        <div class="content">
          <div class="showTips">
-            该病例已经审核【驳回修改】，需要改为{{
+            该病例已经审核【{{
+              checkStatus == 2
+                ? "驳回修改"
+                : checkStatus == 3
+                ? "合格"
+                : checkStatus == 4
+                ? "不合格"
+                : ""
+            }}】，需要改为{{
              btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : ""
            }}吗
          </div>
        </div>
        <div class="btn">
-          <el-button type="primary" :loading="loading" @click="onCancel"
-            >否</el-button
-          >
-          <el-button type="primary" :loading="loading" @click="editSubmit"
-            >是</el-button
-          >
+          <el-button type="primary" @click="onCancel">否</el-button>
+          <el-button type="primary" @click="editSubmit">是</el-button>
        </div>
      </template>
    </public-dialog>
@@ -91,11 +107,12 @@
                ></el-input>
              </el-form-item>
            </el-form>
+            <!-- 标签部分 -->
            <div class="labelPlace">
              <div class="labelList">
                <template v-for="(item, index) in reasonList">
                  <div
-                    v-if="item.note ? item.note.length < 8 : false"
+                    v-if="item.note ? item.note.length <= 8 : false"
                    :key="index"
                    :class="[
                      'listItem',
@@ -106,12 +123,12 @@
                    <!-- selectedReason.includes(item) ? 'active' : '', -->
                    {{ item.note }}
                  </div>
-                  <template v-if="item.note ? item.note.length >= 8 : false">
+                  <template v-if="item.note ? item.note.length > 8 : false">
                    <el-tooltip
                      :key="index"
                      class="item"
                      effect="dark"
-                      :content="item"
+                      :content="item.note"
                      placement="top"
                    >
                      <div
@@ -135,11 +152,16 @@
          </div>
        </div>
        <div class="btn">
-          <el-button type="primary" :loading="loading" @click="onSubmit"
-            >确认并进入下一列审核</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="onSubmit">{{
+            editStatus
+              ? curBtn == 1
+                ? "好的"
+                : "提交"
+              : "确认并进入下一例审核"
+          }}</el-button>
        </div>
      </template>
+      <!-- 标签的弹窗 -->
      <template v-if="!confirmStatus && editLabelFlag" slot="content">
        <div class="left-back" @click="editLabelFlag = false">
          <i class="el-icon-back"></i>
@@ -181,7 +203,7 @@
          >
        </div>
      </template>
-      <!-- 提交后结果 -->
+      <!-- 提交后合格结果 -->
      <template v-if="confirmStatus" slot="content">
        <div class="title">{{ btnGroup[curBtn - 1].text }}</div>
        <div class="content">
@@ -198,9 +220,13 @@
          该病例审核{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}提交成功！
        </div>
        <div class="btn">
-          <el-button type="primary" @click="nextExample"
-            >确认并进入下一列审核</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="nextExample">{{
+            editStatus
+              ? curBtn == 1
+                ? "好的"
+                : "提交"
+              : "确认并进入下一例审核"
+          }}</el-button>
        </div>
      </template>
    </public-dialog>
@@ -212,6 +238,7 @@ import screenReview from "./components/screenReview.vue"
 import {
  getScreeningUser,
  putScreeningCheck,
+  putScreeningCheckAdvice,
  saveSysCheckNote,
  getSysCheckNote,
 } from "@/api/screeningAudit"
@@ -227,6 +254,8 @@ export default {
        reason: "",
      },
      patientId: "", // 当前人的patientId
+      checkNote: "",
+      checkStatus: "", // 传入的checkstatus
      curUnion: "", // 当前医联体
      id: "",
      rules: {
@@ -260,11 +289,21 @@ export default {
    },
  },
  watch: {},
-  created() {
-    let id = this.$route.query.id
-    this.getUser(id)
-  },
+  created() {},
  mounted() {
+    let unionId = this.$route.query.unionId
+    let patientId = this.$route.query.patientId
+    if (unionId && !patientId) {
+      this.editStatus = false
+      this.getUser(unionId)
+    } else if (patientId) {
+      this.editStatus = true
+      this.patientId = patientId
+      this.id = this.$route.query.id
+      this.checkNote = this.$route.query.checkNote
+      this.checkStatus = this.$route.query.checkStatus
+      this.curUnion = this.$route.query.unionName
+    }
    // this.$refs.publicDialog.dialogVisible = true
  },
  methods: {
@@ -294,13 +333,43 @@ export default {
        checkNote: this.form.reason,
        patientId: this.patientId,
      }
-      putScreeningCheck(params).then((res) => {
-        if (res.code == 1 && res.data) {
-          func()
-          // this.confirmStatus = true
-          this.$refs.publicDialog.dialogVisible = true
-        }
-      })
+      putScreeningCheck(params)
+        .then((res) => {
+          if (res.code == 1 && res.data) {
+            func()
+            // this.confirmStatus = true
+            this.$refs.publicDialog.dialogVisible = true
+          } else {
+            this.loading = false
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    //! 修改审核结果
+    putScreeningCheckAdvice(checkStatus, func) {
+      let params = {
+        id: this.id,
+        checkStatus: checkStatus,
+        checkNote: this.form.reason,
+        patientId: this.patientId,
+      }
+      putScreeningCheckAdvice(params)
+        .then((res) => {
+          if (res.code == 1 && res.data) {
+            this.loading = false
+            this.checkStatus = checkStatus
+            this.checkNote = this.form.reason
+            func()
+          } else {
+            this.loading = false
+            this.$refs.publicDialog.dialogVisible = false
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
    },
    // 设置理由
    setReason({ note }) {
@@ -324,6 +393,7 @@ export default {
            this.isEmpty = false
          } else {
            this.isEmpty = true
+            this.$forceUpdate()
          }
        })
        .finally(() => {
@@ -332,37 +402,39 @@ export default {
          }
        })
    },
-    //! checkStatus 合格-3 不合格-4 驳回修改-2  待审核-1
+    //! 合格提交  checkStatus 合格-3 不合格-4 驳回修改-2  待审核-1
    showDialog(val) {
      this.curBtn = val
-      if (val == 1) {
-        this.$confirm("确定要提交审核吗？", "警告", {
-          type: "warning",
-        })
-          .then(() => {
-            if (!this.editStatus) {
-              if (this.curBtn == 1) {
-                // 走接口，保存合格
-                this.putScreeningCheck("3", () => {
-                  this.confirmStatus = true
-                })
-              }
-            } else {
-              this.$refs.editDialog.dialogVisible = true
-            }
-          })
-          .catch(() => {})
+      if (this.editStatus) {
+        //! 精准编辑
+        this.$refs.editDialog.dialogVisible = true
      } else {
-        this.getSysCheckNote()
-        if (!this.editStatus) {
+        //! 医联体的审核
+        if (val == 1) {
+          this.$confirm("确定要提交审核吗？", "警告", {
+            type: "warning",
+          })
+            .then(() => {
+              if (!this.editStatus) {
+                if (this.curBtn == 1) {
+                  // 走接口，保存合格
+                  this.putScreeningCheck("3", () => {
+                    this.confirmStatus = true
+                  })
+                }
+              } else {
+                this.$refs.editDialog.dialogVisible = true
+              }
+            })
+            .catch(() => {})
+        } else {
+          this.getSysCheckNote()
          if (this.curBtn == 2) {
            this.rules.reason[0].message = "请输入不合格原因"
          } else {
            this.rules.reason[0].message = "请输入驳回修改建议"
          }
          this.$refs.publicDialog.dialogVisible = true
-        } else {
-          this.$refs.editDialog.dialogVisible = true
        }
      }
    },
@@ -373,10 +445,18 @@ export default {
      if (this.curBtn != 1) {
        this.$refs.form.validate((valid) => {
          if (valid) {
-            this.putScreeningCheck("4", () => {
-              this.$message.success("提交审核成功")
-              this.nextExample()
-            })
+            let status = this.curBtn == 2 ? "4" : this.curBtn == 3 ? "2" : ""
+            if (this.editStatus) {
+              this.putScreeningCheckAdvice(status, () => {
+                this.$message.success("提交审核成功")
+                this.onCancel()
+              })
+            } else {
+              this.putScreeningCheck(status, () => {
+                this.$message.success("提交审核成功")
+                this.nextExample()
+              })
+            }
          } else {
            console.log("error submit!!")
            this.loading = false
@@ -390,6 +470,7 @@ export default {
    onCancel() {
      this.confirmStatus = false
      this.editLabelFlag = false
+      this.selectedReason = []
      if (this.curBtn != 1) {
        this.form = { reason: "" }
      }
@@ -399,23 +480,41 @@ export default {
        this.$refs.form.clearValidate()
      }
    },
+    // 修改提交
    editSubmit() {
      // this.$refs.editDialog.dialogVisible = false
      if (this.curBtn == 1) {
        // 走接口，保存合格
-        this.confirmStatus = true
-      } else if (this.curBtn == 2) {
-        this.rules.reason[0].message = "请输入不合格原因"
+        if (this.editStatus) {
+          // 走接口，保存合格
+          this.putScreeningCheckAdvice("3", () => {
+            this.confirmStatus = true
+            this.$refs.publicDialog.dialogVisible = true
+            this.selectedReason = []
+          })
+        }
      } else {
-        this.rules.reason[0].message = "请输入驳回修改建议"
+        this.getSysCheckNote()
+        if (this.curBtn == 2) {
+          this.rules.reason[0].message = "请输入不合格原因"
+        } else {
+          this.rules.reason[0].message = "请输入驳回修改建议"
+        }
+        this.$refs.publicDialog.dialogVisible = true
      }
-      this.$refs.publicDialog.dialogVisible = true
    },
    nextExample() {
-      this.getUser(this.$route.query.id, () => {
+      // !
+      this.$store.commit("user/setGetMessageFlag", true)
+      if (this.editStatus) {
        this.loading = false
        this.onCancel()
-      })
+      } else {
+        this.getUser(this.$route.query.unionId, () => {
+          this.loading = false
+          this.onCancel()
+        })
+      }
    },
    deleteLabel(i) {
      this.$confirm("确定要删除该标签吗？", "警告", {
@@ -476,10 +575,13 @@ export default {
    display: flex;
    justify-content: space-between;
    .right {
+      display: flex;
+      align-items: center;
      .btn {
        width: 80px;
        height: 32px;
        border-radius: 4px;
+        margin-top: 0px;
      }
    }
  }
@@ -521,7 +623,7 @@ export default {
 .btn {
  margin-top: 20px;
  .el-button {
-    // width: 100px;
+    min-width: 100px;
    border-radius: 5px;
    height: 32px;
  }

--- a/src/views/audit-qualitycontrol/index.vue
+++ b/src/views/audit-qualitycontrol/index.vue
@@ -64,21 +64,21 @@ export default {
  watch: {
    auditStatus(val) {
      sessionStorage.setItem("audit-status", val)
-      switch (this.type) {
-        case "1":
-          this.handleSearch()
-          break
-      }
+      // switch (this.type) {
+      //   case "1":
+      //     this.handleSearch()
+      //     break
+      // }
      console.log("status", val)
    },
    type(val) {
      console.log("type", val)
      sessionStorage.setItem("audit-type", val)
-      switch (val) {
-        case "1":
-          this.handleSearch()
-          break
-      }
+      // switch (val) {
+      //   case "1":
+      //     this.handleSearch()
+      //     break
+      // }
    },
  },
  computed: {
@@ -160,7 +160,7 @@ export default {
              text = "合格"
            } else if (row.checkStatus == 4) {
              text = "不合格"
-            } else if (row.checkStatus == 5) {
+            } else if (row.checkStatus == 2) {
              text = "驳回修改"
            } else if (row.checkStatus) {
              text = "--"
@@ -198,7 +198,8 @@ export default {
      this.auditStatus = sessionStorage.getItem("audit-status") || "0"
      this.type = sessionStorage.getItem("audit-type") || "0"
    }
-    this.handleSearch()
+    // this.handleSearch()
+    this.handleClick()
  },
  methods: {
    handleClick() {
@@ -220,12 +221,31 @@ export default {
          },
        })
      } else {
-        this.$router.push({
-          path: "/auditdetail",
-          query: {
-            id: data["unionId"],
-          },
-        })
+        switch (this.auditStatus) {
+          case "0":
+            this.$router.push({
+              path: "/auditdetail",
+              query: {
+                unionId: data["unionId"],
+              },
+            })
+            break
+          case "1":
+            this.$router.push({
+              path: "/auditdetail",
+              query: {
+                id: data["id"],
+                patientId: data["patientId"],
+                checkNote: data["checkNote"],
+                checkStatus: data["checkStatus"],
+                unionName: data["unionName"],
+              },
+            })
+            break
+
+          default:
+            break
+        }
      }
    },
    async handleSearch() {

--- a/src/views/followupentry/followaudit.vue
+++ b/src/views/followupentry/followaudit.vue
@@ -4,14 +4,19 @@
    <div class="audit-detail_header p-24">
      <div class="left">
        <span>当前审核</span>
-        <span class="f-b">【{{ unionName }}】【剩余{{ mcCount }}】</span>
+        <span class="f-b"
+          >【{{ medicalCombination }}】【剩余{{ mcCount }}】</span
+        >
      </div>
      <div class="right">
        <el-button class="btn" @click="$router.go(-1)">返回</el-button>
      </div>
    </div>
    <div class="table-content p-24">
-      <follow-review :formDataList="formEdit" :tabActive="tabActive"></follow-review>
+      <follow-review
+        :formDataList="formEdit"
+        :tabActive="tabActive"
+      ></follow-review>
    </div>
    <div class="choose-handle p-24">
      <span v-if="!editStatus">请选择审核结果:</span>
@@ -22,8 +27,9 @@
          type="primary"
          class="p-btn"
          size="medium"
-          @click="showDialog(item.value, index)"
-        >{{ item.text }}</el-button>
+          @click="showDialog(item.value)"
+          >{{ item.text }}</el-button
+        >
        <span v-if="editStatus" class="op">驳回修改建议:胃镜图片不合规</span>
      </div>
    </div>
@@ -34,21 +40,27 @@
        <div class="content">
          <div class="showTips">
            该病例已经审核【驳回修改】，需要改为{{
-            btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : ""
+              btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : ""
            }}吗
          </div>
        </div>
        <div class="btn">
-          <el-button type="primary" :loading="loading" @click="onCancel">否</el-button>
-          <el-button type="primary" :loading="loading" @click="editSubmit">是</el-button>
+          <el-button type="primary" :loading="loading" @click="onCancel"
+            >否</el-button
+          >
+          <el-button type="primary" :loading="loading" @click="editSubmit"
+            >是</el-button
+          >
        </div>
      </template>
    </public-dialog>
    <public-dialog ref="publicDialog" @onCancel="onCancel">
      <!-- 审核结果回显 -->
-      <template v-if="!confirmStatus && !showNote" slot="content">
-        <div class="title">{{ btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : "" }}</div>
-        <div class="content" ref="publicContent">
+      <template v-if="!confirmStatus" slot="content">
+        <div class="title">
+          {{ btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : "" }}
+        </div>
+        <div class="content">
          <div v-if="curBtn != 1" class="noPass">
            <el-form
              ref="form"
@@ -58,7 +70,10 @@
              label-width="100px"
              class="demo-ruleForm"
            >
-              <el-form-item :label="curBtn == 2 ? '不合格原因' : '驳回修改建议'" prop="reason">
+              <el-form-item
+                :label="curBtn == 2 ? '不合格原因' : '驳回修改建议'"
+                prop="reson"
+              >
                <el-input
                  v-model="form.reason"
                  type="textarea"
@@ -84,56 +99,9 @@
          </div>
        </div>
        <div class="btn">
-          <el-button type="primary" :loading="loading" @click="onCancel">确 定</el-button>
-        </div>
-      </template>
-      <!-- 标签操作 -->
-      <template slot="content" v-if="!confirmStatus && showNote">
-        <div class="left-back" @click="handleNoteDialog">
-          <i class="el-icon-back"></i>
-        </div>
-        <div class="title">编辑标签</div>
-        <div class="content note-dialog" v-if=" tagList.length>0" :style="{'min-height':minHeight}">
-          <el-row :key="index" v-for="(item, index) in tagList" class="mb-16">
-            <el-col :span="18">
-              <el-input
-                size="medium"
-                v-model="item.note"
-                class="tag-input"
-                :class="item.isSelect ? '' : 'unselect-tag'"
-                placeholder="请输入标签"
-              ></el-input>
-            </el-col>
-            <el-col :span="3">
-              <span class="handle-text" style="color: #E02020;" @click="delTag(item,index)">删除</span>
-            </el-col>
-            <el-col :span="2">
-              <span
-                class="handle-text"
-                style="color: #4E68FF;"
-                v-if="index == tagList.length - 1"
-                @click="addTag"
-              >添加</span>
-            </el-col>
-          </el-row>
-        </div>
-        <div class="content" :style="{'min-height':minHeight}" v-else>
-          <el-row class="mb-16">
-            <el-col :span="18">
-              <el-input size="medium" v-model="newNote" class="tag-input" placeholder="请输入标签"></el-input>
-            </el-col>
-            <el-col :span="3">
-              <span class="handle-text" style="color: #E02020;" @click="delTag(item,index)">删除</span>
-            </el-col>
-            <el-col :span="2">
-              <span class="handle-text" style="color: #4E68FF;" @click="addTag">添加</span>
-            </el-col>
-          </el-row>
-        </div>
-        <div class="btn">
-          <el-button type="primary" :loading="auditLoading" @click="saveTag">
-            <span>保 存</span>
-          </el-button>
+          <el-button type="primary" :loading="loading" @click="onSubmit"
+            >确 定</el-button
+          >
        </div>
      </template>
      <!-- 提交后结果 -->
@@ -143,14 +111,24 @@
          <div v-if="curBtn == 1" class="pass">该病例审核合格成功！</div>
          <div v-if="curBtn != 1" class="noPass">
            <!-- 不合格和驳回 -->
-            <div class="label">{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}</div>
-            <div class="reason">{{ form.reason }}</div>
+            <div class="label">
+              {{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}
+            </div>
+            <div class="reson">{{ form.reson }}</div>
          </div>
        </div>
-        <div v-if="curBtn != 1" class="showTips">该病例审核{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}提交成功！</div>
+        <div v-if="curBtn != 1" class="showTips">
+          该病例审核{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}提交成功！
+        </div>
        <div class="btn">
-          <el-button type="primary" @click="nextExample" :loading="auditLoading">
-            <span v-if="tabActive < this.formEdit.length - 1">确认并进入下一列审核</span>
+          <el-button
+            type="primary"
+            @click="nextExample"
+            :loading="auditLoading"
+          >
+            <span v-if="tabActive < this.formEdit.length - 1"
+              >确认并进入下一列审核</span
+            >
            <span v-else>确 定</span>
          </el-button>
        </div>
@@ -162,43 +140,22 @@
 import publicDialog from "./components/publicDialog.vue"
 import followReview from "./components/followReview.vue"
 import { getFollowUnCheckDetail, putFollowCheck } from "@/api/followup"
-import { getSysCheckNote,postSysCheckNote } from "@/api/note"
+import { getSysCheckNote, postSysCheckNote } from "@/api/note"
 export default {
  components: { publicDialog, followReview },
  data() {
    return {
+      medicalCombination: "无锡市人民医院医联体",
      mcCount: 7,
      editStatus: false, //进入的状态是第一次审核还是修改审核,false为第一次,true为修改
-      tabActive: "0", //当前随访病例
-      formEdit: [
-        {
-          patientId: "1623190906909835266",
-          id: "1623216842623492098",
-          formRecordId: "1623216842522828802",
-          age: "",
-          name: "",
-          checkStatus: 1,
-          patientFrom: 1,
-          unionName: "合肥高新附院",
-          unionId: "2",
-          reportTime: "",
-          riskRank: "",
-          formId: "1598197066503389185",
-          is_accept: "0",
-        },
-        {
-          name: "djksh",
-          contact_phone: "12345678",
-          is_accept: "1",
-          gas_exam: "15",
-          G_17: "6",
-        },
-      ], //填报数据
-      auditLoading: false,
-      tagLoading:false,
-      form: {
-        reason: "",
-      }, //审核表单
+      formEdit: {
+        name: "djksh",
+        contact_phone: "12345678",
+        is_accept: "0",
+        gas_exam: "15",
+        G_17: "5",
+      }, //填报数据
+      form: {},
      rules: {
        reason: [{ required: true, message: "请填写", trigger: "blur" }],
      },
@@ -238,9 +195,9 @@ export default {
        //   note: "不合格原因",
        // },
      ],
-      newNote:'',
-      minHeight:'170px',
-      showNote:false
+      newNote: "",
+      minHeight: "170px",
+      showNote: false,
    }
  },
  watch: {
@@ -255,10 +212,7 @@ export default {
  },
  computed: {
    unionId() {
-      return this.$route.query.unionId
-    },
-    unionName() {
-      return this.$route.query.unionName || "--"
+      return this.$route.query.id
    },
  },
  methods: {
@@ -312,12 +266,11 @@ export default {
      console.log("tab激活", this.tabActive)
      this.onCancel()
    },
-    //随访数据
    async getDetail() {
      this.loading = true
      let res = await getFollowUnCheckDetail(this.unionId)
      if (res.code == 1) {
-        // this.formEdit=res.data //调试注释
+        this.formEdit = res.data[0]
      }
      this.loading = false
    },
@@ -342,37 +295,35 @@ export default {
      this.tagLoading = true
      let res = await getSysCheckNote()
      if (res.code == 1) {
-        this.tagList=res.data
+        this.tagList = res.data
      }
      this.tagLoading = false
    },
    //选择标签
    seleckTag(item, index) {
      this.tagList[index]["isSelect"] = true
-      this.form.reason = this.form.reason + item.note + '、'
+      this.form.reason = this.form.reason + item.note + "、"
      this.$forceUpdate()
    },
    //标签保存
-    async saveTag(){
+    async saveTag() {
      let params = this.tagList.map((e) => e.note)
      let res = await postSysCheckNote(params)
      if (res.code == 1) {
-          this.$message.success("保存标签成功")
-          this.getSysCheckNote()
-          // this.$refs.noteDialog.dialogVisible = false
+        this.$message.success("保存标签成功")
+        this.getSysCheckNote()
+        // this.$refs.noteDialog.dialogVisible = false
      }
    },
    //标签添加
-    addTag(){
-      this.tagList.push(
-        {
-          note:''
-        },
-      )
-      this.$forceUpdate();
+    addTag() {
+      this.tagList.push({
+        note: "",
+      })
+      this.$forceUpdate()
    },
    //标签删除
-    delTag(item,index){
+    delTag(item, index) {
      this.$confirm("确定要删除该标签吗？", "警告", {
        type: "warning",
      })
@@ -382,26 +333,26 @@ export default {
        .catch(() => {})
    },
    //标签对话框关闭
-    handleNoteDialog(i){
+    handleNoteDialog(i) {
      this.showNote = false
      this.getSysCheckNote()
    },
-  //   //标签保存对话框操作
-  //   noteSave(){
-  //     this.$refs.noteDialog.dialogVisible = false
-  //     this.getSysCheckNote()
-  //   },
-  //   //添加、编辑标签
-  //   async handleTag(item){
-  //     if(!item.note) return
-  //     else{
-  //       let params = {
-  //         note:item.note
-  //       }
-  //       item.id ? params['id']=item.id : ''
-  //       let res = item.id ? await putSysCheckNote(params) : await postSysCheckNote(params)
-  //     }
-  //   }
+    //   //标签保存对话框操作
+    //   noteSave(){
+    //     this.$refs.noteDialog.dialogVisible = false
+    //     this.getSysCheckNote()
+    //   },
+    //   //添加、编辑标签
+    //   async handleTag(item){
+    //     if(!item.note) return
+    //     else{
+    //       let params = {
+    //         note:item.note
+    //       }
+    //       item.id ? params['id']=item.id : ''
+    //       let res = item.id ? await putSysCheckNote(params) : await postSysCheckNote(params)
+    //     }
+    //   }
  },
 }
 </script>
@@ -431,6 +382,7 @@ export default {
    justify-content: space-between;
    .right {
      .btn {
+        margin-top: 0px;
        width: 80px;
        height: 32px;
        border-radius: 4px;

--- a/src/views/followupentry/index.vue
+++ b/src/views/followupentry/index.vue
@@ -4,10 +4,8 @@
    <ConfigForms
      form-type="2"
      formClass="follow-form"
-      :patient-id="patientId"
-      :disabled="disabled"
-      :tabDisabled="tabDisabled"
-      :operation="operation"
+      :disabled="false"
+      :patientId="patientId"
    ></ConfigForms>
  </div>
 </template>
@@ -20,42 +18,13 @@ export default {
    ConfigForms,
  },
  data() {
-    return {
-      disabled:false,
-      tabDisabled:true,
-      operation:'',
-      patientId:this.$route.query.patientId,
-      model:''
-    }
-  },
-  watch:{
-    model(val){
-      switch(val){
-         case 'view':
-           this.disabled = true
-           this.tabDisabled = false
-           this.operation = 'edit'
-          break;
-          case 'edit':
-           this.disabled = false
-           this.tabDisabled = true
-           this.operation = 'edit'
-          break;
-          default:
-           this.disabled = false
-           this.tabDisabled = true
-           this.operation = ''
-          break;
-      }
-      
-    }
+    return { patientId: "" }
  },
  created() {
-    this.model = this.$route.query.model
+    this.patientId = this.$route.query.patientId
  },
  methods: {},
 }
 </script>

-<style lang="scss">
-</style>
+<style lang="scss"></style>
--- a/src/views/followupresearch/index.vue
+++ b/src/views/followupresearch/index.vue
@@ -2,7 +2,11 @@
  <!-- 随访调查 -->
  <div class="screeningSearch">
    <div class="top">
-      <form-components :forms="formList" :formEdit="formEdit" @handleSearch="onSearch"></form-components>
+      <form-components
+        :forms="formList"
+        :formEdit="formEdit"
+        @handleSearch="onSearch"
+      ></form-components>
    </div>
    <div class="bot">
      <el-table-self
@@ -23,20 +27,18 @@
 </template>
 <script>
 import FormComponents from "@/components/FormComponents"
-import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
 import { getCurrentFormByType } from "@/api/coop-group.js"
 import { getFollowSurvey } from "@/api/followup"
-import { getDictDetail } from "@/api/dict.js"
+import { mapGetters } from "vuex"
 export default {
  components: {
-    CustomsTable,
    FormComponents,
  },
  mixins: [paginationMixin],
  data() {
    return {
-      formId:"", //随访表单类型
+      formId: "", //随访表单类型
      listLoading: false,
      keyword: "",
      modifiedFlag: false,
@@ -62,7 +64,10 @@ export default {
          minWidth: 80,
          value: "sex",
          formatter: (row) => {
-            return this.$handle.formatDicList(this.dictMap["d-sex"], row.sex + "")
+            return this.$handle.formatDicList(
+              this.dictMap["d-sex"],
+              row.sex + ""
+            )
          },
        },
        {
@@ -86,7 +91,7 @@ export default {
          minWidth: 180,
          value: "screeningTime",
          formatter: (row) => {
-            return row.createTime ? row.createTime : "--"
+            return row.screeningTime ? row.screeningTime : "--"
          },
        },
        {
@@ -94,7 +99,10 @@ export default {
          minWidth: 120,
          value: "riskRank",
          formatter: (row) => {
-            return this.$handle.formatDicList(this.dictMap["risk_level"],String(row.riskRank))
+            return this.$handle.formatDicList(
+              this.dictMap["risk_level"],
+              String(row.riskRank)
+            )
          },
        },
        {
@@ -110,15 +118,21 @@ export default {
          value: "followBatch",
          minWidth: 120,
          formatter: (row) => {
-            return this.$handle.formatDicList(this.dictMap["follow_type"],String(row.followBatch))
+            return this.$handle.formatDicList(
+              this.dictMap["follow_type"],
+              String(row.followBatch)
+            )
          },
        },
        {
          label: "计划随访时间",
          value: "nextFollowTime",
-          formatter: (row) => {
-            return this.$handle.formatDicList(this.dictMap["next_follow_time"],String(row.nextFollowTime))
-          },
+          // formatter: (row) => {
+          //   return this.$handle.formatDicList(
+          //     this.dictMap["next_follow_time"],
+          //     String(row.nextFollowTime)
+          //   )
+          // },
          minWidth: 120,
        },
        {
@@ -139,8 +153,7 @@ export default {
          ],
        },
      ],
-      tableData: [
-      ],
+      tableData: [],
      formList: [
        {
          xs: 24,
@@ -151,7 +164,7 @@ export default {
          type: "select",
          label: "计划随访时间",
          prop: "nextFollowTime",
-          trans:'next_follow_time',
+          trans: "next_follow_time",
          placeholder: "请选择计划随访时间",
          rules: [],
          opts: [{ label: "123", value: "1" }],
@@ -201,10 +214,13 @@ export default {
          type: "select",
          label: "随访进度",
          prop: "followBatch",
-          trans:'follow_type',
+          trans: "follow_type",
          placeholder: "请选择随访进度",
          rules: [],
-          opts: [{ label: "123", value: "1" }],
+          opts: [
+            { label: "筛查", value: "0" },
+            { label: "随访", value: "1" },
+          ],
        },
        {
          xs: 1,
@@ -225,7 +241,7 @@ export default {
                marginLeft: "40px",
              },
              btnText: "查询",
-              func: this.onSearch
+              func: this.onSearch,
            },
            // {
            //   btnType: "tobeModified",
@@ -234,79 +250,74 @@ export default {
          ],
        },
      ],
-      formEdit:{}
+      formEdit: {},
    }
  },
-  watch: {
-    pageSize(val){
-      sessionStorage.setItem('followResearch-pageSize',val)
-    },
-    //当前页
-    pageIndex(val){
-      sessionStorage.setItem('followResearch-pageIndex',val)
-    }
+  computed: {
+    ...mapGetters({
+      selectedIndex: "table/selectedIndex",
+      refreshFlag: "table/refreshFlag",
+    }),
  },
-  created(){
-    this.initSearchForm()
+  watch: {},
+  created() {
+    // this.initColumn()
  },
  mounted() {
-    this.formEdit = JSON.parse(sessionStorage.getItem('followResearch-form')) ? JSON.parse(sessionStorage.getItem('followResearch-form')) : {}
-    this.pageSize = Number(sessionStorage.getItem('followResearch-pageSize')) || 10
-    this.pageIndex = Number(sessionStorage.getItem('followResearch-pageIndex')) || 1
-    this.getCurrentFormByType(2)
+    this.handleSearch() //调试注释
  },
  methods: {
    changeModified() {
      this.modifiedFlag = !this.modifiedFlag
    },
-    setSelectedIndex(i) {
-      console.log(this.selectedIndex)
-      this.selectedIndex = i
-      sessionStorage.setItem("homeSelectedIndex", this.selectedIndex)
-    },
-    rowOpration(data, i,label) {
-      console.log('跳转',data, i,label)
-      this.$router.push({path:"/followupentry",query:{patientId:data.patientId,formEdit:JSON.stringify(data)}})
+    changePage(v) {
+      this.page[v.type] = v.value
+      console.log(this.page)
+      this.$refs.customTable.loading = false
    },
    onSearch(form) {
-      sessionStorage.setItem('followResearch-form',JSON.stringify(form))
+      sessionStorage.setItem("followResearch-form", JSON.stringify(form))
      this.formEdit = form
      this.handleSearch()
    },
-    
-    async handleSearch(){
+    rowOpration(data, i) {
+      console.log("跳转", data, i)
+      sessionStorage.setItem("formEdit", JSON.stringify(data))
+      this.$router.push({
+        path: `/followupentry?patientId=${data.patientId}`,
+      })
+    },
+    async handleSearch() {
      this.listLoading = true
-      let params={
-        pageSize:this.pageSize,
-        pageNum:this.pageIndex,
-        formId:this.formId,
-        patientFrom:sessionStorage.getItem('selectedIndex') //筛查场景
+      let params = {
+        pageSize: this.pageSize,
+        pageNum: this.pageIndex,
      }
-      if(this.formEdit){
-        params=Object.assign(this.formEdit,params)
+      params.patientFrom = this.selectedIndex
+      if (this.formEdit) {
+        params = Object.assign(this.formEdit, params)
      }
      let res = await getFollowSurvey(params)
-      if(res.code==1){
+      if (res.code == 1) {
        //分页内容
        const d = res.data
-        this.total= d.total
-        this.tableData=d['records']
+        this.total = d.total
+        this.tableData = d["records"]
      }
      this.listLoading = false
    },
    //查询表单枚举值字典
-    initSearchForm(){
-      this.formList.forEach((item,index) => {
-        if(item.trans){
-          if(!item['opts']){
-           item['opts']=[]
-          }
-          else{
-            item['opts']=this.dictMap[item.trans]
+    initSearchForm() {
+      this.formList.forEach((item, index) => {
+        if (item.trans) {
+          if (!item["opts"]) {
+            item["opts"] = []
+          } else {
+            item["opts"] = this.dictMap[item.trans]
          }
        }
      })
-      this.$forceUpdate();
+      this.$forceUpdate()
    },
    // async initDict(type,index){
    //   let params={
@@ -340,14 +351,13 @@ export default {
    getCurrentFormByType(type) {
      getCurrentFormByType({
        type,
-        groupId: this.$store.state.user.group.groupId || '',
+        groupId: this.$store.state.user.group.groupId || "",
+      }).then((res) => {
+        if (res.code === 1) {
+          this.formId = res.data[0].id
+          this.handleSearch()
+        }
      })
-        .then((res) => {
-          if (res.code === 1) {
-            this.formId = res.data[0].id
-            this.handleSearch()
-          }
-        })
    },
  },
 }

--- a/src/views/qualitycontrol-report/index.vue
+++ b/src/views/qualitycontrol-report/index.vue
@@ -6,9 +6,9 @@
        <span class="bold-font">总体情况</span>
      </div>
      <el-row :gutter="20" class="data-box">
-        <el-col :span="6" v-for="(item,index) in totalList" :key="index">
-          <div class="grid-content mb-12">{{item.label}}</div>
-          <h1>{{totalData[item.prop]}}</h1>
+        <el-col v-for="(item, index) in totalList" :key="index" :span="6">
+          <div class="grid-content mb-12">{{ item.label }}</div>
+          <h1>{{ totalData[item.prop] }}</h1>
        </el-col>
      </el-row>
    </div>
@@ -19,21 +19,31 @@
      </div>
      <div class="type-box">
        <span class="mr-10">选择统计周期：</span>
-        <el-radio-group v-model="periodType">
+        <el-radio-group v-model="periodType" @input="handleClick">
          <el-radio-button label="month">月度</el-radio-button>
-          <el-radio-button label="season">季度</el-radio-button>
+          <el-radio-button label="quarter">季度</el-radio-button>
          <el-radio-button label="year">年度</el-radio-button>
        </el-radio-group>
      </div>
      <div class="type-box">
        <span class="mr-10">选择统计年份：</span>
-        <el-select v-model="yearBtn" placeholder="请选择">
-          <el-option v-for="item in yearList" :value="item" :key="item" :label="item"></el-option>
+        <el-select v-model="yearBtn" placeholder="请选择" @change="change">
+          <el-option
+            v-for="item in yearList"
+            :key="item"
+            :value="item"
+            :label="item"
+          ></el-option>
        </el-select>
      </div>
-      <el-table :data="tableData" border show-summary class="mt-20">
+      <el-table
+        :data="tableData"
+        border
+        :show-summary="showSummary"
+        class="mt-20"
+      >
        <el-table-column
-          v-for="(item,index) in tableColumn"
+          v-for="(item, index) in tableColumn"
          :key="index"
          :prop="item.prop"
          :label="item.label"
@@ -44,114 +54,221 @@
  </div>
 </template>
 <script>
+import { checkerQuality, adminQuality } from "@/api/qualitycontrol-report"
 export default {
  data() {
    return {
-      totalList:[
+      curRole: "",
+      totalList: [
        {
-          label:"累计审核病例数",
-          prop:"account"
+          label: "累计审核病例数",
+          prop: "checked",
        },
        {
-          label:"累计审核合格病例数",
-          prop:"account"
+          label: "累计审核合格病例数",
+          prop: "pass",
        },
        {
-          label:"累计审核驳回修改病例数",
-          prop:"account"
+          label: "累计审核驳回修改病例数",
+          prop: "back",
        },
        {
-          label:"累计审核不合格病例数",
-          prop:"account"
+          label: "累计审核不合格病例数",
+          prop: "unPass",
        },
      ],
-      totalData:{
-        account:1600
-      },
-      periodType:"month",
-      yearList: [2021],
-      yearBtn:2022,
-      tableData:[{
-          id: '12987122',
-          name: '王小虎',
-          season: '234',
-          amount2: '3.2',
-          amount3: 10
-        }, {
-          id: '12987123',
-          name: '王小虎',
-          season: '165',
-          amount2: '4.43',
-          amount3: 12
-        }, {
-          id: '12987124',
-          name: '王小虎',
-          season: '324',
-          amount2: '1.9',
-          amount3: 9
-        }, {
-          id: '12987125',
-          name: '王小虎',
-          season: '621',
-          amount2: '2.2',
-          amount3: 17
-        }, {
-          id: '12987126',
-          name: '王小虎',
-          season: '539',
-          amount2: '4.1',
-          amount3: 15
-        }]
+      totalData: {},
+      periodType: "month",
+      yearList: [],
+      yearBtn: 0,
+      tableData: [],
+      tableColumn: [],
+      allData: [],
+      month: [
+        { label: "1月", prop: "value1" },
+        { label: "2月", prop: "value2" },
+        { label: "3月", prop: "value3" },
+        { label: "4月", prop: "value4" },
+        { label: "5月", prop: "value5" },
+        { label: "6月", prop: "value6" },
+        { label: "7月", prop: "value7" },
+        { label: "8月", prop: "value8" },
+        { label: "9月", prop: "value9" },
+        { label: "10月", prop: "value10" },
+        { label: "11月", prop: "value11" },
+        { label: "12月", prop: "value12" },
+      ],
+      quarter: [
+        { label: "第1季度", prop: "value1" },
+        { label: "第2季度", prop: "value2" },
+        { label: "第3季度", prop: "value3" },
+        { label: "第4季度", prop: "value4" },
+      ],
+      year: [],
+      showSummary: false,
    }
  },
-  methods: {
-    getNow() {
-      const nowDate = new Date()
-      this.yearBtn = nowDate.getFullYear();
-      if(!this.yearList.find((item) => item == this.yearBtn)){
-        this.yearList.push(this.yearBtn)
-        this.yearList.sort((a, b) => {
-          return a - b
-        })
-      }
-      
+  computed: {
+    roles() {
+      return this.$store.state.user.roles
    },
  },
+  watch: {},
  mounted() {},
  created() {
-    this.getNow();
+    this.getNow()
+    if (this.roles.length > 0) {
+      let roleCodeArr = this.roles.map((e) => e.roleCode)
+      console.log(roleCodeArr)
+      if (roleCodeArr.includes("admin")) {
+        this.curRole = "admin"
+      } else if (roleCodeArr.includes("auditer")) {
+        this.curRole = "auditer"
+      }
+    }
+    this.getQuality()
  },
-  watch: {},
-  computed:{
-      tableColumn(){
-        const listM=[
-        {
-          label:"月份",
-          prop:"month"
-        },
-        {
-          label:"审核病例数（例）",
-          prop:"count"
-        },
-      ]
-      const listS=[
-        {
-          label:"季度",
-          prop:"season"
-        },
-        {
-          label:"审核病例数（例）",
-          prop:"count"
-        },
-      ]
-        if(this.periodType == 'month'){
-          return listM
-        }
-        if(this.periodType == 'season'){
-          return listS
+  methods: {
+    change(val) {
+      console.log(val)
+      this.getQuality()
+    },
+    getNow() {
+      const nowDate = new Date()
+      this.yearBtn = nowDate.getFullYear()
+      for (let i = 2023; i <= this.yearBtn; i++) {
+        this.yearList.push(i)
+      }
+    },
+    async getQuality() {
+      let res
+      // console.log(this.curRole)
+      switch (this.curRole) {
+        case "admin":
+          res = await adminQuality({ year: this.yearBtn })
+          let { overall } = res.data
+          this.allData = res.data
+          this.totalData = overall
+          this.showSummary = true
+          this.handleClick()
+          break
+
+        case "auditer":
+          res = await checkerQuality({ year: this.yearBtn })
+          this.allData = res.data
+          this.totalData = res.data.overall
+          this.showSummary = false
+          this.handleClick()
+          break
+        default:
+          break
+      }
+    },
+    handleClick(val) {
+      let tableData
+      let headerData
+      if (this.curRole == "admin") {
+        switch (this.periodType) {
+          case "month":
+            tableData = this.allData.month
+            headerData = this.month
+            this.tableColumn = [
+              {
+                label: "审核员/月份",
+                prop: "name",
+              },
+              ...this.month,
+              {
+                label: "合计",
+                prop: "sum",
+              },
+            ]
+            break
+          case "quarter":
+            tableData = this.allData.quarter
+            headerData = this.quarter
+            this.tableColumn = [
+              {
+                label: "审核员/季度",
+                prop: "name",
+              },
+              ...this.quarter,
+              {
+                label: "合计",
+                prop: "sum",
+              },
+            ]
+            break
+          case "year":
+            tableData = this.allData.year
+            this.year = this.yearList.map((e, index) => {
+              let obj = {
+                label: e + "年",
+                prop: "value" + (index + 1),
+              }
+              return obj
+            })
+            headerData = this.year
+            this.tableColumn = [
+              {
+                label: "审核员/年份",
+                prop: "name",
+              },
+              ...this.year,
+            ]
+            break
+          default:
+            break
        }
+        // //处理动态表头  //
+        this.tableData = []
+        tableData.forEach((e, index) => {
+          let data = {
+            name: e.name,
+          }
+          // 计算
+          for (let i = 0; i < headerData.length; i++) {
+            let value = headerData[i].label
+            let filterArr = e.list.filter((item) => item.value === value)
+            if (filterArr.length > 0) {
+              data[headerData[i].prop] = filterArr[0].checked
+            } else {
+              data[headerData[i].prop] = 0
+            }
+          }
+          // !计算右侧合计条数
+          let arr = e.list.map((listItem) => listItem.checked)
+          data.sum = eval(arr.join("+"))
+          // !计算底部合计
+          this.tableData.push(data)
+        })
+      } else if (this.curRole == "auditer") {
+        headerData = [
+          {
+            label:
+              this.periodType == "month"
+                ? "月份"
+                : this.periodType == "quarter"
+                ? "季度"
+                : this.periodType == "year"
+                ? "年度"
+                : "",
+            prop: "value",
+          },
+          { label: "审核病例数(例)", prop: "checked" },
+        ]
+        this.tableColumn = headerData
+        this.tableData =
+          this.periodType == "month"
+            ? this.allData.month
+            : this.periodType == "quarter"
+            ? this.allData.quarter
+            : this.periodType == "year"
+            ? this.allData.year
+            : []
      }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

--- a/src/views/screening/DraftBox.vue
+++ b/src/views/screening/DraftBox.vue
 <template>
  <div class="container" style="max-height: 89vh">
    <div v-show="!isDetail">
-      <div class="header">草稿箱</div>
+      <div class="header">草稿箱 【{{ total }}条】</div>
      <div class="content">
-        <customs-table
+        <el-table-self
          ref="table"
          :table-data="tableData"
          :columns="columns"
-          :header-class="'newHeader'"
          :list-loading="listLoading"
          :current-page="pageIndex"
          :total-count="total"
@@ -36,7 +35,6 @@
  </div>
 </template>
 <script>
-import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
 import ConfigForms from "./components/ConfigForms.vue"
 import { mapGetters } from "vuex"
@@ -45,7 +43,6 @@ export default {
  // 数据概览
  name: "",
  components: {
-    CustomsTable,
    ConfigForms,
  },
  mixins: [paginationMixin],
@@ -57,51 +54,104 @@ export default {
        {
          label: "医联体",
          minWidth: 120,
-          value: "unionId",
+          value: "unionName",
+          formatter: (row) => {
+            return row.unionName ? row.unionName : "--"
+          },
        },
        {
          label: "姓名",
          minWidth: 120,
+          formatter: (row) => {
+            return row.name ? row.name : "--"
+          },
          value: "name",
        },
        {
          label: "性别",
-          minWidth: 120,
+          minWidth: 80,
          value: "sex",
+          formatter: (row) => {
+            return row.sex
+              ? this.$handle.formatDicList(this.dictMap["d-sex"], row.sex + "")
+              : "--"
+          },
        },
-
-        {
-          label: "身份证",
-          minWidth: 120,
-          value: "idCard",
-        },
-
+        // {
+        //   label: "身份证",
+        //   minWidth: 120,
+        //   value: "idCard",
+        //   formatter: (row) => {
+        //     return row.idCard ? row.idCard : "--"
+        //   },
+        // },
        {
          label: "年龄",
          minWidth: 120,
          value: "age",
+          formatter: (row) => {
+            return row.age ? row.age : "--"
+          },
        },
-
        {
          label: "筛查时间",
-          minWidth: 120,
-          value: "screenTime",
+          minWidth: 180,
+          // sortable: "custom",
+          value: "createTime",
+          formatter: (row) => {
+            return row.createTime ? row.createTime : "--"
+          },
        },
-
        {
          label: "风险评估结果",
          minWidth: 120,
-          value: "result",
+          value: "riskRank",
+          formatter: (row) => {
+            let riskRank = {
+              low: "低危",
+              medium: "中危",
+              high: "高危",
+            }
+            return row.riskRank ? riskRank[row.riskRank] : "--"
+          },
        },
        {
-          label: "上次随访时间",
+          label: "是否内镜",
          minWidth: 120,
-          value: "targetFieldCode",
+          value: "isInnerCheck",
+          formatter: (row) => {
+            let arr = [
+              { label: "否", value: "0" },
+              { label: "是", value: "1" },
+            ]
+            let label
+            if (String(row.isInnerCheck)) {
+              label = arr.filter((e) => e.value == row.isInnerCheck)[0].label
+            } else {
+              label = "--"
+            }
+            return label
+          },
        },
        {
          label: "筛查审核状态",
-          minWidth: 180,
-          value: "createTime",
+          minWidth: 120,
+          value: "checkStatus",
+          formatter: (row) => {
+            let arr = [
+              { label: "待审核", value: "1" },
+              { label: "驳回修改", value: "2" },
+              { label: "合格", value: "3" },
+              { label: "不合格", value: "4" },
+            ]
+            let label
+            if (row.checkStatus) {
+              label = arr.filter((e) => e.value == row.checkStatus)[0].label
+            } else {
+              label = "--"
+            }
+            return label
+          },
        },
        {
          label: "操作",
@@ -172,9 +222,14 @@ export default {
      getPatientPage(data).then((res) => {
        this.listLoading = false
        if (res.code === 1) {
-          const d = res.data
-          this.tableData = d.records || []
-          this.total = Number(d.total)
+          if (res.data.records && res.data.records.length > 0) {
+            const d = res.data
+            this.tableData = d.records || []
+            this.total = Number(d.total)
+          } else {
+            this.tableData = []
+            this.total = 0
+          }
        }
      })
    },

--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -8,12 +8,13 @@
  >
    <div v-if="formTabs && formTabs.length > 0" style="position: relative">
      <el-button
-        v-if="formType == 1 ? !disabled ? true : false : true"
+        v-if="formType == 1 ? (!disabled ? true : false) : true"
        class="draftButton"
        :loading="loading"
        :disabled="!infoCompelete"
        @click="onSubmit(formType)"
-      >{{ formType == 1 ? "临时保存" : "返回" }}</el-button>
+        >{{ formType == 1 ? "临时保存" : "返回" }}</el-button
+      >
      <el-tabs
        v-model="activeName"
        v-loading="fromLoading"
@@ -39,6 +40,7 @@
                  :patient-standby-id="patientStandbyId"
                  :newform-record-id="newformRecordId"
                  :form="form"
+                  :formType="formType"
                  :disabled="disabled"
                  :operation="operation"
                  :isDraft="isDraft"
@@ -46,6 +48,7 @@
                  contrast
                  :form-initial="formInitial"
                  :survival-flag="survivalFlag"
+                  :followId="followId"
                  @setFormJson="setFormJson"
                  @handleConfirm="handleConfirm"
                  @onPrev="onPrev"
@@ -69,7 +72,9 @@
          <div class="showTips">您可以在【草稿箱】页面找到该数据</div>
        </div>
        <div class="btn">
-          <el-button type="primary" :loading="loading" @click="continueSubmit">继续添加</el-button>
+          <el-button type="primary" :loading="loading" @click="continueSubmit"
+            >继续添加</el-button
+          >
        </div>
      </template>
      <!-- 保存提交 -->
@@ -82,8 +87,16 @@
          <div class="showTips">您可以在【筛查查询】页面查询到该数据</div>
        </div>
        <div class="btn">
-          <el-button type="primary" :loading="loading" class="textBtn" @click="viewJump">查看</el-button>
-          <el-button type="primary" :loading="loading" @click="continueSubmit">继续添加</el-button>
+          <el-button
+            type="primary"
+            :loading="loading"
+            class="textBtn"
+            @click="viewJump"
+            >查看</el-button
+          >
+          <el-button type="primary" :loading="loading" @click="continueSubmit"
+            >继续添加</el-button
+          >
        </div>
      </template>
    </public-dialog>
@@ -138,10 +151,12 @@ export default {
  watch: {
    activeName(val) {
      if (!this.disabled) {
-        if (!["index0", "index1"].includes(val)) {
-          this.infoCompelete = true
-        } else {
-          this.infoCompelete = false
+        if (this.$route.path != "/followupentry") {
+          if (!["index0", "index1"].includes(val)) {
+            this.infoCompelete = true
+          } else {
+            this.infoCompelete = false
+          }
        }
      }
      if (val == "index1") {
@@ -199,17 +214,28 @@ export default {
    },
  },
  created() {
-    // 字典formType 1 筛查表单
+    // 字典formType 1 筛查表单 2随访表单
+    // console.log('回显2',this.formEdit)
    this.getCurrentFormByType(this.formType)
-    console.log('大表单',this.disabled,this.tabDisabled,this.patientId)
+    console.log(this.$route.path)
+    this.infoCompelete = this.$route.path == "/followupentry" ? true : false
  },
  methods: {
    handleConfirm(data, done, cb) {
-      this.addPatient(data, done, cb)
-      this.$emit("addMethods", {
-        activeName: this.activeName,
-        form: data.data,
-      })
+      console.log("提交", this.formType)
+      if (this.formType == "2") {
+        this.addFollowPatient(data, done, cb)
+        this.$emit("addMethods", {
+          activeName: this.activeName,
+          form: data.data,
+        })
+      } else {
+        this.addPatient(data, done, cb)
+        this.$emit("addMethods", {
+          activeName: this.activeName,
+          form: data.data,
+        })
+      }
    },
    temporaryConfirm(data, done, cb) {
      this.addPatient(data, done, cb, () => {
@@ -233,7 +259,7 @@ export default {
        )[0]
        formTab.temporarySave()
        // console.log(formTab)
-      } else if (type == 2) {
+      } else if (type == 3) {
        //提交
        this.dialogType = "submit"
        this.$refs.showDialog.dialogVisible = true

--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -12,7 +12,7 @@
      <template v-if="!isEmpty">
        <!-- 多次记录 -->
        <el-row v-if="form.fillType === 1">
-          <tags-scroll-bar
+          <!-- <tags-scroll-bar
            v-if="repeatedlyList.length > 0"
            ref="tags"
            :tags-list="repeatedlyList"
@@ -20,7 +20,7 @@
            :disabled="disabled"
            @change="changeRepeate"
            @add="handleAdd"
-          ></tags-scroll-bar>
+          ></tags-scroll-bar> -->
        </el-row>
        <el-row class="header">
          <!-- <template v-if="formData.percent.autoPercent">
@@ -95,6 +95,7 @@ export default {
    disabled: Boolean,
    contrast: Boolean, //同屏对照
    form: Object,
+    formType: String,
    patientId: String,
    patientStandbyId: String,
    newformRecordId: String,
@@ -107,6 +108,7 @@ export default {
      type: String,
      default: "",
    },
+    followId: String,
  },
  provide() {
    return {
@@ -162,6 +164,70 @@ export default {
      return this.loading || this.formloading
    },
  },
+  watch: {
+    formEdit(val) {
+      console.log("回显3", val)
+    },
+    formInitial: {
+      handler(v) {
+        if (v) {
+          this.$set(this.formData, "formEdit", { ...v })
+          console.log(this.formData.formEdit)
+        }
+      },
+      deep: true,
+    },
+  },
+  created() {
+    if (
+      this.formType == "2" &&
+      sessionStorage.getItem("formEdit") &&
+      this.activeName == "index0"
+    ) {
+      let data = JSON.parse(sessionStorage.getItem("formEdit"))
+      for (const key in data) {
+        if (typeof data[key] == "number") {
+          data[key] = data[key] + ""
+        }
+      }
+      this.formData.formEdit = data
+    }
+    this.initForm() //! 随防筛查通用的设置form
+    if (this.getAll) {
+      // 监听patientId 获取页面所有数据
+      this.$watch(
+        "patientId",
+        () => {
+          this.initData()
+        },
+        { immediate: true }
+      )
+    } else {
+      // 监听form.silent 获取当前tab页数据
+      if (this.formType != 2) {
+        this.$watch(
+          "form.silent",
+          () => {
+            this.initData()
+          },
+          { immediate: true }
+        )
+      } else {
+        this.$nextTick(() => {
+          this.$refs.form && this.$refs.form.resetForm()
+        })
+      }
+    }
+  },
+  mounted() {
+    //! 设置新增判断
+    if (this.$route.path == "/screening/add") {
+      // this.handleAdd()
+      if (!this.formData.formRecordId) {
+        this.handleAdd()
+      }
+    }
+  },
  methods: {
    resetForm() {
      this.$refs.form.resetForm(false)
@@ -227,6 +293,9 @@ export default {
      if (this.isDraft) {
        params.statusMap.is_draft = this.isDraft
      }
+      if (this.$route.path == "/followupentry" && this.activeName != "index0") {
+        params.followId = this.followId
+      }
      this.$emit("handleConfirm", params, done, (res) => {
        // 多次填写的表单新增时，获取最新数据
        if (this.form.fillType === 1 && !this.formData.formRecordId) {
@@ -381,55 +450,6 @@ export default {
      })
    },
  },
-  watch: {
-    formEdit(val) {
-      console.log("回显3", val)
-      this.formatString(val)
-    },
-    formInitial: {
-      handler(v) {
-        if (v) {
-          this.$set(this.formData, "formEdit", { ...v })
-          console.log('form-tab',this.formData.formEdit)
-        }
-      },
-      deep: true,
-    },
-  },
-  created() {
-    if (this.$route.query.formEdit) {
-      this.formatString(JSON.parse(this.$route.query.formEdit))
-    }
-    this.initForm()
-    if (this.getAll) {
-      // 监听patientId 获取页面所有数据
-      this.$watch(
-        "patientId",
-        () => {
-          this.initData()
-        },
-        { immediate: true }
-      )
-    } else {
-      // 监听form.silent 获取当前tab页数据
-      this.$watch(
-        "form.silent",
-        () => {
-          this.initData()
-        },
-        { immediate: true }
-      )
-    }
-  },
-  mounted() {
-    //! 设置新增判断
-    if (this.$route.path == "/screening/add") {
-      // this.handleAdd()
-      if (!this.formData.formRecordId) {
-        this.handleAdd()
-      }
-    }
-  },
 }
 </script>
 <style scoped lang="scss">

--- a/src/views/screening/components/mixin.js
+++ b/src/views/screening/components/mixin.js
-import { addPatient } from "@/api/patient.js"
+import { addPatient, addFollowPatient } from "@/api/patient.js"

 import FormTab from "./FormTab"
 import { mapGetters } from "vuex"
@@ -28,7 +28,7 @@ export default {
      let i = this.activeName.split("index")[1] - 0
      i++
      if (i == 6) {
-        this.onSubmit(2)
+        this.onSubmit(3)
        return
      } else {
        this.activeName = "index" + i
@@ -86,6 +86,37 @@ export default {
          }
        })
    },
+    async addFollowPatient(data, done, cb, ConfigFormsCallback) {
+      addFollowPatient(data, "")
+        .then((res) => {
+          // this.$message.success("操作成功")
+          if (res.data) {
+            this.isUpdated = true
+            this.patientStandbyId = res.data.patientId
+            this.followId = res.data.followId
+            this.newformRecordId = res.data.formRecordId
+            if (
+              cb &&
+              Object.prototype.toString.call(cb) === "[object Function]"
+            ) {
+              cb(res)
+            }
+          }
+        })
+        .finally((e) => {
+          done()
+          console.log("走了", ConfigFormsCallback)
+          if (
+            ConfigFormsCallback &&
+            Object.prototype.toString.call(ConfigFormsCallback) ===
+              "[object Function]"
+          ) {
+            ConfigFormsCallback()
+          } else {
+            this.nextTab()
+          }
+        })
+    },

    // json存储
    setFormJson(formJson) {

--- a/src/views/screening/index.vue
+++ b/src/views/screening/index.vue
@@ -5,6 +5,7 @@
        ref="form"
        :label-position="'right'"
        :forms="searchList"
+        :form-defaults="initForm"
        :style="{ textAlign: 'left' }"
        @handleSearch="handleFormSearch"
      />
@@ -17,9 +18,9 @@
        :total-count="total"
        :page-sizes="pageSizes"
        :page-size="pageSize"
+        :sort-change="sortChange"
        @pageSizeChange="handleSizeChange"
        @currentPageChange="handleCurrentChange"
-        :sortChange="sortChange"
      />
    </div>

@@ -31,8 +32,8 @@
        form-type="1"
        :patient-id="patientId"
        :disabled="disabled"
-        :tabDisabled="tabDisabled"
-        :isDraft="'0'"
+        :tab-disabled="tabDisabled"
+        :is-draft="'0'"
        :operation="'edit'"
      ></ConfigForms>
    </div>
@@ -46,8 +47,8 @@ import ConfigForms from "./components/ConfigForms.vue"
 import { mapGetters } from "vuex"
 export default {
  name: "ScreeningIndex",
-  mixins: [paginationMixin],
  components: { ConfigForms },
+  mixins: [paginationMixin],
  data() {
    return {
      isDetail: false, //! 控制详情显隐
@@ -60,7 +61,7 @@ export default {
        {
          type: "date",
          label: "筛查时间",
-          prop: "createTime",
+          prop: "createDate",
          placeholder: "请选择时间",
          valueFormat: "yyyy-MM-dd",
        },
@@ -80,9 +81,9 @@ export default {
          type: "select",
          prop: "riskRank",
          opts: [
-            { label: "低危", value: "c" },
-            { label: "中危", value: "b" },
-            { label: "高危", value: "a" },
+            { label: "低危", value: "low" },
+            { label: "中危", value: "medium" },
+            { label: "高危", value: "high" },
          ],
        },
        {
@@ -131,14 +132,14 @@ export default {
              : "--"
          },
        },
-        {
-          label: "身份证",
-          minWidth: 120,
-          value: "idCard",
-          formatter: (row) => {
-            return row.idCard ? row.idCard : "--"
-          },
-        },
+        // {
+        //   label: "身份证",
+        //   minWidth: 120,
+        //   value: "idCard",
+        //   formatter: (row) => {
+        //     return row.idCard ? row.idCard : "--"
+        //   },
+        // },
        {
          label: "年龄",
          minWidth: 120,
@@ -216,9 +217,19 @@ export default {
            {
              func: this.handleView,
              formatter(row) {
-                return {
-                  label: "查看",
-                  type: "text",
+                if (row.checkStatus != 2) {
+                  return {
+                    label: "查看",
+                    type: "text",
+                  }
+                } else {
+                  return {
+                    label: "",
+                    type: "none",
+                    style: {
+                      display: "none",
+                    },
+                  }
                }
              },
            },
@@ -233,7 +244,7 @@ export default {
                } else {
                  return {
                    label: "",
-                    type: "text",
+                    type: "none",
                    style: {
                      display: "none",
                    },
@@ -245,6 +256,7 @@ export default {
        },
      ],
      searchForm: {},
+      initForm: {},
    }
  },
  methods: {
@@ -313,21 +325,9 @@ export default {
      selectedIndex: "table/selectedIndex",
      refreshFlag: "table/refreshFlag",
    }),
-  },
-  created() {
-    this.handleFormSearch()
-    // if (this.$route.path == "/screening/index") {
-    //   this.tabDisabled = false
-    // }
-    if (this.$route.query.patientId) {
-      let patientId = this.$route.query.patientId
-      // this.$nextTick(() => {
-      this.disabled = true
-      this.tabDisabled = false
-      this.patientId = patientId || null
-      this.isDetail = true
-      // })
-    }
+    initCheckStatus() {
+      return this.$route.query.checkStatus
+    },
  },
  watch: {
    selectedIndex(v) {
@@ -345,6 +345,42 @@ export default {
        })
      }
    },
+    initCheckStatus(v) {
+      if (v) {
+        this.initForm = {
+          checkStatus: this.$route.query.checkStatus + "",
+        }
+        //   console.log(this.searchForm)
+        this.handleSearch(this.initForm)
+      }
+      console.log("status" + v)
+    },
+  },
+  created() {
+    if (this.$route.query.checkStatus) {
+      this.initForm = {
+        checkStatus: this.$route.query.checkStatus + "",
+      }
+      this.handleSearch(this.initForm)
+    } else {
+      this.handleFormSearch()
+    }
+
+    // if (this.$route.path == "/screening/index") {
+    //   this.tabDisabled = false
+    // }
+    if (this.$route.query.patientId) {
+      let patientId = this.$route.query.patientId
+      // this.$nextTick(() => {
+      this.disabled = true
+      this.tabDisabled = false
+      this.patientId = patientId || null
+      this.isDetail = true
+      // })
+    }
+  },
+  mounted() {
+    // console.log(this.$route.query.checkStatus)
  },
 }
 </script>

--- a/src/views/systems/medicalunion-management/index.vue
+++ b/src/views/systems/medicalunion-management/index.vue
@@ -20,7 +20,7 @@
      />
    </div>
    <el-dialog :visible.sync="addVisible" width="520px" :show-close="true">
-      <div class="title">添加医联体</div>
+      <div class="title">{{ title }}</div>
      <el-form
        ref="form"
        :model="form"
@@ -63,13 +63,13 @@
      </span>
    </el-dialog>
    <!-- 删除提示框 -->
-    <el-dialog title="提示" :visible.sync="deleteVisible" width="30%">
+    <!-- <el-dialog title="提示" :visible.sync="deleteVisible" width="30%">
      <span>确定删除吗？</span>
      <span slot="footer" class="dialog-footers">
        <el-button @click="deleteVisible = false">取 消</el-button>
        <el-button type="primary" @click="confirmDelete">确 定</el-button>
      </span>
-    </el-dialog>
+    </el-dialog> -->
  </div>
 </template>
 <script>
@@ -171,6 +171,7 @@ export default {
      ],
      form: {},
      deleteId: "",
+      title: "添加医联体",
    }
  },
  watch: {},
@@ -195,6 +196,7 @@ export default {
    },
    // 添加医联体
    addMedical() {
+      this.title = "添加医联体"
      if (this.$refs["form"]) {
        this.clearForm()
      }
@@ -203,6 +205,7 @@ export default {
    },
    // 编辑医联体
    editMedical(data) {
+      this.title = "编辑医联体"
      console.log(data)
      this.form = { ...data }
      this.addVisible = true
@@ -236,8 +239,15 @@ export default {
    // 删除
    deleteFunc(data) {
      console.log(data)
-      this.deleteVisible = true
+      // this.deleteVisible = true
      this.deleteId = data.id
+      this.$confirm("确定要删除吗？", "警告", {
+        type: "warning",
+      })
+        .then(() => {
+          this.confirmDelete()
+        })
+        .catch(() => {})
    },
    clearForm() {
      this.form = {}

--- a/src/views/systems/operation-management/components/scientificResearch.vue
+++ b/src/views/systems/operation-management/components/scientificResearch.vue
 <template>
  <div id="medicalunion-management">
    <div class="top-btn">
-      <el-select v-model="selectType">
+      <el-select v-model="selectType" @change="getArticleList">
        <el-option
          v-for="item in selectList"
          :key="item.value"
@@ -287,6 +287,7 @@ export default {
        size: this.pageSize,
        current: this.pageIndex,
        moduleType: "5",
+        articleType: this.selectType - 0,
      }
      articleList(params)
        .then((res) => {

--- a/src/views/systems/role/index.vue
+++ b/src/views/systems/role/index.vue
@@ -51,33 +51,33 @@ export default {
      id: null,
      // 查询列表
      searchList: [
-        {
-          label: "角色名",
-          type: "input",
-          prop: "roleName",
-          placeholder: "请输入角色名",
-        },
+        // {
+        //   label: "角色名",
+        //   type: "input",
+        //   prop: "roleName",
+        //   placeholder: "请输入角色名",
+        // },

-        {
-          label: "状态",
-          type: "select",
-          prop: "status",
-          opts: [
-            {
-              label: "启用",
-              value: 1,
-            },
-            {
-              label: "禁用",
-              value: 0,
-            },
-          ],
-        },
-        {
-          type: "button",
-          value: "查询",
-          icon: "el-icon-search",
-        },
+        // {
+        //   label: "状态",
+        //   type: "select",
+        //   prop: "status",
+        //   opts: [
+        //     {
+        //       label: "启用",
+        //       value: 1,
+        //     },
+        //     {
+        //       label: "禁用",
+        //       value: 0,
+        //     },
+        //   ],
+        // },
+        // {
+        //   type: "button",
+        //   value: "查询",
+        //   icon: "el-icon-search",
+        // },
        {
          type: "button",
          color: "primary",

--- a/src/views/systems/user/index.vue
+++ b/src/views/systems/user/index.vue
@@ -11,6 +11,8 @@
      ref="table"
      :table-data="tableData"
      :columns="columns"
+      tab-type="index"
+      tab-label="序号"
      :list-loading="listLoading"
      :current-page="pageIndex"
      :total-count="total"
@@ -57,6 +59,7 @@ import {
  getUserInfo,
  setUserRole,
  resetPassword,
+  baseEnable,
 } from "@/api/user"
 import { getOrgList, getDepartPage } from "@/api/org"
 import { medicalunionList, baseUnion } from "@/api/medicalunion-management"
@@ -111,21 +114,27 @@ export default {
      // 查询列表
      searchList: [
        {
-          label: "用户姓名",
+          label: "选择角色",
+          type: "select",
+          opts: roleList,
+          prop: "roleId",
+          placeholder: "请选择角色",
+        },
+        {
+          label: "登录名",
          type: "input",
-          prop: "name",
-          placeholder: "请输入用户姓名",
+          prop: "userName",
+          placeholder: "请输入登录名",
        },
-
        {
          type: "button",
-          value: "查询",
-          icon: "el-icon-search",
+          value: "搜索",
+          // icon: "el-icon-search",
        },
        {
          type: "button",
          color: "primary",
-          icon: "el-icon-plus",
+          // icon: "el-icon-plus",
          value: "添加",
          func: this.handleAdd,
        },
@@ -133,60 +142,68 @@ export default {
      searchQuery: "",
      columns: [
        {
-          label: "用户姓名",
-          minWidth: 120,
-          value: "name",
+          label: "登录名",
+          width: 140,
+          value: "userName",
        },
        {
-          label: "性别",
-          value: "sex",
-          width: 80,
+          label: "角色",
+          value: "roles",
+          minWidth: 180,
          formatter: (row) => {
-            return this.$handle.formatDicList(
-              this.dictMap["d-sex"],
-              String(row.sex)
-            )
+            if (row.roles.length > 0) {
+              let roleName = row.roles.map((e) => e.roleName)
+              return roleName.join("、")
+            } else {
+              return "--"
+            }
          },
        },
        {
-          label: "身份证号",
-          value: "idCard",
-          minWidth: 180,
-        },
-        {
-          label: "手机",
-          minWidth: 120,
-          value: "phone",
-        },
-        {
-          label: "机构",
+          label: "医联体名称",
+          value: "unions",
          minWidth: 180,
-          value: "orgName",
+          formatter: (row) => {
+            if (row.unions.length > 0) {
+              let unionName = row.unions.map((e) => e.unionName)
+              return unionName.join("、")
+            } else {
+              return "--"
+            }
+          },
        },
        {
-          label: "科室",
+          label: "医联体编号",
+          value: "unions",
          minWidth: 180,
-          value: "deptName",
+          formatter: (row) => {
+            if (row.unions.length > 0) {
+              let unionNo = row.unions.map((e) => e.unionNo)
+              return unionNo.join("、")
+            } else {
+              return "--"
+            }
+          },
        },
        {
-          label: "登录账户名",
-          minWidth: 150,
-          value: "userName",
+          label: "添加时间",
+          width: 140,
+          value: "createTime",
+          formatter: (row) => {
+            if (row.createTime) {
+              return row.createTime
+            } else {
+              return "--"
+            }
+          },
        },
-
        {
-          label: "邮箱",
-          minWidth: 180,
-          value: "email",
+          label: "状态",
+          width: 140,
+          type: "switch",
+          value: "status",
+          func: this.openChage,
        },
-        // {
-        //   label: "状态",
-        //   value: "status",
-        //   width: 100,
-        //   formatter(row) {
-        //     return row.status === 1 ? '启用' : '禁用'
-        //   }
-        // },
        {
          label: "操作",
          width: 220,
@@ -250,6 +267,42 @@ export default {
            },
          ],
        },
+        // {
+        //   label: "登录名",
+        //   minWidth: 120,
+        //   value: "name",
+        // },
+        // {
+        //   label: "性别",
+        //   value: "sex",
+        //   width: 80,
+        //   formatter: (row) => {
+        //     return this.$handle.formatDicList(
+        //       this.dictMap["d-sex"],
+        //       String(row.sex)
+        //     )
+        //   },
+        // },
+        // {
+        //   label: "身份证号",
+        //   value: "idCard",
+        //   minWidth: 180,
+        // },
+        // {
+        //   label: "手机",
+        //   minWidth: 120,
+        //   value: "phone",
+        // },
+        // {
+        //   label: "机构",
+        //   minWidth: 180,
+        //   value: "orgName",
+        // },
+        // {
+        //   label: "科室",
+        //   minWidth: 180,
+        //   value: "deptName",
+        // },
      ],
      tableData: [],
      cacheForm: {},
@@ -370,6 +423,7 @@ export default {
          multiple: true,
        },
      ],
+      roleList: roleList,
      consortiaList: [],
      consortiaDataRole: [
        {
@@ -403,6 +457,21 @@ export default {
    this.loadMore()
  },
  methods: {
+    // 修改启用状态
+    // 启用状态
+    openChage(data, index) {
+      console.log(data, index)
+      let params = {
+        id: data.id,
+        status: data.status ? 1 : 0,
+      }
+      baseEnable(params).then((res) => {
+        if (res.code == 1) {
+          // this.$message.success("保存成功")
+          // this.handleSearch()
+        }
+      })
+    },
    loadMore(current = 1) {
      let params = {
        current: current,
@@ -473,15 +542,11 @@ export default {
      })
    },
    handleReset(row) {
-      this.$confirm(
-        `【${row.name}】是否重置密码? 重置密码为123456！！`,
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
+      this.$confirm(`【${row.name}】是否重置密码? 重置密码为:123456`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
        .then(() => {
          resetPassword(row.id).then((res) => {
            if (res.code === 1) {
@@ -530,6 +595,20 @@ export default {
    handleConsortia({ id }) {
      this.rowId = id
      this.$refs.consortiaRole.open()
+      getUserInfo({ userId: id }).then((res) => {
+        if (res.code === 1) {
+          const consortiaList = []
+
+          res.data.unionList.map((item) => {
+            consortiaList.push(item.id)
+          })
+
+          this.consortiaList = [...consortiaList]
+          this.$refs.consortiaRole.initFields({
+            consortiaList: consortiaList,
+          })
+        }
+      })
    },
    handleRoleConfirm(form) {
      const data = {
@@ -545,6 +624,7 @@ export default {
      setUserRole(data).then((res) => {
        if (res.code === 1) {
          this.$message.success(res.msg)
+          this.handleSearch()
          this.$refs.role.close()
        }
      })

--- a/yarn.lock
+++ b/yarn.lock
@@ -3916,13 +3916,12 @@ ecc-jsbn@~0.1.1:
    jsbn "~0.1.0"
    safer-buffer "^2.1.0"

-echarts@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.1.2.tgz#aa1ab0cef5b74fa2f7c620261a5f286893d30fd1"
-  integrity sha512-okUhO4sw22vwZp+rTPNjd/bvTdpug4K4sHNHyrV8NdAncIX9/AarlolFqtJCAYKGFYhUBNjIWu1EznFrSWTFxg==
+echarts@4.8.0:
+  version "4.8.0"
+  resolved "https://registry.npmmirror.com/echarts/-/echarts-4.8.0.tgz#b2c1cfb9229b13d368ee104fc8eea600b574d4c4"
+  integrity sha512-YwShpug8fWngj/RlgxDaYrLBoD+LsZUArrusjNPHpAF+is+gGe38xx4W848AwWMGoi745t3OXM52JedNrv+F6g==
  dependencies:
-    tslib "2.0.3"
-    zrender "5.1.1"
+    zrender "4.3.1"

 ee-first@1.1.1:
  version "1.1.1"
@@ -7978,6 +7977,11 @@ pbkdf2@^3.0.3:
    safe-buffer "^5.0.1"
    sha.js "^2.4.8"

+pdfjs-dist@2.5.207:
+  version "2.5.207"
+  resolved "https://registry.npmmirror.com/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz#b5e8c19627be64269cd3fb6df3eaaf45ddffe7b6"
+  integrity sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw==
+
 performance-now@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -10381,11 +10385,6 @@ ts-pnp@^1.1.6:
  resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
  integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==

-tslib@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
-
 tslib@^1.9.0:
  version "1.14.1"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -11299,12 +11298,10 @@ zip-stream@^2.1.2:
    compress-commons "^2.1.1"
    readable-stream "^3.4.0"

-zrender@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.1.1.tgz#0515f4f8cc0f4742f02a6b8819550a6d13d64c5c"
-  integrity sha512-oeWlmUZPQdS9f5hK4pV21tHPqA3wgQ7CkKkw7l0CCBgWlJ/FP+lRgLFtUBW6yam4JX8y9CdHJo1o587VVrbcoQ==
-  dependencies:
-    tslib "2.0.3"
+zrender@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.npmmirror.com/zrender/-/zrender-4.3.1.tgz#baf8aa6dc8187a2f819692d7d5f9bedfa2b90fa3"
+  integrity sha512-CeH2TpJeCdG0TAGYoPSAcFX2ogdug1K7LIn9UO/q9HWqQ54gWhrMAlDP9AwWYMUDhrPe4VeazQ4DW3msD96nUQ==

 zwitch@^1.0.0:
  version "1.0.5"