From 921d4a9bb5e963b6370146dbc1718d0efa51b1d2 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Mon, 27 Apr 2026 11:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JqList.vue                     |  124 --
 src/components/PcList.vue                     |  136 --
 src/components/Select.vue                     |  537 -------
 src/components/SelectCell.vue                 |   94 --
 src/components/SelectTime.vue                 |   42 -
 src/components/StartTimeAndEndTime.vue        |   70 -
 src/components/Steps.vue                      |   63 -
 src/components/SxPopup.vue                    |  284 ----
 src/components/SxPopupNew.vue                 |  281 ----
 src/components/SxPopupZdy.vue                 |  135 --
 src/components/YjList.vue                     |  142 --
 src/components/cjbsList.vue                   |  128 --
 src/components/clockList.vue                  |  120 --
 src/components/echarts/annular.vue            |  100 --
 src/components/echarts/brokenLine.vue         |   78 -
 src/components/echarts/columnar.vue           |  112 --
 src/components/echarts/pieChart.vue           |   79 -
 src/components/echarts/pieCharts.vue          |   77 -
 src/components/echarts/pileUpColumn.vue       |  180 ---
 src/components/pcModel.vue                    |  145 --
 src/components/pcclList.vue                   |   95 --
 src/components/search.vue                     |   89 --
 src/components/swiperCell.vue                 |  208 ---
 src/components/swiperCellrw.vue               |  124 --
 src/components/sydwAndSyrkList.vue            |  162 --
 src/components/tabs.vue                       |   80 -
 src/components/tabs/tabs.vue                  |  115 --
 src/components/topSelectTime.vue              |   47 -
 src/components/topTabs.vue                    |  193 ---
 src/components/topTotal.vue                   |   47 -
 src/components/xzjqList.vue                   |   86 --
 src/components/yjItem.vue                     |  510 ------
 src/components/yjzlItem.vue                   |  101 --
 src/components/yyzxItem.vue                   |  128 --
 src/components/zlList.vue                     |  163 --
 .../checkpointList/components/jczDetail.vue   |  217 ---
 .../checkpointList/components/zlJczList.vue   |  365 -----
 src/pages/checkpointList/index.vue            |  165 --
 src/pages/collectPage/collectAndAdd.vue       |  218 ---
 .../collectPage/copmonents/customPopup.vue    |   97 --
 .../copmonents/listItemWrapper.vue            |   57 -
 src/pages/collectPage/index.vue               |  139 --
 src/pages/dqLocation/index.vue                |  249 ---
 src/pages/keyVehicle/index.vue                |    2 +-
 src/pages/my/views/gzrz.vue                   |  103 --
 src/pages/my/views/scyy.vue                   |  106 --
 src/pages/my/views/txl.vue                    |   54 -
 src/pages/my/views/userInfo.vue               |  182 ---
 src/pages/my/views/wdgj.vue                   |  163 --
 src/pages/my/views/wdgjMapPoint.vue           |   78 -
 src/pages/newTwoHome/addZl.vue                |  274 ----
 src/pages/newTwoHome/index.vue                |  490 ------
 src/pages/newTwoHome/jq/xzjqDetail.vue        |   86 --
 src/pages/newTwoHome/jq/xzjqlist.vue          |  178 ---
 src/pages/newTwoHome/jq/zdjq.vue              |  222 ---
 src/pages/newTwoHome/ldjsc.vue                |  987 ------------
 src/pages/newTwoHome/myZl.vue                 |  322 ----
 src/pages/newTwoHome/wqtsChart.vue            |   84 -
 src/pages/newTwoHome/xd.vue                   |  269 ----
 src/pages/newTwoHome/yclList.vue              |   51 -
 src/pages/newTwoHome/zbbbList.vue             |   60 -
 src/pages/newTwoHome/zjq.vue                  |  220 ---
 .../patrolList/copmonents/patrolWrapper.vue   |   74 -
 src/pages/patrolList/index.vue                |  229 ---
 src/pages/rw/index.vue                        |  360 -----
 src/pages/rw/rwlist.vue                       |  401 -----
 src/pages/rw/views/rwDetail.vue               |  304 ----
 src/pages/rw/views/syrkRwDetail.vue           |  441 ------
 src/pages/rw/views/txgjList.vue               |  129 --
 src/pages/scyy/cl.vue                         |  108 --
 src/pages/scyy/jwz.vue                        |  119 --
 src/pages/scyy/kfd.vue                        |   83 -
 src/pages/scyy/xfll.vue                       |  129 --
 src/pages/scyy/xfq.vue                        |   85 -
 src/pages/scyy/zb.vue                         |  187 ---
 src/pages/spsHome/components/checkCar.vue     |  289 ----
 src/pages/spsHome/components/checkCarNew.vue  |  298 ----
 src/pages/spsHome/components/checkPeople.vue  |  210 ---
 .../spsHome/components/checkPeopleNew.vue     |  210 ---
 src/pages/spsHome/components/peopleList.vue   |  125 --
 src/pages/spsHome/components/prpcPopup.vue    |   95 --
 .../taskList/copmonents/patrolWrapper.vue     |   94 --
 src/pages/taskList/historyDetail.vue          |  377 -----
 src/pages/taskList/historyDetail1.vue         |  708 ---------
 src/pages/taskList/index.vue                  |  215 ---
 .../CanVehicle/components/checkPeople.vue     |  155 --
 src/pages/views/CanVehicle/index.vue          |  776 ----------
 src/pages/views/Declaration/addEdit copy.vue  |  240 ---
 src/pages/views/Declaration/addEdit.vue       |  529 -------
 src/pages/views/Declaration/addEditCyry.vue   |  213 ---
 src/pages/views/Declaration/addEditDw.vue     |  348 -----
 src/pages/views/Declaration/addEditRw.vue     |  386 -----
 .../views/Declaration/components/Select.vue   |  327 ----
 .../views/Declaration/components/cyryItem.vue |   71 -
 .../views/Declaration/components/dwglItem.vue |   96 --
 .../views/Declaration/components/rwItem.vue   |   81 -
 .../Declaration/components/zgItem copy.vue    |  110 --
 .../views/Declaration/components/zgItem.vue   |  100 --
 src/pages/views/Declaration/index.vue         |  515 -------
 .../QuarantinePersonnel/drivinglicence.vue    |   40 -
 .../views/QuarantinePersonnel/featureInfo.vue |  122 --
 src/pages/views/QuarantinePersonnel/index.vue |  958 ------------
 .../QuarantinePersonnel/motorVehicle.vue      |   43 -
 .../QuarantinePersonnel/pestilenceRelated.vue |  311 ----
 src/pages/views/TrackInventory/index.vue      |  118 --
 src/pages/views/jqfx/compareFx.vue            |  677 --------
 src/pages/views/jqfx/components/TopArea.vue   |  112 --
 .../views/jqfx/components/barEcharts.vue      |  165 --
 .../views/jqfx/components/barEcharts1.vue     |  172 ---
 .../views/jqfx/components/barEcharts2.vue     |  138 --
 .../views/jqfx/components/casePerson.vue      |  168 --
 src/pages/views/jqfx/components/lineChart.vue |  140 --
 src/pages/views/jqfx/dqscFx.vue               | 1020 ------------
 src/pages/views/jqfx/fourTallFx.vue           |  621 --------
 src/pages/views/jqfx/jqAnsisy.vue             |   83 -
 src/pages/views/jqfx/percent.vue              |  165 --
 .../views/report/components/normalReport.vue  | 1350 ----------------
 .../views/report/components/specialReport.vue | 1370 -----------------
 src/pages/views/report/index.vue              |   49 -
 src/pages/xlmjHome/components/filing.vue      |  509 ------
 src/pages/xlmjHome/components/fjFunction.vue  |  229 ---
 src/pages/xlmjHome/components/selectPeo.vue   |  250 ---
 src/pages/xlmjHome/index.vue                  |  703 ---------
 src/pages/yyzx/cjbsPage/cjbsList.vue          |  172 ---
 src/pages/yyzx/cjbsPage/index.vue             |  131 --
 src/pages/yyzx/clock/clockList.vue            |  132 --
 src/pages/yyzx/clock/index.vue                |  325 ----
 src/pages/yyzx/components/calendarList.vue    |  107 --
 src/pages/yyzx/components/calendarListZb.vue  |  107 --
 src/pages/yyzx/components/normalReport.vue    |  446 ------
 src/pages/yyzx/components/specialReport.vue   | 1215 ---------------
 src/pages/yyzx/deptxfbbCalendar/index.vue     |  462 ------
 src/pages/yyzx/deptzbbbCalendar/index.vue     |  461 ------
 src/pages/yyzx/dhcr/index.vue                 |  131 --
 src/pages/yyzx/index.vue                      |  254 ---
 src/pages/yyzx/jqxx/gljqList.vue              |   32 -
 src/pages/yyzx/jqxx/index.vue                 |  218 ---
 src/pages/yyzx/jqxx/jqDetail.vue              |   91 --
 src/pages/yyzx/jqxx/mryq.vue                  |  329 ----
 src/pages/yyzx/rwzx/components/barChart.vue   |  223 ---
 src/pages/yyzx/rwzx/components/ranking.vue    |  109 --
 .../yyzx/rwzx/components/sircleChart.vue      |  344 -----
 src/pages/yyzx/rwzx/components/statics.vue    |   87 --
 src/pages/yyzx/rwzx/index.vue                 |  317 ----
 src/pages/yyzx/ryxj/components/addEidt.vue    |  280 ----
 src/pages/yyzx/ryxj/index.vue                 |  158 --
 src/pages/yyzx/views/calendar.vue             |  351 -----
 src/pages/yyzx/views/clpc.vue                 |  262 ----
 src/pages/yyzx/views/feedBack.vue             |  303 ----
 src/pages/yyzx/views/hisQwCenter.vue          | 1207 ---------------
 src/pages/yyzx/views/pcry.vue                 |  219 ---
 src/pages/yyzx/views/qwCenter.vue             | 1164 --------------
 src/pages/yyzx/views/tjyj.vue                 |  341 ----
 src/pages/yyzx/views/wzzxIndex.vue            |  740 ---------
 src/pages/yyzx/views/xfbbInfo.vue             | 1204 ---------------
 src/pages/yyzx/views/xttj.vue                 |  325 ----
 src/pages/yyzx/views/yjsj.vue                 |  270 ----
 src/pages/yyzx/views/zbbbInfo.vue             |  555 -------
 src/pages/yyzx/xfbb/addXfbb.vue               | 1178 --------------
 src/pages/yyzx/xfbb/addtsXfbb.vue             |  919 -----------
 src/pages/yyzx/xfbb/tsXfbbList.vue            |  262 ----
 src/pages/yyzx/yjtjInfo/gzyInfo.vue           |  233 ---
 src/pages/yyzx/yjtjInfo/pcsyjinfo.vue         |  232 ---
 src/pages/yyzx/yjtjInfo/ryyjinfo.vue          |  222 ---
 src/pages/yyzx/yjxx/components/lineChart.vue  |  155 --
 .../yyzx/yjxx/components/lineChartPcs.vue     |  113 --
 .../yyzx/yjxx/components/peopleRanking.vue    |  124 --
 src/pages/yyzx/yjxx/components/ranking.vue    |  145 --
 src/pages/yyzx/yjxx/index.vue                 |  261 ----
 src/pages/yyzx/yjxx/yjDetail.vue              |  620 --------
 src/pages/yyzx/yjxx/yjMapPoint.vue            |  190 ---
 src/pages/yyzx/yjxx/yjTotal.vue               |  119 --
 src/pages/yyzx/zbbb/addZbbb.vue               |   46 -
 src/pages/yyzx/zbbb/zbbbCalendar.vue          |  455 ------
 src/pages/yyzx/zlzx/addzl.vue                 |  129 --
 .../yyzx/zlzx/components/messsageList.vue     |  560 -------
 src/pages/yyzx/zlzx/components/taskRank.vue   |  123 --
 src/pages/yyzx/zlzx/components/voice.vue      |  558 -------
 .../yyzx/zlzx/components/weekTrendBar.vue     |  234 ---
 .../yyzx/zlzx/components/weekTrendPie.vue     |  126 --
 src/pages/yyzx/zlzx/zlDetail.vue              |  970 ------------
 src/pages/yyzx/zlzx/zlTotal.vue               |  148 --
 src/pages/yyzx/zlzx/zlzxIndex.vue             |  417 -----
 src/router/index.js                           |  514 +------
 184 files changed, 17 insertions(+), 51351 deletions(-)
 delete mode 100644 src/components/JqList.vue
 delete mode 100644 src/components/PcList.vue
 delete mode 100644 src/components/Select.vue
 delete mode 100644 src/components/SelectCell.vue
 delete mode 100644 src/components/SelectTime.vue
 delete mode 100644 src/components/StartTimeAndEndTime.vue
 delete mode 100644 src/components/Steps.vue
 delete mode 100644 src/components/SxPopup.vue
 delete mode 100644 src/components/SxPopupNew.vue
 delete mode 100644 src/components/SxPopupZdy.vue
 delete mode 100644 src/components/YjList.vue
 delete mode 100644 src/components/cjbsList.vue
 delete mode 100644 src/components/clockList.vue
 delete mode 100644 src/components/echarts/annular.vue
 delete mode 100644 src/components/echarts/brokenLine.vue
 delete mode 100644 src/components/echarts/columnar.vue
 delete mode 100644 src/components/echarts/pieChart.vue
 delete mode 100644 src/components/echarts/pieCharts.vue
 delete mode 100644 src/components/echarts/pileUpColumn.vue
 delete mode 100644 src/components/pcModel.vue
 delete mode 100644 src/components/pcclList.vue
 delete mode 100644 src/components/search.vue
 delete mode 100644 src/components/swiperCell.vue
 delete mode 100644 src/components/swiperCellrw.vue
 delete mode 100644 src/components/sydwAndSyrkList.vue
 delete mode 100644 src/components/tabs.vue
 delete mode 100644 src/components/tabs/tabs.vue
 delete mode 100644 src/components/topSelectTime.vue
 delete mode 100644 src/components/topTabs.vue
 delete mode 100644 src/components/topTotal.vue
 delete mode 100644 src/components/xzjqList.vue
 delete mode 100644 src/components/yjItem.vue
 delete mode 100644 src/components/yjzlItem.vue
 delete mode 100644 src/components/yyzxItem.vue
 delete mode 100644 src/components/zlList.vue
 delete mode 100644 src/pages/checkpointList/components/jczDetail.vue
 delete mode 100644 src/pages/checkpointList/components/zlJczList.vue
 delete mode 100644 src/pages/checkpointList/index.vue
 delete mode 100644 src/pages/collectPage/collectAndAdd.vue
 delete mode 100644 src/pages/collectPage/copmonents/customPopup.vue
 delete mode 100644 src/pages/collectPage/copmonents/listItemWrapper.vue
 delete mode 100644 src/pages/collectPage/index.vue
 delete mode 100644 src/pages/dqLocation/index.vue
 delete mode 100644 src/pages/my/views/gzrz.vue
 delete mode 100644 src/pages/my/views/scyy.vue
 delete mode 100644 src/pages/my/views/txl.vue
 delete mode 100644 src/pages/my/views/userInfo.vue
 delete mode 100644 src/pages/my/views/wdgj.vue
 delete mode 100644 src/pages/my/views/wdgjMapPoint.vue
 delete mode 100644 src/pages/newTwoHome/addZl.vue
 delete mode 100644 src/pages/newTwoHome/index.vue
 delete mode 100644 src/pages/newTwoHome/jq/xzjqDetail.vue
 delete mode 100644 src/pages/newTwoHome/jq/xzjqlist.vue
 delete mode 100644 src/pages/newTwoHome/jq/zdjq.vue
 delete mode 100644 src/pages/newTwoHome/ldjsc.vue
 delete mode 100644 src/pages/newTwoHome/myZl.vue
 delete mode 100644 src/pages/newTwoHome/wqtsChart.vue
 delete mode 100644 src/pages/newTwoHome/xd.vue
 delete mode 100644 src/pages/newTwoHome/yclList.vue
 delete mode 100644 src/pages/newTwoHome/zbbbList.vue
 delete mode 100644 src/pages/newTwoHome/zjq.vue
 delete mode 100644 src/pages/patrolList/copmonents/patrolWrapper.vue
 delete mode 100644 src/pages/patrolList/index.vue
 delete mode 100644 src/pages/rw/index.vue
 delete mode 100644 src/pages/rw/rwlist.vue
 delete mode 100644 src/pages/rw/views/rwDetail.vue
 delete mode 100644 src/pages/rw/views/syrkRwDetail.vue
 delete mode 100644 src/pages/rw/views/txgjList.vue
 delete mode 100644 src/pages/scyy/cl.vue
 delete mode 100644 src/pages/scyy/jwz.vue
 delete mode 100644 src/pages/scyy/kfd.vue
 delete mode 100644 src/pages/scyy/xfll.vue
 delete mode 100644 src/pages/scyy/xfq.vue
 delete mode 100644 src/pages/scyy/zb.vue
 delete mode 100644 src/pages/spsHome/components/checkCar.vue
 delete mode 100644 src/pages/spsHome/components/checkCarNew.vue
 delete mode 100644 src/pages/spsHome/components/checkPeople.vue
 delete mode 100644 src/pages/spsHome/components/checkPeopleNew.vue
 delete mode 100644 src/pages/spsHome/components/peopleList.vue
 delete mode 100644 src/pages/spsHome/components/prpcPopup.vue
 delete mode 100644 src/pages/taskList/copmonents/patrolWrapper.vue
 delete mode 100644 src/pages/taskList/historyDetail.vue
 delete mode 100644 src/pages/taskList/historyDetail1.vue
 delete mode 100644 src/pages/taskList/index.vue
 delete mode 100644 src/pages/views/CanVehicle/components/checkPeople.vue
 delete mode 100644 src/pages/views/CanVehicle/index.vue
 delete mode 100644 src/pages/views/Declaration/addEdit copy.vue
 delete mode 100644 src/pages/views/Declaration/addEdit.vue
 delete mode 100644 src/pages/views/Declaration/addEditCyry.vue
 delete mode 100644 src/pages/views/Declaration/addEditDw.vue
 delete mode 100644 src/pages/views/Declaration/addEditRw.vue
 delete mode 100644 src/pages/views/Declaration/components/Select.vue
 delete mode 100644 src/pages/views/Declaration/components/cyryItem.vue
 delete mode 100644 src/pages/views/Declaration/components/dwglItem.vue
 delete mode 100644 src/pages/views/Declaration/components/rwItem.vue
 delete mode 100644 src/pages/views/Declaration/components/zgItem copy.vue
 delete mode 100644 src/pages/views/Declaration/components/zgItem.vue
 delete mode 100644 src/pages/views/Declaration/index.vue
 delete mode 100644 src/pages/views/QuarantinePersonnel/drivinglicence.vue
 delete mode 100644 src/pages/views/QuarantinePersonnel/featureInfo.vue
 delete mode 100644 src/pages/views/QuarantinePersonnel/index.vue
 delete mode 100644 src/pages/views/QuarantinePersonnel/motorVehicle.vue
 delete mode 100644 src/pages/views/QuarantinePersonnel/pestilenceRelated.vue
 delete mode 100644 src/pages/views/TrackInventory/index.vue
 delete mode 100644 src/pages/views/jqfx/compareFx.vue
 delete mode 100644 src/pages/views/jqfx/components/TopArea.vue
 delete mode 100644 src/pages/views/jqfx/components/barEcharts.vue
 delete mode 100644 src/pages/views/jqfx/components/barEcharts1.vue
 delete mode 100644 src/pages/views/jqfx/components/barEcharts2.vue
 delete mode 100644 src/pages/views/jqfx/components/casePerson.vue
 delete mode 100644 src/pages/views/jqfx/components/lineChart.vue
 delete mode 100644 src/pages/views/jqfx/dqscFx.vue
 delete mode 100644 src/pages/views/jqfx/fourTallFx.vue
 delete mode 100644 src/pages/views/jqfx/jqAnsisy.vue
 delete mode 100644 src/pages/views/jqfx/percent.vue
 delete mode 100644 src/pages/views/report/components/normalReport.vue
 delete mode 100644 src/pages/views/report/components/specialReport.vue
 delete mode 100644 src/pages/views/report/index.vue
 delete mode 100644 src/pages/xlmjHome/components/filing.vue
 delete mode 100644 src/pages/xlmjHome/components/fjFunction.vue
 delete mode 100644 src/pages/xlmjHome/components/selectPeo.vue
 delete mode 100644 src/pages/xlmjHome/index.vue
 delete mode 100644 src/pages/yyzx/cjbsPage/cjbsList.vue
 delete mode 100644 src/pages/yyzx/cjbsPage/index.vue
 delete mode 100644 src/pages/yyzx/clock/clockList.vue
 delete mode 100644 src/pages/yyzx/clock/index.vue
 delete mode 100644 src/pages/yyzx/components/calendarList.vue
 delete mode 100644 src/pages/yyzx/components/calendarListZb.vue
 delete mode 100644 src/pages/yyzx/components/normalReport.vue
 delete mode 100644 src/pages/yyzx/components/specialReport.vue
 delete mode 100644 src/pages/yyzx/deptxfbbCalendar/index.vue
 delete mode 100644 src/pages/yyzx/deptzbbbCalendar/index.vue
 delete mode 100644 src/pages/yyzx/dhcr/index.vue
 delete mode 100644 src/pages/yyzx/index.vue
 delete mode 100644 src/pages/yyzx/jqxx/gljqList.vue
 delete mode 100644 src/pages/yyzx/jqxx/index.vue
 delete mode 100644 src/pages/yyzx/jqxx/jqDetail.vue
 delete mode 100644 src/pages/yyzx/jqxx/mryq.vue
 delete mode 100644 src/pages/yyzx/rwzx/components/barChart.vue
 delete mode 100644 src/pages/yyzx/rwzx/components/ranking.vue
 delete mode 100644 src/pages/yyzx/rwzx/components/sircleChart.vue
 delete mode 100644 src/pages/yyzx/rwzx/components/statics.vue
 delete mode 100644 src/pages/yyzx/rwzx/index.vue
 delete mode 100644 src/pages/yyzx/ryxj/components/addEidt.vue
 delete mode 100644 src/pages/yyzx/ryxj/index.vue
 delete mode 100644 src/pages/yyzx/views/calendar.vue
 delete mode 100644 src/pages/yyzx/views/clpc.vue
 delete mode 100644 src/pages/yyzx/views/feedBack.vue
 delete mode 100644 src/pages/yyzx/views/hisQwCenter.vue
 delete mode 100644 src/pages/yyzx/views/pcry.vue
 delete mode 100644 src/pages/yyzx/views/qwCenter.vue
 delete mode 100644 src/pages/yyzx/views/tjyj.vue
 delete mode 100644 src/pages/yyzx/views/wzzxIndex.vue
 delete mode 100644 src/pages/yyzx/views/xfbbInfo.vue
 delete mode 100644 src/pages/yyzx/views/xttj.vue
 delete mode 100644 src/pages/yyzx/views/yjsj.vue
 delete mode 100644 src/pages/yyzx/views/zbbbInfo.vue
 delete mode 100644 src/pages/yyzx/xfbb/addXfbb.vue
 delete mode 100644 src/pages/yyzx/xfbb/addtsXfbb.vue
 delete mode 100644 src/pages/yyzx/xfbb/tsXfbbList.vue
 delete mode 100644 src/pages/yyzx/yjtjInfo/gzyInfo.vue
 delete mode 100644 src/pages/yyzx/yjtjInfo/pcsyjinfo.vue
 delete mode 100644 src/pages/yyzx/yjtjInfo/ryyjinfo.vue
 delete mode 100644 src/pages/yyzx/yjxx/components/lineChart.vue
 delete mode 100644 src/pages/yyzx/yjxx/components/lineChartPcs.vue
 delete mode 100644 src/pages/yyzx/yjxx/components/peopleRanking.vue
 delete mode 100644 src/pages/yyzx/yjxx/components/ranking.vue
 delete mode 100644 src/pages/yyzx/yjxx/index.vue
 delete mode 100644 src/pages/yyzx/yjxx/yjDetail.vue
 delete mode 100644 src/pages/yyzx/yjxx/yjMapPoint.vue
 delete mode 100644 src/pages/yyzx/yjxx/yjTotal.vue
 delete mode 100644 src/pages/yyzx/zbbb/addZbbb.vue
 delete mode 100644 src/pages/yyzx/zbbb/zbbbCalendar.vue
 delete mode 100644 src/pages/yyzx/zlzx/addzl.vue
 delete mode 100644 src/pages/yyzx/zlzx/components/messsageList.vue
 delete mode 100644 src/pages/yyzx/zlzx/components/taskRank.vue
 delete mode 100644 src/pages/yyzx/zlzx/components/voice.vue
 delete mode 100644 src/pages/yyzx/zlzx/components/weekTrendBar.vue
 delete mode 100644 src/pages/yyzx/zlzx/components/weekTrendPie.vue
 delete mode 100644 src/pages/yyzx/zlzx/zlDetail.vue
 delete mode 100644 src/pages/yyzx/zlzx/zlTotal.vue
 delete mode 100644 src/pages/yyzx/zlzx/zlzxIndex.vue

diff --git a/src/components/JqList.vue b/src/components/JqList.vue
deleted file mode 100644
index 8f49660..0000000
--- a/src/components/JqList.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <div class="list_box" @click="onGoDetail">
-    <div class="time_box">
-      <span class="title bule" :style="{ color: item.bjlb == '01000000' ? 'red' : '' }">{{
-        item.bjlbmc +
-        " — " +
-        item.bjlxmc +
-        (item.bjxlmc ? " — " + item.bjxlmc : "")
-      }}</span>
-      <span>{{ item.bjsj }}</span>
-    </div>
-    <span> </span>
-    <!-- <span v-if="item.jqjb">
-        <van-tag
-          type="warning"
-          style="padding: 0.3vw 5vw; border-radius: 3vw"
-          v-if="item.jqjb == 1"
-          >一级警情</van-tag
-        >
-        <van-tag
-          type="warning"
-          style="padding: 0.3vw 5vw; border-radius: 3vw"
-          v-else-if="item.jqjb == 2"
-          >二级警情
-        </van-tag>
-        <van-tag
-          type="primary"
-          style="padding: 0.3vw 5vw; border-radius: 3vw"
-          v-else-if="item.jqjb == 3"
-          >三级警情
-        </van-tag>
-        <van-tag
-          type="success"
-          style="padding: 0.3vw 5vw; border-radius: 3vw"
-          v-else-if="item.jqjb == 4"
-          >四级警情
-        </van-tag>
-      </span> -->
-    <div class="title">{{ item.jqnr }}</div>
-    <div class="item">
-      <span class="address_box">位置</span>
-      <span>&ensp;{{ item.sfdz }}</span>
-    </div>
-    <div class="item">
-      <span>
-        报警人：{{ item.bjrXm }}(<span style="color: #3e6ee8">{{
-          item.bjdh
-        }}</span>)
-      </span>
-      <span class="jjy_box">接警员：{{ item.jjyxm }}</span>
-    </div>
-    <div class="item">
-      报警内容：<span class="bjnr">{{ item.bjnr }}</span>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import router from "../router/index.js";
-import { defineProps, ref } from "vue";
-const props = defineProps({
-  item: Object, //列表内容
-  path: { type: String, default: false }, //跳转详情的路由
-});
-//跳转
-function onGoDetail() {
-  if (!props.path) {
-    return false;
-  }
-  router.push({ path: props.path, query: { id: props.item.id } });
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.list_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  // margin: 0vw 2vw 2vw 2vw;
-  padding: 2vw 3vw;
-  margin-bottom: 1.5vw;
-  background: #f6f8fd;
-
-  // @include item_bottom_color($bottom-border-top-clore-theme);
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
-  }
-}
-
-.title {
-  @include font_size($font_medium);
-  font-weight: 600;
-}
-
-.item {
-  line-height: 6vw;
-}
-
-.list_box:nth-child(1) {
-  border-top: none !important;
-}
-
-.jjy_box {
-  display: inline-block;
-  margin-left: 5vw;
-}
-
-.bjnr {
-  font-weight: 600;
-}
-
-.address_box {
-  background: #3bc2b5;
-  color: #fff;
-  display: inline-block;
-  font-size: 11px;
-  padding: 0 8px;
-  border-radius: 10px;
-  height: 17px;
-  line-height: 18.5px;
-}
-</style>
diff --git a/src/components/PcList.vue b/src/components/PcList.vue
deleted file mode 100644
index cac80a6..0000000
--- a/src/components/PcList.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-  <div class="list_box">
-    <div class="time_box">
-      <span>
-        <van-icon name="clock-o" />
-        &ensp;{{ item.pcsj }}
-      </span>
-      <span v-if="item.pcclJg">
-        <van-tag type="danger" style="padding: 0.3vw 5vw; border-radius: 3vw" v-if="item.pcclJg == '9'">盘查</van-tag>
-        <van-tag type="warning" style="padding: 0.3vw 5vw; border-radius: 3vw" v-else-if="item.pcclJg == '2'">移交
-        </van-tag>
-        <van-tag color="#ffcc40" style="padding: 0.3vw 5vw; border-radius: 3vw" v-else-if="item.pcclJg == '1'">放行
-        </van-tag>
-      </span>
-    </div>
-    <div class="detail_box">
-      <van-image width="80px" :src="baseUrl" @click="onClickImg(baseUrl)" style="flex: 1" v-if="baseUrl && item.sfzh">
-        <template v-slot:loading>
-          <van-loading type="spinner" size="20" />
-        </template>
-      </van-image>
-      <div class="detail_item">
-        <div class="item user_info">
-          <span v-if="item.yjClcph">{{ item.yjClcph }}</span>
-          <span>{{ item.xm }}</span>
-          <span v-if="item.mz">{{ item.mz }}</span>
-          <span>{{ item.sfzh }}</span>
-        </div>
-        <div class="item" v-if="item.bqmc || item.bqxxsj">
-          <van-tag type="primary" style="padding: 0 2vw; margin-right: 2vw" plain>
-            {{ item.bqmc == "" ? "无标签人员" : item.bqxxsj }}
-          </van-tag>
-        </div>
-        <div class="item">{{ item.pcmjXm }}</div>
-        <div class="item">管辖派出所：{{ item.ssbm }}</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import router from "../router/index.js";
-import { getBase64 } from "../utils/tools.js";
-import { defineProps, ref, watch } from "vue";
-import { getDictList, setDict } from "../utils/dict";
-import { ImagePreview } from "vant";
-const props = defineProps({
-  item: Object, //列表内容
-  path: String, //跳转详情的路由
-  dict: {
-    type: Object,
-    default: {
-      D_BZ_YJLX: [],
-      D_BZ_TYJB: [],
-      D_BZ_PCCLJG: [],
-    },
-  },
-});
-const baseUrl = ref("");
-watch(
-  () => props.item,
-  (newValue) => {
-    if (Object.keys(newValue).length > 0) _getBase64(newValue);
-  },
-  { immediate: true, deep: true }
-);
-//预览图片
-function onClickImg(url) {
-  ImagePreview([url]);
-}
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    baseUrl.value = res;
-  }, `http://10.64.201.128:2366/xlpcAdminNew/requestservice/czrk/ryxp.jpg?sfzh=${item.sfzh}`);
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.list_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  margin: 0vw 2vw 2vw 2vw;
-  padding: 2vw 1vw;
-  @include item_bottom_color($bottom-border-top-clore-theme);
-
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .count_size {
-      font-size: 5vw;
-      display: inline-block;
-      margin: 0 1vw;
-      color: red;
-    }
-  }
-}
-
-.list_box:nth-child(1) {
-  border-top: none !important;
-}
-
-.detail_box {
-  margin-top: 1vw;
-  display: flex;
-  position: relative;
-
-  .detail_item {
-    flex: 3.5;
-    margin-left: 2vw;
-
-    .user_info {
-      @include font_size($font_medium);
-      font-weight: 600;
-      color: #507ce9;
-
-      &>span {
-        display: inline-block;
-        margin-right: 2vw;
-      }
-    }
-
-    .item {
-      line-height: 6vw;
-    }
-  }
-}
-
-::v-deep .van-image__img {
-  height: auto;
-  max-height: 101px;
-}
-</style>
diff --git a/src/components/Select.vue b/src/components/Select.vue
deleted file mode 100644
index 7e579d5..0000000
--- a/src/components/Select.vue
+++ /dev/null
@@ -1,537 +0,0 @@
-<template>
-  <van-popup v-model:show="props.show" style="width: 90%">
-    <div class="popupTitle">{{ popupTitle }}</div>
-    <van-tabs v-model:active="active" color="#3e6ee8" @change="onActive">
-      <van-tab title="全部" name="2"> </van-tab>
-      <van-tab title="本部门" name="1"> </van-tab>
-    </van-tabs>
-    <van-search v-model="kwd" :placeholder="placeholder" @search="onUpdate" @clear="onClear" />
-    <!-- 智能装备筛选条件 -->
-    <div v-if="popupTitle === '选择智能装备'" class="zn_tag_select">
-      <van-tag type="primary" :plain="tagCode == '' ? false : true" style="margin-right: 3vw"
-        @click="onClickTag('')">全部</van-tag>
-      <van-tag type="primary" :plain="tagCode == '86' ? false : true" style="margin-right: 3vw"
-        @click="onClickTag('86')">对讲机</van-tag>
-      <van-tag type="primary" :plain="tagCode == '80' ? false : true" @click="onClickTag('80')">执法记录仪</van-tag>
-    </div>
-
-    <div v-if="popupTitle === '选择警用器械'" class="zn_tag_select">
-      全选 <span class="squre" @click="onClickTagJyqx" :class="isAllQx ? 'isActiveAll' : ''"> <van-icon v-if="isAllQx"
-          color="#fff" name='success' /> </span>
-    </div>
-
-    <div class="check-data-box" ref="listBox" :loading="loading">
-      <!-- 单选 -->
-      <van-radio-group v-model="radioChecked" v-if="isRadio">
-        <van-cell-group>
-          <van-cell v-for="item in list.mulChooseList" clickable :key="item" :title="`${item.value}`" :border="false">
-            <template #right-icon>
-              <van-radio :name="item.key" @click="onRadionChange(item.key)" />
-            </template>
-          </van-cell>
-        </van-cell-group>
-      </van-radio-group>
-      <!-- 多选 -->
-      <van-checkbox-group v-model="checkedLists" v-else @change="onCheckboxnChange">
-        <van-cell-group>
-          <van-cell v-for="item in list.mulChooseList" clickable :key="item" :title="`${item.value}`">
-            <template #right-icon>
-              <van-checkbox shape="square" :name="item.key" />
-            </template>
-            <template #label v-if="title === '选择警用器械'">
-              数量：
-              <van-stepper v-model="item.sl" integer />
-            </template>
-          </van-cell>
-        </van-cell-group>
-      </van-checkbox-group>
-      <van-empty description="没有数据" image="default" v-if="list.mulChooseList.length <= 0 && showEmpty" />
-      <van-loading type="spinner" v-show="loadingShow" style="text-align: center;" />
-    </div>
-    <div class="popbtn-box">
-      <van-button style="flex: 1" type="default" @click="onCancel">取消
-      </van-button>
-      <van-button style="flex: 1" type="primary" @click="onConfirm">确定</van-button>
-    </div>
-  </van-popup>
-</template>
-
-<script setup>
-import { getBBData } from "../api/xfbbAndZbbb.js";
-import { defineProps, ref, defineEmits, watch, reactive, onMounted, nextTick } from "vue";
-import { dateFormat, hintToast } from "../utils/tools";
-const props = defineProps({
-  selectType: String, //查询的类型  详情见watch 监听
-  bclx: String, //勤务班次类型
-  dwlx: String, // 快反点/检查站 类型 01快反点 02检查站
-  show: Boolean, //是否显示
-  checkedList: Array, //默认选中 多选
-  checked: String, //单选
-  xfqSx:String,//巡防区属性 01.基本巡区 02.叠加巡区 03.护校巡区")
-});
-const emits = defineEmits([
-  "update:cancel",
-  "update:confirm",
-  "update:kwd",
-  "update:tabs",
-  "update:tag",
-]);
-const loadingShow=ref(false)
-const hasChoosZb = ref([])
-const isAllQx = ref(false)
-const listBox = ref(null)
-const page = ref(1);
-const size = ref(10);
-const total = ref(0);
-const radioChecked = ref("");
-const checkedLists = ref([]);
-const loading = ref(false);
-const finished = ref(false);
-const selectedPageLast = ref([]) //上一次当前页面选中
-const selectObj = ref([]); //选中的数据
-const active = ref(0); //默认的TBS 选择
-const tagCode = ref(""); //智能设备选中状态
-const placeholder = ref(""); //占位字符
-const showEmpty = ref(false);
-const isUserDept = ref(2); //是否是用户本部门
-const kwd = ref(""); //选择器关键字
-const selectIndex = ref(1); //选择器组件KEY
-const selectType = ref(""); //选择的类型
-const znzbCode = ref(""); //智能装备类型筛选
-const popupTitle = ref(""); //标题
-const isRadio = ref(false); //是否是单选
-const list = reactive({
-  jzList: [],
-  fzrList: [],
-  fjList: [],
-  zbList: [],
-  jyqxList: [],
-  clList: [],
-  mulChooseList: [],
-  xfqList: [],
-  kfdList: [],
-  bcList: [],
-});
-const isFirst = ref(true)
-const listData = ref([]) //缓存列表数据
-watch(
-  () => props.selectType,
-  (newValue) => {
-    checkedLists.value = props.checkedList;
-    selectedPageLast.value = props.checkedList
-    radioChecked.value = props.checked;
-  },
-  { immediate: true, deep: true }
-);
-onMounted(() => {
-  scroll()
-})
-
-//触底加载
-function scroll() {
-  let scrollTargetBox = listBox.value;
-  if (!scrollTargetBox) return false;
-  scrollTargetBox.onscroll = (e) => {
-    var scrollHeight = scrollTargetBox.scrollHeight; //251
-    var scrollTop = scrollTargetBox.scrollTop; //0-18
-    var clientHeight = scrollTargetBox.clientHeight; //233
-    if (scrollHeight - clientHeight ==  Math.ceil(scrollTop)) {
-      //滚动条滚到最底部
-      if (list.mulChooseList.length < total.value) {
-        loadingShow.value=true;
-        page.value++;
-        _getSelectData(props.selectType);
-      }
-    }
-  };
-}
-
-//tabs筛选
-function onActive(val) {
-  isUserDept.value = val;
-  list.mulChooseList = [];
-  page.value = 1;
-  total.value = 0;
-  selectedPageLast.value = []
-  _getSelectData(props.selectType);
-}
-//获取数据
-function _getSelectData(val) {
-  let obj = {}; //亲求路径及参数
-  switch (val) {
-    case "xz":
-      popupTitle.value = "选择巡组";
-      placeholder.value = "请输入巡组名称";
-      obj["url"] = "/mosty-qwzx/tbQwXfbb/selectJmxz";
-      obj["xz"] = "xz";
-      isRadio.value = false;
-      break;
-    case "kfd":
-      popupTitle.value = "选择快反点";
-      placeholder.value = "请输入快反点名称或部门名称";
-      obj["url"] = "/mosty-jcgl/tpJcglKfd/getKfdList";
-      isRadio.value = true;
-      break;
-    case "jcz":
-      popupTitle.value = "选择警务站";
-      placeholder.value = "请输入警务站名称或部门名称";
-      obj["url"] = "/mosty-jcgl/tpJcglKfd/getKfdList";
-      isRadio.value = true;
-      break;
-    case "xfq":
-      popupTitle.value = "选择巡防区";
-      placeholder.value = "请输入巡防区名称或部门名称";
-      obj["url"] = "/mosty-jcgl/tbJcglXfqy/getXfqList";
-      isRadio.value = false;
-      break;
-    case "qwbc":
-      popupTitle.value = "选择班次";
-      placeholder.value = "请输入班次名称或部门名称";
-      obj["url"] = "/mosty-qwzx/tbQwQwbc/getBcList";
-      isRadio.value = true;
-      break;
-    case "fzr":
-    case "mj":
-    case "zbld":
-    case "zhz":
-    case "zzzhz":
-    case "fz":
-      popupTitle.value = "选择民警";
-      placeholder.value = "请输入姓名或部门名称";
-      obj["url"] = "/mosty-jcgl/tbJcglXfll/getXfllList";
-      obj["jllx"] = "01";
-      isRadio.value = false;
-      if (val == "fzr" || val == "zbld" || val == "zhz" || val == "zzzhz" || val == "fz") {
-        isRadio.value = true;
-      }
-      break;
-    case "fj":
-      popupTitle.value = "选择辅警";
-      placeholder.value = "请输入姓名或部门名称";
-      obj["url"] = "/mosty-jcgl/tbJcglXfll/getXfllList";
-      obj["jllx"] = "02";
-      isRadio.value = false;
-      break;
-    case "zn":
-      popupTitle.value = "选择智能装备";
-      placeholder.value = "请输入设备名称或部门名称";
-      obj["url"] = "/mosty-jcgl/tpjcglZnzb/getZnzbList";
-      obj["scode"] = tagCode.value;
-      isRadio.value = false;
-      break;
-    case "jy":
-      popupTitle.value = "选择警用器械";
-      placeholder.value = "请输入器械名称";
-      obj["url"] = "/mosty-jcgl/tpJcglJyqx/getJyqxList";
-      isRadio.value = false;
-      break;
-    case "cl":
-      popupTitle.value = "选择巡防车辆";
-      placeholder.value = "请输入车牌号或部门名称";
-      obj["url"] = "/mosty-jcgl/tpJcglXfcl/selectXfclList";
-      break;
-    case "jz":
-      popupTitle.value = "选择警组";
-      placeholder.value = "请输入警组名称或部门名称";
-      obj["url"] = "/mosty-jcgl/tbJcglJz/selectJzList";
-      isRadio.value = true;
-  }
-  if (Object.keys(obj).length > 0) _getBBData(obj, val);
-}
-//获取数据
-function _getBBData(obj, type) {
-  //url 请求地址，jllx 警力类型  有需要就传，scode 智能装备筛选条件  有需要就传
-  let { url, jllx, scode, xz } = obj;
-  loading.value = true;
-  let data = {
-    type: isUserDept.value,
-    keyword: kwd.value,
-    bclx: props.bclx,
-    dwlx: props.dwlx,
-    xfqSx: props.xfqSx,
-    jllx,
-    scode,
-    pageCurrent: page.value,
-    pageSize: size.value,
-  };
-  getBBData(url, data).then((res) => {
-    loadingShow.value=false;
-    loading.value = false;
-    total.value = res.total;
-    if (jllx || xz) {
-      if (res && res.records && res.records.length > 0) {
-        _setData(res.records, type);
-      } else {
-        showEmpty.value = true;
-      }
-    } else {
-      if (res && res.length > 0) {
-        _setData(res, type);
-      } else if (res && res.records) {
-        _setData(res.records, type);
-      } else {
-        showEmpty.value = true;
-      }
-    }
-    let dataLen = list.mulChooseList.length
-    if (props.checkedList.length == dataLen && dataLen != 0 && popupTitle.value == '选择警用器械') {
-      isAllQx.value = true
-    } else {
-      isAllQx.value = false
-    }
-  })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-//智能装备选择
-function onClickTag(code) {
-  list.mulChooseList = [];
-  page.value = 1;
-  total.value = 0;
-  if (tagCode.value && tagCode.value == code) {
-    tagCode.value = "";
-  } else {
-    tagCode.value = code;
-  }
-  _getSelectData(props.selectType);
-}
-//搜索关键词
-function onUpdate(val) {
-  page.value = 1;
-  list.mulChooseList = [];
-  selectedPageLast.value = []
-  _getSelectData(props.selectType);
-}
-//清空关键字
-function onClear() {
-  list.mulChooseList = [];
-  _getSelectData(props.selectType);
-}
-//关闭弹窗
-function onCancel() {
-  emits("update:cancel", false);
-}
-//点击单选
-function onRadionChange(val) {
-  _backData(val);
-}
-//点击多选
-function onCheckboxnChange(val) {
-  _backData(val);
-  let dataLen = list.mulChooseList.length
-  if (checkedLists.value.length == dataLen && dataLen != 0 && popupTitle.value == '选择警用器械') {
-    isAllQx.value = true
-  } else {
-    isAllQx.value = false
-  }
-
-  if (popupTitle.value === '选择智能装备') {
-    let arr = []
-    list.mulChooseList.forEach(item => {
-      val.forEach(itChid => {
-        if (item.id == itChid) arr.push(item)
-      })
-    })
-    hasChoosZb.value = [...hasChoosZb.value, ...arr]
-  }
-}
-function onClickTagJyqx() {
-  isAllQx.value = !isAllQx.value
-  if (isAllQx.value) {
-    checkedLists.value = list.mulChooseList.map(item => { return item.id })
-  } else {
-    checkedLists.value = []
-  }
-  _backData(checkedLists.value);
-}
-//确认选择
-function onConfirm() {
-  if (popupTitle.value === '选择智能装备') {
-    //  去重
-    let list = []
-    for (let j = 0; j < checkedLists.value.length; j++) {
-      let item = checkedLists.value[j]
-      for (let i = 0; i < hasChoosZb.value.length; i++) {
-        let itemchid = hasChoosZb.value[i]
-        if (item == itemchid.id) {
-          list.push(itemchid)
-          break;
-        }
-      }
-    }
-    emits("update:confirm", list);
-  } else {
-    emits("update:confirm", selectObj.value);
-  }
-  emits("update:cancel", false);
-}
-
-//处理返回父组件数据
-function _backData(val) {
-  if (typeof val == "string") {
-    //单选数据
-    let obj = list.mulChooseList.find((item) => { return item.key == val; });
-    selectObj.value = [obj];
-  } else {
-    //多选数据
-    let arr = [];
-    let lastChoose = selectedPageLast.value //上一次选中
-    if (lastChoose.length > 0) {
-      lastChoose.forEach(it => { //上一次
-        if (!val.includes(it)) {
-          selectObj.value = selectObj.value.filter(item => { return item.key != it }) // 在上一次情况下删除
-        }
-        val.forEach(id => { //现在选中的
-          if (!lastChoose.includes(id)) arr.push(findItem(id)) //在上一次的情况下新增
-        })
-      })
-    } else {
-      val.forEach(id => { arr.push(findItem(id)) })
-    }
-    selectObj.value = selectObj.value.concat(arr)
-    selectedPageLast.value = JSON.parse(JSON.stringify(val)); //缓存当前页面数据
-    let listVrr = []
-    selectObj.value.forEach(item => { if (!listVrr.includes(item) && item) listVrr.push(item) }) //去重
-    selectObj.value = listVrr;
-  }
-}
-
-const findItem = (id) => {
-  let obj = listData.value.find(v => { return v.key == id })
-  return obj
-}
-
-//设置数据
-function _setData(res, type) {
-  for (let i = 0; i < res.length; i++) {
-    switch (type) {
-      case "qwbc":
-        res[i].value = `${res[i].ssbm}-${res[i].bcmc}`;
-        res[i].key = res[i].id;
-        break;
-      case "xfq":
-        res[i].value = `${res[i].ssbm}-${res[i].xfqMc}`;
-        res[i].key = res[i].id;
-        break;
-      case "kfd":
-        res[i].value = `${res[i].ssbm}-${res[i].kfdMc}`;
-        res[i].key = res[i].kfdId;
-        break;
-      case "jcz":
-        res[i].value = `${res[i].ssbm}-${res[i].kfdMc}`;
-        res[i].key = res[i].kfdId;
-        break;
-      case "jz":
-        res[i].value = `${res[i].ssbm}-${res[i].jzMc}`;
-        res[i].key = res[i].id;
-        break;
-      case "fzr":
-      case "mj":
-      case "zbld":
-      case "zhz":
-      case "zzzhz":
-      case "fz":
-        // res[i].value = `${res[i].ssbm}-${res[i].xm}`;
-        res[i].value = `${res[i].xm}`;
-        res[i].key = res[i].ryid;
-        break;
-      case "fj":
-        // res[i].value = `${res[i].ssbm}-${res[i].xm}`;
-        res[i].value = `${res[i].xm}`;
-        res[i].key = res[i].id;
-        break;
-      case "cl":
-        res[i].value = `${res[i].ssbm}-${res[i].cph}`;
-        res[i].key = res[i].cid;
-        break;
-      case "zn":
-        res[i].value = `${res[i].ssbm}-${res[i].sbmc}`;
-        res[i].key = res[i].id;
-        break;
-      case "jy":
-        res[i].value = `${res[i].ssbm}-${res[i].qxMc}`;
-        res[i].key = res[i].id;
-        break;
-      case "xz":
-        res[i].value = `${res[i].jzMc || res[i].fzrXm + "组"}`;
-        res[i].key = res[i].id;
-        break;
-    }
-  }
-  listData.value = listData.value.concat(res)
-  if ((page.value == 1)) {
-    list.mulChooseList = res;
-  } else {
-    list.mulChooseList = list.mulChooseList.concat(res);
-  }
-  if (isFirst.value) {
-    let arr = []
-    selectedPageLast.value.forEach(id => {
-      arr.push(findItem(id))
-    })
-    selectObj.value = arr;
-    isFirst.value = false
-  }
-
-  loading.value = false;
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-  color: #fff;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  padding-top: 2vw;
-}
-
-.check-data-box {
-  height: 100vw;
-  overflow: auto;
-}
-
-::v-deep .van-stepper__input {
-  width: 100px;
-}
-
-.zn_tag_select {
-  padding: 2vw 3.5vw;
-  display: flex;
-  align-items: center;
-
-  .squre {
-    display: inline-block;
-    width: 20px;
-    height: 20px;
-    border: 1px solid #cccccc;
-    border-radius: 4px;
-    margin-left: 10px;
-    text-align: center;
-    line-height: 20px;
-  }
-
-  .isActiveAll {
-    background: #1989fa;
-  }
-}
-
-::v-deep .van-cell {
-  align-items: flex-start;
-}
-
-::v-deep .van-cell__title,
-.van-cell__value {
-  margin-right: 1vw;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/SelectCell.vue b/src/components/SelectCell.vue
deleted file mode 100644
index ed88631..0000000
--- a/src/components/SelectCell.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <div class="cell_group_box">
-    <van-cell v-for="(item, index) in arrayList" :key="index+props.showSfzh">
-      <template #title>
-        <span>{{ item[title] }} <span v-if="showSfzh == 'sfzh'">({{item[showSfzh]}})</span></span>
-      </template>
-      <template #value>
-        <div class="ch-box">
-          <van-checkbox
-            @click="choose(item)"
-            v-model="item.checked"
-          ></van-checkbox>
-        </div>
-      </template>
-    </van-cell>
-  </div>
-</template>
-
-<script setup>
-import { defineProps, defineEmits, ref, watch, onMounted } from "vue";
-const props = defineProps({
-  list: {
-    type: Array,
-    default: [],
-  },
-  title: {
-    type: String,
-    default: "name",
-  },
-  showSfzh: {
-    type: String,
-    default: "sfzh",
-  },
-});
-const emits = defineEmits(["update:choose"]);
-const checked = ref(false);
-const arrayList = ref([]);
-onMounted(() => {
-  arrayList.value = props.list.map((item) => {
-    return {
-      ...item,
-      checked: false,
-    };
-  });
-});
-watch(
-  () => props.list,
-  (val) => {
-    arrayList.value = props.list.map((item) => {
-      return {
-        ...item,
-        checked: false,
-      };
-    });
-    array.value.forEach((item) => {
-      arrayList.value.forEach((el) => {
-        if (item.id == el.id) {
-          el.checked = true;
-        }
-      });
-    });
-  },
-  {
-    deep: true,
-  }
-);
-const array = ref([]);
-function choose(item) {
-  if (item.checked == true) {
-    array.value.push(item);
-  } else {
-    array.value.forEach((ele, index) => {
-      if (ele.id == item.id) {
-        array.value.splice(index, 1);
-      }
-    });
-  }
-  emits("update:choose", {
-    list: array.value,
-  });
-}
-</script>
-
-<style scoped>
-.cell_group_box {
-  height: 35vh;
-  overflow: hidden;
-  overflow-y: auto;
-}
-.ch-box {
-  display: flex;
-  justify-content: flex-end;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/SelectTime.vue b/src/components/SelectTime.vue
deleted file mode 100644
index 8d0b887..0000000
--- a/src/components/SelectTime.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <van-dialog v-model:show="show" :show-confirm-button="false">
-    <van-datetime-picker
-      v-model="presentTime"
-      type="date"
-      :title="title"
-      @cancel="onCancel"
-      @confirm="onTimeConfirm"
-    ></van-datetime-picker>
-  </van-dialog>
-</template>
-<script setup>
-import {ref, defineProps, onMounted, defineEmits, watch, computed} from "vue";
-import { dateFormat } from "../utils/tools.js";
-const props = defineProps({
-  timeType: String,
-});
-const emits = defineEmits(["update:time"]);
-const show = ref(true);
-const presentTime = ref(new Date()); //选择器默认时间
-
-const title = computed(() => {
-  if (props.timeType == 'start') {
-    return '选择开始日期'
-  } else if (props.timeType == 'end') {
-    return '选择结束日期'
-  } else {
-    return props.timeType
-  }
-})
-function onTimeConfirm(val) {
-  emits("update:time", dateFormat("", val));
-}
-
-function onCancel() {
-  emits("update:cancelTime", "");
-}
-//确定选中的时间
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-</style>
diff --git a/src/components/StartTimeAndEndTime.vue b/src/components/StartTimeAndEndTime.vue
deleted file mode 100644
index 88fb879..0000000
--- a/src/components/StartTimeAndEndTime.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <div class="time_box">
-    <van-field
-      v-model="startTimeval"
-      label-width="60px"
-      placeholder="开始日期"
-      input-align="left"
-      right-icon="arrow-down"
-      readonly
-      @click.stop="onClickTime('start')"
-    ></van-field>
-    <div class="relevance">至</div>
-    <van-field
-      v-model="endTimeVal"
-      label-width="60px"
-      input-align="left"
-      right-icon="arrow-down"
-      placeholder="结束日期"
-      @click.stop="onClickTime('end')"
-      readonly
-    ></van-field>
-  </div>
-</template>
-<script setup>
-import { ref, onMounted, watch, defineProps, defineEmits } from "vue";
-import { dateFormat } from "../utils/tools.js";
-const props = defineProps({
-  startTime: String,
-  endTime: String,
-});
-watch(
-  () => props.endTime,
-  (newValue) => {
-    endTimeVal.value = newValue;
-  }
-);
-watch(
-  () => props.startTime,
-  (newValue) => {
-    startTimeval.value = newValue;
-  }
-);
-
-const emits = defineEmits(["update:startTime", "update:endTime"]);
-const startTimeval = ref(""); //开始时间
-const endTimeVal = ref(""); //结束时间
-const timeType = ref("start");
-function onClickTime(val) {
-  timeType.value = val;
-  if (val == "start") {
-    emits("update:startTime", val);
-  } else {
-    emits("update:endTime", val);
-  }
-}
-</script>
-<style lang="scss" scoped>
-.time_box {
-  display: flex;
-  padding: 0 3vw;
-  margin-bottom: 4vw;
-
-  .relevance {
-    position: relative;
-    bottom: 0;
-    line-height: 33.5px;
-    margin: 0 2.5vw;
-  }
-}
-</style>
diff --git a/src/components/Steps.vue b/src/components/Steps.vue
deleted file mode 100644
index 8fbd17b..0000000
--- a/src/components/Steps.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
-  <!-- 步骤条组件 -->
-  <div class="main">
-    <div
-      class="item"
-      v-for="(item, index) in props.data"
-      :key="index + item[props.time]"
-    >
-      <div
-        class="item_l"
-        :class="{ deftaultColor: true, selectColor: index == 0 }"
-      >
-        {{ item[props.time].split(" ")[0] }}<br />{{
-          item[props.time].split(" ")[1]
-        }}
-        <van-icon class="icon" name="checked" color="#1f6cec"></van-icon>
-      </div>
-      <div class="item_r">
-        <slot :scope="item"></slot>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref, defineProps } from "vue";
-const props = defineProps({
-  time: { type: String, default: "time" },
-  data: { type: Array, default: [] },
-});
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-.main {
-  padding: 5vw;
-  box-sizing: border-box;
-  .item {
-    display: flex;
-    @include font_size($font_medium_s);
-    .item_l {
-      text-align: right;
-      border-right: 1px dotted #808080;
-      padding-right: 12px;
-      margin-right: 16px;
-      position: relative;
-      .icon {
-        position: absolute;
-        top: 5px;
-        right: -6px;
-      }
-    }
-    .item_r {
-      flex: 1;
-    }
-  }
-}
-.deftaultColor {
-  color: #808080;
-}
-.selectColor {
-  color: #1f6cec;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/SxPopup.vue b/src/components/SxPopup.vue
deleted file mode 100644
index adf3d60..0000000
--- a/src/components/SxPopup.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-<template>
-  <div>
-    <div class="popup_box" :style="{ marginTop: p_top + 'px' }" v-if="showPopup" @click="onHide" @touchmove.prevent>
-      <div class="detail_box">
-        <div v-for="(item, index) in list" :key="index" class="other_type_box">
-          <div class="other_type_title">{{ item.title }}</div>
-          <span>
-            <span v-for="(it, ind) in item.array" :key="ind">
-              <van-tag plain class="tag_item" :type="it.isCheck ? 'primary' : 'default'" @click.stop="onClickTag(item, it)">{{ it.name }}
-              </van-tag>
-              <br v-if="['超时签收','巡逻中','手动确认到达现场(实际未到达)','超时到达现场','处置完成'].includes(it.name)" />
-            </span>
-          </span>
-          <!-- showSolt 是否自定义插槽  SoltName:名字-->
-           <template v-if="item.showSolt">
-            <slot :name="item.SoltName"></slot>
-          </template>
-        </div>
-
-        <slot>
-          <div v-show="showTime" class="other_type_title" style="margin-left: 3vw">自定义时间</div>
-          <div v-show="showTime" class="time_box">
-            <van-field
-                v-model="startTime"
-                label-width="60px"
-                placeholder="开始日期"
-                input-align="left"
-                right-icon="arrow-down"
-                readonly
-                @click.stop="onClickTime('start')"
-            ></van-field>
-            <div class="relevance">至</div>
-            <van-field
-                v-model="endTime"
-                label-width="60px"
-                input-align="left"
-                right-icon="arrow-down"
-                placeholder="结束日期"
-                @click.stop="onClickTime('end')"
-                readonly
-            ></van-field>
-          </div>
-        </slot>
-        <div class="but_box">
-          <van-button round block type="primary" size="small" @click.stop="onConfirm" style="margin: 0 3vw 0 0vw">确定</van-button>
-          <van-button round block type="warning" size="small" @click.stop="onReset" style="margin: 0 0 0 3vw">重置 </van-button>
-        </div>
-      </div>
-    </div>
-    <SelectTime :timeType="timeType" v-if="timeShow" @update:time="onSelectTime" @update:cancelTime="timeShow = false"/>
-  </div>
-</template>
-<script setup>
-import { ref, defineProps, onMounted, defineEmits, watch } from "vue";
-import { dateFormat } from "../utils/tools.js";
-import SelectTime from "./SelectTime.vue";
-import store from "../store/index.js";
-import { hintToast } from "../utils/tools.js";
-const props = defineProps({
-  showPopup: Boolean, //是否显示
-  list: Array, //其余赛选条件
-  p_top: Number, //距离顶部的内填充距离
-  kssj: String, //开始时间
-  jssj: String, // 结束时间,
-  showTime:{
-    type:Boolean,
-    default:true
-  } ,//是否展示时间筛选
-});
-const tagIndex = ref(1); //如果是单选，选中的下标
-const emits = defineEmits(["update:close", 'reset', "update:onConfirm"]);
-const startTime = ref(props.kssj); //开始时间
-const endTime = ref(props.jssj); //结束时间
-const timeShow = ref(false); //是否显示时间选择器
-const timeType = ref("start"); //选择时间的类型
-const keyIndex = ref(1);
-//点击选择时间
-function onClickTime(val) {
-  timeType.value = val;
-  timeShow.value = true;
-}
-/**
- * 点击赛选项
- * @param {Object} item 父级选项
- * @param {Object} it 子集选项
- */
-function onClickTag(item, it) {
-  //多选
-  if (item.isCheckBox) {
-    item.array.forEach((_item) => {
-      _item.isCheck = false
-      if (_item.key == it.key) {
-        _item.isCheck = !_item.isCheck;
-      }
-    });
-  } else {
-    //单选
-    item.array.forEach((_item) => {
-      _item.isCheck = false;
-      if (_item.key == it.key) {
-        _item.isCheck = !_item.isCheck;
-        //如果是时间段选项
-        if (item.title == "按时间") {
-          setTimeSjd(it.name);
-        }
-      }
-    });
-  }
-}
-//如果选中的是时间段条件
-function setTimeSjd(valName) {
-  switch (valName) {
-    case "今日":
-      startTime.value = dateFormat();
-      break;
-    case "近三日":
-      startTime.value = dateFormat("3");
-      break;
-    case "近一周":
-      startTime.value = dateFormat("week");
-      break;
-    case "近一月":
-      startTime.value = dateFormat("month");
-      break;
-    case "近三月":
-      startTime.value = dateFormat("3month");
-      break;
-    case "近半年":
-      startTime.value = dateFormat("6month");
-      break;
-  }
-  endTime.value = dateFormat();
-  keyIndex.value++;
-}
-//选中的时间
-function onSelectTime(val) {
-  props.list.forEach((item) => {
-    if (item.title == "按时间") {
-      item.array.forEach((_item) => {
-        _item.isCheck = false;
-      });
-    }
-  });
-  if (timeType.value == "start") {
-    startTime.value = val;
-  } else {
-    endTime.value = val;
-  }
-
-  if (new Date(startTime.value).getTime() > new Date(endTime.value).getTime()) {
-    hintToast("起始时间错误！！");
-    return;
-  }
-
-  timeShow.value = false;
-}
-//打开开始时间
-function onSlectStartTime(val) {
-  timeType.value = "start";
-  timeShow.value = true;
-}
-//打开结束时间
-function onSlectEndTime(val) {
-  timeType.value = "end";
-  timeShow.value = true;
-}
-//关闭
-function onHide() {
-  // props.list.forEach((item) => {
-  //   item.array.forEach((_item) => {
-  //     _item.isCheck = false;
-  //   });
-  // });
-  // startTime.value = "";
-  // endTime.value = "";
-  emits("update:close", false);
-}
-//确认选中数据
-function onConfirm() {
-  const list = props?.list ? JSON.parse(JSON.stringify(props?.list)) : [];
-  let array = [];
-  //筛选出按时间的筛选条件
-  for (let i = 0; i < list?.length; i++) {
-    if (list[i].title != "按时间") {
-      array.push(list[i]);
-    }
-  }
-  store.commit("setStartTime", startTime.value);
-  store.commit("setEndTime", endTime.value);
-  emits("update:onConfirm", {
-    list: array,
-    startTime: startTime.value,
-    endTime: endTime.value,
-  });
-  emits("update:close", false);
-  //清空当前时间
-  // startTime.value = "";
-  // endTime.value = "";
-}
-//重置选项
-function onReset() {
-  props.list?.forEach((item) => {
-    item.array?.forEach((_item) => {
-      _item.isCheck = false;
-    });
-  });
-  startTime.value = "";
-  endTime.value = "";
-  emits('reset')
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.popup_box {
-  @include font_size($font_medium_s);
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  background: rgba(0, 0, 0, 0.6);
-}
-
-.detail_box {
-  background: #fff;
-  padding: 4vw 0;
-}
-
-.other_type_box,
-.time_box,
-.but_box {
-  padding: 0 3vw;
-}
-
-.but_box {
-  display: flex;
-  align-items: center;
-  color: #fff;
-}
-
-.time_box {
-  display: flex;
-  margin-bottom: 4vw;
-
-  .relevance {
-    position: relative;
-    bottom: 0;
-    line-height: 33.5px;
-    margin: 0 2.5vw;
-  }
-}
-
-.other_type_box {
-  margin-bottom: 2vw;
-
-  .tag_item {
-    padding: 1vw 3vw;
-    margin: 0 3vw 3vw 0;
-    border-radius: 5px;
-  }
-}
-
-.other_type_title {
-  margin-bottom: 2vw;
-  @include font_size($font_medium);
-}
-
-::v-deep .van-cell {
-  padding: 0;
-}
-
-::v-deep .van-field__body {
-  border: 1px solid #507ce9;
-  border-radius: 5px;
-  padding: 1vw;
-  //   margin: 0 2vw;
-}
-
-.isChecked {
-  border: 1px solid #507ce9;
-}
-</style>
diff --git a/src/components/SxPopupNew.vue b/src/components/SxPopupNew.vue
deleted file mode 100644
index b0b5aa2..0000000
--- a/src/components/SxPopupNew.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <div>
-    <div class="popup_box" :style="{ marginTop: p_top + 'px' }" v-if="showPopup" @click.stop="onHide" @touchmove.prevent>
-      <div class="detail_box">
-        <div v-for="(item, index) in list" :key="index" class="other_type_box">
-          <div class="other_type_title">{{ item.title }}</div>
-          <span v-if="item.type == 'checkBox'">
-            <span v-for="(it, ind) in item.array" :key="ind">
-              <van-tag plain class="tag_item" :type="it.isCheck ? 'primary' : 'default'" @click.stop="onClickTag(item, it)">{{ it.name || it.text }}
-              </van-tag>
-              <br v-if="['超时签收','巡逻中','手动确认到达现场(实际未到达)','超时到达现场','处置完成'].includes(it.name)" />
-            </span>
-          </span>
-          <span v-if="item.type == 'input'" @click.stop>
-            <van-field v-model="formDate[item.lebel]" :placeholder="item.placeholder"/>
-          </span>
-
-          <!-- showSolt 是否自定义插槽  SoltName:名字-->
-          <template v-if="item.showSolt">
-            <slot :name="item.SoltName"></slot>
-          </template>
-        </div>
-
-        <div v-show="showTime" class="other_type_title" style="margin-left: 3vw">自定义时间</div>
-        <div v-show="showTime" class="time_box">
-          <van-field
-            v-model="startTime"
-            label-width="60px"
-            placeholder="开始日期"
-            input-align="left"
-            right-icon="arrow-down"
-            readonly
-            @click.stop="onClickTime('start')"
-          ></van-field>
-          <div class="relevance">至</div>
-          <van-field
-            v-model="endTime"
-            label-width="60px"
-            input-align="left"
-            right-icon="arrow-down"
-            placeholder="结束日期"
-            @click.stop="onClickTime('end')"
-            readonly
-          ></van-field>
-        </div>
-        <div class="but_box">
-          <van-button round block type="primary" size="small" @click.stop="onConfirm" style="margin: 0 3vw 0 0vw">确定</van-button>
-          <van-button round block type="warning" size="small" @click.stop="onReset" style="margin: 0 0 0 3vw">重置 </van-button>
-        </div>
-      </div>
-    </div>
-    <SelectTime :timeType="timeType" v-if="timeShow" @update:time="onSelectTime" @update:cancelTime="timeShow = false"/>
-  </div>
-</template>
-<script setup>
-import { ref, defineProps, onMounted, defineEmits, watch } from "vue";
-import { dateFormat } from "../utils/tools.js";
-import SelectTime from "./SelectTime.vue";
-import store from "../store/index.js";
-import { hintToast } from "../utils/tools.js";
-const props = defineProps({
-  showPopup: Boolean, //是否显示
-  list: Array, //其余赛选条件
-  p_top: Number, //距离顶部的内填充距离
-  kssj: String, //开始时间
-  jssj: String, // 结束时间,
-  showTime:{
-    type:Boolean,
-    default:true
-  } ,//是否展示时间筛选
-});
-const formDate = ref({})
-const tagIndex = ref(1); //如果是单选，选中的下标
-const emits = defineEmits(["update:close", 'reset', "update:onConfirm"]);
-const startTime = ref(props.kssj); //开始时间
-const endTime = ref(props.jssj); //结束时间
-const timeShow = ref(false); //是否显示时间选择器
-const timeType = ref("start"); //选择时间的类型
-const keyIndex = ref(1);
-//点击选择时间
-function onClickTime(val) {
-  timeType.value = val;
-  timeShow.value = true;
-}
-/**
- * 点击赛选项
- * @param {Object} item 父级选项
- * @param {Object} it 子集选项
- */
-function onClickTag(item, it) {
-  //多选
-  if (item.isCheckBox) {
-    item.array.forEach((_item) => {
-      // _item.isCheck = false
-      if (_item.key == it.key) {
-        _item.isCheck = !_item.isCheck;
-      }
-    });
-  } else {
-    //单选
-    item.array.forEach((_item) => {
-      _item.isCheck = false;
-      if (_item.key == it.key) {
-        _item.isCheck = !_item.isCheck;
-        //如果是时间段选项
-        if (item.title == "按时间") {
-          setTimeSjd(it.name);
-        }
-      }
-    });
-  }
-}
-//如果选中的是时间段条件
-function setTimeSjd(valName) {
-  switch (valName) {
-    case "今日":
-      startTime.value = dateFormat();
-      break;
-    case "近三日":
-      startTime.value = dateFormat("3");
-      break;
-    case "近一周":
-      startTime.value = dateFormat("week");
-      break;
-    case "近一月":
-      startTime.value = dateFormat("month");
-      break;
-    case "近三月":
-      startTime.value = dateFormat("3month");
-      break;
-    case "近半年":
-      startTime.value = dateFormat("6month");
-      break;
-  }
-  endTime.value = dateFormat();
-  keyIndex.value++;
-}
-//选中的时间
-function onSelectTime(val) {
-  props.list.forEach((item) => {
-    if (item.title == "按时间") {
-      item.array.forEach((_item) => {
-        _item.isCheck = false;
-      });
-    }
-  });
-  if (timeType.value == "start") {
-    startTime.value = val;
-  } else {
-    endTime.value = val;
-  }
-
-  if (new Date(startTime.value).getTime() > new Date(endTime.value).getTime()) {
-    hintToast("起始时间错误！！");
-    return;
-  }
-
-  timeShow.value = false;
-}
-//打开开始时间
-function onSlectStartTime(val) {
-  timeType.value = "start";
-  timeShow.value = true;
-}
-//打开结束时间
-function onSlectEndTime(val) {
-  timeType.value = "end";
-  timeShow.value = true;
-}
-//关闭
-function onHide() {
-  emits("update:close", false);
-}
-//确认选中数据
-function onConfirm() {
-  const list = JSON.parse(JSON.stringify(props.list));
-  let array = [];
-  //筛选出按时间的筛选条件
-  for (let i = 0; i < list.length; i++) {
-    if (list[i].title != "按时间") array.push(list[i]);
-  }
-  store.commit("setStartTime", startTime.value);
-  store.commit("setEndTime", endTime.value);
-  emits("update:onConfirm", {
-    list: array,
-    startTime: startTime.value,
-    endTime: endTime.value,
-    data:formDate.value
-  });
-  emits("update:close", false);
-  formDate.value = {}
-}
-//重置选项
-function onReset() {
-  props.list.forEach((item) => {
-    if(item.array && item.array.length>0){
-      item.array.forEach((_item) => {
-        _item.isCheck = false;
-      });
-    }
-  });
-  formDate.value = {}
-  startTime.value = "";
-  endTime.value = "";
-  emits("update:close", false);
-  emits('reset')
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.popup_box {
-  @include font_size($font_medium_s);
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  background: rgba(0, 0, 0, 0.6);
-}
-
-.detail_box {
-  background: #fff;
-  padding: 4vw 0;
-}
-
-.other_type_box,
-.time_box,
-.but_box {
-  padding: 0 3vw;
-}
-
-.but_box {
-  display: flex;
-  align-items: center;
-  color: #fff;
-}
-
-.time_box {
-  display: flex;
-  margin-bottom: 4vw;
-
-  .relevance {
-    position: relative;
-    bottom: 0;
-    line-height: 33.5px;
-    margin: 0 2.5vw;
-  }
-}
-
-.other_type_box {
-  margin-bottom: 2vw;
-
-  .tag_item {
-    padding: 1vw 3vw;
-    margin: 0 3vw 3vw 0;
-    border-radius: 5px;
-  }
-}
-
-.other_type_title {
-  margin-bottom: 2vw;
-  @include font_size($font_medium);
-}
-
-::v-deep .van-cell {
-  padding: 0;
-}
-
-::v-deep .van-field__body {
-  border: 1px solid #507ce9;
-  border-radius: 5px;
-  padding: 1vw;
-  //   margin: 0 2vw;
-}
-
-.isChecked {
-  border: 1px solid #507ce9;
-}
-</style>
diff --git a/src/components/SxPopupZdy.vue b/src/components/SxPopupZdy.vue
deleted file mode 100644
index 68d8dcd..0000000
--- a/src/components/SxPopupZdy.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <div class="popup_box" :style="{ marginTop: p_top + 'px' }" v-if="showPopup" @click="onHide" @touchmove.prevent>
-    <div class="detail_box">
-      <div v-for="(item, index) in list" :key="index" class="other_type_box">
-        <div class="other_type_title">{{ item.label }}</div>
-        <van-field v-if="item.type == 'input'" v-model="queryForm[item.key]" label="" :placeholder="item.placeholder" input-align="left"/>
-        <!-- showSolt 是否自定义插槽  SoltName:名字-->
-        <template v-if="item.showSolt">
-          <slot :name="item.SoltName"></slot>
-        </template>
-      </div>
-      <div class="but_box">
-        <van-button round block type="primary" size="small" @click.stop="onConfirm" style="margin: 0 3vw 0 0vw">确定</van-button>
-        <van-button round block type="warning" size="small" @click.stop="onReset" style="margin: 0 0 0 3vw">重置 </van-button>
-      </div>
-    </div>
-  </div>
-</template>
-<script setup>
-import { ref, defineProps, onMounted, defineEmits, watch } from "vue";
-import { dateFormat } from "../utils/tools.js";
-import store from "../store/index.js";
-import { hintToast } from "../utils/tools.js";
-const props = defineProps({
-  showPopup: Boolean, //是否显示
-  list: Array, //其余赛选条件
-  p_top: Number, //距离顶部的内填充距离
-});
-const queryForm = ref({})
-const emits = defineEmits(["update:close", 'reset', "update:onConfirm"]);
-
-//关闭
-function onHide() {
-  emits("update:close", false);
-}
-//确认选中数据
-function onConfirm() {
-  const list = JSON.parse(JSON.stringify(props.list));
-  let array = [];
-  //筛选出按时间的筛选条件
-  for (let i = 0; i < list.length; i++) {
-    if (list[i].title != "按时间") {
-      array.push(list[i]);
-    }
-  }
-  emits("update:onConfirm", queryForm.value);
-  emits("update:close", false);
-}
-//重置选项
-function onReset() {
-  queryForm.value = {}
-  emits('reset')
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.popup_box {
-  @include font_size($font_medium_s);
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  background: rgba(0, 0, 0, 0.6);
-}
-
-.detail_box {
-  background: #fff;
-  padding: 4vw 0;
-}
-
-.other_type_box,
-.time_box,
-.but_box {
-  padding: 0 3vw;
-}
-
-.but_box {
-  display: flex;
-  align-items: center;
-  color: #fff;
-  margin-top: 4vw;
-}
-
-.van-cell{
-  background-color: #e8eeff;
-  margin: 1vw 0;
-  border-radius: 2vw;
-  padding: 6px 16px;
-}
-
-// .time_box {
-//   display: flex;
-//   margin-bottom: 4vw;
-
-//   .relevance {
-//     position: relative;
-//     bottom: 0;
-//     line-height: 33.5px;
-//     margin: 0 2.5vw;
-//   }
-// }
-
-// .other_type_box {
-//   margin-bottom: 2vw;
-
-//   .tag_item {
-//     padding: 1vw 3vw;
-//     margin: 0 3vw 3vw 0;
-//     border-radius: 5px;
-//   }
-// }
-
-// .other_type_title {
-//   margin-bottom: 2vw;
-//   @include font_size($font_medium);
-// }
-
-// ::v-deep .van-cell {
-//   padding: 0;
-// }
-
-// ::v-deep .van-field__body {
-//   border: 1px solid #507ce9;
-//   border-radius: 5px;
-//   padding: 1vw;
-//   //   margin: 0 2vw;
-// }
-
-// .isChecked {
-//   border: 1px solid #507ce9;
-// }
-</style>
diff --git a/src/components/YjList.vue b/src/components/YjList.vue
deleted file mode 100644
index 91bb576..0000000
--- a/src/components/YjList.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-  <div class="list_box" @click="onGoDetail()">
-    <div class="time_box">
-      <span>
-        <van-icon name="clock-o" />
-        &ensp;{{ item.yjFssj }}
-      </span>
-      <span v-if="item.yjJrcs">
-        今日预警<span class="count_size">{{ item.yjJrcs }}</span>次
-      </span>
-      <span v-if="item.yjJb">
-        <van-tag type="danger" style="padding: 0.3vw 5vw; border-radius: 3vw" v-if="item.yjJb == '10'">红色</van-tag>
-        <van-tag type="warning" style="padding: 0.3vw 5vw; border-radius: 3vw" v-else-if="item.yjJb == '20'">橙色
-        </van-tag>
-        <van-tag color="#ffcc40" style="padding: 0.3vw 5vw; border-radius: 3vw" v-else-if="item.yjJb == '30'">黄色
-        </van-tag>
-        <van-tag type="primary" style="padding: 0.3vw 5vw; border-radius: 3vw"
-          v-else-if="item.yjJb == '40'">蓝色</van-tag>
-      </span>
-    </div>
-    <div class="detail_box">
-      <van-image width="80px" height="85px" :src="baseUrl" style="flex: 1" @click.stop="ImagePreview([baseUrl])"
-        v-if="baseUrl">
-        <template v-slot:loading>
-          <van-loading type="spinner" size="20" />
-        </template>
-      </van-image>
-      <div class="detail_item">
-        <div class="item user_info">
-          <span v-if="item.yjClcph">{{ item.yjClcph }}</span>
-          <span>{{ item.yjRyxm }}</span>
-          <span v-if="item.mz">{{ item.mz }}</span>
-          <span>{{ item.yjRysfzh }}</span>
-          <span v-if="item.yjLx == '5'">{{ item.yjBt }}</span>
-        </div>
-        <div class="item">
-          <van-tag type="primary" style="padding: 0 2vw; margin-right: 2vw" plain>{{
-            item.yjbqmc ? item.yjbqmc : setDict(item.yjLx, dict.D_BZ_YJLX)
-          }}</van-tag>
-        </div>
-        <div class="item">地址：{{ item.yjDz || item.yjGzymc }}</div>
-        <div class="item">管辖派出所：{{ item.ssbm }}</div>
-      </div>
-      <img src="../assets/images/zwzl.png" class="zwzl_box" v-if="item.sfFszl > 0" />
-    </div>
-  </div>
-</template>
-
-<script setup>
-import router from "../router/index.js";
-import { getBase64 } from "../utils/tools.js";
-import { defineProps, ref, onMounted, watch } from "vue";
-import { getDictList, setDict } from "../utils/dict";
-import { ImagePreview } from "vant";
-// const { D_BZ_YJLX, D_BZ_TYJB } = getDictList("D_BZ_YJLX", "D_BZ_TYJB"); //字典信息
-const props = defineProps({
-  item: Object, //列表内容
-  path: String, //跳转详情的路由
-  dict: {
-    type: Object,
-    default: {
-      D_BZ_YJLX: [],
-      D_BZ_TYJB: [],
-    },
-  },
-});
-watch(
-  () => props.item,
-  (newValue) => {
-    if (Object.keys(newValue).length > 0) _getBase64(newValue);
-  },
-  { immediate: true, deep: true }
-);
-const baseUrl = ref("");
-//跳转
-
-function onGoDetail() {
-  try {
-    router.push(props.path);
-  } catch (error) { }
-}
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    baseUrl.value = res;
-  }, item.yjTp);
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.list_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  margin: 0vw 2vw 2vw 2vw;
-  padding: 2vw 1vw;
-  @include item_bottom_color($bottom-border-top-clore-theme);
-
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .count_size {
-      font-size: 5vw;
-      display: inline-block;
-      margin: 0 1vw;
-      color: red;
-    }
-  }
-}
-
-.list_box:nth-child(1) {
-  border-top: none !important;
-}
-
-.detail_box {
-  margin-top: 1vw;
-  display: flex;
-  position: relative;
-
-  .detail_item {
-    flex: 3.5;
-    margin-left: 2vw;
-
-    .user_info {
-      @include font_size($font_medium);
-      font-weight: 600;
-      color: #507ce9;
-
-      &>span {
-        display: inline-block;
-        margin-right: 2vw;
-      }
-    }
-
-    .item {
-      line-height: 6vw;
-    }
-  }
-}
-</style>
diff --git a/src/components/cjbsList.vue b/src/components/cjbsList.vue
deleted file mode 100644
index cefe2bf..0000000
--- a/src/components/cjbsList.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <div class="list_box" @click="changeRouter(item)">
-    <div class="time_box">
-      <span>
-        <van-icon name="clock-o" />
-        &ensp;{{ item.xtCjsj }}
-      </span>
-    </div>
-    <div class="detail_box">
-      <div class="detail_item">
-        <div class="item user_info">
-          <span>警情类型：<van-tag type="primary" style="padding: 0 2vw; margin-right: 2vw" plain>{{ setDict(item.cjsbLx,
-            dict.D_QW_CJSBLX)
-              }}</van-tag></span>
-        </div>
-        <div class="item">上报情况：{{ item.cjsbQk }}</div>
-        <div class="item">上报人员：{{ item.cjsbRyXm }}</div>
-        <div class="item">管辖派出所：{{ item.ssbm }}</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import router from "../router/index.js";
-import { getBase64 } from "../utils/tools.js";
-import { defineProps, ref, watch } from "vue";
-import { getDictList, setDict } from "../utils/dict.js";
-import { ImagePreview } from "vant";
-import { qcckGet } from "@/api/qcckApi.js";
-const props = defineProps({
-  item: Object, //列表内容
-  path: String, //跳转详情的路由
-  dict: {
-    type: Object,
-    default: {
-      D_QW_CJSBLX: [],
-    },
-  },
-});
-const baseUrl = ref("");
-const getImageUrl = (item) => {
-  qcckGet({}, `/mosty-base/minio/file/download/${item.tpid}`).then(res => {
-    _getBase64(res.url)
-  })
-}
-watch(
-  () => props.item,
-  (newValue) => {
-    if (Object.keys(newValue).length > 0) getImageUrl(newValue);
-  },
-  { immediate: true, deep: true }
-);
-
-const changeRouter=(item)=>{
-  router.push({path:'/cjbsPage',query:{item:JSON.stringify(item)}})
-}
-//预览图片
-function onClickImg(url) {
-  ImagePreview([url]);
-}
-
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    baseUrl.value = res;
-  }, item);
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.list_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  margin: 0vw 2vw 2vw 2vw;
-  padding: 2vw 1vw;
-  @include item_bottom_color($bottom-border-top-clore-theme);
-
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .count_size {
-      font-size: 5vw;
-      display: inline-block;
-      margin: 0 1vw;
-      color: red;
-    }
-  }
-}
-
-.list_box:nth-child(1) {
-  border-top: none !important;
-}
-
-.detail_box {
-  margin-top: 1vw;
-  display: flex;
-  position: relative;
-
-  .detail_item {
-    flex: 3.5;
-    margin-left: 2vw;
-
-    .user_info {
-      @include font_size($font_medium);
-      font-weight: 600;
-      color: #507ce9;
-
-      &>span {
-        display: inline-block;
-        margin-right: 2vw;
-      }
-    }
-
-    .item {
-      line-height: 6vw;
-    }
-  }
-}
-
-::v-deep .van-image__img {
-  height: auto;
-  max-height: 101px;
-}
-</style>
diff --git a/src/components/clockList.vue b/src/components/clockList.vue
deleted file mode 100644
index 7c7a083..0000000
--- a/src/components/clockList.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<template>
-  <div class="list_box">
-    <div class="time_box">
-      <span>
-        <van-icon name="clock-o" />
-        &ensp;{{ item.xtCjsj }}
-      </span>
-    </div>
-    <div class="detail_box">
-      <van-image width="80px" :src="baseUrl" @click="onClickImg(baseUrl)" style="flex: 1" v-if="baseUrl">
-        <template v-slot:loading>
-          <van-loading type="spinner" size="20" />
-        </template>
-      </van-image>
-      <div class="detail_item">
-        <div class="item user_info">
-          <span>{{ item.dkrxm }}</span>
-          <!-- <span>{{ item.dkrsfzh }}</span> -->
-        </div>
-        <div class="item">管辖派出所：{{ item.ssbm }}</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import router from "../router/index.js";
-import { getBase64 } from "../utils/tools.js";
-import { defineProps, ref, watch } from "vue";
-import { getDictList, setDict } from "../utils/dict";
-import { ImagePreview } from "vant";
-import { qcckGet } from "@/api/qcckApi.js";
-const props = defineProps({
-  item: Object, //列表内容
-  path: String, //跳转详情的路由
-});
-const baseUrl = ref("");
-const getImageUrl = (item) => {
-  qcckGet({}, `/mosty-base/minio/file/download/${item.tpid}`).then(res => {
-    _getBase64(res.url)
-  })
-}
-watch(
-  () => props.item,
-  (newValue) => {
-    if (Object.keys(newValue).length > 0) getImageUrl(newValue);
-  },
-  { immediate: true, deep: true }
-);
-//预览图片
-function onClickImg(url) {
-  ImagePreview([url]);
-}
-
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    baseUrl.value = res;
-  }, item);
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.list_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  margin: 0vw 2vw 2vw 2vw;
-  padding: 2vw 1vw;
-  @include item_bottom_color($bottom-border-top-clore-theme);
-
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .count_size {
-      font-size: 5vw;
-      display: inline-block;
-      margin: 0 1vw;
-      color: red;
-    }
-  }
-}
-
-.list_box:nth-child(1) {
-  border-top: none !important;
-}
-
-.detail_box {
-  margin-top: 1vw;
-  display: flex;
-  position: relative;
-
-  .detail_item {
-    flex: 3.5;
-    margin-left: 2vw;
-
-    .user_info {
-      @include font_size($font_medium);
-      font-weight: 600;
-      color: #507ce9;
-
-      &>span {
-        display: inline-block;
-        margin-right: 2vw;
-      }
-    }
-
-    .item {
-      line-height: 6vw;
-    }
-  }
-}
-
-::v-deep .van-image__img {
-  height: auto;
-  max-height: 101px;
-}
-</style>
diff --git a/src/components/echarts/annular.vue b/src/components/echarts/annular.vue
deleted file mode 100644
index 7d7206c..0000000
--- a/src/components/echarts/annular.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-	<div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-	import * as echarts from 'echarts'
-	export default {
-		props: ["datas"],
-		watch: {
-			datas: {
-				handler(val) {
-					this.hamdlegfChart()
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		data() {
-			return {
-				echid: '',
-				themeType: getStorage('themeSetting')
-			}
-		},
-		created() {
-			this.echid = 'ech_' + new Date().getTime();
-		},
-		mounted() {
-			// this.titles = this.titles
-			// this.datas = this.datas
-			this.hamdlegfChart()
-		},
-		methods: {
-			hamdlegfChart() {
-				if (document.getElementById(this.echid)) {
-					let myechart = echarts.init(document.getElementById(this.echid))
-					myechart.setOption({
-						grid: {
-							left: '0',
-							right: '0',
-							bottom: '0',
-							top: '10',
-							containLabel: true
-						},
-						series: [{
-							type: 'pie',
-							radius: ['45%', '60%'],
-							labelLine: {
-								length: 30
-							},
-							label: {
-								formatter: '{b|{b}}\n{per|{d}%}',
-								minMargin: 5,
-								edgeDistance: 10,
-								lineHeight: 18,
-								color: this.themeType == 'light' ? '#333':'#fff',
-								rich: {
-									b: {
-										fontSize: 13,
-									},
-									per: {
-										padding: [3, 4],
-										borderRadius: 4
-									}
-								}
-							},
-							data: [{
-									value: Math.floor(Math.random()*1000),
-									name: '类型一'
-								},
-								{
-									value: Math.floor(Math.random()*1000),
-									name: '类型二'
-								},
-								{
-									value: Math.floor(Math.random()*1000),
-									name: '类型三'
-								},
-								{
-									value: Math.floor(Math.random()*1000),
-									name: '类型四'
-								}
-							]
-						}]
-					})
-					window.addEventListener('resize', () => {
-						myechart.resize();
-					});
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.gfChart {
-		margin-top: 1vw;
-		height: 55vw;
-		width: 100%;
-	}
-</style>
diff --git a/src/components/echarts/brokenLine.vue b/src/components/echarts/brokenLine.vue
deleted file mode 100644
index 0a86076..0000000
--- a/src/components/echarts/brokenLine.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-	<div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-	import * as echarts from 'echarts'
-	export default {
-		props: ["datas"],
-		watch: {
-			datas: {
-				handler(val) {
-					this.hamdlegfChart()
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		data() {
-			return {
-				echid: '',
-				themeType: getStorage('themeSetting')
-			}
-		},
-		created() {
-			this.echid = 'ech_' + new Date().getTime();
-		},
-		mounted() {
-			// this.titles = this.titles
-			// this.datas = this.datas
-			this.hamdlegfChart()
-		},
-		methods: {
-			hamdlegfChart() {
-				if (document.getElementById(this.echid)) {
-					let myechart = echarts.init(document.getElementById(this.echid))
-					myechart.setOption({
-						grid: {
-							left: '10',
-							right: '10',
-							bottom: '0',
-							top: '25',
-							containLabel: true
-						},
-						xAxis: {
-							type: 'category',
-							data:this.datas.titles
-						},
-						yAxis: {
-							type: 'value',
-							splitLine:{show: false}
-						},
-						series: [{
-							data: this.datas.xsList,
-							type: 'line',
-							stack: 'Total',
-							label: {
-								show: true,
-								position: 'top',
-								color: this.themeType == 'light' ? '#333':'#fff'
-							},
-						}]
-					})
-					window.addEventListener('resize', () => {
-						myechart.resize();
-					});
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.gfChart {
-		margin-top: 1vw;
-		height: 55vw;
-		width: 100%;
-	}
-</style>
diff --git a/src/components/echarts/columnar.vue b/src/components/echarts/columnar.vue
deleted file mode 100644
index 4c100ca..0000000
--- a/src/components/echarts/columnar.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-	<div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-	import * as echarts from 'echarts'
-	export default {
-		props: ["datas"],
-		watch: {
-			datas: {
-				handler(val) {
-					this.hamdlegfChart()
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		data() {
-			return {
-				echid: '',
-				themeType: getStorage('themeSetting')
-			}
-		},
-		created() {
-			this.echid = 'ech_' + new Date().getTime();
-
-		},
-		mounted() {
-			// this.titles = this.titles
-			// this.datas = this.datas
-			this.hamdlegfChart()
-		},
-		methods: {
-			hamdlegfChart() {
-				if (document.getElementById(this.echid)) {
-					let myechart = echarts.init(document.getElementById(this.echid))
-					myechart.setOption({
-						tooltip: {
-							trigger: 'axis',
-							axisPointer: {
-								type: 'shadow'
-							}
-						},
-						grid: {
-							left: '10',
-							right: '10',
-							bottom: '0',
-							top: '25',
-							containLabel: true
-						},
-						xAxis: [{
-							type: 'category',
-							data: this.datas.titles,
-							axisTick: {
-								alignWithLabel: true
-							}
-						}],
-						yAxis: [{
-							type: 'value',
-							splitLine: {
-								show: false
-							},
-						}],
-						series: [{
-							type: 'bar',
-							barWidth: 11,
-							stack: 'Total',
-							label: {
-								show: true,
-								position: 'top',
-								color: this.themeType == 'light' ? '#333':'#fff'
-							},
-							itemStyle: {
-								normal: {
-									barBorderRadius: [5, 5, 5, 5]
-								}
-							},
-							data: this.datas.xsList,
-							color: [{
-								type: 'linear',
-								x: 0,
-								y: 0,
-								x2: 0,
-								y2: 1,
-								colorStops: [{
-										offset: 0,
-										color: '#00c0fa'
-									},
-									{
-										offset: 1,
-										color: '#015eea'
-									}
-								]
-							}]
-						}]
-					})
-					window.addEventListener('resize', () => {
-						myechart.resize();
-					});
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.gfChart {
-		margin-top: 1vw;
-		height: 55vw;
-		width: 100%;
-	}
-</style>
diff --git a/src/components/echarts/pieChart.vue b/src/components/echarts/pieChart.vue
deleted file mode 100644
index 7e399ff..0000000
--- a/src/components/echarts/pieChart.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-	<div :id="echid" class="gfChart"></div>
-</template> 
-
-<script>
-	import * as echarts from 'echarts'
-	export default {
-		props: ["datas"],
-		watch: {
-			datas: {
-				handler(val) {
-					this.hamdlegfChart()
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		data() {
-			return {
-				echid: '',
-			}
-		},
-		created() {
-			this.echid = 'echa_' + new Date().getTime();
-
-		},
-		mounted() {
-			this.hamdlegfChart()
-		},
-		methods: {
-			hamdlegfChart() {
-				if (document.getElementById(this.echid)) {
-					let myechart = echarts.init(document.getElementById(this.echid))
-					myechart.setOption({
-						tooltip: {},
-						series: [{
-							name: '',
-							type: 'pie',
-							radius: '80%',
-							center: ['50%', '50%'],
-							label: {
-								position: 'inside',
-								textStyle: {
-									fontSize: 14,
-									color: '#fff'
-								},
-								formatter: "{num|{c}} \n {name|{b}} ",
-								rich: {
-									num: {
-										fontSize: 34,
-									}
-								}
-							},
-							data: this.datas,
-							emphasis: {
-								itemStyle: {
-									shadowBlur: 10,
-									shadowOffsetX: 0,
-									shadowColor: 'rgba(0,0,0,.5)'
-								}
-							}
-						}]
-					})
-					window.addEventListener('resize', () => {
-						myechart.resize();
-					});
-				}
-			}
-		},
-	}
-</script>
-
-<style scoped>
-	.gfChart {
-		margin-top: 1vw;
-		height: 75vw;
-		width: 100%;
-	}
-</style>
diff --git a/src/components/echarts/pieCharts.vue b/src/components/echarts/pieCharts.vue
deleted file mode 100644
index 204aa4d..0000000
--- a/src/components/echarts/pieCharts.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<div :id="echid" class="gfChart"></div>
-</template> 
-
-<script>
-	import * as echarts from 'echarts'
-	export default {
-		props: ["datas",'id'],
-		watch: {
-			datas: {
-				handler(val) {
-					this.hamdlegfChart()
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		data() {
-			return {
-				echid: '',
-			}
-		},
-		created() {
-			this.echid = 'echa_'+this.id + new Date().getTime();
-		},
-		mounted() {
-			this.hamdlegfChart()
-		},
-		methods: {
-			hamdlegfChart() {
-				if (document.getElementById(this.echid)) {
-					let myechart = echarts.init(document.getElementById(this.echid))
-					myechart.setOption({
-						tooltip: {},
-						series: [{
-							name: '',
-							type: 'pie',
-							radius: '76%',
-							center: ['50%', '50%'],
-							label: {
-								position: 'inside',
-								textStyle: {
-									fontSize: 14,
-									color: '#fff'
-								},
-								formatter: "{num|{c}} \n {name|{b}} ",
-								rich: {
-									num: {
-										fontSize: 18,
-									}
-								}
-							},
-							data: this.datas,
-							emphasis: {
-								itemStyle: {
-									shadowBlur: 10,
-									shadowOffsetX: 0,
-									shadowColor: 'rgba(0,0,0,.5)'
-								}
-							}
-						}]
-					})
-					window.addEventListener('resize', () => {
-						myechart.resize();
-					});
-				}
-			}
-		},
-	}
-</script>
-
-<style scoped>
-	.gfChart {
-		height: 100%;
-		width: 100%;
-	}
-</style>
diff --git a/src/components/echarts/pileUpColumn.vue b/src/components/echarts/pileUpColumn.vue
deleted file mode 100644
index a6a43b9..0000000
--- a/src/components/echarts/pileUpColumn.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-	<div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-	import * as echarts from 'echarts'
-	export default {
-		props: ["datas"],
-		watch: {
-			datas: {
-				handler(val) {
-					this.hamdlegfChart()
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		data() {
-			return {
-				echid: '',
-				themeType: getStorage('themeSetting')
-			}
-		},
-		created() {
-			this.echid = 'echc_' + new Date().getTime();
-
-		},
-		mounted() {
-			this.hamdlegfChart()
-		},
-		methods: {
-			hamdlegfChart() {
-				if (document.getElementById(this.echid)) {
-					let myechart = echarts.init(document.getElementById(this.echid))
-					myechart.setOption({
-						legend: {
-							textStyle:{
-								color:this.themeType == 'light' ? '#333':'#fff'
-							}
-						},
-						grid: {
-							left: '10',
-							right: '10',
-							bottom: '0',
-							top: '35',
-							containLabel: true
-						},
-						xAxis: {
-							type: 'category',
-							// data: ['xxx派出所','xxx派出所','xxx派出所','xxx派出所','xxx派出所'],
-							data: this.datas.Xlist,
-							axisLabel: {
-								interval: 0,
-								rotate: 40,
-								textStyle: {
-									color: this.themeType == 'light' ? '#333':'#fff'
-								}
-							}
-						},
-						yAxis: {
-							type: 'value',
-							splitLine: {
-								show: false,
-							},
-						},
-						series: [{
-								name: '系统问题',
-								type: 'bar',
-								stack: 'total',
-								label: {
-									show: true,
-									color: '#fff',
-									fontSize: 12
-								},
-								emphasis: {
-									focus: 'series'
-								},
-								// data: [30,50,20.50,60,50],
-								data: this.datas.xtwtList,
-								barGap: '20',
-								barWidth: '20',
-								// barGap: '50%',
-								// barWidth:'50%',
-								color: [{
-									type: 'linear',
-									x: 0,
-									y: 0,
-									x2: 0,
-									y2: 1,
-									colorStops: [{
-											offset: 0,
-											color: '#39B079'
-										},
-										{
-											offset: 1,
-											color: '#39B079'
-										}
-									]
-
-								}]
-							}, {
-								name: '功能改进',
-								type: 'bar',
-								stack: 'total',
-								barGap: '50%',
-								barWidth: '50%',
-								label: {
-									show: true,
-									color: '#fff'
-								},
-								emphasis: {
-									focus: 'series'
-								},
-								data: this.datas.gngjList,
-								color: [{
-									type: 'linear',
-									x: 0,
-									y: 0,
-									x2: 0,
-									y2: 1,
-									colorStops: [{
-											offset: 0,
-											color: '#D17D1C'
-										},
-										{
-											offset: 1,
-											color: '#ff887c'
-										}
-									]
-								}]
-							},
-							{
-								name: '新需求',
-								type: 'bar',
-								barGap: '50%',
-								barWidth: '50%',
-								stack: 'total',
-								label: {
-									show: true,
-									color: '#fff'
-								},
-								emphasis: {
-									focus: 'series'
-								},
-								data: this.datas.xxqList,
-								color: [{
-									type: 'linear',
-									x: 0,
-									y: 0,
-									x2: 0,
-									y2: 1,
-									colorStops: [{
-											offset: 0,
-											color: '#EB0E0E'
-										},
-										{
-											offset: 1,
-											color: '#D31F1F'
-										}
-									]
-								}]
-							},
-						]
-					})
-					window.addEventListener('resize', () => {
-						myechart.resize();
-					});
-				}
-			}
-		},
-	}
-</script>
-
-<style scoped>
-	.gfChart {
-		margin-top: 2vw;
-		height: 75vw;
-		width: 100%;
-	}
-</style>
diff --git a/src/components/pcModel.vue b/src/components/pcModel.vue
deleted file mode 100644
index a64dfb1..0000000
--- a/src/components/pcModel.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <div class="container">
-    <!-- 盘人 -->
-    <van-popup
-      v-model:show="peoplePopupShow"
-      round
-      :style="{ width: '90%' }"
-      close-icon="close"
-      :overlay="true"
-      @close="handlePClose"
-    >
-      <div class="checkPeoplePopup">
-        <div class="select-box">
-          <div
-            class="item-boxs"
-            v-for="(item, index) in checkPList"
-            :key="index"
-            @click="getPItem(item, index)"
-          >
-            <span :class="pCheckFlag === item.value ? 'checkText' : ''">{{
-              item.label
-            }}</span>
-          </div>
-        </div>
-        <div class="content-box">
-          <van-field
-            v-model="form.sfzh"
-            placeholder="请输入身份证号"
-            v-if="pCheckFlag === 'sfzh'"
-            :rules="[{ required: true, message: '请输入身份证号码' }]"
-          >
-          </van-field>
-          <van-field
-            v-model="form.lxdh"
-            placeholder="请输入手机号"
-            v-if="pCheckFlag === 'phoneNum'"
-            :rules="[{ required: true, message: '请输入手机号码' }]"
-          >
-          </van-field>
-        </div>
-        <div class="checkPeopleSubmit" @click="checkP()">
-          <div class="sub-btn">
-            <img
-              :src="require('../assets/images/new/faceR.png')"
-              alt=""
-              width="17"
-              height="17"
-            />&nbsp;&nbsp;查询人员
-          </div>
-        </div>
-        <div class="alert_info">
-          请根据工作需求使用此功能，您的每次查询将记录日志！
-        </div>
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import {
-  ref,
-  reactive,
-  watch,
-  defineProps,
-  defineEmits,
-  toRefs,
-  toRef,
-  defineExpose,
-} from "vue";
-import { useRouter } from "vue-router";
-import { hintToast } from "../utils/tools.js";
-const router = useRouter();
-const peoplePopupShow = ref(false);
-const form = ref({
-  sfzh: "",
-  lxdh: "",
-});
-// 盘人弹框按钮List
-const checkPList = [
-  { label: "身份证", value: "sfzh" },
-  { label: "手机号", value: "phoneNum" },
-];
-const pCheckFlag = ref("sfzh");
-
-// 关闭弹窗
-function handlePClose() {
-  peoplePopupShow.value = false;
-}
-
-// 盘人
-function checkP(e) {
-  if (pCheckFlag.value == "sfzh") {
-    if (form.value.sfzh) {
-      router.push({
-        path: "/yyzx/dhcr",
-        query: { sfzh: form.value.sfzh, pclx: "sjh" },
-      });
-    } else {
-      hintToast("请输入身份证！！！");
-    }
-  }
-  if (pCheckFlag.value == "phoneNum") {
-    if (form.value.lxdh) {
-      router.push({ path: "/yyzx/dhcr", query: { dhhm: form.value.lxdh , pclx: "sjh",} });
-    } else {
-      hintToast("请输入电话号码！！！");
-    }
-  }
-}
-
-// 按钮切换
-function getPItem(item, index) {
-  pCheckFlag.value = item.value;
-}
-
-defineExpose({
-  peoplePopupShow,
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-.item-boxs {
-  @include font_size($font_medium_s);
-}
-.sub-btn {
-  @include font_size($font_medium_s);
-}
-.alert_info {
-  font-size: 11px;
-  text-align: center;
-  color: red;
-}
-.checkPeoplePopup {
-  padding: 2vw;
-  box-sizing: border-box;
-  .select-box {
-    padding: 1vw;
-  }
-}
-.van-cell {
-  background: #f7f7f7;
-  border-radius: 2vw;
-}
-</style>
diff --git a/src/components/pcclList.vue b/src/components/pcclList.vue
deleted file mode 100644
index b530a55..0000000
--- a/src/components/pcclList.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-  <div class="cnt_box">
-      <div class="list_box">
-          <div class="head">
-              <span class="time">
-                  <van-icon name="clock-o" />&ensp;
-                  {{item.pcsj}}</span>
-              <span class="bq red" v-if="item.pcclJg == 2">{{item.pcclJgmc}}</span>
-              <span class="bq blue" v-if="item.pcclJg == 1">{{item.pcclJgmc}}</span>
-              <span class="bq orange" v-if="item.pcclJg == 9">{{item.pcclJgmc}}</span>
-          </div>
-          <div class="info">
-              <div class="item">
-                  车辆信息：<span class="text">{{item.hphm}}</span> <span>{{setDict(item.hpzl,dict.D_BZ_HPZL)}}</span>
-              </div>
-              <div class="item">
-                  人员信息：<span class="text">{{item.jdcsyr}}</span> <span>{{item.jdcsyrsfzh}}</span>
-              </div>
-              <div class="item">
-                  盘查人：<span class="text">{{item.ssbm}}</span> <span>{{item.pcmjXm}}</span>
-              </div>
-          </div>
-      </div>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive,onMounted,defineProps } from "vue";
-import {getDictList,setDict} from '../utils/dict'
-const props = defineProps({
-  item: Object, //列表内容
-  path: String, //跳转详情的路由
-  dict: {
-    type: Object,
-    default: {
-      D_BZ_HPZL: []
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-.cnt_box{
-    margin-top: 2vw;
-    padding: 0 4vw;
-    box-sizing: border-box;
-    .list_box{
-        padding: 2vw;
-        box-sizing: border-box;
-        border-radius: 2vw;
-        background: #fff;
-        border: 1px solid #e5e5e5;
-        .head{
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            height: 10vw;
-            border-bottom: 1px solid #e9e9e9;
-            .time{
-                color: #4081e9;
-                @include font_size($font_medium_s);
-            }
-            .bq{
-                padding: 1vw 4vw;
-                color: #fff;
-                border-radius: 4vw;
-                @include font_size($font_medium_s);
-            }
-            .red{
-                background: red;
-            }
-            .orange {
-                background-color: #FF802E;
-            }
-            .yellow {
-                background-color: #FFB114;
-            }
-            .blue{
-                background: #3ACDFF;
-            }
-        }
-        .info{
-            margin-top: 2vw;
-            .item{
-                @include font_size($font_medium_s);
-                line-height: 6vw;
-                .text{
-                    margin: 0 4vw;
-                }
-            }
-        }
-    }
-}
-</style>>
diff --git a/src/components/search.vue b/src/components/search.vue
deleted file mode 100644
index 1db2950..0000000
--- a/src/components/search.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-  <van-config-provider :theme-vars="themeVars">
-    <div class="search_box">
-      <van-search
-        v-model="values"
-        :placeholder="placeholder"
-        shape="round"
-        @clear="onClear"
-        @search="onSearch"
-        :style="{ width: isSx ? '90%' : '100%' }"
-      >
-      </van-search>
-      <!-- 是否有筛选条件 -->
-      <div class="sx_box" v-if="isSx" @click="onClickSx">
-        <van-icon name="bars" size="8vw"></van-icon>
-      </div>
-    </div>
-  </van-config-provider>
-</template>
-
-<script>
-export default {
-  name: "search",
-  props: ["placeholder", "modelValue", "isSx"],
-  data() {
-    return {
-      isChecked: 0,
-      themeType: getStorage("themeSetting"),
-      themeVars: {},
-      values: "",
-    };
-  },
-  watch: {
-    modelValue: {
-      handler(val) {
-        this.$nextTick(() => {
-          this.values = val;
-        });
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
-  mounted() {
-    this.themeVars = {
-      fieldInputTextColor: this.themeType == "light" ? "#333" : "#333",
-      // fieldInputTextColor: this.themeType == "light" ? "#333" : "#fff",
-      SearchContentBackgroundColor:
-        this.themeType == "light" ? "#f7f8fa" : "#f7f8fa",
-      // SearchContentBackgroundColor: this.themeType == "light" ? "#f7f8fa" : "#092556",
-    };
-  },
-  methods: {
-    //确认筛选
-    onSearch(e) {
-      this.$emit("update:modelValue", this.values);
-    },
-    //清除
-    onClear() {
-      this.$emit("update:modelValue", "");
-    },
-    //打开筛选条件
-    onClickSx() {
-      this.$emit("update:sx", true);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.search_box {
-  @include font_size($font_medium_s);
-  display: flex;
-  width: 100%;
-  z-index: 1;
-}
-.sx_box {
-  width: 10%;
-  @include font_color($font-color-theme);
-  text-align: center;
-  padding: 3.1vw 2vw 2vw 0;
-}
-::v-deep .van-search {
-  background: none;
-  padding: 10px;
-}
-</style>
diff --git a/src/components/swiperCell.vue b/src/components/swiperCell.vue
deleted file mode 100644
index d32474b..0000000
--- a/src/components/swiperCell.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <van-swipe-cell>
-    <div class="status_box">
-      <div class="title">{{ item.rwmc }}</div>
-      <span
-        style="whiteSpace: nowrap"
-        :class="{
-          bule: item.grrwzt == 0,
-          cyan: item.grrwzt == 1,
-          green: item.grrwzt == 2,
-          yellow: item.grrwzt == 3,
-          red: item.grrwzt == 4,
-        }"
-        >{{ setDict(item.grrwzt, dict.D_BZ_GRRWZT) }}</span
-      >&nbsp;
-      <div>
-        <van-tag color="#fcc31f" v-if="item.rwzt == 1">关闭</van-tag>
-        <van-tag type="primary" v-else-if="item.rwzt == 2">暂停 </van-tag>
-        <van-tag type="success" v-else-if="item.rwzt == 0">正常</van-tag>
-      </div>
-    </div>
-    <div class="nr">开始时间：{{ item.rwfqsj }}</div>
-    <div class="nr">{{ item.rwnr }}</div>
-    <div class="nr">
-      发起人：<span v-if="item.ssbm">{{ item.ssbm }}-</span>
-      <span>{{ item.cjrxm }}</span>
-    </div>
-    <template #right>
-      <div class="rw_but_box">
-        <!-- <van-button
-          type="primary"
-          style="margin: 0.5vw"
-          @click.stop="
-            onLookRw(
-              item.ywid,
-              item.id,
-              item.rwxl,
-              item.rwlx,
-              item.rwzt,
-              item.grrwzt,
-              item.rwid
-            )
-          "
-          >查看</van-button
-        > -->
-        <van-button
-          type="warning"
-          style="margin: 0.5vw"
-          v-if="
-            (item.rwzflx == 1 &&
-              item.rwxl == '05' &&
-              item.rwzt == 0 &&
-              item.grrwzt != '2' &&
-              item.grrwzt != '3' &&
-              item.grrwzt != '34') ||
-            item.rwzt == 1
-          "
-          @click.stop="onTransmit(item.id, item.rwzt)"
-          >转发</van-button
-        >
-        <van-button
-          type="danger"
-          style="margin: 0.5vw"
-          v-if="
-            item.rwzflx == 2 &&
-            item.rwxl == '05' &&
-            ['0', '1'].includes(item.grrwzt)
-          "
-          @click.stop="onDown(item.id, item.rwzt)"
-          >驳回</van-button
-        >
-      </div>
-    </template>
-  </van-swipe-cell>
-</template>
-<script setup>
-import { defineProps, ref, defineEmits } from "vue";
-import { getDictList, setDict } from "../utils/dict";
-import router from "../router/index.js";
-import { upGrzt, isMyTask } from "../api/rwzx.js";
-import { hintToast } from "../utils/tools.js";
-const props = defineProps({
-  //是否只查看本人数据
-  isMy: {
-    type: Boolean,
-    default: false,
-  },
-  item: Object,
-  dict: {
-    type: Object,
-    default: { D_BZ_GRRWZT: [] },
-  },
-});
-const emits = defineEmits(["click:Transmit", "click:onDown"]);
-//点击转发按钮
-function onTransmit(id, rezt) {
-  emits("click:Transmit", { id, rezt });
-}
-//驳回按钮
-function onDown(id, rezt) {
-  emits("click:onDown", { id, rezt });
-}
-//查看任务详情
-function onLookRw(ywid, id, rwxl, rwlx, rwzt, grrwzt, rwid) {
-  if (props.isMy) {
-    isMyTask(id).then((res) => {
-      if (res) {
-        //判断任务是暂停和关闭
-        if (rwzt == 1) {
-          hintToast("任务已关闭！！！");
-          return;
-        }
-        if (rwzt == 2) {
-          hintToast("任务已暂停！！！");
-          return;
-        }
-        if (grrwzt === "0") {
-          upGrzt({ rwid: rwid, rwzt: "1" });
-        }
-        //通知任务
-        if (rwlx == 1) {
-          router.push(`/rw/views/rwDetail?id=${id}`);
-          return;
-        }
-        //值班任务
-        if (rwxl == "04") {
-          router.push("/yyzx/views/addZbbb");
-          return;
-        }
-        //巡防任务
-        if (rwxl == "03") {
-          router.push("/yyzx/xfbb/addXfbb");
-          return;
-        }
-        //指令任务
-        if (rwxl == "05") {
-          router.push(`/yyzx/zlzx/zlDetail?id=${ywid}`);
-          return;
-        }
-        //实有人口任务
-        if (rwxl == "01") {
-          router.push(`/rw/views/syrkRwDetail?id=${rwid}`);
-          return;
-        }
-      }
-    });
-  } else {
-    //判断任务是暂停和关闭
-    if (rwzt == 1) {
-      hintToast("任务已关闭！！！");
-      return;
-    }
-    if (rwzt == 2) {
-      hintToast("任务已暂停！！！");
-      return;
-    }
-    if (grrwzt === "0") {
-      upGrzt({ rwid: rwid, rwzt: "1" });
-    }
-    //通知任务
-    if (rwlx == 1) {
-      router.push(`/rw/views/rwDetail?id=${rwid}`);
-      return;
-    }
-    //值班任务
-    if (rwxl == "04") {
-      router.push("/yyzx/views/addZbbb");
-      return;
-    }
-    //巡防任务
-    if (rwxl == "03") {
-      router.push("/yyzx/xfbb/addXfbb");
-      return;
-    }
-    //指令任务
-    if (rwxl == "05") {
-      router.push(`/yyzx/zlzx/zlDetail?id=${ywid}`);
-      return;
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-.status_box {
-  display: flex;
-  justify-content: space-between;
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-}
-.nr {
-  line-height: 5.5vw;
-}
-.title {
-  @include font_size($font_medium);
-  font-weight: bold;
-  // padding: 1vw 0;
-}
-.rw_but_box {
-  display: flex;
-  align-items: center;
-  height: 100%;
-  padding-left: 2vw;
-}
-::v-deep .van-tag {
-  white-space: nowrap;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/swiperCellrw.vue b/src/components/swiperCellrw.vue
deleted file mode 100644
index 79a8a97..0000000
--- a/src/components/swiperCellrw.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <van-swipe-cell>
-    <div class="status_box">
-      <div class="nr title">
-        <span>{{ item.rwmc }}</span>
-        <van-tag color="#fcc31f" v-if="item.rwzt == 1">关闭</van-tag>
-        <van-tag type="primary" v-else-if="item.rwzt == 2">暂停 </van-tag>
-        <van-tag type="success" v-else-if="item.rwzt == 0">正常</van-tag>
-      </div>
-      <div class="time">
-        <span>开始时间：{{ item.rwfqsj }}</span>
-      </div>
-    </div>
-    <div class="nr">{{ item.rwnr }}</div>
-    <div class="nr">
-      发起人：<span v-if="item.ssbm">{{ item.ssbm }}-</span>
-      <span>{{ item.cjrxm }}</span>
-    </div>
-    <div class="nr">接收人：{{ item.jsrxm || "暂无" }}</div>
-    <template #right>
-      <div class="rw_but_box">
-        <van-button
-          type="primary"
-          style="margin: 0.5vw"
-          @click.stop="
-            onLookRw(item.ywid, item.id, item.rwxl, item.rwlx, item.rwzt)
-          "
-          >查看</van-button
-        >
-        <van-button
-          type="warning"
-          style="margin: 0.5vw"
-          v-if="(item.rwxl == '05' && item.rwzt == 0) || item.rwzt == 1"
-          @click.stop="onTransmit(item.id, item.rwzt)"
-          >转发</van-button
-        >
-        <van-button
-          type="danger"
-          style="margin: 0.5vw"
-          v-if="item.rwxl == '05' && item.rwzt"
-          @click.stop="onDown(item.id, item.rwzt)"
-          >驳回</van-button
-        >
-      </div>
-    </template>
-  </van-swipe-cell>
-</template>
-<script setup>
-import { defineProps, ref, defineEmits } from "vue";
-import { getDictList, setDict } from "../utils/dict";
-import router from "../router/index.js";
-import { hintToast } from "../utils/tools.js";
-const props = defineProps({
-  item: Object,
-  dict: {
-    type: Object,
-    default: { D_BZ_GRRWZT: [] },
-  },
-});
-const emits = defineEmits(["click:Transmit", "click:onDown"]);
-//点击转发按钮
-function onTransmit(id, rezt) {
-  emits("click:Transmit", { id, rezt });
-}
-//驳回按钮
-function onDown(id, rezt) {
-  emits("click:onDown", { id, rezt });
-}
-//查看任务详情
-function onLookRw(ywid, id, rwxl, rwlx, rwzt) {
-  //判断任务是暂停和关闭
-  if (rwzt == 1) {
-    hintToast("任务已关闭！！！");
-    return;
-  }
-  if (rwzt == 2) {
-    hintToast("任务已暂停！！！");
-    return;
-  }
-  //通知任务
-  if (rwlx == 1) {
-    router.push(`/rw/views/rwDetail?id=${id}`);
-    return;
-  }
-  //值班任务
-  if (rwxl == "04") {
-    router.push("/yyzx/views/addZbbb");
-    return;
-  }
-  //巡防任务
-  if (rwxl == "03") {
-    router.push("/yyzx/xfbb/addXfbb");
-    return;
-  }
-  //指令任务
-  if (rwxl == "05") {
-    router.push(`/yyzx/zlzx/zlDetail?id=${ywid}`);
-    return;
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-.status_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-}
-.nr {
-  line-height: 5vw;
-}
-.title {
-  @include font_size($font_medium);
-  display: flex;
-  justify-content: space-between;
-  font-weight: bold;
-  padding: 1vw 0;
-}
-.rw_but_box {
-  display: flex;
-  align-items: center;
-  height: 100%;
-  padding-left: 2vw;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/sydwAndSyrkList.vue b/src/components/sydwAndSyrkList.vue
deleted file mode 100644
index 3a65c86..0000000
--- a/src/components/sydwAndSyrkList.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div class="list_box" @click="onGoDetail">
-    <div class="detail_box">
-      <van-image width="80px" height="85px" :class="_getBase64(item)" :src="item.baseUrl" style="flex: 1"
-        v-if="props.type === '01'">
-        <template v-slot:loading>
-          <van-loading type="spinner" size="20" />
-        </template>
-      </van-image>
-
-      <template v-if="props.type === '01'">
-        <div class="detail_item">
-          <div class="item user_info">
-            <span>{{ item.xm }}</span>
-            <span>{{ setDict(item.mzdm, props.dict) }}</span>
-            <span>{{ item.zjhm }}</span>
-          </div>
-          <span class="red status_box" v-if="item.gldjdm == 1">A类</span>
-          <span class="yellow status_box" v-else-if="item.rylb == 2">B类</span>
-          <span class="orange status_box" v-else>C类</span>
-          <div class="item">居住地址：{{ item.jzdDzxz }}</div>
-          <div class="item">
-            联系电话：{{ item.lxdh }}&emsp;&emsp;
-            <!-- 同住人员：{{item.tzry + "人" }} -->
-          </div>
-          <!-- <div class="item">责任区：{{ item.jzdZrqdm }}</div> -->
-        </div>
-      </template>
-      <template v-else>
-        <div class="detail_item">
-          <div class="item user_info">
-            <span>{{ item.dwmc }}</span>
-          </div>
-          <span class="red status_box" v-if="item.gldj == '1'">A类</span>
-          <span class="yellow status_box" v-else-if="item.gldj == '2'">B类</span>
-          <span class="orange status_box" v-else>C类</span>
-          <div class="item">地址：{{ item.zcdz }}</div>
-          <div class="item">
-            联系电话：{{ item.dwlxdh }}&emsp;&emsp;从业人员：{{
-              item.cyrs + "人"
-            }}
-          </div>
-          <div class="item">责任区：{{ item.sszrqmc }}</div>
-        </div>
-      </template>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import router from "../router/index.js";
-import { setDict } from "../utils/dict";
-import { defineProps, ref } from "vue";
-import { getBase64 } from "../utils/tools.js";
-const props = defineProps({
-  item: Object, //列表内容
-  path: String, //跳转详情的路由
-  dict: {
-    type: Array,
-    default: []
-  },
-  type: String, //内容类型 01 实有人口 02实有单位
-});
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, `http://10.64.201.128:2366/xlpcAdminNew/requestservice/czrk/ryxp.jpg?sfzh=${item.zjhm}`);
-}
-//跳转
-function onGoDetail() {
-  router.push({
-    path: props.path,
-    query: props.item,
-  });
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.list_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  margin: 0vw 2vw 2vw 2vw;
-  padding: 2vw 1vw;
-  @include item_bottom_color($bottom-border-top-clore-theme);
-
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .count_size {
-      font-size: 5vw;
-      display: inline-block;
-      margin: 0 1vw;
-      color: red;
-    }
-  }
-}
-
-// .list_box:nth-child(1) {
-// 	border: none!important;
-// }
-
-.detail_box {
-  margin-top: 1vw;
-  display: flex;
-  position: relative;
-
-  .detail_item {
-    flex: 3.5;
-    margin-left: 2vw;
-
-    .user_info {
-      @include font_size($font_medium);
-      font-weight: 600;
-      color: #507ce9;
-      padding-right: 60px;
-
-      &>span {
-        display: inline-block;
-        margin-right: 2vw;
-      }
-    }
-
-    .item {
-      line-height: 6vw;
-    }
-
-    .status_box {
-      display: inline-block;
-      color: #fff;
-      font-size: 10px;
-      border-radius: 20px;
-      padding: 0px 15px;
-      position: absolute;
-      top: 1vw;
-      right: 2vw;
-    }
-
-    .red {
-      background-color: red;
-    }
-
-    .yellow {
-      background-color: #ffcc40;
-    }
-
-    .orange {
-      background-color: orange;
-    }
-  }
-
-  .zwzl_box {
-    position: absolute;
-    right: -1vw;
-    width: 18vw;
-    top: 6vw;
-  }
-}
-</style>
diff --git a/src/components/tabs.vue b/src/components/tabs.vue
deleted file mode 100644
index 0a5862a..0000000
--- a/src/components/tabs.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <div class="tabs_box">
-    <van-tabs
-      v-model:active="active"
-      title-active-color="#3e6ee8"
-      color="#3e6ee8"
-      @click="onChange"
-      :background="themeType == 'light' ? '#fff' : '#041634'"
-      :title-inactive-color="themeType == 'light' ? '#333' : '#fff'"
-    >
-      <van-tab
-        v-for="(item, index) in list"
-        :key="index"
-        :name="index"
-        :title="item.name"
-        :badge="item.count"
-      ></van-tab>
-    </van-tabs>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "tabs",
-  props: ["list", "type", "checked"],
-  data() {
-    return {
-      active: 0,
-      themeType: getStorage("themeSetting"),
-      //tabs 徽标颜色
-      badgeTextCoior: {
-        type: String,
-        default: "#fff",
-      },
-    };
-  },
-  watch: {
-    checked: {
-      handler(val) {
-        this.$nextTick(() => {
-          this.active = val;
-        });
-      },
-      deep: true,
-    },
-  },
-  mounted() {
-    this.badgeTextCoior.default = this.themeType == "light" ? "#333" : "#fff";
-  },
-  methods: {
-    onChange(e) {
-      this.$emit("onYjjb", this.active);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.tabs_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  @include bg_color($background-color-theme);
-  margin-top: 8.5vw;
-}
-::v-deep .van-tabs__wrap {
-  height: 70px;
-}
-::v-deep .van-badge--fixed {
-  color: var(--badgeTextCoior);
-  background: none;
-  top: 30px;
-  right: 50%;
-  font-size: 13px;
-}
-::v-deep .van-badge {
-  border: none;
-}
-</style>
diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue
deleted file mode 100644
index 3e67383..0000000
--- a/src/components/tabs/tabs.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <div class="tabsBox">
-    <van-tabs v-model:active="active" title-active-color="#3e6ee8" color="#3e6ee8" @click="onChange"
-      :background="themeType == 'light' ? '#fff' : '#041634'"
-      :title-inactive-color="themeType == 'light' ? '#333' : '#fff'">
-      <van-tab v-for="(item, index) in Tabslist" :key="index" :name="index" :title="item.name"
-        :badge="item.count"></van-tab>
-    </van-tabs>
-  </div>
-</template>
-
-<script setup>
-import axios from "axios";
-import { baseUrl2 } from "../../utils/request";
-import { dateFormat } from "../../utils/tools.js";
-import { ref, defineProps, reactive, defineEmits, onMounted, watch } from "vue";
-const active = ref(0);
-const emits = defineEmits(["TabsItem"]);
-const themeType = ref("light");
-const props = defineProps({
-  status: {
-    type: Number,
-    default: 1,
-  },
-});
-watch(
-  () => props.status, (val) => {
-    active.value = val - 1
-  }, {
-  deep: true,
-  immediate: true
-}
-);
-const Tabslist = ref([
-  { name: "总警情", count: 0 },//0
-  { name: "重大警情", count: 0 },//1
-  { name: "违法犯罪", count: 0 },//2
-  { name: "行政", count: 0 },//3
-  { name: "刑事", count: 0 },//4
-  { name: "盗窃三车", count: 0 },//5
-  { name: "扒窃", count: 0 },//6
-  { name: "车财", count: 0 },//7
-  { name: "两抢", count: 0 },//8
-  { name: "汽车", count: 0 },//9
-  { name: "入盗", count: 0 },//10
-  { name: "电诈", count: 0 },//11
-  { name: "纠纷", count: 0 },//12
-  { name: "求助", count: 0 },//13
-  { name: "其他", count: 0 },//14
-]);
-
-onMounted(() => {
-  getCount()
-})
-// 点击tabs
-function onChange(e) {
-  emits('TabsItem', active.value)
-}
-
-function getCount(type) {
-  let data = {
-    orgId: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0].deptCode,
-    startTime: `${dateFormat("z")} 16:00:00`,
-    endTime: `${dateFormat()} 16:00:00`,
-    type: 1,
-    keyword: "",
-  };
-  axios.post(`${baseUrl2}/xz1Api/api/alarm/count`, data).then((res) => {
-    if (res.data) {
-      Tabslist.value[0].count = res.data.data.total //总警情
-      Tabslist.value[1].count = res.data.data.zdCount //重大警情
-      Tabslist.value[2].count = res.data.data.wffzCount //违法犯罪
-      Tabslist.value[3].count = res.data.data.xzCount //行政
-      Tabslist.value[4].count = res.data.data.xsCount //刑事
-      Tabslist.value[5].count = res.data.data.dqscCount //盗窃三车
-      Tabslist.value[6].count = res.data.data.pqCount //扒窃
-      Tabslist.value[7].count = res.data.data.ccCount //车财
-      Tabslist.value[8].count = res.data.data.lqCount //两抢
-      Tabslist.value[9].count = res.data.data.qcCount //汽车
-      Tabslist.value[10].count = res.data.data.rdCount //入盗
-      Tabslist.value[11].count = res.data.data.dzCount //电诈
-      Tabslist.value[12].count = res.data.data.jfCount //纠纷
-      Tabslist.value[13].count = res.data.data.qzCount //求助
-      Tabslist.value[14].count = res.data.data.qtCount //其他
-    }
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.tabsBox {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  @include bg_color($background-color-theme);
-  margin-top: 8.5vw;
-}
-
-::v-deep .van-tabs__wrap {
-  height: 70px;
-}
-
-::v-deep .van-badge--fixed {
-  color: var(--badgeTextCoior);
-  background: none;
-  top: 30px;
-  right: 50%;
-  font-size: 13px;
-}
-
-::v-deep .van-badge {
-  border: none;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/topSelectTime.vue b/src/components/topSelectTime.vue
deleted file mode 100644
index d0aec4c..0000000
--- a/src/components/topSelectTime.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <van-tabs
-    v-model:active="timeActive"
-    @click-tab="onChange"
-    type="card"
-    title-active-color="#fff"
-    :color="thColor"
-    :title-inactive-color="inactive"
-  >
-    <van-tab v-for="item in list" :title="item" :key="item"> </van-tab>
-  </van-tabs>
-</template>
-
-<script>
-export default {
-  name: "tabs",
-  props: {
-    //主题色
-    thColor: {
-      type: String,
-      default: "#3e6ee8",
-    },
-    list: {
-      type: Array,
-      default: ["今日", "近7日", "近30日", "近90日"],
-    },
-    inactive: {
-      type: String,
-      default: " #333",
-    },
-  },
-  data() {
-    return {
-      timeActive: 0,
-    };
-  },
-  methods: {
-    onChange(e) {
-      this.$emit("chenge:time", this.timeActive);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-</style>
diff --git a/src/components/topTabs.vue b/src/components/topTabs.vue
deleted file mode 100644
index 754508b..0000000
--- a/src/components/topTabs.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <div class="topIconBox">
-    <template v-for="item in props.list" : :key="item.id">
-      <div v-if="item.bkmc == '报备'" @click="clickNav()">
-        <img src="../assets/images/leader/top_bb.png" /><br />{{isBb ? "已报备" : "报备打卡" }}
-      </div>
-      <div v-if="item.bkmc == '特殊报备'" @click="clickTsbb()">
-        <img src="../assets/images/leader/top_bb.png" /><br />特殊报备
-      </div>
-      <div v-if="item.bkmc == '指令'" @click="onClickZl()">
-        <img src="../assets/images/leader/top_zl.png" /><br />指令
-      </div>
-      <div v-if="item.bkmc == '盘人'" @click="clickPc('pr')">
-        <img src="../assets/images/menu-yyhc.png" /><br />盘人
-      </div>
-      <div v-if="item.bkmc == '盘车'" @click="clickPc('pc')">
-        <img src="../assets/images/menu-clhc.png" /><br />盘车
-      </div>
-    </template>
-  </div>
-</template>
-<script setup>
-import emitter from "../utils/eventBus.js";
-import { getXfqListById,getKfdListById } from "../api/xfbbAndZbbb.js";
-import { getMybbTodayNew } from "../api/common";
-import { ContactList } from "vant";
-import { ref, reactive, onMounted, defineEmits,onUnmounted } from "vue";
-import { useRouter } from "vue-router";
-import { getItem } from "../utils/storage";
-const router = useRouter();
-const props = defineProps({
-  list: Array, //展示数据
-  pcType: Object, //盘查类型,
-  kkid: String,
-  kkmc: String,
-  xzList: Array, //巡组数据，如果有巡组数据  显示已报备
-});
-const emit = defineEmits(["onPcTypeShow"]);
-const userInfo = ref({});
-const userInfoAs = getItem("userInfo");
-const isBb = ref(false); //报备数据
-const bbxx = ref({}); //报备数据
-onMounted(() => {
-  _getBbInfo();
-  try {
-    userInfo.value = JSON.parse(bridge.getLocation());
-  } catch (error) {}
-});
-
-//获取用户的报备信息
-function _getBbInfo() {
-  emitter.emit("deletePointArea", "kfd");
-  emitter.emit("deletePointArea", "kfdArea");
-  getMybbTodayNew().then((res) => {
-    bbxx.value = res;
-    if (res) {
-      userInfoAs.bbId = res.id;
-      userInfoAs.jzId = res.jzId;
-      userInfoAs.jzMc = res.jzMc;
-       if (res.xffwlx == 1) {
-         let ids = res.xffwid.split(',')
-         ids.forEach(item => {
-            _getXfqList(item,'xfq') //巡防区
-         });
-       
-      } else if (res.xffwlx == 2) {
-        _getKfdList(res.xffwid,'kfd')
-      } else if (res.xffwlx == 3) {
-        _getKfdList(res.xffwid,'jcz')
-      }
-      localStorage.setItem('GET_BBINFO',JSON.stringify(res))
-      setStorage("userInfo", JSON.stringify(userInfoAs));
-    }else{
-      window.localStorage.removeItem('GET_BBINFO')
-    }
-    isBb.value = res ? true : false;
-  });
-}
-
-// 巡防区
-function _getXfqList(id) {
-  getXfqListById(id).then((res) => {
-    let list = res.pgis ? res.pgis : []
-    let arrString = list.join(',')
-    emitter.emit("polygonFigure", { coords: [arrString], flag:'kfdArea', color: '#ff0000'});
-  });
-}
-//获取快反点数据
-function _getKfdList(id,type) {
-  getKfdListById(id).then((res) => {
-    if(type == 'kfd'){
-      let yfz = res.yfzfw ? res.yfzfw : []
-      emitter.emit("polygonFigure", { coords: [yfz.join(',')], flag:'kfdArea', color: '#ff0000',opacity:0.5});
-      let sfz = res.yfzfw ? res.sfzfw : []
-      emitter.emit("polygonFigure", { coords: [sfz.join(',')], flag:'kfdArea', color: '#fdae2e',opacity:0.3});
-      let wfz = res.yfzfw ? res.wfzfw : []
-      emitter.emit("polygonFigure", { coords: [wfz.join(',')], flag:'kfdArea', color: '#0066ff',opacity:0.1});
-    }else{
-      let icon = require("@/assets/pointIcon/kfd.png")
-      emitter.emit("addPointArea", { coords: [res], flag:'kfd', icon: icon});
-    }
-  });
-}
-
-//代办任务
-function onClickDbrw() {
-  router.replace("/rw");
-}
-//今日勤务
-function onClickJrqw() {
-  router.push("/qwCenter");
-}
-//今日预警
-function onClickJryj() {
-  router.push("/jqfx");
-}
-function onClickTz() {
-  let user = JSON.parse(window.localStorage.getItem("userInfo"));
-  try {
-    bridge.to3RdPage(
-      `sjzh/index.html?idCard=${user.idEntityCard}&page=orderList`
-    );
-  } catch (error) {}
-}
-function onClickZl() {
-  if (props.kkid) {
-    router.push({ path: "/lmjHome/zlJcz", query: { kkid: props.kkid } });
-  } else {
-    router.push("/yyzx/zlzx/zlzxIndex");
-    // try {
-    //   bridge.to3RdPage(
-    //     `sjzh/index.html?idCard=${userInfo.value.app_sfzh}&page=orderList`
-    //   );
-    // } catch (error) {}
-  }
-}
-//点击盘车人员与车辆
-function clickPc(type) {
-  emit("onPcTypeShow", type);
-}
-//跳转页面
-function clickNav() {
-  if (bbxx.value && bbxx.value.bblx == "02") {
-    router.push("/yyzx/xfbb/addtsXfbb");
-  } else {
-    router.push("/yyzx/xfbb/addXfbb");
-  }
-}
-// 特殊报备
-function clickTsbb(){
-  router.push("/yyzx/xfbb/addtsXfbb");
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-.topIconBox {
-  display: flex;
-  justify-content: space-around;
-  padding: 2vw 4vw;
-  position: relative;
-  @include font_color($font-color-theme);
-  margin: 3vw 3.5vw 0vw 3.5vw;
-  border-radius: 2.5vw;
-  @include bg_color($background-color-theme);
-  @include border_outer_color($border-outer-color-theme);
-}
-
-.topIconBox > div {
-  text-align: center;
-  font-size: 3.06667vw;
-  line-height: 5vw;
-  width: 15vw;
-  position: relative;
-}
-
-.topIconBox > div .numb {
-  position: absolute;
-  height: 4.54vw;
-  line-height: 4.54vw;
-  padding: 0 1.5vw;
-  font-size: 3.2vw;
-  display: block;
-  background: #f85452;
-  border-radius: 2.27vw;
-  left: 10vw;
-  top: -1vw;
-}
-
-.topIconBox > div img {
-  width: 11.46667vw;
-}
-</style>
diff --git a/src/components/topTotal.vue b/src/components/topTotal.vue
deleted file mode 100644
index 0169699..0000000
--- a/src/components/topTotal.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <ul class="statics-rwzx">
-    <li class="item item_box" v-for="item in list" :key="item">
-      <div class="title">{{ item.title }}</div>
-      <div class="number numb">{{ item.count }}</div>
-    </li>
-  </ul>
-</template>
-
-<script setup>
-import { reactive, ref, onMounted, defineProps } from "vue";
-const props = defineProps({
-  list: Array,
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-.statics-rwzx {
-    display: flex;
-    flex-wrap: wrap;
-    margin: 2vw 3vw 1vw 3vw;
-  .item {
-    width: 31.3%;
-    border-radius: 2vw;
-    overflow: hidden;
-    margin-bottom: 4vw;
-    .title {
-      height: 7vw;
-      text-align: center;
-      line-height: 7vw;
-      @include font_size($font_medium_s);
-      background: #3e6ee8;
-      color: #fff;
-    }
-    .number {
-      height: 10vw;
-      text-align: center;
-      line-height: 10vw;
-    }
-  }
-  li:nth-child(3n + 2) {
-    margin-left: 3%;
-    margin-right: 3%;
-  }
-}
-</style>
diff --git a/src/components/xzjqList.vue b/src/components/xzjqList.vue
deleted file mode 100644
index d3afd8b..0000000
--- a/src/components/xzjqList.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <div class="list_box" @click="onGoDetail">
-    <div class="time_box">
-      <span>
-        <span class="title bule">{{ item.caseTypeName }}</span> &nbsp;
-        <van-tag type="success">{{ item.statusName }}</van-tag>
-      </span>
-      <span> {{ item.alarmTime }}</span>
-    </div>
-    <span> </span>
-    <div class="title">{{ item.jqnr }}</div>
-    <div class="item">
-      <span class="address_box">位置</span>
-      <span>&ensp;{{ item.alarmAddress }}</span>
-    </div>
-    <div class="item">
-      <span>派出所：{{ item.orgName + "_" + item.gridName }}</span>
-    </div>
-    <div class="item">
-      报警内容：<span class="bjnr">{{ item.alarmContent }}</span>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import router from "../router/index.js";
-import { defineProps, ref } from "vue";
-const props = defineProps({
-  item: Object, //列表内容
-  path: { type: String, default: false }, //跳转详情的路由
-});
-//跳转
-function onGoDetail() {
-  if (!props.path) {
-    return false;
-  }
-  router.push({
-    path: props.path,
-    query: { item: JSON.stringify(props.item) },
-  });
-}
-</script>
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-.list_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  // margin: 0vw 2vw 2vw 2vw;
-  padding: 2vw 3vw;
-  margin-bottom: 1.5vw;
-  background: #f6f8fd;
-  // @include item_bottom_color($bottom-border-top-clore-theme);
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
-  }
-}
-.title {
-  @include font_size($font_medium);
-  font-weight: 600;
-}
-.item {
-  line-height: 6vw;
-}
-.list_box:nth-child(1) {
-  border-top: none !important;
-}
-.jjy_box {
-  display: inline-block;
-  margin-left: 5vw;
-}
-.bjnr {
-  font-weight: 600;
-}
-.address_box {
-  background: #3bc2b5;
-  color: #fff;
-  display: inline-block;
-  font-size: 11px;
-  padding: 0 8px;
-  border-radius: 10px;
-  height: 17px;
-  line-height: 18.5px;
-}
-</style>
diff --git a/src/components/yjItem.vue b/src/components/yjItem.vue
deleted file mode 100644
index dfb9a58..0000000
--- a/src/components/yjItem.vue
+++ /dev/null
@@ -1,510 +0,0 @@
-<template>
-  <div class="">
-    <!-- <div class="mapMs" @click="onClick7Day">近7日轨迹</div> -->
-    <!-- 人员 -->
-    <div class="trailList" v-if="listData.length > 0 && sfzh">
-      <div class="total_sl_box">
-        累计预警 <span class="total_sl">{{ total }}</span
-        >次
-      </div>
-      <div
-        class="item ry_item"
-        v-for="(item, index) in listData"
-        :key="index"
-        :class="{
-          red: item.yj_jb == 10,
-          orange: item.yj_jb == 20,
-          yellow: item.yj_jb == 30,
-          blue: item.yj_jb == 40,
-        }"
-      >
-        <div class="warning_time">
-          <img class="timeicon" src="../assets/images/time@2x.png" />
-          <span>{{ item.yj_sj }}</span>
-        </div>
-        <div class="detail_info">
-          <div class="ryImg_box">
-            <!-- 预警图片 -->
-            <van-image
-              width="100px"
-              height="90px"
-              :class="_getBase64(item)"
-              @click.stop="ImagePreview([item.yj_xtp])"
-              :src="item.yj_xtp"
-            >
-              <template v-slot:loading>
-                <van-loading type="spinner" size="20" />
-              </template>
-            </van-image>
-            <!-- 预警库图片 -->
-            <van-image
-              width="100px"
-              height="90px"
-              :class="_getBase64(item)"
-              @click.stop="ImagePreview([item.cover_image])"
-              :src="item.cover_image"
-              style="margin-left: 3vw"
-            >
-              <template v-slot:loading>
-                <van-loading type="spinner" size="20" />
-              </template>
-            </van-image>
-          </div>
-          <div class="waring_detail">
-            <div>
-              <span style="font-size: 4vw">{{ item.yj_ryxm }}</span>
-              <span style="margin-left: 2vw">{{ item.yj_rysfzh }}</span>
-              <span style="color: #ffa500; margin-left: 10px"
-                >相似{{ item.yj_xsd * 100 }}%</span
-              >
-            </div>
-            <div
-              class="yjlx_type"
-              :class="{
-                bqred: item.yj_jb == 10,
-                bqorange: item.yj_jb == 20,
-                bqyellow: item.yj_jb == 30,
-                bqblue: item.yj_jb == 40,
-              }"
-            >
-              {{ item.yjly_bqmc }}
-            </div>
-            <!-- <div class="">{{ item.yj_gzymc }}</div> -->
-            <div class="">{{ item.yj_nr }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- 车辆 -->
-    <div class="trailList" v-if="listData.length > 0 && hphm">
-      <div class="total_sl_box">
-        累计预警 <span class="total_sl">{{ total }}</span
-        >次
-      </div>
-      <div
-        class="item"
-        v-for="(item, index) in listData"
-        :key="index"
-        :class="{ blue: true }"
-      >
-        <div class="warning_time">
-          <img class="timeicon" src="../assets/images/time@2x.png" />
-          <span>{{ item.yj_sj }}</span>
-        </div>
-        <div class="detail_info detail_car">
-          <van-image
-            width="220px"
-            height="80px"
-            fit="contain"
-            :class="_getBase64(item)"
-            @click.stop="ImagePreview([item.yj_xtp])"
-            :src="item.yj_xtp"
-          >
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-          </van-image>
-          <div class="waring_detail">
-            <div class="bp_box">
-              <span style="font-size: 4vw">{{ item.yj_clcph }}</span>
-              <span class="clbq bqblue">{{ item.yjly_bqmc }}</span>
-            </div>
-
-            <div class="">{{ item.yj_gzymc }}</div>
-            <div class="">{{ item.yj_nr }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {
-  dateFormat,
-  timeValidate,
-  getRecentDay,
-  getnRencebtMonth,
-  getBase64,
-} from "../utils/tools.js";
-import { notUrlGetData } from "../api/notUrlRequest.js";
-import { hintToast } from "../utils/tools.js";
-import emitter from "../utils/eventBus.js";
-import { ImagePreview } from "vant";
-export default {
-  data() {
-    return {
-      listData: [],
-      loading: true,
-      ryhdDay: "", //人员时间类型
-      showEmpty: false,
-      sfzh: "", //身份证
-      hphm: "", //车牌号
-      clTime: "", //车辆时间类型
-      options: null,
-      total: 0, //统计预警
-      ssbmdm: "", //所属部门代码
-      scry: "", //三车人员
-      baseUrl: this.baseUrl2,
-      urls1: [], //图片放大
-      params: "",
-      showMap: false,
-    };
-  },
-  created() {
-    let item = JSON.parse(this.$route.query.item);
-    this.options = item;
-    this.ryhdDay = item.time;
-    this.sfzh = item.yj_rysfzh;
-    this.hphm = item.yj_clcph;
-    this.clTime = item.clTime;
-    this.ssbmdm = item.ssbmdm;
-    this.scry = item.type;
-    this.showMap = true;
-    if (this.scry == "scry") {
-      this._getScryyjData();
-    } else if (this.sfzh) {
-      this._getRyyjData();
-    } else {
-      this._getCltjData();
-    }
-  },
-  methods: {
-    //跳转七日轨迹
-    // onClick7Day() {
-    //   if (this.options.sfzh) {
-    //     let { sfzh } = this.options;
-    //     uni.navigateTo({
-    //       url: `../ryyjTop5AndMap/ryyjTop5AndMap?sfzh=${sfzh}&is7Day=近7日预警轨迹&time=近7日${
-    //         this.ssbmdm ? "&ssbmdm=" + this.ssbmdm : ""
-    //       }`,
-    //     });
-    //   } else {
-    //     let { hphm } = this.options;
-    //     uni.navigateTo({
-    //       url: `../ryyjTop5AndMap/ryyjTop5AndMap?hphm=${hphm}&is7Day=近7日预警轨迹&clTime=近7日${
-    //         this.ssbmdm ? "&ssbmdm=" + this.ssbmdm : ""
-    //       }`,
-    //     });
-    //   }
-    // },
-    //获取base64地址
-    _getBase64(item) {
-      getBase64((res) => {
-        item.baseUrl = res;
-      }, item.cover_image || item.yj_xtp);
-    },
-    //车辆预警
-    _getCltjData() {
-      this.loading = true;
-      this.listData = [];
-      let points = [];
-      if (this.hphm == "未知") {
-        hintToast("车牌号异常!!!");
-        return;
-      }
-      let data = {
-        hphm: this.hphm,
-      };
-      let url = "";
-      switch (this.clTime) {
-        case "今日":
-          data.kssj = timeValidate(new Date(), "ymd") + " 00:00:00";
-          data.jssj = timeValidate(new Date(), "ymd") + " 23:59:59";
-          url = "/yjxx/yjcl/queryBycCphmlb";
-          break;
-        case "近7日":
-          data.kssj = getRecentDay(-7);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjcl/queryBycCphmlb";
-          break;
-        case "近7周":
-          data.kssj = getRecentDay(-49);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjcl/zqueryBycCphmlb";
-          break;
-        default:
-          data.ksny = getnRencebtMonth(6);
-          data.jsny = getnRencebtMonth(0);
-          url = "/yjxx/yjcl/yqueryBycCphmlb";
-          break;
-      }
-      notUrlGetData(`/mosty-yjzl${url}`, data).then((res) => {
-        this.loading = false;
-        if (res) {
-          for (let i = 0; i < res.length; i++) {
-            if (res[i].jd && res[i].wd) {
-              points.push({
-                jd: res[i].jd,
-                wd: res[i].wd,
-              });
-            }
-          }
-
-          this.listData = [res[0]];
-          emitter.emit("addPointArea", {
-            coords: points,
-            icon: require("../assets/pointIcon/icon-jq.png"),
-            flag: "cl_yj",
-          });
-          this.total = points.length;
-        }
-      });
-    },
-    //查询人员预警总数
-    _getRyyjData() {
-      this.loading = true;
-      this.ryyjList = [];
-      let points = [];
-      let data = {
-        sfzh: this.sfzh,
-        ssbmdm: this.ssbmdm,
-      };
-      let url = "";
-      switch (this.ryhdDay) {
-        case "今日":
-          data.kssj = timeValidate(new Date(), "ymd") + " 00:00:00";
-          data.jssj = timeValidate(new Date(), "ymd") + " 23:59:59";
-          url = "/yjxx/yjry/queryBySfzhlb";
-          break;
-        case "近7日":
-          data.kssj = getRecentDay(-7);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjry/queryBySfzhlb";
-          break;
-        case "近7周":
-          data.kssj = getRecentDay(-49);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjry/zqueryBySfzhlb";
-          break;
-        default:
-          data.ksny = getnRencebtMonth(6);
-          data.jsny = getnRencebtMonth(0);
-          url = "/yjxx/yjry/yqueryBySfzhlb";
-          break;
-      }
-      notUrlGetData(`/mosty-yjzl${url}`, data).then((res) => {
-        this.loading = false;
-        if (res.length > 0) {
-          for (let i = 0; i < res.length; i++) {
-            if (res[i].jd && res[i].wd) {
-              points.push({
-                jd: res[i].jd,
-                wd: res[i].wd,
-              });
-            }
-          }
-          this.listData = [res[0]];
-          emitter.emit("addPointArea", {
-            coords: points,
-            icon: require("../assets/pointIcon/icon-jq.png"),
-            flag: "ry_yj",
-          });
-          this.total = points.length;
-        }
-      });
-    },
-    //查询三车人员预警总数
-    _getScryyjData() {
-      this.loading = true;
-      this.ryyjList = [];
-      let points = [];
-      let data = {
-        sfzh: this.sfzh,
-        ssbmdm: this.ssbmdm ? this.ssbmdm : "",
-      };
-      let url = "";
-      switch (this.ryhdDay) {
-        case "今日":
-          data.kssj = timeValidate(new Date(), "ymd") + " 00:00:00";
-          data.jssj = timeValidate(new Date(), "ymd") + " 23:59:59";
-          url = "/yjxx/yjry/queryBySfzhlbsc";
-          break;
-        case "近7日":
-          data.kssj = getRecentDay(-7);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjry/queryBySfzhlbsc";
-          break;
-        case "近7周":
-          data.kssj = getRecentDay(-49);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjry/zqueryBySfzhlbsc";
-          break;
-        default:
-          data.ksny = getnRencebtMonth(6);
-          data.jsny = getnRencebtMonth(0);
-          url = "/yjxx/yjry/yqueryBySfzhlbsc";
-          break;
-      }
-      notUrlGetData(`/mosty-yjzl${url}`, data).then((res) => {
-        this.loading = false;
-        if (res.data) {
-          for (let i = 0; i < res.data.length; i++) {
-            res.data[i].imgUrl = res.data[i].cover_image;
-            res.data[i].imgUrlLeng = JSON.parse(res.data[i].yj_xtp).url;
-            if (res.data[i].jd && res.data[i].wd) {
-              points.push({
-                jd: res.data[i].jd,
-                wd: res.data[i].wd,
-              });
-            }
-          }
-          points.splice(145);
-          this.total = points.length;
-          res.data[0].imgUrl = res.data[0].imgUrl.replace(
-            "http://80.35.1.70:30080",
-            this.baseUrl
-          );
-          res.data[0].imgUrlLeng = res.data[0].imgUrlLeng.replace(
-            "http://80.35.1.147:10222",
-            this.baseUrl
-          );
-          this.listData = [res.data[0]];
-          this.params = `?data=${encodeURIComponent(JSON.stringify(points))}`;
-        }
-      });
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-@import "../assets/styles/mixin.scss";
-::v-deep .u-popup__content {
-  background: #09224d;
-}
-
-.total_sl_box {
-  font-size: 3vw;
-  position: absolute;
-  right: 5vw;
-  top: 3vw;
-}
-
-.total_sl {
-  display: inline-block;
-  margin: 0 2vw;
-  color: #fc011a;
-  font-size: 5vw;
-}
-
-.trailList {
-  position: relative;
-  @include font_color($font-color-theme);
-  @include bg_color($background-color-theme);
-  @include font_size($font_medium_s);
-  border-top-left-radius: 1vw;
-  border-top-right-radius: 1vw;
-  .item {
-    padding: 3vw;
-
-    .warning_time {
-      display: flex;
-      align-items: center;
-
-      img.timeicon {
-        width: 2.93334vw;
-        height: 2.93334vw;
-        margin-right: 1vw;
-        vertical-align: middle;
-      }
-
-      span {
-        vertical-align: middle;
-      }
-
-      // display: flex;
-      // justify-content: space-between;
-      // align-items: center;
-
-      .warning_type {
-        background-color: #4cbaff;
-        padding: 0.5vw 2vw;
-        font-size: 12px;
-        border-radius: 0.8vw;
-      }
-    }
-
-    .detail_info {
-      // display: flex;
-      margin-top: 2vw;
-
-      .ryImg_box {
-        display: flex;
-      }
-
-      .carImg {
-        width: 100%;
-        height: 180px;
-      }
-
-      .waring_detail {
-        margin-left: 2vw;
-
-        .bp_box {
-          display: flex;
-          align-items: center;
-
-          .clbq {
-            font-size: 12px;
-            margin-left: 10px;
-            padding: 1px 5px;
-            background: rgba(19, 125, 255, 0.4);
-            color: #fff;
-            border-radius: 5px;
-          }
-        }
-
-        & > div {
-          margin: 1.2vw 0;
-        }
-
-        .name {
-          font-size: 4.26667vw;
-        }
-      }
-    }
-  }
-}
-
-.red {
-  box-shadow: inset 0px 0px 2.66667vw 0px #ed0000 !important;
-}
-
-.orange {
-  box-shadow: inset 0px 0px 2.66667vw 0px #ffa500 !important;
-}
-
-.yellow {
-  box-shadow: inset 0px 0px 2.66667vw 0px #ffcc40 !important;
-}
-
-.blue {
-  box-shadow: inset 0px 0px 2.66667vw 0px #63acff !important;
-}
-
-.green {
-  box-shadow: inset 0px 0px 15px 0px #1cd66c !important;
-}
-.detail_car {
-  display: flex;
-}
-.yjlx_type {
-  display: inline;
-  font-size: 10px;
-  padding: 1px 5px;
-  border-radius: 5px;
-  color: #fff;
-}
-.bqred {
-  background: #ed0000;
-}
-.bqorange {
-  background: #ffa500;
-}
-.bqyellow {
-  background: #ffcc40;
-}
-.bqblue {
-  background: #63acff;
-}
-</style>
diff --git a/src/components/yjzlItem.vue b/src/components/yjzlItem.vue
deleted file mode 100644
index 5102ea9..0000000
--- a/src/components/yjzlItem.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2023-02-01 14:25:29
- * @LastEditTime: 2023-02-02 14:32:40
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \app-template（泸州）\src\components\yjzlItem.vue
--->
-<template>
-  <div class="yjzlItem-box">
-    <div class="time"><van-icon name="clock-o" />{{props.data.warnningTime}}</div>
-    <div class="info">
-      <div class="item-tip">
-        <span class="status"
-        :class="props.data.alarmStatus.desc == '待处理'?'colorRed':''"
-        >{{props.data.alarmStatus.desc}}</span>
-        <span class="bq"><span class="sircle"></span> {{props.data.label}}</span>
-      </div>
-      <div class="itemitem">
-        <span><van-icon name="coupon-o" />{{props.data.plateNumber}}</span>
-        <span class="name"><van-icon name="user-o" />{{props.data.userName}}</span>
-      </div>
-      <div class="itemitem">
-        <span><van-icon name="coupon-o" />{{props.data.checkName}}</span>
-      </div>
-      <div class="itemitem">
-        <span
-          ><van-icon
-            name="location-o"
-          />{{props.data.activityAddress}}</span
-        >
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref, onMounted, reactive, defineProps } from "vue";
-const props = defineProps({
-  data: Object,
-});
-</script>
-
-<style lang="scss" scoped>
-.yjzlItem-box {
-  padding: 3vw 4vw;
-  box-sizing: border-box;
-  .time {
-    font-size: 16px;
-    .van-icon-clock-o {
-      margin-right: 2vw;
-      font-size: 16px;
-    }
-  }
-  .info {
-    background-color: rgba(241, 241, 241, 0.5);
-    padding: 2vw;
-    box-sizing: border-box;
-    border-radius: 3px;
-    .item-tip {
-      display: flex;
-      justify-content: space-between;
-      font-size: 12px;
-      .status {
-        color: #3373fa;
-      }
-      .colorRed{
-        color: red;
-      }
-      .bq {
-        padding: 0 0.3125rem;
-        border-radius: 100px 0 0 100px;
-        background-color: #ffb139;
-        color: #fff;
-        font-size: 0.875rem;
-        line-height: 24px;
-        height: 24px;
-        .sircle {
-          display: inline-block;
-          width: 8px;
-          height: 8px;
-          background: #fff;
-          border-radius: 50%;
-          margin-right: 1vw;
-        }
-      }
-    }
-    .itemitem {
-      font-size: 0.875rem;
-      color: #999;
-      line-height: 6vw;
-      .van-icon {
-        margin-right: 1vw;
-      }
-      .name {
-        margin-left: 2vw;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/components/yyzxItem.vue b/src/components/yyzxItem.vue
deleted file mode 100644
index ae3eedf..0000000
--- a/src/components/yyzxItem.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <div class="yyzx_item_box">
-    <div class="top_title">
-      <div class="strip_box">
-        <span class="strip"></span>
-        <span>{{ title }}</span>
-      </div>
-      <div class="zd_icon_box" @click.stop="onClickZd">
-        <van-icon name="arrow-down" :class="isZd ? 'is_zd' : 'no_zd'" />
-      </div>
-    </div>
-    <div class="function_item_box" v-show="isZd">
-      <div
-        class="function_item"
-        v-for="item in list"
-        :key="item"
-        @click="onClickSkip(item.path)"
-      >
-        <img :src="item.imgUrl" alt="" style="width: 55px; height: 55px" />
-        <div class="item_name">{{ item.name }}</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref } from "vue";
-import { useRouter } from "vue-router";
-import emitter from "../utils/eventBus.js";
-import { onBeforeRouteLeave } from "vue-router";
-const props = defineProps({
-  title: String, //左侧标题
-  list: Array, //展示数据
-});
-const activeNames = ref(["1"]);
-const isZd = ref(true); //是否折叠  true 不折叠
-const router = useRouter();
-//点击折叠
-function onClickZd() {
-  isZd.value = !isZd.value;
-}
-//跳转页面
-function onClickSkip(url) {
-  switch (url) {
-    case "pr":
-      emitter.emit("onClickPc", url);
-      break;
-    case "pc":
-      emitter.emit("onClickPc", url);
-      break;
-    case "/dhcr":
-      emitter.emit("onClickPc", url);
-      break;
-    case "rhjs":
-      try {
-        bridge.toFusionComputing();
-      } catch (error) {}
-      break;
-    case "rw":
-      router.replace("/rw");
-      break;
-    default:
-      router.push(url);
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.yyzx_item_box {
-  @include font_color($font-color-theme);
-
-  padding: 3vw;
-
-  .top_title {
-    display: flex;
-    justify-content: space-between;
-
-    .strip_box {
-      display: flex;
-      align-items: center;
-    }
-
-    .strip {
-      display: inline-block;
-      width: 4px;
-      height: 14px;
-      background-color: #1989fa;
-      margin-right: 2vw;
-      @include font_size($font_medium);
-    }
-
-    .zd_icon_box {
-      width: 30px;
-      height: 20px;
-      text-align: right;
-      // transition: 1.5s;
-    }
-
-    .is_zd {
-      transform: rotate(-180deg);
-      transition: 1s;
-    }
-
-    .no_zd {
-      transition: 1s;
-    }
-  }
-
-  .function_item_box {
-    display: flex;
-    flex-wrap: wrap;
-
-    .function_item {
-      // border: 1px solid red;
-      width: 25%;
-      text-align: center;
-      margin-top: 4vw;
-
-      .item_name {
-        margin-top: 1.5vw;
-        @include font_size($font_medium_s);
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/zlList.vue b/src/components/zlList.vue
deleted file mode 100644
index 4f34649..0000000
--- a/src/components/zlList.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-  <div class="list_box" @click="onGoDetail">
-    <van-image width="80px" height="85px" :src="baseUrl" style="flex: 1" @click.stop="onClickImg(baseUrl)"
-      v-if="baseUrl">
-      <template v-slot:loading>
-        <van-loading type="spinner" size="20" />
-      </template>
-    </van-image>
-    <div class="detail_box">
-      <div class="time_box" :style="{ marginLeft: item.zltp || item.tpId ? '2vw' : '0' }">
-        <span>
-          <van-icon name="clock-o" />
-          &ensp;{{ item.zlfqsj || item.zlfssj }}
-        </span>
-        <span v-if="item.zldj">
-          <van-tag type="danger" style="padding: 0.3vw 5vw; border-radius: 3vw" v-if="item.zldj == 10">红色</van-tag>
-          <van-tag type="warning" style="padding: 0.3vw 5vw; border-radius: 3vw" v-else-if="item.zldj == 20">橙色
-          </van-tag>
-          <van-tag color="#ffcc40" style="padding: 0.3vw 5vw; border-radius: 3vw" v-else-if="item.zldj == 30">黄色
-          </van-tag>
-          <van-tag type="primary" style="padding: 0.3vw 5vw; border-radius: 3vw" v-else>蓝色</van-tag>
-        </span>
-      </div>
-
-      <div class="detail_item" :style="{ marginLeft: item.zltp || item.tpId ? '2vw' : '0' }">
-        <div class="title text_title">{{ item.zlbt || item.zlBt }}</div>
-        <!-- <div>
-					{{ item.zlnr }}
-				</div> -->
-        <div class="ststus" v-if="item.dqzt" :class="{
-          djc: true,
-          yfk: item.dqzt == '01',
-          ddc: item.dqzt == '94',
-          ywj: item.dqzt == '92' || item.dqzt == '93',
-        }">
-          {{ setDict(item.dqzt, dict.D_BZ_ZXZTAI) }}
-        </div>
-        <div>发送人：{{ item.ssbm }}-{{ item.zlfqr }}</div>
-        <div v-if="item.dqzt == '92'">
-          指令完成时间：{{ GetDateDiff(item.zlfqsj, item.dqztSj, "m") }}分钟
-        </div>
-        <div v-if="item.zlfsdd">
-          <van-icon name="location" size="15px" color="#3e6ee8"></van-icon>
-          <span>&nbsp;{{ item.zlfsdd }}</span>
-        </div>
-        <img src="../assets/images/czwc.png" class="zwzl_box" v-if="item.dqzt == '92' || item.dqzt == '93'" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { getDictList, setDict } from "../utils/dict";
-import { getBase64, GetDateDiff } from "../utils/tools.js";
-import router from "../router/index.js";
-import { defineProps, ref, watch } from "vue";
-import { ImagePreview } from "vant";
-const props = defineProps({
-  item: Object, //列表内容
-  path: String, //跳转详情的路由
-  dict: {
-    type: Object,
-    default: {
-      D_BZ_ZXZTAI: [],
-    },
-  },
-});
-const baseUrl = ref("");
-watch(
-  () => props.item,
-  (newValue) => {
-    if ((Object.keys(newValue).length > 0 && newValue.zltp) || newValue.tpId)
-      _getBase64(newValue);
-  },
-  { immediate: true, deep: true }
-);
-//预览图片
-function onClickImg(url) {
-  ImagePreview([url]);
-}
-//跳转
-function onGoDetail() {
-  router.push(`${props.path}`);
-}
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    baseUrl.value = res;
-  }, item.zltp || item.tpId);
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../assets/styles/mixin.scss";
-
-.list_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  @include item_bottom_color($bottom-border-top-clore-theme);
-  margin: 0vw 2vw 2vw 2vw;
-  padding: 2vw;
-  display: flex;
-
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .detail_box {
-    flex: 3.5;
-
-    .detail_item {
-      position: relative;
-      margin-top: 1vw;
-
-      >div {
-        line-height: 5.5vw;
-      }
-    }
-
-    .title {
-      @include font_size($font_medium);
-      width: 100%;
-      font-weight: 550;
-      color: #507ce9;
-    }
-  }
-}
-
-.ststus {
-  font-size: 10px;
-  color: #fff;
-  border-radius: 1vw;
-  display: inline;
-  padding: 1px 5px;
-}
-
-.dfk {
-  color: rgb(242, 199, 6);
-  border: 1px solid rgb(242, 199, 6);
-}
-
-.yfk {
-  color: #3e6ee8;
-  border: 1px solid #3e6ee8;
-}
-
-.ywj {
-  color: #4fbe0d;
-  border: 1px solid #4fbe0d;
-}
-
-.ddc {
-  color: orangered;
-  border: 1px solid orangered;
-}
-
-.djc {
-  color: orange;
-  border: 1px solid orange;
-}
-</style>
diff --git a/src/pages/checkpointList/components/jczDetail.vue b/src/pages/checkpointList/components/jczDetail.vue
deleted file mode 100644
index ca1d04b..0000000
--- a/src/pages/checkpointList/components/jczDetail.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="指令详情" :showRight="false" :showLeft="true" />
-    <div class="detailBox">
-      <div class="detailInfo">
-        <div class="detailInfo-left">
-          <!-- <div class="photo"><img :src="detailInfo.carImg" alt=""></div> -->
-          <div class="photo"><img :src="detailInfo.photo" alt=""></div>
-          <div class="title">预警</div>
-        </div>
-        <div class="detailInfo-right">
-          <div class="info-item"><van-icon name="coupon-o" />{{detailInfo.plateNumber}}</div>
-          <div class="info-item"><van-icon name="manager-o" />{{detailInfo.userName}}</div>
-          <div class="info-item"><van-icon name="coupon-o" />{{detailInfo.checkName}}</div>
-          <div class="info-item">
-            <van-icon name="location-o" />{{detailInfo.activityAddress}}
-          </div>
-          <div class="info-item">
-            <van-icon name="clock-o" />{{detailInfo.time}}
-          </div>
-        </div>
-      </div>
-      <div class="liucheng">
-        <Steps :data="stepsData">
-          <template v-slot:default="{ scope }">
-            <div class="content">
-              <div class="cont_l" v-if="scope.isQsStatus == '01'">
-                <span class="triangleleft"></span>
-                <div class="status">待签收</div>
-                <div class="btns">
-                  <span @click="handelEvents('reback')">拒绝</span>
-                  <span @click="handelEvents('receive')">签收</span>
-                </div>
-              </div>
-              <div class="cont_l" v-if="scope.isQsStatus == '02'">
-                <span class="triangleleft"></span>
-                <div class="text">已签收</div>
-                <div class="text">
-                  <van-icon name="manager-o" />周瓜皮 特警大队
-                </div>
-                <div class="text">
-                  <van-icon
-                    name="location-o"
-                  />成都市武侯区高新成都市武侯区高新公安局公安局
-                </div>
-              </div>
-              <div class="cont_l" v-if="scope.isQsStatus == '03'">
-                <span class="triangleleft"></span>
-                <div class="text">
-                  <van-icon name="manager-o" />周瓜皮 特警大队
-                </div>
-                <div class="text">
-                  <van-icon
-                    name="location-o"
-                  />成都市武侯区高新成都市武侯区高新公安局公安局
-                </div>
-              </div>
-            </div>
-          </template>
-        </Steps>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script  setup>
-import { ref, onMounted } from "vue";
-import TopNav from "../../../components/topNav.vue";
-import Steps from "../../../components/Steps.vue";
-import { updateDetail,getyjzlInfoDetail } from "../../../api/checkponit.js";
-import { useRouter, useRoute } from "vue-router";
-import { Form } from "vant";
-const route = useRoute();
-const router = useRouter();
-const detailInfo = ref({})
-const stepsData = ref([
-  { time:  route.query.time, isQsStatus: "01" },
-]);
-onMounted(() => {
-  detailInfo.value = route.query
-  getInfoDetail('01')
-});
-
-// 签收
-function handelEvents(val){
-  switch(val){
-    case 'receive':
-      getInfoDetail('02')
-      break
-    case 'reback':
-      break
-  }
-
-}
-
-// 指令详情
-function getDetail(zlId){
-  getyjzlInfoDetail(zlId).then(res=>{
-  })
-}
-
-function getInfoDetail(zlztdm){
-  let params = {
-    zlztsj:route.query.time,
-    zlztddxz:route.query.activityAddress,
-    zlztddjd:route.query.jd,
-    zlztddwd:route.query.wd,
-    zlid:route.query.id,
-    zlztbmdm:JSON.parse(window.localStorage.getItem("userInfo")).deptList[0].deptCode,
-    zlztbmmc:JSON.parse(window.localStorage.getItem("userInfo")).deptList[0].deptName,
-    zlztrysfzh:route.query.sfzh,
-    zlztryxm:route.query.userName,
-    ssfxjmc:'',
-    ssfxjdm:'',
-    ssdszmc:'',
-    ssdszdm:'',
-    zlztdm:zlztdm,
-  }
-  updateDetail(params).then(res=>{
-    getDetail(route.query.id)
-  })
-}
-</script>
-
-<style lang="scss" scoped>
-.detailBox {
-  background: #e9e9e9;
-  height: calc(100vh - 13vw);
-  padding: 2vw 4vw;
-  box-sizing: border-box;
-  .detailInfo {
-    display: flex;
-    width: 100%;
-    background: #fff;
-    font-size: 14px;
-    padding: 2vw;
-    box-sizing: border-box;
-    .detailInfo-left {
-      margin-right: 4vw;
-      .photo {
-        width: 90px;
-        height: 110px;
-        border: 1px solid #e9e9e9;
-        img{
-          width: 100%;
-          height: 100%;
-        }
-      }
-      .title {
-        text-align: center;
-        line-height: 8vw;
-        color: #000;
-      }
-    }
-    .detailInfo-right {
-      flex: 1;
-      .info-item {
-        line-height: 7vw;
-        .van-icon {
-          margin-right: 2vw;
-        }
-      }
-    }
-  }
-  .liucheng {
-    .content {
-      padding: 2vw;
-      box-sizing: border-box;
-      .cont_l {
-        position: relative;
-        padding: 2vw;
-        box-sizing: border-box;
-        background: #fff;
-        .status {
-          line-height: 10vw;
-          border-bottom: 1px solid #ccc;
-        }
-        .btns {
-          display: flex;
-          span {
-            flex: 1;
-            text-align: center;
-            margin-top: 4vw;
-            color: #3373fa;
-          }
-          span:nth-child(1) {
-            color: red;
-          }
-        }
-        .triangleleft {
-          position: absolute;
-          left: -16px;
-          top: 46%;
-          display: inline-block;
-          width: 0;
-          height: 0;
-          border: 8px solid transparent;
-          border-right-color: #fff;
-        }
-        .text {
-          line-height: 7vw;
-          .van-icon {
-            margin-right: 2vw;
-          }
-        }
-      }
-    }
-  }
-}
-::v-deep .main .item .item_l .icon {
-  top: 50%;
-}
-::v-deep .main .item .item_l {
-  padding-top: 13%;
-  box-sizing: border-box;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/checkpointList/components/zlJczList.vue b/src/pages/checkpointList/components/zlJczList.vue
deleted file mode 100644
index 6696067..0000000
--- a/src/pages/checkpointList/components/zlJczList.vue
+++ /dev/null
@@ -1,365 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="指令列表" :showRight="false" :showLeft="true" />
-    <div class="search">
-      <div class="sort">
-        <van-icon name="arrow-up" />
-        <van-icon name="arrow-down" />
-        时间排序
-      </div>
-      <span class="search-filter" @click="showRight = true">过滤筛选 <van-icon name="filter-o" /></span>
-    </div>
-    <!-- 列表 -->
-    <ul class="listBox">
-      <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="onLoad" offset="1"
-          :immediate-check="false">
-          <li class="listBox-item" v-for="(item, index) in yjList" :key="index" @click="handelDetail(item)">
-            <YjzlItem :data="item" />
-          </li>
-          <van-empty description="暂无信息" image="default" v-if="yjList.length <= 0 && !loading" />
-        </van-list>
-      </van-pull-refresh>
-    </ul>
-
-    <!-- 弹出层 -->
-    <van-popup v-model:show="showRight" position="right" :style="{ width: '60%', height: '100%' }">
-      <div class="popup-content">
-        <div class="popup-title">过滤筛选</div>
-        <ul class="popup-box">
-          <li class="popup-item yjlx-info">
-            <van-field v-model="form.warnType" label-width="60px" label="预警类型:" readonly placeholder="请选择预警类型"
-              @click.stop="chooseYjlx()"></van-field>
-
-            <ul class="select-box" v-if="showLx">
-              <span class="triangleup"></span>
-              <li class="select-box-li" :class="isActive == 0 ? 'active' : ''" @click="cilickLx(0)">
-                车辆
-              </li>
-              <li class="select-box-li" :class="isActive == 1 ? 'active' : ''" @click="cilickLx(1)">
-                人员
-              </li>
-            </ul>
-          </li>
-          <li class="popup-item">
-            <van-field v-model="form.beginDate" label-width="60px" label="开始时间:" input-align="left"
-              placeholder="请选择开始时间" readonly @click.stop="onClickTime('start')"></van-field>
-          </li>
-          <li class="popup-item">
-            <van-field v-model="form.endDate" label-width="60px" input-align="left" label="结束时间:"
-              @click.stop="onClickTime('end')" placeholder="请选择结束时间" readonly></van-field>
-          </li>
-        </ul>
-        <div style="padding: 4vw 2vw">
-          <van-button block plain @click="(form = {}), (form.beginDate = dateFormat())"
-            style="margin-bottom: 2vw">重置</van-button>
-          <van-button block type="primary" @click="onSubmit" loading-type="spinner"
-            loading-text="登录中...">查询</van-button>
-        </div>
-      </div>
-    </van-popup>
-    <!-- 时间选择器 -->
-    <SelectTime :timeType="timeType" v-if="timeShow" @update:time="onSelectTime"
-      @update:cancelTime="timeShow = false" />
-
-    <!-- 时间提示框 -->
-    <van-popup v-model:show="alertInfo" round :style="{ width: '80%' }">
-      <div class="alertInfoBox">
-        <div class="alert">结束时间必须大于开始时间</div>
-        <div class="alertBtn" @click="alertInfo = false">确定</div>
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import { ref, onMounted } from "vue";
-import TopNav from "../../../components/topNav.vue";
-import YjzlItem from "../../../components//yjzlItem.vue";
-import SelectTime from "../../../components//SelectTime.vue";
-import { useRouter, useRoute } from "vue-router";
-import { getyjzlList } from "../../../api/checkponit.js";
-import { dateFormat } from "../../../utils/tools.js";
-import { Loading } from "vant";
-const route = useRoute();
-const router = useRouter();
-const showRight = ref(false);
-const form = ref({ beginDate: dateFormat() });
-const isActive = ref(-1);
-const showLx = ref(false); //显示类型
-const timeType = ref("start");
-const timeShow = ref(false); //是否显示时间选择器
-const page = ref(1); //分页
-const pageSize = ref(10); //分页数
-const total = ref(0); //总数
-const yjList = ref([]);
-const loadingPull = ref(false); //下拉刷新
-const loading = ref(true); //数据加载中
-const finished = ref(false); //数据加载完成
-const alertInfo = ref(false) //消息提示
-onMounted(() => {
-  getYjList();
-});
-
-// 触底加载数据
-function onLoad() {
-  if (yjList.value.length < total.value) {
-    page.value++;
-    getYjList();
-  } else {
-    loading.value = false;
-    finished.value = true;
-  }
-}
-//下拉刷新
-function onRefresh() {
-  loading.value = false;
-  loadingPull.value = false;
-  finished.value = false;
-  page.value = 1;
-  getYjList();
-}
-
-// 查询
-function onSubmit() {
-  let date1 = new Date(form.value.beginDate); //开始
-  let date2 = new Date(form.value.endDate); //结束
-  if (date1 > date2) {
-    alertInfo.value = true
-  } else {
-    yjList.value = [];
-    showRight.value = false;
-    page.value = 1;
-    loading.value = true
-    getYjList();
-  }
-}
-
-// 获取预警指令列表
-function getYjList() {
-  let warnType =
-    form.value.warnType == "车辆"
-      ? "1"
-      : form.value.warnType == "人员"
-        ? "2"
-        : "";
-  let params = {
-    currentPage: page.value,
-    pageSize: pageSize.value,
-    beginDate: '2022-01-01',
-    // beginDate: form.value.beginDate,
-    checkpointCode: route.query.kkid,
-    warnType: warnType,
-    endDate: form.value.endDate,
-  };
-  getyjzlList(params)
-    .then((res) => {
-      if (page.value == 1) {
-        yjList.value = res.records;
-      } else {
-        yjList.value = yjList.value.concat(res.records);
-      }
-      page.value = res.current;
-      pageSize.value = res.size;
-      total.value = res.total;
-      loading.value = false;
-    })
-    .catch(() => {
-      loading.value = false;
-    });
-}
-
-//查看详情
-function handelDetail(item) {
-  let data = {
-    time: item.warnningTime,
-    label: item.label,
-    plateNumber: item.plateNumber,
-    checkName: item.checkName,
-    activityAddress: item.activityAddress,
-    id: item.id,
-    carImg: item.carImg,
-    userName: item.userName,
-    photo: item.idcardPhoto,
-    jd: item.jd,
-    wd: item.wd,
-    sfzh: item.idcard
-  }
-  router.push({ path: '/lmjHome/zlJczDetail', query: data })
-}
-
-// 时间点击
-function onClickTime(val) {
-  timeType.value = val;
-  timeShow.value = true;
-}
-
-// 时间选中
-function onSelectTime(val) {
-  if (timeType.value == "start") {
-    form.value.beginDate = val;
-  } else {
-    form.value.endDate = val;
-  }
-  timeShow.value = false;
-}
-
-// 选则类型
-function chooseYjlx() {
-  showLx.value = !showLx.value;
-}
-// 选中类型
-function cilickLx(val) {
-  isActive.value = val;
-  switch (val) {
-    case 0:
-      form.value.warnType = "车辆";
-      break;
-    case 1:
-      form.value.warnType = "人员";
-      break;
-  }
-  showLx.value = !showLx.value;
-}
-</script>
-
-<style lang="scss" scoped>
-.search {
-  padding: 2vw 2vw 0;
-  box-sizing: border-box;
-  height: 11vw;
-  line-height: 5vw;
-  font-size: 12px;
-  background: #f1f1f1;
-
-  .sort {
-    float: left;
-    padding: 1vw 3vw 1vw 6vw;
-    border: 1px solid #e9e9e9;
-    position: relative;
-    background: #fff;
-
-    .van-icon-arrow-up {
-      position: absolute;
-      left: 4px;
-      top: 2px;
-    }
-
-    .van-icon-arrow-down {
-      position: absolute;
-      left: 4px;
-      bottom: 2px;
-    }
-  }
-
-  .search-filter {
-    float: right;
-    color: #3373fa;
-    line-height: 8vw;
-
-    .van-icon {
-      font-size: 13px;
-    }
-  }
-}
-
-.listBox {
-  height: calc(100vh - 24vw);
-  overflow: hidden;
-  overflow-y: auto;
-  // .van-pull-refresh{
-  //   height: 100%;
-  //   overflow-y: auto;
-
-  // }
-  .listBox-item {}
-}
-
-// 弹窗
-.popup-content {
-  .popup-title {
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    background: #fff;
-    color: #000;
-  }
-
-  .popup-box {
-    border-top: 1px solid #e5e5e5;
-    font-size: 12px;
-    line-height: 11vw;
-    color: #000;
-
-    .popup-item {
-      border-bottom: 1px solid #e5e5e5;
-
-      .popup-name {
-        display: inline-block;
-        width: 60px;
-        text-align-last: justify;
-      }
-    }
-  }
-
-  .yjlx-info {
-    position: relative;
-
-    .select-box {
-      position: absolute;
-      z-index: 99;
-      width: 50%;
-      background: #fff;
-      border: 1px solid #ccc;
-      top: 50px;
-      right: 20px;
-
-      .select-box-li {
-        padding-left: 2vw;
-        box-sizing: border-box;
-        border-bottom: 1px solid #e9e9e9;
-      }
-
-      .active {
-        background: rgb(22, 220, 255);
-        color: #fff;
-      }
-
-      .select-box-li:last-child {
-        border: none;
-      }
-    }
-
-    .triangleup {
-      position: absolute;
-      left: 50px;
-      top: -13px;
-      display: inline-block;
-      width: 0;
-      height: 0;
-      border: 6px solid transparent;
-      border-bottom-color: #ccc;
-    }
-  }
-}
-
-.alertInfoBox {
-  padding: 2vw;
-
-  .alert {
-    line-height: 10vw;
-    text-align: center;
-    color: #8f8f94;
-    border-bottom: 1px solid #ddd;
-  }
-
-  .alertBtn {
-    text-align: center;
-    height: 12vw;
-    line-height: 12vw;
-    margin: 4vw 0;
-    background: #eee;
-    color: #8f8f94
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/checkpointList/index.vue b/src/pages/checkpointList/index.vue
deleted file mode 100644
index 69153a6..0000000
--- a/src/pages/checkpointList/index.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="选择执勤卡点" :showRight="false" :showLeft="true" />
-    <div class="heckpointBox">
-      <!-- 查询 -->
-      <Search
-        v-model="jczValue"
-        placeholder="请输入搜索关键词"
-        @update:modelValue="onSearch"
-      ></Search>
-
-      <!-- 列表 -->
-      <ul class="list">
-        <li class="item" v-for="(item, index) in List" :key="index">
-          <div class="title">{{ item.areaName }}</div>
-          <div class="item-li">
-            <van-radio-group v-model="cheaked" @change="chooseJcz(item.areaName)">
-              <van-radio
-                v-for="itemChid in item.checkList"
-                :name="itemChid.checkCode"
-                :key="itemChid.checkCode"
-                >{{ itemChid.pointName }}</van-radio
-              >
-            </van-radio-group>
-          </div>
-        </li>
-        <van-empty v-if="List.length<=0" description="暂无数据"/>
-      </ul>
-
-      <!-- 弹窗 -->
-      <van-popup
-        v-model:show="peoplePopupShow"
-        round
-        :style="{ width: '80%' }"
-        close-icon="close"
-        :overlay="true"
-      >
-      <div class="info">
-        <div class="info_title">是否选择{{selectTitle}}?</div>
-        <div class="info-btns">
-          <span @click="handlePClose">否</span>
-          <span @click="handlePass">是</span>
-        </div>
-      </div>
-      </van-popup>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../components/topNav.vue";
-import Search from "../../components/search.vue";
-import router from "../../router/index.js";
-import { getJczList } from "../../api/checkponit.js";
-import { ref, reactive, onMounted, onUnmounted, onActivated } from "vue";
-const jczValue = ref(""); //搜索关键字
-const List = ref([]); //检查站列表
-const cheaked = ref(null); //选择的检查站
-const peoplePopupShow = ref(false); //弹窗
-const selectTitle = ref(''); //弹窗标题
-
-onMounted(() => {
-  getList(); //获取列表
-});
-// 搜索
-function onSearch() {
-}
-
-// 获取列表
-function getList() {
-  let user = JSON.parse(window.localStorage.getItem("userInfo"));
-  getJczList({ username: user.idEntityCard }).then((res) => {
-    List.value = handellArray(res);
-  });
-}
-
-// 处理数据
-function handellArray(array) {
-  let arrWrap = [],resuleArr = [];
-  array.forEach((item) => {
-    if (!arrWrap.includes(item.areaCode)) {
-      let obj = {
-        areaName: item.areaName,
-        checkList: [],
-      };
-      obj.checkList.push(item);
-      resuleArr.push(obj);
-      arrWrap.push(item.areaCode);
-    } else {
-      resuleArr[arrWrap.indexOf(item.areaCode)].checkList.push(item);
-    }
-  });
-  return resuleArr;
-}
-
-// 选择检查站
-function chooseJcz(val) {
-  peoplePopupShow.value = true
-  List.value.forEach(item=>{
-    if(item.areaName == val){
-      item.checkList.forEach(child=>{
-        if(child.checkCode == cheaked.value) selectTitle.value = child.pointName
-      })
-    }
-  })
-}
-
-// 确定弹窗
-function handlePass(){
-  peoplePopupShow.value = false
-  router.push({path:'/',query:{kkid:cheaked.value,kkmc:selectTitle.value}});
-}
-// 关闭弹窗
-function handlePClose() {
-  peoplePopupShow.value = false
-}
-</script>
-
-<style lang="scss" scoped>
-.heckpointBox {
-  .list {
-    .title {
-      height: 50px;
-      font-size: 20px;
-      line-height: 50px;
-      background: #ddd;
-      padding: 0 6vw;
-      box-sizing: border-box;
-      color: #999;
-    }
-    .item-li {
-      padding: 0 6vw;
-      box-sizing: border-box;
-      .van-radio {
-        height: 46px;
-        line-height: 46px;
-        border-bottom: 1px solid #e9e9e9;
-      }
-    }
-  }
-}
-
-// 提示数据
-.info{
-  .info_title{
-    text-align: center;
-    line-height: 15vw;
-    border: 1px solid #e9e9e9;
-    padding:'10px';
-    box-sizing: border-box;
-    font-size: 17px;
-  }
-  .info-btns{
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    height: 11vw;
-    span{
-      flex: 1;
-      text-align: center;
-      color: #007aff;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/collectPage/collectAndAdd.vue b/src/pages/collectPage/collectAndAdd.vue
deleted file mode 100644
index 8f2483a..0000000
--- a/src/pages/collectPage/collectAndAdd.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<script setup>
-import emitter from "@/utils/eventBus";
-import TopNav from "@/components/topNav.vue";
-import {onMounted, ref} from "vue";
-import CustomPopup from "@/pages/collectPage/copmonents/customPopup.vue";
-import GdMap from "@/components/GdMap/index.vue"
-import {addSaveData, fetchTbZdxlFgdwId} from "@/api/collectPage";
-import {hintToast} from "@/utils/tools";
-import router from "@/router";
-import {useRoute} from "vue-router";
-
-const navTitle = ref("必到点采集新增")
-const loading = ref(false)
-const disabled = ref(false)
-const visible = ref(false)
-const formData = ref({})
-const route = useRoute()
-
-const onSubmit = async (data) => {
-  try {
-    loading.value = true;
-    const res = await addSaveData(formData.value)
-    if (res) {
-      hintToast(res?.msg || '新增成功')
-
-      setTimeout( () => {
-        router.back()
-      }, 500)
-    }
-  } catch (error) {
-    console.log(error)
-    hintToast(error?.msg || "新增失败")
-  } finally {
-    setTimeout(() => {
-      loading.value = false
-    }, 1000)
-  }
-}
-
-// 获取方格
-const handleChange = (val) => {
-  formData.value.mc = val?.mc
-  formData.value.fgdwId = val?.id
-}
-
-const handleVisible = () => {
-  if (disabled.value) return
-  visible.value = true
-}
-
-// 查看获取详情
-const getFetchTbZdxlFgdwId = async (id) => {
-  const res = await fetchTbZdxlFgdwId(id)
-  if (res) {
-    emitter.emit("deletePointArea", "addfg")
-    const { x1 = "", y1 = "", x2 = "", y2 = "", id = "", zxX = "", zxY = "", mc = "" } = res
-    const centerPoint = [zxX, zxY]
-    const position = [[Number(x1),Number(y1)],[Number(x2),Number(y2)]]
-    const text = mc
-    const obj = [{ position: position, text, id, userData: res }]
-    emitter.emit("echoPlane", { fontColor:'#12fdb8',coords: obj, type:'rectangle', flag:'addfg', color:'rgba(2,20,51,0.5)', linecolor:'#1C97FF'})
-    emitter.emit("setMapCenter", { location: centerPoint, zoomLevel: 14 });
-    emitter.emit("addPointArea", {
-      coords: [{ jd: formData.value?.jd, wd: formData.value?.wd }],
-      coordinates: [formData.value?.jd, formData.value?.wd],
-      icon: require("@/assets/lz/dw.png"),
-      sizeX: 30,
-      sizeY: 35
-    });
-
-    // 禁用地图
-    emitter.emit("setMapInteractions", !disabled.value)
-  }
-}
-
-onMounted(() => {
-  if (route.query?.item) {
-    // 查看详情禁用处理
-    formData.value = JSON.parse(route.query.item)
-    console.log(formData.value)
-    disabled.value = true
-
-    navTitle.value = '必到点采集详情'
-
-    getFetchTbZdxlFgdwId(formData.value?.fgdwId)
-  } else {
-    disabled.value = false
-
-    // 获取经纬度
-    emitter.emit("getMapClickCoordinates");
-
-    // 更新地图标注位置
-    emitter.on("mapClickCoordinates", async (res) => {
-      emitter.emit("deletePointArea")
-
-      formData.value.jd = res.lng
-      formData.value.wd = res.lat
-
-      emitter.emit("addPointArea", {
-        coords: [{ jd: res.lng, wd: res.lat }],
-        coordinates: res?.coordinates,
-        icon: require("../../assets/lz/dw.png"),
-        sizeX: 30,
-        sizeY: 35
-      });
-    })
-  }
-})
-</script>
-
-<template>
-  <div>
-    <TopNav :navTitle="navTitle" :showLeft="true" />
-
-    <div class="formWrapper">
-      <van-form @submit="onSubmit" class="form" :readonly="disabled">
-<!--        <van-field-->
-<!--          v-model="formData.cjsbQk"-->
-<!--          readonly-->
-<!--          label="所属部门"-->
-<!--          placeholder="请输入必到点名称"-->
-<!--        />-->
-        <van-field
-           v-model="formData.bddMc"
-           name="bddMc"
-           :required="!disabled"
-           label="必到点名称"
-           placeholder="请输入必到点名称"
-           :rules="[{ required: true, message: '请输入必到点名称' }]"
-        />
-        <van-field
-           v-model="formData.mc"
-           name="mc"
-           :required="!disabled"
-           is-link
-           readonly
-           label="所属方格"
-           placeholder="请输入必到点名称"
-           :rules="[{ required: true, message: '请输入必到点名称' }]"
-           @click="handleVisible"
-        />
-        <van-field
-           v-model="formData.bddDz"
-           name="bddDz"
-           :required="!disabled"
-           label="地址"
-           placeholder="请输入必到点名称"
-           :rules="[{ required: true, message: '请输入必到点名称' }]"
-        />
-        <van-field
-           v-model="formData.jd"
-           name="jd"
-           :required="!disabled"
-           label="经度"
-           placeholder="请输入经度"
-           :rules="[{ required: true, message: '请输入经度' }]"
-        />
-        <van-field
-           v-model="formData.wd"
-           name="wd"
-           :required="!disabled"
-           label="纬度"
-           placeholder="请输入纬度"
-           :rules="[{ required: true, message: '请输入纬度' }]"
-        />
-       <div class="mapWrapper">
-         <div class="label">地图选点</div>
-         <div style="height: 40vh; margin-top: 2vw">
-           <gd-map />
-         </div>
-       </div>
-
-        <div class="btn" v-if="!disabled">
-          <van-button
-            round
-            block
-            type="primary"
-            native-type="submit"
-            :loading="loading"
-            loading-type="spinner"
-            loading-text="保存中..."
-          >保存</van-button>
-        </div>
-      </van-form>
-    </div>
-
-    <custom-popup v-model="visible" @change="handleChange" />
-  </div>
-</template>
-
-<style scoped lang="scss">
-.formWrapper {
-  margin-top: 13vw;
-
-  .mapWrapper {
-    padding: var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);
-    font-size: var(--van-cell-font-size);
-    color: var(--van-field-label-color);
-
-    .label {
-      margin-right: var(--van-field-label-margin-right);
-      width: var(--van-field-label-width);
-    }
-
-    .context {
-      margin-top: 2vw;
-    }
-  }
-
-  .btn {
-    position: fixed;
-    padding: 2vw;
-    bottom: 0;
-    left: 0;
-    width: calc(100% - 4vw);
-  }
-}
-</style>
diff --git a/src/pages/collectPage/copmonents/customPopup.vue b/src/pages/collectPage/copmonents/customPopup.vue
deleted file mode 100644
index 4b1baad..0000000
--- a/src/pages/collectPage/copmonents/customPopup.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<script setup>
-import {computed, onMounted, ref} from "vue";
-import Search from "@/components/search.vue";
-import {getSelectList} from "@/api/collectPage";
-import emitter from "@/utils/eventBus";
-
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    default: false
-  },
-  position: {
-    type: String,
-    default: 'bottom'
-  },
-})
-
-const emits = defineEmits(["update:modelValue", "change"]);
-const visible = computed({
-  get: function () {
-    return props.modelValue;
-  },
-  set: function (val) {
-    emits("update:modelValue", val)
-  }
-})
-
-const visibleEmpty = ref(false)
-const searchValue = ref("")
-const radioChecked = ref("")
-const list = ref([])
-
-const onSearch = (value) => {
-  list.value = []
-  getSelectListData(value)
-}
-
-const onRadionChange = (value) => {
-  emitter.emit("deletePointArea", "zdxl_fzyc")
-  emits('change', value)
-
-  const { x1, y1, x2, y2, id, zxX, zxY, mc } = value
-  const centerPoint = [zxX, zxY]
-  const position = [[Number(x1),Number(y1)],[Number(x2),Number(y2)]]
-  const text = mc
-  const obj = [{ position: position, text, id, userData: value}]
-
-  emitter.emit("echoPlane", { fontColor:'#12fdb8',coords: obj, type:'rectangle', flag:'zdxl_fzyc', color:'rgba(2,20,51,0.5)', linecolor:'#1C97FF'})
-  emitter.emit("setMapCenter", { location: centerPoint, zoomLevel: 14 });
-}
-
-// 获取数据
-const getSelectListData = async (mc) => {
-  try {
-    const res = await getSelectList({ mc });
-    if (res?.length > 0) {
-      list.value = res || []
-      visibleEmpty.value = false
-    } else {
-      visibleEmpty.value = true
-    }
-
-  } catch (error) {
-    visibleEmpty.value = true
-  }
-}
-
-onMounted(() => {
-  getSelectListData()
-})
-</script>
-
-<template>
-  <van-popup v-model:show="visible" :position="position">
-    <search placeholder="请输入方格名称" v-model="searchValue" @update:modelValue="onSearch" />
-
-    <div class="selectWrapper">
-      <van-radio-group v-model="radioChecked">
-        <van-cell-group>
-          <van-cell v-for="item in list" clickable :key="item" :title="item?.mc" :border="false">
-            <template #right-icon>
-              <van-radio :name="item?.id" @click="onRadionChange(item)" />
-            </template>
-          </van-cell>
-        </van-cell-group>
-      </van-radio-group>
-      <van-empty description="没有数据" image="default" v-if="list.length <= 0 && visibleEmpty" />
-    </div>
-  </van-popup>
-</template>
-
-<style scoped lang="scss">
-.selectWrapper {
-  height: 80vw;
-  overflow: auto;
-}
-</style>
diff --git a/src/pages/collectPage/copmonents/listItemWrapper.vue b/src/pages/collectPage/copmonents/listItemWrapper.vue
deleted file mode 100644
index 8bcf831..0000000
--- a/src/pages/collectPage/copmonents/listItemWrapper.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<script setup>
-import router from "@/router";
-
-const props = defineProps({
-  list: {
-    type: Array,
-    required: true,
-    default: () => []
-  }
-})
-
-
-const handleTo = (item) => {
-  const { bddMc, bddDz, wd, jd, fgdwMc, fgdwId } = item
-  router.push({ path: "/collectAndAdd", query: { item: JSON.stringify({ bddMc, bddDz, wd, jd, fgdwId, mc: fgdwMc }) } });
-}
-</script>
-
-<template>
-  <div class="item-wrapper">
-    <template v-for="(item, index) in list" :key="index">
-      <div class="item" @click="handleTo(item)">
-        <div class="title">{{ item.bddMc }}</div>
-        <div class="infoWrapper">
-<!--          <div class="mt">所属部门：{{ item.sssgaj }}</div>-->
-          <div class="mt">所属方格：{{ item?.fgdwMc }}</div>
-          <div class="mt">地址：{{ item.bddDz }}</div>
-        </div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.item-wrapper {
-  margin: 2vw;
-
-  .item {
-    padding: 2vw;
-    border-top: 0.13333vw solid #f4f5f1;
-
-    .title {
-      font-size: 14px;
-    }
-
-    .mt {
-      margin-top: 2vw;
-    }
-
-    .infoWrapper {
-      font-size: 12px;
-      color: #999999;
-
-    }
-  }
-}
-</style>
diff --git a/src/pages/collectPage/index.vue b/src/pages/collectPage/index.vue
deleted file mode 100644
index 7bf58b4..0000000
--- a/src/pages/collectPage/index.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<script setup>
-import TopNav from "@/components/topNav.vue";
-import Search from "@/components/search.vue";
-import { onMounted, reactive, ref } from "vue";
-import ListItemWrapper from "@/pages/collectPage/copmonents/listItemWrapper.vue";
-import router from "@/router";
-import { getSelectPage } from "@/api/collectPage";
-
-const finished = ref(false);
-const loading = ref(false);
-const loadingRefresh = ref(false);
-const searchValue = ref("");
-const pageData = reactive({
-  pageSize: 10,
-  pageCurrent: 1,
-  total: 0,
-});
-
-const data = reactive({
-  list: [],
-});
-
-const onSearch = (value) => {
-  loading.value = true;
-  pageData.pageCurrent = 1;
-  data.list = [];
-  getData();
-};
-
-const onRefresh = () => {
-  loading.value = false;
-  loadingRefresh.value = true;
-  finished.value = false;
-  pageData.pageCurrent = 1;
-  data.list = [];
-  getData();
-};
-
-const getData = async () => {
-  loading.value = true;
-  try {
-    const { total, ...ret } = pageData;
-    const res = await getSelectPage({ ...ret, bddMc: searchValue.value });
-    if (res?.records.length > 0) {
-      data.list = data.list.concat(res?.records) || [];
-      pageData.total = res?.total;
-      loading.value = false;
-    } else {
-      finished.value = true;
-    }
-    loadingRefresh.value = false;
-  } catch (error) {
-    loading.value = false;
-    loadingRefresh.value = false;
-  }
-};
-const onLoad = () => {
-  if (data.list.length >= pageData?.total) {
-    finished.value = true;
-    return;
-  }
-
-  pageData.pageCurrent++;
-  getData();
-};
-
-onMounted(() => {
-  data.list = [];
-  getData();
-});
-
-const handleTo = () => {
-  router.push("/collectAndAdd");
-};
-</script>
-
-<template>
-  <div>
-    <TopNav navTitle="必到点采集列表" :showLeft="true" />
-
-    <van-sticky>
-      <div class="header">
-        <search
-          placeholder="请输入部门、所属方格或必到点名称进行查询"
-          v-model="searchValue"
-          @update:modelValue="onSearch"
-        />
-      </div>
-    </van-sticky>
-
-    <div class="content">
-      <van-pull-refresh v-model="loadingRefresh" @refresh="onRefresh">
-        <van-list
-          v-model:loading="loading"
-          :finished="finished"
-          finished-text=""
-          @load="onLoad"
-          offset="1"
-          :immediate-check="false"
-        >
-          <list-item-wrapper :list="data.list" />
-
-          <van-empty
-            description="暂无采集数据"
-            image="default"
-            v-if="data.list.length <= 0 && loadingRefresh === false"
-          />
-        </van-list>
-      </van-pull-refresh>
-    </div>
-
-    <div class="footer" @click="handleTo">
-      <van-button round native-type="submit" block type="primary">
-        新增必到点采集
-      </van-button>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-@import "@/assets/styles/mixin.scss";
-
-.header {
-  margin-top: 13vw;
-  @include bg_color($background-color-theme);
-}
-
-.content {
-  margin-bottom: 16vw;
-}
-
-.footer {
-  position: fixed;
-  padding: 2vw;
-  bottom: 0;
-  left: 0;
-  width: calc(100% - 4vw);
-}
-</style>
diff --git a/src/pages/dqLocation/index.vue b/src/pages/dqLocation/index.vue
deleted file mode 100644
index d671a75..0000000
--- a/src/pages/dqLocation/index.vue
+++ /dev/null
@@ -1,249 +0,0 @@
-<template>
-  <div style="height:100vh;padding-top: 13vw;">
-    <TopNav navTitle="当前位置" :showRight="false" :showLeft="true" />
-    <GdMap />
-  </div>
-</template>
-
-<script setup>
-import Axios from "axios";
-import { getyjzlCount } from "../../api/checkponit.js";
-import { qcckGet } from "@/api/qcckApi.js";
-import {
-  dateFormat,
-  setUserHome,
-  hintToast,
-  timeValidate,
-} from "../../utils/tools.js";
-import TopNav from "../../components/topNav.vue";
-import GdMap from "../../components/GdMap/index.vue";
-import { setUserDefaultModleData, getUserLzLocation } from "../../api/user.js";
-import emitter from "../../utils/eventBus.js";
-import {
-  ref,
-  onMounted,
-} from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { Dialog } from "vant";
-const route = useRoute();
-const Loadtion = ref({
-  address: "暂无地址信息",
-  lng: "暂无",
-  lat: "暂无",
-  ly: "暂无",
-});
-let timer;
-onMounted(() => {
-  localStorage.removeItem('NFC')
-  localStorage.removeItem('OCR')
-  _getUserLocation(true); //获取当前位置
-  setInterval(() => {
-    _getUserLocation(false); //获取当前位置
-  }, 5000);
-});
-
-
-
-//获取当前位置信息
-function _getUserLocation(sfdw) {
-  let { lng, lat, zbly } = getLocation();
-  if (lng && lat) {
-    Loadtion.value.lng = lng;
-    Loadtion.value.lat = lat;
-    Loadtion.value.ly = zbly == 1 ? "GPS" : "融合";
-    emitter.emit("deletePointArea", "dw");
-    //地图撒点然后移动
-    emitter.emit("addPointArea", {
-      coords: [{ jd: lng, wd: lat }],
-      icon: require("../../assets/lz/dw.png"),
-      flag: "dw",
-      sfdw: sfdw,
-      sizeX: 30,
-      sizeY: 35
-    });
-  } else {
-    hintToast("暂无坐标信息");
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-::v-deep .van-radio-group {
-  padding: 5vw;
-}
-
-::v-deep .van-radio {
-  padding: 2vw 0;
-}
-
-.homeTotal_box {
-  position: absolute;
-  bottom: 13.5vw;
-  z-index: 20;
-  background: #fff;
-  width: 100%;
-  border-top-left-radius: 2vw;
-  border-top-right-radius: 2vw;
-}
-
-.home_box {
-  padding: 1vw 3vw 3vw 3vw;
-}
-
-.point-pop-alert {
-  position: absolute;
-  display: flex;
-  flex-direction: column;
-  top: 80px;
-  right: 10px;
-
-  >img {
-    width: 45px;
-    height: 45px;
-    margin: 2vw 0;
-  }
-}
-
-.count-box {
-  display: flex;
-  flex-wrap: wrap;
-  line-height: 3.5vh;
-  justify-content: space-around;
-  @include font_size($font_medium_s);
-
-  .count-item {
-    margin-top: 1vh;
-    width: 47%;
-    display: flex;
-    margin-top: 3%;
-    align-items: center;
-    background-color: rgba(140, 175, 206, 0.1);
-    border-radius: 1.5vw;
-
-    .bottom-box {
-      flex: 1;
-      box-sizing: border-box;
-      padding: 10px;
-      border-right: 1px dashed rgb(172, 171, 171);
-      width: 100%;
-      height: 100%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      line-height: 2.5vh;
-
-      .inner-box {
-        width: 70%;
-        text-align: center;
-      }
-    }
-
-    .text-box {
-      color: rgb(179, 179, 179);
-    }
-
-    .left {
-      flex: 1;
-      text-align: center;
-      // margin-right: 4vw;
-    }
-
-    .right {
-      flex: 1;
-      text-align: center;
-      // margin-left: 4vw;
-    }
-
-    .num1 {
-      color: rgb(16, 16, 16);
-      font-weight: bold;
-    }
-
-    .num2 {
-      color: rgb(5, 167, 24);
-      font-weight: bold;
-    }
-
-    .num3 {
-      color: rgb(241, 8, 8);
-      font-weight: bold;
-    }
-
-    .top {
-      display: flex;
-    }
-  }
-
-  // 检查站
-  .count-item-jcz {
-    width: calc(50% - 1px);
-    text-align: center;
-    color: #999;
-    border-top: 1px solid #e9e9e9;
-
-    .count-time-jcz {
-      font-size: 1rem;
-      color: #222;
-      line-height: 12vw;
-    }
-
-    .count-item-jcz-num {
-      display: flex;
-      @include font_size($font_medium_s);
-
-      .count-item-jcz-num-left {
-        position: relative;
-        width: 50%;
-        text-align: right;
-        padding: 0 3vw;
-        box-sizing: border-box;
-      }
-
-      .count-item-jcz-num-right {
-        width: 50%;
-        text-align: left;
-        padding: 0 3vw;
-        box-sizing: border-box;
-      }
-
-      .count-item-jcz-num-left::after {
-        content: "";
-        position: absolute;
-        right: 0;
-        top: 10px;
-        bottom: 10px;
-        width: 1px;
-        background: #e9e9e9;
-        border-radius: 1px;
-      }
-
-      .num-red {
-        color: #f00;
-        font-size: 14px;
-      }
-
-      .num {
-        color: #000;
-        font-size: 14px;
-      }
-    }
-  }
-
-  .count-item-jcz:nth-child(2n + 1) {
-    border-right: 1px solid #e9e9e9;
-  }
-}
-
-.count-box-jcz {
-  padding-top: 1vh;
-  box-sizing: border-box;
-}
-
-.hsf {
-  position: absolute;
-  top: 20px;
-  right: 18px;
-}
-</style>
diff --git a/src/pages/keyVehicle/index.vue b/src/pages/keyVehicle/index.vue
index 16cd44b..376fe97 100644
--- a/src/pages/keyVehicle/index.vue
+++ b/src/pages/keyVehicle/index.vue
@@ -101,7 +101,7 @@ function handleSearch() {
 // 跳转到详情页
 function goToDetail(vehicle) {
   router.push({
-    path: "/key-vehicle-detail",
+    path: "/keyVehicle/detail",
     query: { id: vehicle.id },
   });
 }
diff --git a/src/pages/my/views/gzrz.vue b/src/pages/my/views/gzrz.vue
deleted file mode 100644
index a9cb0f6..0000000
--- a/src/pages/my/views/gzrz.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-	<div style="padding-top: 13vw;">
-		<TopNav navTitle="工作日志" :rightTitle="'地图模式'"/>
-		<div class="rz_item_box" v-for="(item,index) in gzrzList.list" :key="index" >
-			<div class="rz_item_img_box">
-				<van-image width="45px" height="45px" fit="contain" :src="item.imgUrl">
-					<template v-slot:loading>
-						<van-loading type="spinner" size="20" />
-					</template>
-				</van-image>
-				<div class="rz_item_text">
-					<div class="time">{{item.time}}</div>
-					<div>
-						<soan>{{item.name}}</soan>
-						<soan class="address">{{item.address}}</soan>
-					</div>
-				</div>
-			</div>
-			<soan class="rz_zt" :class="item.status == 0 ? 'proceed' : 'accomplish'">{{item.status == 0 ? '进行中' : '已完成'}}</soan>
-		</div>
-	</div>
-</template>
-
-<script setup>
-	import TopNav from '../../../components/topNav.vue';
-	import {
-		ref,
-		reactive
-	} from 'vue';
-	const themeType = ref(getStorage('themeSetting'));
-	const gzrzList = reactive({
-		list: [{
-				name: '人员核查',
-				time: '2022-03-11 14:32:55',
-				address: '高新区创业路5号3单元',
-				imgUrl: require('../../../assets/images/menu-yyhc.png'),
-				status: 0
-			},
-			{
-				name: '车辆核查',
-				time: '2022-03-11 14:32:55',
-				address: '高新区创业路5号3单元',
-				imgUrl: require('../../../assets/images/menu-clhc.png'),
-				status: 1
-			},
-			{
-				name: '人员报备',
-				time: '2022-03-11 14:32:55',
-				address: '高新区创业路5号3单元',
-				imgUrl: require('../../../assets/images/menu-rwzx.png'),
-				status: 1
-			}
-		]
-	})
-</script>
-
-<style lang="scss" scoped>
-	@import "../../../assets/styles/mixin.scss";
-
-	.rz_item_box {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding:4vw 3vw;
-		// border-bottom: 1px solid #F1F3F4;
-		@include font_size($font_medium_s);
-		@include font_color($font-color-theme);
-		@include item_bottom_color($bottom-border-top-clore-theme);
-		.rz_item_img_box {
-			display: flex;
-			align-items: center;
-		}
-
-		.rz_item_text {
-			margin-left: 3vw;
-
-			.time {
-				@include font_size($font_medium);
-				margin-bottom: 1.5vw;
-			}
-
-			.address {
-				margin-left: 5vw;
-
-			}
-		}
-
-		.rz_zt {
-			height: 5vw;
-			@include font_size($font_little_s);
-			padding: 2px 8px;
-			border-radius: 15px;
-			color: #fff;
-			
-		}
-		.accomplish{
-			background-color: #23D96E;
-		}
-		.proceed{
-			background-color: #3e6ee8;
-		}
-	}
-</style>
diff --git a/src/pages/my/views/scyy.vue b/src/pages/my/views/scyy.vue
deleted file mode 100644
index a89357b..0000000
--- a/src/pages/my/views/scyy.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-	<div style="padding-top: 13vw;">
-		<TopNav navTitle="收藏应用" />
-		<div class="function_item_box">
-			<div @click="routerPush(item.path)" class="function_item" v-for="item in zhxfList.list" :key="item">
-				<van-image width="55px" height="55px" fit="contain" :src="item.imgUrl">
-					<template v-slot:loading>
-						<van-loading type="spinner" size="20" />
-					</template>
-				</van-image>
-				<div class="item_name">{{item.name}}</div>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script setup>
-	import TopNav from '../../../components/topNav.vue';
-	import {
-		ref,
-		reactive
-	} from 'vue';
-import router from '../../../router';
-	//智慧巡防
-	const zhxfList = reactive({
-		list: [{
-				name: '巡防报告',
-				imgUrl: require('../../../assets/images/menu-rwzx.png'),
-				path: ''
-			},
-			{
-				name: '盘查物品',
-				imgUrl: require('../../../assets/images/home/FXYJ@3x.png'),
-				path: ''
-			}, {
-				name: '指令信息',
-				imgUrl: require('../../../assets/images/menu-zlzx.png'),
-				path: ''
-			},
-			{
-				name: '报备信息',
-				imgUrl: require('../../../assets/images/menu-qwzx.png'),
-				path: ''
-			},
-			{
-				name: '指令设置',
-				imgUrl: require('../../../assets/images/menu-qwzx.png'),
-				path: ''
-			},
-			{
-				name: '巡防区',
-				imgUrl: require('../../../assets/images/11.png'),
-				path: '/scyy/xfq'
-			},
-			{
-				name: '警务站',
-				imgUrl: require('../../../assets/images/2.png'),
-				path: '/scyy/jwz'
-			},
-			{
-				name: '快反点',
-				imgUrl: require('../../../assets/images/3.png'),
-				path: '/scyy/kfd'
-			},
-			{
-				name: '巡防力量',
-				imgUrl: require('../../../assets/images/4.png'),
-				path: '/scyy/xfll'
-			},
-			{
-				name: '车辆',
-				imgUrl: require('../../../assets/images/5.png'),
-				path: '/scyy/cl'
-			},
-			{
-				name: '装备',
-				imgUrl: require('../../../assets/images/6.png'),
-				path: '/scyy/zb'
-			}
-		]
-	})
-function routerPush(url){
-	router.push(url)
-}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../../assets/styles/mixin.scss";
-	.function_item_box {
-		display: flex;
-		flex-wrap: wrap;
-		@include font_color($font-color-theme);
-		.function_item {
-			// border: 1px solid red;
-			width: 25%;
-			text-align: center;
-			margin-top: 4vw;
-	
-			.item_name {
-				margin-top: 1.5vw;
-				@include font_size($font_medium_s);
-			}
-		}
-	
-	}
-</style>
diff --git a/src/pages/my/views/txl.vue b/src/pages/my/views/txl.vue
deleted file mode 100644
index 5adb3ee..0000000
--- a/src/pages/my/views/txl.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <van-config-provider :theme-vars="themeVars">
-    <div style="padding-top: 13vw">
-      <TopNav navTitle="通讯录" />
-      <!-- <van-index-bar> -->
-      <!-- <van-index-anchor index="A" /> -->
-      <Search
-        v-model="kwd"
-        placeholder="请输入搜索关键词"
-        @update:modelValue="onSearch"
-      ></Search>
-      <template v-for="item in 10" :key="item">
-        <van-cell title="张三(高新网安大队)" label="13612345678">
-          <template #right-icon>
-            <van-icon name="phone-circle" color="#3e6ee8" class="search-icon" />
-          </template>
-        </van-cell>
-        <van-cell title="李四(高新网安大队)" label="13612345678">
-          <template #right-icon>
-            <van-icon name="phone-circle" color="#3e6ee8" class="search-icon" />
-          </template>
-        </van-cell>
-        <van-cell title="王五(高新网安大队)" label="13612345678">
-          <template #right-icon>
-            <van-icon name="phone-circle" color="#3e6ee8" class="search-icon" />
-          </template>
-        </van-cell>
-      </template>
-      <!-- </van-index-bar> -->
-    </div>
-  </van-config-provider>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import { ref, reactive } from "vue";
-const listIndex = ref(["A"]);
-const themeType = ref(getStorage("themeSetting"));
-const kwd = ref("");
-const themeVars = ref({
-  cellBackgroundColor: themeType.value == "light" ? "#fff" : "#041634",
-  cellBorderColor: themeType.value == "light" ? "#dbdbdb" : "#001e6b",
-  cellTextColor: themeType.value == "light" ? "#333" : "#fff",
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.search-icon {
-  font-size: 30px;
-}
-</style>
diff --git a/src/pages/my/views/userInfo.vue b/src/pages/my/views/userInfo.vue
deleted file mode 100644
index 841fd9f..0000000
--- a/src/pages/my/views/userInfo.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <van-config-provider :theme-vars="themeVars">
-    <div style="padding-top: 13vw">
-      <TopNav navTitle="个人信息" />
-      <div class="user_function_box">
-        <div
-          class="user_function_item"
-          v-for="(item, index) in functionList.list"
-          :key="index"
-        >
-          <span class="function_title">{{ item.name }}</span>
-          <van-image
-            width="45px"
-            height="45px"
-            fit="contain"
-            :src="item.message"
-            v-if="item.isImg"
-          >
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-            <!-- <template v-slot:error>图片加载失败</template> -->
-          </van-image>
-          <van-field
-            v-model="item.message"
-            input-align="right"
-            :readonly="item.readonly"
-            v-else
-          />
-        </div>
-      </div>
-      <div style="margin: 10vw 3vw" @click="onClickSave">
-        <van-button type="primary" round block>保存</van-button>
-      </div>
-    </div>
-  </van-config-provider>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted } from "vue";
-import TopNav from "../../../components/topNav.vue";
-import { hintToast } from "../../../utils/tools.js";
-const themeType = ref(getStorage("themeSetting"));
-const themeVars = ref({
-  cellBackgroundColor: themeType.value == "light" ? "#fff" : "#092556",
-  fieldInputTextColor: themeType.value == "light" ? "#333" : "#fff",
-});
-//功能模块
-const functionList = reactive({
-  list: [
-    {
-      name: "姓名",
-      message: "警官",
-      readonly: true,
-    },
-    {
-      name: "照片",
-      message: require("../../../assets/images/tx.png"),
-      isImg: true,
-    },
-    {
-      name: "性别",
-      message: "男",
-      readonly: true,
-    },
-    {
-      name: "座机电话",
-      message: "02812345678",
-      readonly: false,
-    },
-    {
-      name: "手机",
-      message: "13612345678",
-      readonly: false,
-    },
-    {
-      name: "组织机构",
-      message: "测试部门",
-      readonly: true,
-    },
-    {
-      name: "警号",
-      message: "121380",
-      readonly: true,
-    },
-  ],
-});
-onMounted(() => {
-  let user = JSON.parse(getStorage("userInfo"));
-  functionList.list.forEach((item) => {
-    switch (item.name) {
-      case "姓名":
-        item.message = user.userName;
-        break;
-      case "性别":
-        if (user.sex == 1) {
-          item.message = "男";
-        } else if (user.sex == 2) {
-          item.message = "女";
-        } else {
-          item.message = "未知";
-        }
-        break;
-      case "座机电话":
-        item.message = user.telePhone;
-        break;
-      case "手机":
-        item.message = user.mobile;
-        break;
-      case "组织机构":
-        item.message = user.deptName;
-        break;
-      case "警号":
-        item.message = user.inDustRialId;
-        break;
-    }
-  });
-});
-
-//保存
-function onClickSave() {
-  hintToast("保存成功")
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.user_function_box,
-.user_box {
-  @include font_color($font-color-theme);
-}
-
-.user_box {
-  // background: url('../../../assets/images/my-info-bg@2x.png') no-repeat;
-  // background-size: 100% 100%;
-  display: flex;
-  align-items: center;
-  padding: 4vw 3vw;
-  margin: 3vw;
-  border-radius: 5px;
-  @include user_function_item_color($user-function-item-theme);
-  .user {
-    display: flex;
-    flex-direction: column;
-    margin-left: 3vw;
-    .user_name {
-      @include font_size($font_large_s);
-    }
-    .user_dep {
-      @include font_size($font_medium_s);
-      margin-top: 2vw;
-    }
-  }
-}
-
-.user_function_box {
-  margin-bottom: 10vw;
-  @include user_function_item_color($user-function-item-theme);
-  @include font_size($font_medium_s);
-  padding: 2vw 3vw;
-  margin: 3vw;
-  border-radius: 5px;
-  .user_function_item {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    @include item_bottom_color($bottom-border-top-clore-theme);
-    padding: 2vw 0;
-    .function_title {
-      width: 22vw;
-    }
-  }
-  .user_function_item:last-child {
-    border-bottom: none;
-  }
-}
-::v-deep .van-field__control--right {
-  @include font_size($font_medium_s);
-}
-</style>
diff --git a/src/pages/my/views/wdgj.vue b/src/pages/my/views/wdgj.vue
deleted file mode 100644
index 4789331..0000000
--- a/src/pages/my/views/wdgj.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-09-15 14:10:42
- * @LastEditTime: 2022-09-27 16:12:16
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \new_gxga_app\src\pages\my\views\wdgj.vue
--->
-<template>
-  <van-config-provider :theme-vars="themeVars">
-    <div style="padding-top: 13vw">
-      <TopNav
-        navTitle="我的轨迹"
-        rightIcon="location"
-        :showRight="true"
-        @clickRight="onClickRight"
-      />
-      <van-cell title="选择时间" @click="calShow = true">
-        <template #value>
-          <span>{{ chooseTime }}</span>
-        </template>
-      </van-cell>
-      <van-calendar
-        v-model:show="calShow"
-        @confirm="onConfirm"
-        :min-date="minDate"
-        :max-date="maxDate"
-        color="#3e6ee8"
-      ></van-calendar>
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text=" "
-        @load="onLoad"
-        offset="30"
-        :immediate-check="false"
-      >
-        <van-steps
-          direction="vertical"
-          :active="0"
-          active-color="#3e6ee8"
-          :inactive-color="themeType == 'light' ? '#333' : '#fff'"
-        >
-          <van-step v-for="item in gjList" :key="item">
-            <div class="steps_box">{{ item.dwsj }}</div>
-            <div class="steps_box">地址：{{ item.dzxz }}</div>
-            <div class="steps_box">
-              停留时长：{{ (item.xfsc / 60 / 60).toFixed(2) }}小时
-            </div>
-          </van-step>
-        </van-steps>
-        <van-empty
-          description="暂无轨迹信息"
-          image="default"
-          v-if="gjList.length <= 0 && showEmpty"
-        />
-      </van-list>
-    </div>
-  </van-config-provider>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { ref, reactive, onMounted } from "vue";
-import { getWdgj } from "../../../api/common.js";
-import { getUserLzLocation } from "../../../api/user.js";
-import { dateFormat } from "../../../utils/tools.js";
-import router from "../../../router/index.js";
-const themeType = ref(getStorage("themeSetting"));
-const themeVars = ref({
-  stepsBackgroundColor: themeType.value == "light" ? "#fff" : "#041634",
-});
-const minDate = new Date(2000, 0, 1);
-const maxDate = new Date();
-const chooseTime = ref(dateFormat());
-const calShow = ref(false); //是否显示日历
-const gjList = ref([]); //轨迹数据
-const loading = ref(false);
-const finished = ref(false);
-const pageSize = ref(10);
-const pageCurrent = ref(1);
-const total = ref(0);
-const showEmpty = ref(false);
-const kssj = ref(dateFormat());
-const jssj = ref(dateFormat());
-onMounted(() => {
-  _getWdgj();
-});
-//触底加载
-function onLoad() {
-  if (total.value <= pageCurrent.value) {
-    finished.value = true;
-    return;
-  }
-  pageCurrent.value++;
-  _getWdgj();
-}
-
-//确认日期选择
-function onConfirm(val) {
-  calShow.value = false;
-  pageCurrent.value = 1;
-  gjList.value = [];
-  chooseTime.value = dateFormat("", val);
-  _getWdgj();
-}
-//点击地图模式
-function onClickRight() {
-  router.push(`/my/views/wdgjMapPoint?time=${chooseTime.value}`);
-}
-//获取轨迹数据
-function _getWdgj() {
-  loading.value = true;
-  let data = {
-    pageSize: pageSize.value,
-    pageCurrent: pageCurrent.value,
-    dwrq: chooseTime.value,
-    sfzh: JSON.parse(window.localStorage.getItem("userInfo")).idEntityCard,
-  };
-  getWdgj(data)
-    .then((res) => {
-      loading.value = false;
-      if (res && res.records.length > 0) {
-        total.value = res.pages;
-        for (let i = 0; i < res.records.length; i++) {
-          res.records[i].address = "";
-          // _getUserLocation(res.records[i].jd, res.records[i].wd, (_res) => {
-          //   res.records[i].address = _res;
-          //   gjList.value.push(res.records[i]);
-          // });
-
-           gjList.value.push(res.records[i]);
-        }
-      } else {
-        showEmpty.value = true;
-      }
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-//获取当前位置信息
-function _getUserLocation(jd, wd, fun) {
-  getUserLzLocation({ jd, wd }).then((res) => {
-    if (res) {
-      fun(res);
-    }
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-::v-deep .van-step__line {
-  background: #ebedf0 !important;
-}
-.steps_box {
-  // @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-  line-height: 6vw;
-}
-</style>
diff --git a/src/pages/my/views/wdgjMapPoint.vue b/src/pages/my/views/wdgjMapPoint.vue
deleted file mode 100644
index 6521e6f..0000000
--- a/src/pages/my/views/wdgjMapPoint.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="地图模式" :showRight="false" :showLeft="true" />
-    <GdMap />
-  </div>
-</template>
-<script setup>
-import { ref, onMounted } from "vue";
-import { useRoute } from "vue-router";
-import TopNav from "../../../components/topNav.vue";
-import GdMap from "../../../components/GdMap/index.vue";
-import { getMApWdgj } from "../../../api/common.js";
-import { hintToast } from "../../../utils/tools.js";
-import emitter from "../../../utils/eventBus.js";
-const item = ref(null); // 警情数据
-const isRlt = ref(false);
-const points = ref([]);
-onMounted(() => {
-  window.closeMapTitle = closeMapTitle;
-  _getMApWdgj();
-});
-//获取坐标数据
-function _getMApWdgj() {
-  let data = {
-    dwrq: useRoute().query.time,
-    sfzh: JSON.parse(window.localStorage.getItem("userInfo")).idEntityCard,
-  };
-  getMApWdgj(data).then((res) => {
-    if (res && res.zbList.length > 0) {
-      for (let i = 0; i < res.zbList.length; i++) {
-        points.value = [...points.value, ...res.zbList[i]];
-      }
-      points.value = points.value.join(",");
-      emitter.emit("drawLine", points.value);
-    }
-  });
-}
-//关闭弹窗dom
-function closeMapTitle(val) {
-  let doms = document.getElementById(val);
-  doms.remove();
-}
-</script>
-<style lang="scss" scoped>
-.map_but_box {
-  position: absolute;
-  bottom: 10vw;
-  width: 50%;
-  left: 50%;
-  z-index: 99;
-  margin-left: -25%;
-}
-
-.top_btn {
-  position: fixed;
-  top: 16vw;
-  left: 0;
-  right: 12px;
-  height: 24px;
-  color: #fff;
-  z-index: 9;
-  text-align: right;
-
-  span {
-    display: inline-block;
-    border: 1px solid #fff;
-    line-height: 22px;
-    padding: 0 12px;
-    border-radius: 12px;
-    font-size: 14px;
-  }
-
-  span.active {
-    background: #517cea;
-    border-color: #517cea;
-  }
-}
-</style>
diff --git a/src/pages/newTwoHome/addZl.vue b/src/pages/newTwoHome/addZl.vue
deleted file mode 100644
index c1b4809..0000000
--- a/src/pages/newTwoHome/addZl.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="'下发指令'" />
-    <van-form @submit="onSubmit">
-      <van-field v-model="normalForm.zlbt" label="指令标题" placeholder="请输入指令标题" input-align="right" required
-        :rules="[{ required: true, message: '请输入指令标题' }]" />
-      <van-cell-group>
-        <van-cell clickable title="等级" :border="false">
-          <template #right-icon>
-            <van-radio-group v-model="zldj" direction="horizontal">
-              <van-radio :name="item.dm" v-for="item in D_BZ_TYJB" :key="item">{{ item.zdmc }}</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
-        <van-cell clickable title="接收对象" :border="false">
-          <template #right-icon>
-            <van-radio-group v-model="jsdx" direction="horizontal">
-              <van-radio :name="item.dm" v-for="item in D_BZ_ZLJSDX" :key="item">{{ item.zdmc }}</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
-      </van-cell-group>
-      <van-cell class="mulSelect" title="人员" color="#1989fa" v-if="jsdx == '01'">
-        <template #right-icon>
-          <van-icon @click.stop="onSelectData('mj')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in list.mj" :key="index">
-              <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'mj')" plain>{{ item.zxrXm
-                }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-field v-model="normalForm.bmName" label="部门" placeholder="请选择部门" input-align="right" readonly is-link
-        required :rules="[{ required: true, message: '请选择部门' }]"
-        @click="(bmShow = true), (selectType = 'bm'), (showSelect = false)" v-if="jsdx == '02'" />
-      <van-cell class="mulSelect" title="巡组" color="#1989fa" v-if="jsdx == '03'">
-        <template #right-icon>
-          <van-icon @click.stop="onSelectData('xz')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in list.xz" :key="index">
-              <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'xz')" plain>{{ item.zxrXzmc
-                }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-field rows="3" label="内容" type="textarea" label-width="35px" v-model="normalForm.zlnr"
-        placeholder="请输入指令内容" />
-      <div style="margin: 20vw 0; padding: 0 5vw">
-        <van-button :loading="loading" round native-type="submit" block type="primary">
-          提交
-        </van-button>
-      </div>
-    </van-form>
-    <Select bclx="02" :dwlx="dwlx" :checked="r_checked" :selectType="selectType" :show="showSelect"
-      :checkedList="list.checkedList" @update:cancel="showSelect = false" @update:confirm="onComfirm"
-      :key="selectIndex" />
-    <van-dialog :show="bmShow" title="选择部门" show-cancel-button @confirm="bmShow = false" @cancel="bmShow = false"
-      confirmButtonColor="#3e6ee8">
-      <van-cascader v-model="normalForm.deptName" :closeable="false" @change="onChangeBm" :show-header="false"
-        active-color="#3e6ee8" title="请选择部门" :options="list.options" :field-names="customFieldName"
-        @click-tab="onClickTabCascader">
-      </van-cascader>
-    </van-dialog>
-  </div>
-</template>
-
-<script setup>
-import { selectNextPage } from "../../api/yjxx.js";
-import TopNav from "../../components/topNav.vue";
-import { getDictList, setDict } from "../../utils/dict";
-import { onMounted, ref, reactive } from "vue";
-import { addZlData } from "../../api/zlzx.js";
-import Select from "../../components/Select.vue";
-import { hintToast } from "../../utils/tools.js";
-import router from "@/router/index.js";
-const { D_BZ_TYJB, D_BZ_ZLJSDX } = getDictList("D_BZ_TYJB", "D_BZ_ZLJSDX"); //字典信息
-const zldj = ref("40"); //指令等级 默认蓝色
-const jsdx = ref("01"); //接收对象 默认人员
-const dwlx = ref("01");
-const r_checked = ref(""); //单选框默认选中
-const kwd = ref(""); //选择器关键字
-const selectIndex = ref(1); //选择器组件KEY
-const selectType = ref(""); //选择的类型
-const showSelect = ref(false);
-const bmShow = ref(false); //部门选择器
-const list = reactive({
-  checkedList: [],
-  mj: [],
-  xz: [],
-  bm: [],
-  options: [],
-  tabCascader: [], //选中部门的临时数据
-});
-//选择器字段
-const customFieldName = {
-  text: "orgName",
-  value: "id",
-  children: "childDeptList",
-};
-//表单数据
-const normalForm = ref({
-  zlbt: "",
-  zlnr: "",
-  deptName: "",
-  bmName: "",
-});
-const zxrDtoList = ref([]);
-onMounted(() => {
-  _selectNextPage();
-});
-//选中的部门数据
-function onChangeBm(val) {
-  list.tabCascader = val.selectedOptions;
-  let info = val.selectedOptions.find((item) => {
-    return item.id == val.value;
-  });
-  if (info) {
-    let { orgName, id } = info;
-    normalForm.value.bmName = orgName;
-    list.bm = [{ ssbmid: id, ssbmmc: orgName }];
-  }
-}
-//部门选择tabs
-function onClickTabCascader(val) {
-  let info = list.tabCascader[val];
-  if (info) {
-    let { orgName, id } = info;
-    normalForm.value.bmName = orgName;
-    list.bm = [{ ssbmid: id, ssbmmc: orgName }];
-  }
-}
-//查询部门数据
-function _selectNextPage() {
-  selectNextPage({
-    size: 100,
-    current: 1,
-  }).then((res) => {
-    list.options = [res.records[0]];
-  });
-}
-//提交指令
-function onSubmit() {
-  switch (selectType.value) {
-    case "mj":
-      zxrDtoList.value = list.mj;
-      break;
-    case "bm":
-      zxrDtoList.value = list.bm;
-      break;
-    case "xz":
-      zxrDtoList.value = list.xz;
-      break;
-  }
-  let data = {
-    zlbt: normalForm.value.zlbt,
-    zldj: zldj.value,
-    zljsdx: jsdx.value,
-    zllx: "08",
-    zlnr: normalForm.value.zlnr,
-    zxrDtoList: zxrDtoList.value,
-  };
-  addZlData(data).then((res) => {
-    hintToast("下发成功！");
-    router.replace("/newTwoHome/myZl");
-  });
-}
-//打开弹窗
-function onSelectData(val) {
-  selectType.value = val;
-  showSelect.value = true;
-  list.bm = [];
-  list.mj = [];
-  list.xz = [];
-  selectIndex.value++;
-}
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return;
-  switch (selectType.value) {
-    case "mj":
-      list.checkedList = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "xz":
-      list.checkedList = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-  }
-}
-//设置选中值
-const toggle = (item) => {
-  switch (selectType.value) {
-    case "mj":
-      list.mj.push({
-        zxrJllx: item.fl,
-        zxrLx: "01",
-        zxrSfz: item.sfzh,
-        jlxm: item.xm,
-        sfzh: item.sfzh,
-        zxrXm: item.xm,
-        zxrId: item.ryid,
-      });
-      break;
-    case "xz":
-      list.xz.push({
-        zxrXzmc: item.jzMc || item.fzrXm + "组",
-        zxrXzid: item.id,
-      });
-      break;
-  }
-};
-//删除选中数据
-function deleteCheckTag(item, index, val) {
-  switch (val) {
-    case "mj":
-      list.mj.splice(index, 1);
-      break;
-    case "xz":
-      list.xz.splice(index, 1);
-      break;
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.container {
-  margin-top: 2vw;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-
-.van-cell:after {
-  display: none;
-}
-
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 4%;
-  width: 92%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-</style>
diff --git a/src/pages/newTwoHome/index.vue b/src/pages/newTwoHome/index.vue
deleted file mode 100644
index a88af0c..0000000
--- a/src/pages/newTwoHome/index.vue
+++ /dev/null
@@ -1,490 +0,0 @@
-<template>
-  <div class="" @click="showThemeSetting = false">
-    <div class="new_leaderTop">
-      <div class="new_welcome">
-        <div class="userName_box">
-          <div class="wd">
-            {{ weatherInfo.typeName }} {{ weatherInfo.minTemp }}℃-{{
-              weatherInfo.maxTemp
-            }}℃ {{ weatherInfo.wind }}风 {{ weatherInfo.power }} 级
-          </div>
-          <img class="face" src="../../assets/images/leader/face@2x.png" />
-          <span class="tq_box">欢迎您&ensp;{{ userInfo.userName }}</span>
-        </div>
-        <van-popover v-model:show="showThemeSetting" :actions="actions" :theme="defaultThemeQp" :offset="[16, -25]"
-          placement="bottom-end" @select="onSelectSeting" :teleport="isbody">
-          <template #reference>
-            <van-icon name="weapp-nav" color="#fff" size="22px" @click.stop="showThemeSetting = true" />
-          </template>
-        </van-popover>
-      </div>
-    </div>
-    <div class="center_function_box">
-      <div class="f_item" v-for="item in home.functionList" :key="item" @click="onRouter(item.path)">
-        <img :src="item.imgUrl" alt="" />
-        <div>{{ item.name }}</div>
-      </div>
-    </div>
-    <div style="height: 3vw; background: #eff0f5"></div>
-    <div style="padding: 3vw" @click="onClickLdjsc">
-      <div class="ldjsc_box">
-        <div class="ldjsc_detail">
-          <span class="ldjsc_title">领导驾驶舱</span>
-          <span class="ldjsc_hint">点击进入领导驾驶舱看板</span>
-        </div>
-        <div class="ckgd">查看更多</div>
-      </div>
-    </div>
-    <div style="height: 3vw; background: #eff0f5"></div>
-    <div class="zszh_box_box">
-      <div class="zszh">掌上指挥</div>
-      <!-- <div class="zszh_box">
-        <div
-          class="zszh_box_item"
-          style="
-            background: linear-gradient(90deg, #fff9f1 0%, #f9f1e4 100%);
-            color: #783000;
-          "
-          @click="onCLickFqzl"
-        >
-          <van-icon
-            :name="require('../../assets/images/new/cswdzl.png')"
-            size="11vw"
-            badge="+"
-          ></van-icon>
-          <div class="zszh_title">新增指令</div>
-        </div>
-        <div
-          class="zszh_box_item"
-          style="
-            background: linear-gradient(90deg, #fff9f1 0%, #f9f1e4 100%);
-            color: #783000;
-          "
-          @click="onCLickZlLb"
-        >
-          <van-icon
-            :name="require('../../assets/images/new/cswdzl.png')"
-            size="11vw"
-            :badge="myzlCount"
-          ></van-icon>
-          <div class="zszh_title">我发起的指令</div>
-        </div>
-        <div
-          class="zszh_box_item"
-          style="
-            background: linear-gradient(90deg, #f6fafd 0%, #e8f0fc 100%);
-            color: #163678;
-          "
-          @click="onCLickYwcldzl"
-        >
-          <van-icon
-            :name="require('../../assets/images/new/wcldzl.png')"
-            size="11vw"
-            :badge="ywclzlCount"
-          ></van-icon>
-          <div class="zszh_title">由我处理指令</div>
-        </div>
-        <div
-          class="zszh_box_item"
-          style="
-            background: linear-gradient(90deg, #f6fafd 0%, #e8fcfa 100%);
-            color: #397361;
-          "
-        >
-          <van-icon
-            :name="require('../../assets/images/new/wfsdzl.png')"
-            size="11vw"
-            :badge="cswdzlCount"
-          ></van-icon>
-          <div class="zszh_title">抄送我的指令</div>
-        </div>
-      </div> -->
-      <div class="zszh_box">
-        <div class="zszh_box_item" v-for="item in home.totalLit" :key="item"
-          :style="{ background: item.bg, color: item.colors }" @click="onCLickSelect(item.url)">
-          <van-icon :name="item.icons" size="11vw" :badge="item.badges"></van-icon>
-          <div class="zszh_title">{{ item.text }}</div>
-        </div>
-      </div>
-    </div>
-    <van-dialog :show="showUserChangePicker" title="选择角色" show-cancel-button @confirm="onConfirm"
-      @cancel="showUserChangePicker = false" confirmButtonColor="#3e6ee8">
-      <van-radio-group v-model="isActive">
-        <van-radio v-for="item in radioList" :key="item.id" :name="item.id">{{
-          item.homename
-        }}</van-radio>
-      </van-radio-group>
-    </van-dialog>
-    <!-- 盘人 -->
-    <checkedPeople ref="peo" :key="zdgzKey + 'pr'" />
-    <!-- 盘车 -->
-    <checkedCar ref="car" :key="zdgzKey + 'pc'" />
-
-    <PcModel ref="dhcr" :key="zdgzKey + 'dhcr'"></PcModel>
-    <!-- 底部tas -->
-    <div style="height: 11.8666vw"></div>
-    <BottomTabs type="sy" />
-  </div>
-</template>
-<script setup>
-import BottomTabs from "../../components/bottomTabs.vue";
-import { getUserSelectPage } from "../../api/gxHomeApi.js";
-import { dateFormat, setUserHome, getWeatherData } from "../../utils/tools.js";
-import checkedCar from "../../pages/spsHome/components/checkCar.vue";
-import checkedPeople from "../../pages/spsHome/components/checkPeople.vue";
-import PcModel from "../../components/pcModel.vue";
-import { getHomejqtj } from "../../api/jqxx.js";
-import { getZdRyCount } from "../../api/zdry.js";
-import { ref, onMounted, onUnmounted, onActivated, reactive } from "vue";
-import { getMyTaskList, getMyTaskTotal, upGrzt } from "../../api/rwzx.js";
-import { getMyZlList } from "../../api/zlzx.js";
-import router from "../../router";
-import { onBeforeRouteLeave } from "vue-router";
-const isActive = ref(6); //用户选中的身份
-const radioList = ref([]); //用户身份数据
-const showUserChangePicker = ref(false); //用户换身份弹窗
-const showThemeSetting = ref(false); //是否显示设置主题模板
-const defaultThemeQp = ref("light"); //默认的右侧气泡框主题
-const isbody = ref("body");
-const weatherInfo = ref({
-  maxTemperature: 24,
-  minTemperature: 14,
-  type: "多云",
-}); //天气数据
-const actions = [
-  {
-    text: "切换身份",
-    icon: "exchange",
-  },
-];
-const dhcr = ref(); //电话查人组件对象
-const peo = ref(); //盘查人员组件对象
-const car = ref(); //盘查车辆组件对象
-const ywclzlCount = ref(0); //由我处理的指令统计
-const myzlCount = ref(0);
-const cswdzlCount = ref(0); //抄送我的指令统计
-const zdgzKey = ref(1);
-const userInfo = JSON.parse(window.localStorage.getItem("userInfo")); //用户信息
-const home = reactive({
-  functionList: [
-    {
-      name: "人员盘查",
-      imgUrl: require("../../assets/images/menu-yyhc.png"),
-      path: "pr",
-    },
-    {
-      name: "勤务统计",
-      imgUrl: require("../../assets/images/qwtj.png"),
-      path: "/hisQwCenter",
-    },
-    {
-      name: "车辆盘查",
-      imgUrl: require("../../assets/images/menu-clhc.png"),
-      path: "pc",
-    },
-    {
-      name: "巡防报备",
-      imgUrl: require("../../assets/images/menu-rwzx.png"),
-      path: "/yyzx/xfbb/addXfbb",
-    },
-    {
-      name: "预警统计",
-      imgUrl: require("../../assets/images/jq_home.png"),
-      path: "/yyzx/yjxx/yjTotal",
-    },
-    {
-      name: "值班报备",
-      imgUrl: require("../../assets/images/menu-qwzx.png"),
-      path: "/yyzx/views/addZbbb",
-    },
-    {
-      name: "查看更多",
-      imgUrl: require("../../assets/images/new_gd.png"),
-      path: "/yyzx",
-    },
-  ], //中间功能区
-  rwList: [],
-  totalLit: [
-    {
-      url: "/newTwoHome/addZl",
-      icons: require("../../assets/images/new/cswdzl.png"),
-      text: "新增指令",
-      bg: "linear-gradient(90deg, #fff9f1 0%, #f9f1e4 100%)",
-      colors: "#783000",
-      badges: "+",
-    },
-    {
-      url: "/newTwoHome/myZl",
-      icons: require("../../assets/images/new/cswdzl.png"),
-      text: "我发起的指令",
-      bg: "linear-gradient(90deg, #fff9f1 0%, #f9f1e4 100%)",
-      colors: "#783000",
-      badges: 0,
-    },
-    {
-      url: "/yyzx/zlzx/zlzxIndex",
-      icons: require("../../assets/images/new/wcldzl.png"),
-      text: "由我处理的指令",
-      bg: "linear-gradient(90deg, #f6fafd 0%, #e8f0fc 100%)",
-      colors: "#163678",
-      badges: 0,
-    },
-    {
-      url: "/newTwoHome/myZl?type=cs",
-      icons: require("../../assets/images/new/wfsdzl.png"),
-      text: "抄送我的指令",
-      bg: "linear-gradient(90deg, #f6fafd 0%, #e8fcfa 100%)",
-      colors: "#397361",
-      badges: 0,
-    },
-  ],
-});
-const timeObj = reactive({
-  kssj: "",
-  jssj: "",
-});
-onMounted(() => {
-  zdgzKey.value++;
-  _getUserSelectPage();
-  _getMyTaskTotal();
-});
-//跳转
-function onCLickSelect(url) {
-  router.push(url);
-}
-//发起指令
-function onCLickFqzl() {
-  router.push("/newTwoHome/addZl");
-}
-// 我发起的指令列表
-function onCLickZlLb() {
-  router.push("/newTwoHome/myZl");
-}
-//点击由我处理的指令
-function onCLickYwcldzl() {
-  router.push("/yyzx/zlzx/zlzxIndex");
-}
-//跳转领导驾驶舱
-function onClickLdjsc() {
-  router.push("/newTwoHome/ldjsc");
-}
-//获取任务统计
-function _getMyTaskTotal() {
-  getMyTaskTotal({ sfzh: userInfo.idEntityCard }).then((res) => {
-    if (res) {
-      res.forEach((item) => {
-        if (item.rwxl == "05") {
-          ywclzlCount.value = item.count;
-        }
-        if (item.rwxl == "06") {
-        }
-      });
-    }
-  });
-  getMyZlList({
-    pageSize: 10,
-    pageCurrent: 1,
-  }).then((res) => {
-    myzlCount.value = res.total;
-  });
-}
-//获取用户首页模板
-function _getUserSelectPage() {
-  getUserSelectPage({
-    size: 20,
-    current: 1,
-  }).then((res) => {
-    res.records.forEach((item) => {
-      radioList.value.push(item);
-    });
-  });
-}
-//选中的设置信息
-function onSelectSeting(e) {
-  switch (e.text) {
-    case "切换身份":
-      showUserChangePicker.value = true;
-      break;
-  }
-}
-//用户选中身份
-function onConfirm() {
-  showUserChangePicker.value = false;
-  setUserHome(isActive.value);
-}
-//跳转页面
-function onRouter(path) {
-  switch (path) {
-    case "/rw":
-    case "/yyzx":
-      router.replace(path);
-      break;
-    case "pr":
-      checkPeople();
-      break;
-    case "pc":
-      checkCar();
-      break;
-    case "/dhcr":
-      checkDhcr();
-      break;
-    case "rhjs":
-      try {
-        bridge.toFusionComputing();
-      } catch (error) { }
-      break;
-    default:
-      router.push(path);
-  }
-}
-//点击盘人
-function checkPeople() {
-  peo.value.handleOpen();
-}
-//点击盘车
-function checkCar() {
-  car.value.handleOpen();
-}
-// 点击电弧查人
-function checkDhcr() {
-  dhcr.value.peoplePopupShow = true;
-}
-</script>
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.zszh_box_box {
-  padding: 3vw;
-
-  .zszh {
-    @include font_size($font_medium);
-    font-weight: 700;
-  }
-}
-
-.zszh_box {
-  @include font_size($font_medium_s);
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  margin-top: 4vw;
-
-  .zszh_box_item {
-    text-align: center;
-    width: 30%;
-    padding: 4vw 0;
-    border-radius: 3vw;
-    margin-bottom: 5vw;
-
-    .zszh_title {
-      margin-top: 2vw;
-    }
-  }
-}
-
-.new_leaderTop {
-  height: 26.33334vw;
-  background: url("../../assets/images/new/banner.png") no-repeat;
-  background-size: 100%;
-  top: 0;
-  @include font_size($font_medium_s);
-}
-
-.new_welcome {
-  padding: 5.5vw 5vw 3vw 5vw;
-  display: flex;
-  justify-content: space-between;
-  font-size: 13px;
-  @include font_size($font_medium_s);
-
-  .userName_box {
-    color: #fff;
-
-    .wd {
-      margin-bottom: 3vw;
-    }
-
-    .tq_box {
-      @include font_size($font_medium);
-      position: relative;
-      top: -0.5vw;
-    }
-
-    .face {
-      width: 5vw;
-      height: 4vw;
-      margin-right: 2.5vw;
-    }
-  }
-}
-
-.center_function_box {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  background: #fff;
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  padding: 4vw 1vw 0 1vw;
-
-  .f_item {
-    text-align: center;
-    width: 20%;
-    margin: 0 0 4.5vw 0;
-
-    &>img {
-      width: 13vw;
-      height: 13vw;
-      margin-bottom: 2vw;
-    }
-  }
-}
-
-::v-deep .van-radio-group {
-  padding: 5vw;
-}
-
-::v-deep .van-radio {
-  padding: 2vw 0;
-}
-
-.ldkb_img {
-  width: 100%;
-}
-
-.ldjsc_box {
-  background: url("../../assets/images/new/ldjsc_url.png");
-  background-size: 100% 100%;
-  height: 26vw;
-  @include font_size($font_medium_s);
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 6vw;
-}
-
-.ldjsc_detail {
-  display: flex;
-  flex-direction: column;
-
-  .ldjsc_title {
-    font-size: 5vw;
-    font-weight: 700;
-    color: #104ca5;
-  }
-
-  .ldjsc_hint {
-    margin-top: 3vw;
-  }
-}
-
-.ckgd {
-  height: 7vw;
-  line-height: 7vw;
-  width: 20vw;
-  text-align: center;
-  color: #fff;
-  border-radius: 4vw;
-  background: linear-gradient(90deg, #2972fa 0%, #0aa7f8 100%);
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/newTwoHome/jq/xzjqDetail.vue b/src/pages/newTwoHome/jq/xzjqDetail.vue
deleted file mode 100644
index 0585541..0000000
--- a/src/pages/newTwoHome/jq/xzjqDetail.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <div style="padding-top: 14vw">
-    <TopNav navTitle="警情详情" :showRight="false" :showLeft="true" />
-    <div class="ry_info">
-      <List :item="jqDetail" v-if="jqDetail" />
-    </div>
-    <Steps :data="stepsData">
-      <template v-slot:default="{ scope }">
-        <div class="content">
-          <div class="cont_l">
-            <div class="text title">{{ scope.content }}</div>
-            <div class="text">执行人:{{ scope.cjPoliceName }}</div>
-            <div class="text">执行部门:{{ scope.cjOrgName }}</div>
-            <div class="text">状态:{{ scope.statusName }}</div>
-          </div>
-        </div>
-      </template>
-    </Steps>
-    <van-empty
-      description="没有警情信息"
-      image="default"
-      v-if="stepsData.length <= 0 && showEmpty"
-    />
-  </div>
-</template>
-<script setup>
-import axios from "axios";
-import List from "../../../components/xzjqList.vue";
-import TopNav from "../../../components/topNav.vue";
-import Steps from "../../../components/Steps.vue";
-import { getJqInfo } from "../../../api/jqxx";
-import { onMounted, ref } from "vue";
-import { baseUrl2 } from "../../../utils/request";
-const route = useRoute();
-const jqDetail = ref();
-const stepsData = ref([]);
-const showEmpty = ref(false);
-onMounted(() => {
-  jqDetail.value = JSON.parse(route.query.item);
-  _getCjList(jqDetail.value.incidentCode);
-});
-//获取处警记录
-function _getCjList(incidentCode) {
-  axios
-    .get(`${baseUrl2}/xz1Api/api/alarm/cj/${incidentCode}`, {})
-    .then((res) => {
-      if (res.data && res.data.data.length > 0) {
-        for (let i = 0; i < res.data.data.length; i++) {
-          let item = res.data.data[i];
-          item.time = item.cjTime.substring(0, item.cjTime.length - 3);
-        }
-        res.data.data.sort(
-          (a, b) => new Date(b.time).getTime() - new Date(a.time).getTime()
-        );
-        stepsData.value = res.data.data;
-      } else {
-        showEmpty.value = true;
-      }
-    })
-    .catch((err) => {
-      showEmpty.value = true;
-    });
-}
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.ry_info {
-  margin: 2vw 3vw;
-  border-radius: 2vw;
-  @include jrtz_fill_color($jrtz-fill-color-theme);
-}
-.content {
-  display: flex;
-  padding-bottom: 20px;
-  .cont_l {
-    margin-right: 16px;
-    .text {
-      line-height: 5.5vw;
-    }
-    .title {
-      @include font_size($font_medium);
-      font-weight: 550;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/newTwoHome/jq/xzjqlist.vue b/src/pages/newTwoHome/jq/xzjqlist.vue
deleted file mode 100644
index a1a207f..0000000
--- a/src/pages/newTwoHome/jq/xzjqlist.vue
+++ /dev/null
@@ -1,178 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="警情列表" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs :status="status" @TabsItem="onSelect" :key="tabsIndex"></Tabs>
-        <Search
-          placeholder="请输入关键字"
-          v-model="kwd"
-          :isSx="true"
-          @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"
-        ></Search>
-      </div>
-    </van-sticky>
-    <SxPopup
-      :showPopup="showPopup"
-      :list="yjxx.sxList"
-      :p_top="145"
-      @update:close="showPopup = false"
-      @update:onConfirm="onConfirm"
-    />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text=" "
-        @load="onLoad"
-        offset="3"
-        :immediate-check="false"
-      >
-        <List
-          v-for="(item, index) in yjxx.list"
-          :key="index"
-          :item="item"
-          path="/newTwoHome/jq/xzjqDetail"
-        />
-        <van-empty
-          description="没有警情信息"
-          image="default"
-          v-if="yjxx.list.length <= 0 && showEmpty"
-        />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-<script>
-export default {
-  name: "newTwoHome/jq/xzjqlist",
-};
-</script>
-<script setup>
-import axios from "axios";
-import { baseUrl2 } from "../../../utils/request";
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/xzjqList.vue";
-import { setTimeQuantum, dateFormat } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted, watch, onActivated } from "vue";
-import { getJqList, getStatistics } from "../../../api/jqxx";
-import { useRoute, onBeforeRouteLeave } from "vue-router";
-import router from "../../../router";
-const status = ref(1);
-const showEmpty = ref(false);
-const loading = ref(false);
-const total = ref(0);
-const tabsIndex = ref(1);
-const params = ref({
-  pageNum: 1,
-  pageSize: 20,
-  bjnr: "",
-  endTime: dateFormat(),
-  startTime: dateFormat("z"),
-});
-const yjxx = reactive({
-  sxList: [setTimeQuantum()], //筛选条件数据
-  list: [], //预警列表数据,
-});
-const kwd = ref("");
-const finished = ref(false);
-const loadingPull = ref(false);
-const showPopup = ref(false); //筛选弹窗
-onMounted(() => {
-  if (useRoute().query.status) {
-    status.value = useRoute().query.status;
-    onSelect();
-  }
-});
-//下拉刷新
-function onRefresh() {
-  yjxx.list = [];
-  tabsIndex.value++;
-  params.value.pageNum = 1;
-  params.value.bjnr = "";
-  params.value.endTime = dateFormat();
-  params.value.startTime = dateFormat("z");
-  onSelect();
-}
-//触底加载
-function onLoad() {
-  if (params.value.pageNum >= total.value) {
-    finished.value = true;
-  } else {
-    params.value.pageNum++;
-    onSelect();
-  }
-}
-
-/**
- * tab选择
- * @param {Object} val
- */
-function onSelect(val) {
-  if (val || val == 0) {
-    status.value = val + 1;
-    yjxx.list = [];
-    params.value.pageNum = 1;
-    params.value.bjnr = "";
-    finished.value = false;
-  }
-  loading.value = true;
-  let data = {
-    orgId: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0]
-      .deptCode,
-    startTime: `${params.value.startTime} 16:00:00`,
-    endTime: `${params.value.endTime} 16:00:00`,
-    type: status.value,
-    keyword: params.value.bjnr,
-    currPage: params.value.pageNum,
-    pageSize: params.value.pageSize,
-  };
-  axios
-    .post(`${baseUrl2}/xz1Api/api/alarm/list `, data)
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (res.data && res.data.data.list.length > 0) {
-        yjxx.list = [...res.data.data.list, ...yjxx.list];
-        total.value = res.data.data.totalPage;
-      } else {
-        showEmpty.value = true;
-      }
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.list = [];
-  params.value.endTime = dateFormat();
-  params.value.startTime = dateFormat("z");
-  params.value.pageNum = 1;
-  params.value.bjnr = val;
-  finished.value = false;
-  onSelect();
-}
-function onConfirm(val) {
-  yjxx.list = [];
-  params.value.startTime = `${val.startTime}`;
-  params.value.endTime = `${val.endTime}`;
-  showPopup.value = false;
-  params.value.pageNum = 1;
-  params.value.bjnr = "";
-  finished.value = false;
-  onSelect();
-}
-</script>
-
-<style>
-</style>
diff --git a/src/pages/newTwoHome/jq/zdjq.vue b/src/pages/newTwoHome/jq/zdjq.vue
deleted file mode 100644
index 1e019d6..0000000
--- a/src/pages/newTwoHome/jq/zdjq.vue
+++ /dev/null
@@ -1,222 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="警情列表" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs
-          :list="tabs"
-          @onYjjb="onSelect"
-          :type="'car'"
-          :key="tabsIndex"
-        ></Tabs>
-        <Search
-          placeholder="请输入关键字"
-          v-model="kwd"
-          :isSx="true"
-          @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"
-        ></Search>
-      </div>
-    </van-sticky>
-    <SxPopup
-      :showPopup="showPopup"
-      :list="yjxx.sxList"
-      :p_top="145"
-      @update:close="showPopup = false"
-      @update:onConfirm="onConfirm"
-    />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text=" "
-        @load="onLoad"
-        offset="3"
-        :immediate-check="false"
-      >
-        <List
-          v-for="(item, index) in yjxx.list"
-          :key="index"
-          :item="item"
-          path="/yyzx/jqxx/jqDetail"
-        />
-        <van-empty
-          description="没有警情信息"
-          image="default"
-          v-if="yjxx.list.length <= 0 && showEmpty"
-        />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/JqList.vue";
-import { setTimeQuantum, dateFormat } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted, watch } from "vue";
-import { getJqList, getStatistics } from "../../../api/jqxx";
-const tabs = ref([
-  {
-    name: "全部警情",
-    value: null,
-    count: 0,
-  },
-  {
-    name: "刑事警情",
-    value: 1,
-    count: 0,
-  },
-  {
-    name: "行政警情",
-    value: 2,
-    count: 0,
-  },
-  {
-    name: "交通警情",
-    value: 3,
-    count: 0,
-  },
-  {
-    name: "其他",
-    value: 4,
-    count: 0,
-  },
-]);
-const yjxx = reactive({
-  sxList: [setTimeQuantum()], //筛选条件数据
-  list: [], //预警列表数据,
-  total: 0,
-});
-const params = ref({
-  pageNum: 1,
-  pageSize: 20,
-  bjnr: "",
-  bjlb: "",
-  endTime: dateFormat(),
-  startTime: dateFormat(),
-});
-const tabsIndex = ref(1);
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const loadingPull = ref(false);
-const showEmpty = ref(false);
-const showPopup = ref(false); //筛选弹窗
-//下拉刷新
-function onRefresh() {
-  tabsIndex.value++;
-  yjxx.list = [];
-  params.value.pageNum = 1;
-  params.value.bjnr = "";
-  params.value.bjlb = "";
-  params.value.endTime = "";
-  params.value.startTime = "";
-  getList();
-  getJqtj();
-}
-//获取警情列表
-function getList() {
-  loading.value = true;
-  getJqList(params.value)
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (res.records && res.records.length > 0) {
-        yjxx.list = res.records;
-      } else {
-        showEmpty.value = true;
-      }
-      yjxx.total = res.total;
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-function onLoad() {
-  if (yjxx.list.length >= yjxx.total) {
-    finished.value = true;
-  } else {
-    params.value.pageNum++;
-    loading.value = true;
-    getJqList(params.value)
-      .then((res) => {
-        loading.value = false;
-        loadingPull.value = false;
-        yjxx.list.push(...res.records);
-        yjxx.total = res.total;
-      })
-      .catch((err) => {
-        loading.value = false;
-      });
-  }
-}
-//获取警情统计数据
-function getJqtj() {
-  const data = {
-    endTime: params.value.endTime,
-    startTime: params.value.startTime,
-    bjnr: params.value.bjnr,
-  };
-  getStatistics(data).then((res) => {
-    tabs.value[0].count = res.jtCount + res.qtCount + res.xsCount + res.xzCount;
-    tabs.value[1].count = res.xsCount;
-    tabs.value[2].count = res.xzCount;
-    tabs.value[3].count = res.jtCount;
-    tabs.value[4].count = res.qtCount;
-  });
-}
-onMounted(() => {
-  getList();
-  getJqtj();
-});
-/**
- * tab选择
- * @param {Object} val
- */
-function onSelect(val) {
-  yjxx.list = [];
-  params.value.bjnr = "";
-  params.value = {
-    pageNum: 1,
-    pageSize: 20,
-    endTime: params.value.endTime,
-    startTime: params.value.startTime,
-    bjlb: !val ? null : val,
-  };
-  getList();
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.list = [];
-  params.value.bjnr = val;
-  params.value = {
-    pageNum: 1,
-    pageSize: 20,
-    endTime: "",
-    startTime: "",
-    bjlb: !val ? null : val,
-  };
-  getList();
-  getJqtj();
-}
-function onConfirm(val) {
-  yjxx.list = [];
-  params.value.startTime = val.startTime;
-  params.value.endTime = val.endTime;
-  getList();
-  getJqtj();
-  showPopup.value = false;
-}
-</script>
-
-<style>
-</style>
diff --git a/src/pages/newTwoHome/ldjsc.vue b/src/pages/newTwoHome/ldjsc.vue
deleted file mode 100644
index 31d34ca..0000000
--- a/src/pages/newTwoHome/ldjsc.vue
+++ /dev/null
@@ -1,987 +0,0 @@
-<template>
-  <div class="" style="padding-top: 13vw">
-    <TopNav navTitle="领导驾驶舱" :showRight="false" :showLeft="true" />
-    <div class="wddb_box">
-      <div class="wdrw_title">我的待办任务</div>
-      <div class="dbrw_total">
-        <div @click="routerPush('/rw')" class="wddb_item">
-          <span class="num">{{ myDb.dcl }}</span><br />
-          待处理任务
-        </div>
-        <div @click="routerPush('/newTwoHome/yclList')" class="wddb_item">
-          <span class="num">{{ myDb.ycl }}</span><br />
-          已处理任务
-        </div>
-      </div>
-    </div>
-    <div style="height: 3vw; background: #eff0f5"></div>
-    <div class="jq_box topM">
-      <span class="jmsfjq_total_title">警情态势</span>
-    </div>
-    <div class="jq_box">
-      <div class="jq_item left_item" style="padding: 0">
-        <div class="jrjqzs_total jq_total_item" @click="onClickJqTotal(1)">
-          <span class="jmsfjq_total_title">今日总警情</span>
-          <div style="margin: 1vw 0">
-            <span class="jq_num">{{ jqTotal.total }} </span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">环比<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.totalHb > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.totalHb > 0 ? 'red' : 'green'">
-                  {{ jqTotal.totalHb }}%</span>
-              </span>
-            </span>
-          </div>
-        </div>
-        <div class="zdjqzs_total jq_total_item" @click="onClickJqTotal(2)">
-          <span class="jmsfjq_total_title">今日重大警情</span>
-          <div style="margin: 1vw 0 0 0">
-            <span class="red jq_num">{{ jqTotal.zdCount }}</span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">
-              占比<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.zdHb > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.zdHb > 0 ? 'red' : 'green'">
-                  {{ jqTotal.zdHb }}%</span></span>
-            </span>
-          </div>
-        </div>
-        <div class="wffzzs_total jq_total_item" @click="onClickJqTotal(3)">
-          <span class="jmsfjq_total_title">今日违法犯罪警情</span>
-          <div style="margin: 1vw 0">
-            <span class="jq_num">{{ jqTotal.wffzCount }}</span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">
-              环比<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.wffzHb > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.wffzHb > 0 ? 'red' : 'green'">
-                  {{ jqTotal.wffzHb }}%</span></span>
-            </span>
-          </div>
-          <div class="xz_xs_total">
-            <span>刑事 {{ jqTotal.xsCount }} </span>
-            <span class="sx"></span>
-            <span>行政 {{ jqTotal.xzCount }}</span>
-          </div>
-        </div>
-        <div class="jq_total_item dxzp_item" @click="onClickJqTotal(12)">
-          <span class="jmsfjq_total_title">今日一般警情</span>
-          <div style="margin: 1vw 0 0 0">
-            <span class="jq_num">{{ jqTotal.dzCount }}</span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">
-              占比<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.dzHb > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.dzHb > 0 ? 'red' : 'green'">
-                  {{ jqTotal.dzHb }}%</span></span>
-            </span>
-          </div>
-        </div>
-      </div>
-      <div class="jq_item jmsfjq_box">
-        <div class="jmsfjq_total_title">街面实发警情</div>
-        <div style="margin-top: 2vw">
-          <span style="font-size: 6vw; font-weight: 700">{{
-            jqTotal.jmsfTotal
-          }}</span>
-          <span>&ensp;件&ensp;</span>
-          <span>较昨日 &ensp;<span :class="zrjqTotal > 0 ? 'red' : 'green'">{{
-            zrjqTotal > 0 ? "+" + zrjqTotal : zrjqTotal
-          }}</span></span>
-        </div>
-        <div class="mk_jq_total_box" @click="onClickJqTotal(9)">
-          <div class="jq_total">
-            <div>
-              <span class="red"># </span>
-              <span>两抢</span>
-            </div>
-            <div>
-              <span style="font-size: 4.5vw">{{ jqTotal.lqCount }}</span>
-              <span class="jq_total_unit">&ensp;件</span>
-            </div>
-          </div>
-          <span class="jqhb">&emsp;较昨日&ensp;<span :class="jqTotal.lqCount > 0 ? 'red' : 'green'">{{ jqTotal.lqUp > 0 ?
-            "+" + jqTotal.lqUp : jqTotal.lqUp }}</span></span>
-        </div>
-        <div class="mk_jq_total_box" @click="onClickJqTotal(10)">
-          <div class="jq_total">
-            <div>
-              <span class="red"># </span>
-              <span>盗窃汽车</span>
-            </div>
-            <div>
-              <span style="font-size: 4.5vw">
-                {{ jqTotal.qcCount }}
-              </span>
-              <span class="jq_total_unit"> 件</span>
-            </div>
-          </div>
-          <span class="jqhb">&emsp;较昨日&ensp;<span :class="jqTotal.qcUp > 0 ? 'red' : 'green'">{{ jqTotal.qcUp > 0 ? "+"
-            + jqTotal.qcUp : jqTotal.qcUp }}</span></span>
-        </div>
-        <div class="mk_jq_total_box" @click="onClickJqTotal(8)">
-          <div class="jq_total">
-            <div>
-              <span class="red"># </span>
-              <span>盗窃车内财物</span>
-            </div>
-            <div>
-              <span style="font-size: 4.5vw">{{ jqTotal.ccCount }}</span>
-              <span class="jq_total_unit"> 件</span>
-            </div>
-          </div>
-          <span class="jqhb">&emsp;较昨日&ensp;<span :class="jqTotal.ccUp > 0 ? 'red' : 'green'">{{ jqTotal.ccUp > 0 ? "+"
-            + jqTotal.ccUp : jqTotal.ccUp }}</span></span>
-        </div>
-        <div class="mk_jq_total_box" @click="onClickJqTotal(7)">
-          <div class="jq_total">
-            <div>
-              <span class="red"># </span>
-              <span>扒窃</span>
-            </div>
-            <div>
-              <span style="font-size: 4.5vw">{{ jqTotal.pqCount }}</span>
-              <span class="jq_total_unit"> 件</span>
-            </div>
-          </div>
-          <span class="jqhb">&emsp;较昨日&ensp;<span :class="jqTotal.pqUp > 0 ? 'red' : 'green'">{{ jqTotal.pqUp > 0 ? "+"
-            + jqTotal.pqUp : jqTotal.pqUp }}</span></span>
-        </div>
-
-        <div class="mk_jq_total_box" @click="onClickJqTotal(6)">
-          <div class="jq_total">
-            <div>
-              <span class="red"># </span>
-              <span>盗窃三车</span>
-            </div>
-            <div>
-              <span style="font-size: 4.5vw">{{ jqTotal.dqscCount }}</span>
-              <span class="jq_total_unit"> 件</span>
-            </div>
-          </div>
-          <span class="jqhb">&emsp;较昨日&ensp;<span :class="jqTotal.dqscUp > 0 ? 'red' : 'green'">{{
-            jqTotal.dqscUp > 0 ? "+" + jqTotal.dqscUp : jqTotal.dqscUp
-          }}</span></span>
-        </div>
-        <!-- <div class="mk_jq_total_box">
-          <div class="jq_total">
-            <div>
-              <span class="red"># </span>
-              <span>入室盗窃</span>
-            </div>
-            <div>
-              <span style="font-size: 4.5vw">{{ jqTotal.rdCount }}</span>
-              <span class="jq_total_unit"> 件</span>
-            </div>
-          </div>
-          <span class="jqhb"
-            >&emsp;较昨日&ensp;<span
-              :class="jqTotal.rdUp > 0 ? 'red' : 'green'"
-              >{{ jqTotal.rdUp > 0 ? "+" + jqTotal.rdUp : jqTotal.rdUp }}</span
-            ></span
-          >
-        </div> -->
-      </div>
-    </div>
-    <!-- <div style="height: 3vw; background: #eff0f5"></div> -->
-    <!-- <div class="wqts_box">
-      <div class="jq_box topM">
-        <span class="jmsfjq_total_title">稳情态势</span>
-      </div>
-
-      <div class="order_total">
-        <div class="total_item" style="background: #dd2024">
-          <span>2</span><br />
-          <span>失控数量</span>
-        </div>
-        <div class="total_item" style="background: #fb8734">
-          <span>10</span><br />
-          <span>在控数量</span>
-        </div>
-        <div class="total_item" style="background: #ecc617">
-          <span>10</span><br />
-          <span>待反馈数</span>
-        </div>
-      </div>
-    </div>
-    <div class="wk_echart">
-      <WqtsChart style="flex: 1" />
-      <div style="flex: 1">
-        <div class="wk_item" v-for="(item, index) in wkList" :key="index">
-          <span class="wk_dot" :style="{ background: item.color }"></span
-          >{{ item.text }}&nbsp; {{ item.hb }}% &nbsp; {{ item.num }} 人
-        </div>
-      </div>
-    </div> -->
-
-    <!-- <div style="height: 3vw; background: #eff0f5"></div> -->
-    <div style="height: 3vw; background: #eff0f5"></div>
-    <div class="qwqk_box">
-      <div class="jmsfjq_total_title title_box" @click="routerPush(`/qwCenter`, { status: '街面警力' })">
-        <span>勤务情况</span>
-        <span class="look_more">查看更多 </span>
-      </div>
-      <div class="qu_total">
-        <div class="qu_item_total">
-          <span>{{ qwData.zbld.zbldxm }}</span><br /><span>值班领导</span>
-        </div>
-        <div class="qu_item_total">
-          <span>{{ qwData.zgjl }}</span><br /><span>在岗警力</span>
-        </div>
-        <div class="qu_item_total">
-          <span>{{ qwData.jmjl }}</span><br /><span>街面警力</span>
-        </div>
-      </div>
-      <div class="zdqw_box" v-if="qwData.xfList.length > 0">
-        <div class="zdqw_item_box" v-for="item in qwData.xfList" :key="item" @click="onClickXfInfo(item.id)">
-          <div class="zdqw_title_box">
-            <span class="zdqw_msg" style="font-size: 15px; font-weight: 700"><span style="
-                  background: #4d1717;
-                  color: #fff;
-                  display: inline-block;
-                  padding: 0 1vw;
-                  margin-right: 1.5vw;
-                  border-radius: 3px;
-                  font-size: 11px;
-                ">类型</span>{{ setDict(item.qwlx, D_BZ_QWLX) }}</span>
-            <span class="">负责人：<span style="
-                  display: inline-block;
-                  background: #fff;
-                  border-radius: 10px;
-                  padding: 0 1.5vw;
-                ">{{ item.fzrXm }}</span></span>
-          </div>
-          <div class="zdqw_mj_fj_num">
-            <span class="van-ellipsis">备注：{{ item.bz }}</span>
-            <div class="" style="font-weight: 700; line-height: 5vw">
-              <span class="zdqw_msg">民警：{{ item.pbmj.length }}人</span>
-              <span class="zdqw_msg" style="padding-left: 5vw; border-left: 1px solid #4d1717">辅警：{{ item.pbfj.length
-                }}人</span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="wzdqw_box" v-else>无重大勤务</div>
-      <div class="zbld_box">
-        <div class="zbld_item_box" v-for="item in qwData.zbList" :key="item" @click="onClickZbInfo(item.id)">
-          <img src="../../assets/images/new/jc.png" />
-          <div class="abld_detail">
-            <span>{{ item.zbldXm }}</span><br />
-            <span style="display: inline-block; width: 28vw; margin-top: 1vw" class="van-ellipsis">{{ item.ssbm
-              }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div style="height: 3vw; background: #eff0f5"></div>
-    <div class="sjkb_box">
-      <div class="jmsfjq_total_title">数据详览</div>
-      <div class="sjkb_item_box">
-        <div @click="routerPush('/yyzx/fmjq/index')" class="sjkb_item">
-          方面性警情分析
-        </div>
-        <div @click="routerPush('/jqfx', { jqlx: 'zjq' })" class="sjkb_item">
-          总警情分析
-        </div>
-        <div @click="routerPush('/jqfx', { jqlx: 'wffzjq' })" class="sjkb_item">
-          违法犯罪警情分析
-        </div>
-        <div @click="routerPush('/jqfx', { jqlx: 'jmjq' })" class="sjkb_item">
-          街面警情分析
-        </div>
-      </div>
-    </div>
-    <div style="height: 3vw; background: #eff0f5"></div>
-    <!-- <div class="jq_box topM">
-      <span class="jmsfjq_total_title" style="paddingtop: 2vw">部门动态</span>
-    </div>
-    <div class="bmdt_box">
-      <div
-        v-for="(item, index) in bmList"
-        :key="index"
-        style="text-align: center; margin-right: 1.5vw"
-        @click="bmClick(item)"
-      >
-        <img :src="item.img" alt="" class="bmdt_img" />
-        <div class="bm_item">
-          {{ item.text }}
-          <span
-            v-if="index != 0"
-            style="font-weight: 100; color: #333; margin-top: 2vw"
-            >（开发中）</span
-          >
-        </div>
-      </div>
-    </div> -->
-  </div>
-</template>
-<script setup>
-import WqtsChart from "./wqtsChart.vue";
-import { getMyTaskTotal } from "../../api/rwzx.js";
-import { getZdRyCount } from "../../api/zdry.js";
-import {
-  getYclTask,
-  getZbld,
-  getJmjlCount,
-  getZgjlCount,
-  getTbQwZbbb,
-  getTbQwXfbb,
-} from "../../api/ldjsc.js";
-import { baseUrl2 } from "../../utils/request";
-import { getDictList, setDict } from "../../utils/dict";
-import TopNav from "../../components/topNav.vue";
-import { ref, onMounted, onUnmounted, onActivated, reactive } from "vue";
-import router from "../../router";
-import axios from "axios";
-import { dateFormat } from "../../utils/tools.js";
-import { getYqList } from "../../api/common.js";
-import store from "../../store";
-import { onBeforeRouteLeave } from "vue-router";
-const { D_BZ_QWLX } = getDictList("D_BZ_QWLX");
-const userInfo = JSON.parse(window.localStorage.getItem("userInfo"));
-const myDb = reactive({
-  dcl: 0,
-  ycl: 0,
-});
-const zdgz = reactive({
-  hszdry: 0,
-});
-const qwData = reactive({
-  zgjl: 0, //在岗警力
-  jmjl: 0, //街面警力
-  zbld: {}, //值班领导
-  zbList: [], //勤务值班列表
-  xfList: [], //巡防列表
-});
-const wkList = ref([
-  {
-    text: "红色预警",
-    color: "#dd2024",
-    num: 2,
-    hb: ((2 / 22) * 100).toFixed(0),
-  },
-  {
-    text: "橙色预警",
-    color: "#fb8734",
-    num: 4,
-    hb: ((4 / 22) * 100).toFixed(0),
-  },
-  {
-    text: "黄色预警",
-    color: "#ecc617",
-    num: 6,
-    hb: ((6 / 22) * 100).toFixed(0),
-  },
-  {
-    text: "蓝色预警",
-    color: "#4399fc",
-    num: 10,
-    hb: ((10 / 22) * 100).toFixed(0),
-  },
-]);
-const bmList = ref([
-  {
-    text: "巡大",
-    num: 0,
-    img: require("../../assets/images/new/xd.png"),
-  },
-  {
-    text: "出入境管理",
-    num: 0,
-    img: require("../../assets/images/new/crjgl.png"),
-  },
-  {
-    text: "侦察署",
-    num: 0,
-    img: require("../../assets/images/new/zcs.png"),
-  },
-  {
-    text: "办公室",
-    num: 0,
-    img: require("../../assets/images/new/bgs.png"),
-  },
-  {
-    text: "指挥室",
-    num: 0,
-    img: require("../../assets/images/new/zhs.png"),
-  },
-  {
-    text: "政治处",
-    num: 0,
-    img: require("../../assets/images/new/zzc.png"),
-  },
-  {
-    text: "政经文保署",
-    num: 0,
-    img: require("../../assets/images/new/zjwbs.png"),
-  },
-  {
-    text: "治安署",
-    num: 0,
-    img: require("../../assets/images/new/zas.png"),
-  },
-  {
-    text: "法制大队",
-    num: 0,
-    img: require("../../assets/images/new/fzdd.png"),
-  },
-  {
-    text: "纪检组",
-    num: 0,
-    img: require("../../assets/images/new/jjz.png"),
-  },
-]);
-function bmClick(item) {
-  switch (item.text) {
-    case "巡大":
-      router.push("/newTwoHome/xd");
-      break;
-    default:
-      break;
-  }
-}
-const jqTotal = ref({}); //今日警情统计
-const zrjqTotal = ref(0); //昨日警情数据
-const QWLX = ref([]); //勤务类型
-//点击警情统计查看列表
-function onClickJqTotal(status) {
-  if (status === 1) {
-    router.push(`/newTwoHome/zjq`);
-  } else {
-    router.push(`/newTwoHome/jq/xzjqlist?status=${status}`);
-  }
-}
-//获取警情统计  type 是否是昨日
-function _getJqTotal(type) {
-  return new Promise((ok) => {
-    let data = {
-      orgId: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0]
-        .deptCode,
-      startTime: `${dateFormat("z")} 16:00:00`,
-      endTime: `${dateFormat()} 16:00:00`,
-      type: 1,
-      keyword: "",
-    };
-    if (type) {
-      data.startTime = `${dateFormat("z2")} 16:00:00`;
-      data.endTime = `${dateFormat("z")} 16:00:00`;
-    }
-    axios.post(`${baseUrl2}/xz1Api/api/alarm/count`, data).then((res) => {
-      if (res.data) {
-        if (type) {
-          let num =
-            res.data.data.lqCount +
-            res.data.data.qcCount +
-            res.data.data.ccCount +
-            res.data.data.pqCount +
-            res.data.data.dqscCount;
-          zrjqTotal.value = jqTotal.value.jmsfTotal - num;
-        } else {
-          jqTotal.value = res.data.data;
-          jqTotal.value.jmsfTotal =
-            res.data.data.lqCount +
-            res.data.data.qcCount +
-            res.data.data.ccCount +
-            res.data.data.pqCount +
-            res.data.data.dqscCount;
-        }
-        ok();
-      }
-    });
-  });
-}
-//查看巡防详情
-function onClickXfInfo(id) {
-  router.push({
-    path: "/yyzx/xfbb/addtsXfbb",
-    query: {
-      bbid: id,
-    },
-  });
-}
-//查看值班详情
-function onClickZbInfo(id) {
-  router.push({
-    path: "/yyzx/views/addZbbbInfo",
-    query: {
-      zt: "",
-      id: id,
-      text: "",
-      color: "",
-      flag: "",
-    },
-  });
-}
-//获取巡防列表
-function _getTbQwXfbb() {
-  let data = {
-    pageSize: 1000,
-    pageCurrent: 1,
-    qwlxs: "01,02,03,04,05",
-    ssbmid: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0]
-      .deptId,
-    bbzt: 0,
-  };
-  getTbQwXfbb(data).then((res) => {
-    if (res && res.records.length > 0) {
-      res.records.forEach((item) => {
-        if (item.pbfj) {
-          item.pbfj = JSON.parse(item.pbfj);
-        } else {
-          item.pbfj = [];
-        }
-        if (item.pbmj) {
-          item.pbmj = JSON.parse(item.pbmj);
-        } else {
-          item.pbmj = [];
-        }
-        qwData.xfList.push(item);
-      });
-    }
-  });
-}
-//获取值班列表
-function _getTbQwZbbb() {
-  let data = {
-    pageSize: 50,
-    pageCurrent: 1,
-    startTime: `${dateFormat("z")} 16:00:00`,
-    endTime: `${dateFormat()} 16:00:00`,
-    ssbmdm: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0]
-      .deptCode,
-  };
-  getTbQwZbbb(data).then((res) => {
-    if (res && res.records.length > 0) {
-      qwData.zbList = res.records;
-    }
-  });
-}
-//获取勤务数据
-function _getQwData() {
-  getZbld().then((res) => {
-    if (res) qwData.zbld = res;
-  });
-  getJmjlCount().then((res) => {
-    if (res) qwData.jmjl = res.jmjl;
-  });
-  getZgjlCount().then((res) => {
-    if (res) qwData.zgjl = res.zgjl;
-  });
-}
-function getZdgz() {
-  zdgz.hszdry = 0;
-  getZdRyCount({}).then((res) => {
-    res.forEach((v) => {
-      zdgz.hszdry += v.COUNT;
-    });
-  });
-}
-//待办任务数据
-function getMyDb() {
-  myDb.dcl = 0;
-  getMyTaskTotal({ sfzh: userInfo.idEntityCard }).then((res) => {
-    if (res) {
-      res.forEach((e) => {
-        myDb.dcl += e.count;
-      });
-    }
-  });
-  getYclTask().then((res) => {
-    myDb.ycl = res;
-  });
-}
-
-function routerPush(url, data = {}) {
-  router.push({
-    path: url,
-    query: data,
-  });
-}
-onMounted(async () => {
-  getMyDb();
-  getZdgz();
-  await _getJqTotal();
-  await _getJqTotal(true);
-  _getQwData();
-  _getTbQwZbbb();
-  _getTbQwXfbb();
-});
-</script>
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.sjkb_box {
-  @include font_size($font_medium_s);
-  font-weight: 700;
-  padding: 3vw;
-
-  .sjkb_item_box {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    margin-top: 3vw;
-
-    .sjkb_item {
-      width: 44%;
-      margin-bottom: 3vw;
-      padding: 2vw 2vw;
-      background: #ebf2fa;
-      text-align: center;
-      border-radius: 1vw;
-      color: #00347e;
-      border: 1px solid #0d4595;
-    }
-  }
-}
-
-.wddb_box {
-  @include font_size($font_medium_s);
-  background: url("../../assets/images/new/ldjsc_total.png");
-  background-size: 100% 100%;
-  margin: 3vw;
-  color: #ffffff;
-  padding: 4vw 0;
-
-  .wdrw_title {
-    text-align: center;
-    @include font_size($font_medium);
-    font-weight: 700;
-  }
-
-  .dbrw_total {
-    display: flex;
-    justify-content: space-between;
-    // padding: 2vw 3.5vw 5vw 3.5vw;
-  }
-
-  .wddb_item {
-    width: 41%;
-    border-radius: 2vw;
-    text-align: center;
-
-    .num {
-      font-size: 5vw;
-      margin-right: 1.5vw;
-      display: inline-block;
-      margin-bottom: 1vw;
-    }
-  }
-}
-
-.jq_box {
-  display: flex;
-  justify-content: space-between;
-  @include font_size($font_medium_s);
-  margin: 0 3vw 3vw 3vw;
-
-  .jmsfjq_box {
-    background: linear-gradient(0deg, #f4f8fb 35%, #e1eeff 100%);
-  }
-
-  .left_item {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-  }
-
-  .jq_item {
-    width: 46.85%;
-    border-radius: 2vw;
-    padding: 1.5vw;
-
-    .mk_jq_total_box {
-      margin: 5vw 0;
-
-      .jq_total {
-        @include font_size($font_medium);
-        display: flex;
-        justify-content: space-between;
-
-        .jq_total_unit {
-          @include font_size($font_medium_s);
-        }
-      }
-
-      .jqhb {
-        display: inline-block;
-        margin-top: 1vw;
-        color: #999;
-      }
-    }
-
-    .jq_total_item {
-      padding: 2.5vw;
-      border-radius: 2vw;
-    }
-
-    .dxzp_item {
-      background: rgba(81, 193, 242, 0.1);
-    }
-
-    .zdjqzs_total {
-      background: url("../../assets/images/new/zdjqzs.png");
-      background-size: 100%;
-    }
-
-    .jrjqzs_total {
-      background: rgba(125, 148, 248, 0.3);
-    }
-
-    .wffzzs_total {
-      background: #fae9e1;
-
-      .xz_xs_total {
-        display: flex;
-        justify-content: space-between;
-        color: #7c4e19;
-
-        .sx {
-          width: 1px;
-          background: #7c4e19;
-        }
-      }
-    }
-  }
-}
-
-.order_total {
-  margin: 3vw;
-  @include font_size($font_medium_s);
-  display: flex;
-  justify-content: space-between;
-  margin-top: 3vw;
-  color: #fff;
-
-  .total_item {
-    border-radius: 5px;
-    width: 31%;
-    padding: 2.5vw 0;
-    text-align: center;
-
-    &>span:nth-child(1) {
-      display: inline-block;
-      @include font_size($font_medium);
-      font-weight: 700;
-      margin-bottom: 1.5vw;
-    }
-  }
-}
-
-.wk_echart {
-  display: flex;
-  align-items: flex-start;
-  @include font_size($font_medium_s);
-  height: 40vw;
-  overflow: hidden;
-
-  .wk_dot {
-    display: inline-block;
-    width: 2vw;
-    height: 2vw;
-    border-radius: 50%;
-    margin-right: 2vw;
-  }
-
-  .wk_item {
-    margin: 4vw;
-  }
-}
-
-.topM {
-  padding-top: 2vw;
-}
-
-.yuqts_box {
-  display: flex;
-  justify-content: center;
-  height: 40vw;
-  overflow: auto;
-  // background: #f1f6f4;
-  // margin: 0 3vw 3vw 3vw;
-  // padding: 2.5vw;
-  padding-bottom: 5vw;
-  @include font_size($font_medium_s);
-}
-
-.bmdt_box {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  overflow-x: auto;
-  margin: 0 2.5vw 3vw 2.5vw;
-  @include font_size($font_medium_s);
-
-  .bm_item {
-    // white-space: nowrap;
-    border-radius: 10px;
-    flex-shrink: 0;
-    height: 12vw;
-    margin: 0 1vw;
-    padding: 0 5px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    font-weight: 700;
-  }
-}
-
-.qwqk_box {
-  margin: 3vw;
-  @include font_size($font_medium_s);
-
-  .title_box {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .qu_total {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 3vw;
-
-    .qu_item_total {
-      width: 31.5%;
-      text-align: center;
-      background: #f5f5f5;
-      padding: 3vw 0;
-      border-radius: 1.5vw;
-
-      &>span:nth-child(1) {
-        display: inline-block;
-        @include font_size($font_medium);
-        font-weight: 700;
-        margin-bottom: 2vw;
-      }
-    }
-  }
-
-  .zbld_box {
-    margin-top: 3vw;
-    overflow-x: auto;
-    display: flex;
-
-    .zbld_item_box {
-      border: 1px solid #eee;
-      padding: 2.5vw 3vw;
-      flex-shrink: 0;
-      width: 39vw;
-      margin-right: 2.5vw;
-      display: table;
-      border-radius: 1.5vw;
-
-      &>img {
-        position: relative;
-        top: -1vw;
-      }
-
-      .abld_detail {
-        display: inline-block;
-        margin-left: 1.7vw;
-
-        &>span:nth-child(1) {
-          @include font_size($font_medium);
-          font-weight: 700;
-        }
-      }
-    }
-  }
-
-  .zdqw_box {
-    margin-top: 3vw;
-    overflow-x: auto;
-    display: flex;
-
-    .zdqw_item_box {
-      background: #fef4f4;
-      line-height: 6vw;
-      margin-right: 3vw;
-      // padding: 2vw;
-      flex-shrink: 0;
-      display: table;
-      border-radius: 1.5vw;
-      width: 60vw;
-      overflow: hidden;
-      color: #4d1717;
-
-      .zdqw_msg {
-        display: inline-block;
-        margin-right: 5vw;
-      }
-    }
-  }
-}
-
-.wzdqw_box {
-  padding: 2.5vw;
-  text-align: center;
-  background: rgba(106, 188, 131, 0.2);
-  margin-top: 3vw;
-  border-radius: 1.5vw;
-  @include font_size($font_medium);
-  font-weight: 700;
-}
-
-.jmsfjq_total_title {
-  @include font_size($font_medium);
-  font-weight: 700;
-}
-
-.bl_img {
-  width: 2vw;
-  height: 2.5vw;
-  margin-right: 1vw;
-}
-
-.jq_num {
-  font-size: 6vw;
-  font-weight: 700;
-  margin: 2vw 0;
-}
-
-.wqts_box {
-  background: url("../../assets/images/new/wqts.png");
-  background-size: 100%;
-  padding: 2vw 0;
-}
-
-.yqts_box {
-  background: url("../../assets/images/new/yqts.png");
-  background-size: 100% 100%;
-  padding: 2vw 0;
-}
-
-.look_more {
-  font-weight: normal;
-  color: #777;
-  @include font_size($font_medium_s);
-}
-
-.zdqw_title_box {
-  background: #f5e9e9;
-  padding: 1.5vw;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.zdqw_mj_fj_num {
-  padding: 2vw;
-}
-
-.bmdt_img {
-  width: 11vw;
-  height: 11vw;
-  padding: 4vw 5.5vw;
-  background: #f5f7fd;
-  border-radius: 5px;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/newTwoHome/myZl.vue b/src/pages/newTwoHome/myZl.vue
deleted file mode 100644
index 584d69e..0000000
--- a/src/pages/newTwoHome/myZl.vue
+++ /dev/null
@@ -1,322 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav :navTitle="title" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="myzls">
-        <Search placeholder="请输入关键字" v-model="kwd" :isSx="true" @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"></Search>
-      </div>
-    </van-sticky>
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list v-model:loading="loading" :finished="finished" finished-text=" " @load="onLoad" offset="1"
-        :immediate-check="false">
-        <ZlList v-for="(item, index) in zlList.list" :key="index" :item="item"
-          :dict="{ D_BZ_ZXZTAI, D_BZ_RGZLLX, D_BZ_ZLLY, D_BZ_ZLLX }" :path="`/yyzx/zlzx/zlDetail?id=${item.zlId}`"
-          :isMyFqdzl="true">
-        </ZlList>
-        <van-empty description="暂无指令信息" image="default" v-if="showEmpty" />
-      </van-list>
-    </van-pull-refresh>
-    <SxPopup :showPopup="showPopup" :list="zlList.sxTypeList" :p_top="105" @update:close="showPopup = false"
-      @update:onConfirm="onConfirm" />
-  </div>
-</template>
-<script setup>
-import { getTrsToken } from "@/api/common";
-import Tabs from "../../components/tabs.vue";
-import TopNav from "../../components/topNav.vue";
-import Search from "../../components/search.vue";
-import ZlList from "../../components/zlList.vue";
-import SxPopup from "../../components/SxPopup.vue";
-import {
-  dateFormat,
-  setTimeQuantum,
-  setEchartTime,
-} from "../../utils/tools.js";
-import { getDictList, setDict } from "../../utils/dict";
-import { ref, onMounted, reactive, watch } from "vue";
-import { Toast } from "vant";
-import { getMyZlList, getMyCsList } from "../../api/zlzx.js";
-import { useRoute } from "vue-router";
-const { D_BZ_ZXZTAI, D_BZ_RGZLLX, D_BZ_ZLLY, D_BZ_ZLLX } = getDictList(
-  "D_BZ_ZXZTAI",
-  "D_BZ_RGZLLX",
-  "D_BZ_ZLLY",
-  "D_BZ_ZLLX"
-); //字典信息
-const userInfo = JSON.parse(window.localStorage.getItem("userInfo"));
-const kwd = ref(""); //搜索关键字
-const showPopup = ref(false); //赛选条件窗口
-const zlztIndex = ref(-1); //选中的指令状态下标
-const timeShow = ref(false); //时间选择器
-const presentTime = ref(new Date()); //当前时间
-const timeType = ref(""); //选择的时间类型
-const startTime = ref(""); //开始时间
-const endTime = ref(""); //结束时间
-const loading = ref(false);
-const loadingPull = ref(false);
-const finished = ref(false);
-const showEmpty = ref(false);
-const pageSize = ref(10);
-const pageCurrent = ref(1);
-const zllx = ref(""); // 指令类型
-const zlTypeIndex = ref(""); //选中的查询类型下标
-const total = ref(0); //
-const tabsIndex = ref(1);
-const zlList = reactive({
-  list: [], //指令列表数据
-  sxTypeList: [], //筛选项数据
-});
-const title = ref("我发起的指令");
-const type = ref("");
-watch(D_BZ_ZXZTAI, (newValue) => {
-  //设置筛选值
-  let array = [];
-  for (let i = 0; i < newValue.length; i++) {
-    array.push({
-      name: newValue[i].text,
-      key: newValue[i].dm,
-      isCheck: false,
-    });
-  }
-  zlList.sxTypeList = [
-    {
-      title: "指令进行状态",
-      isCheckBox: false,
-      array: array,
-    },
-  ];
-  zlList.sxTypeList[1] = setTimeQuantum();
-});
-onMounted(() => {
-  type.value = useRoute().query.type;
-  if (type.value == "cs") {
-    title.value = "抄送我的指令";
-  }
-  _getZlList();
-});
-//下拉刷新
-function onRefresh() {
-  zlList.list = [];
-  zlList.Sclist = [];
-  pageCurrent.value = 1;
-  zlTypeIndex.value = "";
-  kwd.value = "";
-  startTime.value = "";
-  endTime.value = "";
-  loading.value = false;
-  loadingPull.value = false;
-  finished.value = false;
-  tabsIndex.value++;
-  _getZlList();
-}
-//关键字查询
-function onSearch(e) {
-  kwd.value = e;
-  zlList.list = [];
-  zlList.Sclist = [];
-  pageCurrent.value = 1;
-  showEmpty.value = false;
-  _getZlList();
-}
-// //类型查询
-function onSelect(val) {
-  zlList.list = [];
-  zlList.Sclist = [];
-  pageCurrent.value = 1;
-  zllx.value = tabs.value[val].zllx;
-  loading.value = false;
-  loadingPull.value = false;
-  finished.value = false;
-  _getZlList();
-}
-//获取指令数据列表
-function _getZlList() {
-  loading.value = true;
-  showEmpty.value = false;
-  let data = {
-    pageSize: pageSize.value,
-    pageCurrent: pageCurrent.value,
-    zlzxzt: zlTypeIndex.value,
-    zlnr: kwd.value,
-    kssj: startTime.value,
-    jssj: endTime.value,
-    zllx: zllx.value,
-    sfcs: type.value ? 1 : 0,
-  };
-  if (type.value) {
-    getMyCsList(data).then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      total.value = res.pages;
-      if (res.records.length > 0) {
-        res.records.forEach((item) => {
-          zlList.list.push(item);
-        });
-      } else {
-        showEmpty.value = true;
-      }
-    });
-  } else {
-    getMyZlList(data).then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      total.value = res.pages;
-      if (res.records.length > 0) {
-        res.records.forEach((item) => {
-          zlList.list.push(item);
-        });
-      } else {
-        showEmpty.value = true;
-      }
-    });
-  }
-}
-
-//选中时间
-function onTimeConfirm(val) {
-  if (timeType.value == "start") {
-    startTime.value = dateFormat("", val);
-  } else {
-    endTime.value = dateFormat("", val);
-  }
-  timeShow.value = false;
-}
-
-//选中指令状态
-function onClickZlzt(index, dm) {
-  zlTypeIndex.value = dm;
-  zlztIndex.value = index;
-}
-//确认筛选条件
-function onConfirm(val) {
-  zlList.list = [];
-  zlList.Sclist = [];
-  pageCurrent.value = 1;
-  startTime.value = val.startTime;
-  endTime.value = val.endTime;
-  showEmpty.value = false;
-  zlTypeIndex.value = "";
-  for (let i = 0; i < val.list.length; i++) {
-    for (let j = 0; j < val.list[i].array.length; j++) {
-      if (val.list[i].array[j].isCheck) {
-        zlTypeIndex.value = val.list[i].array[j].key;
-        break;
-      }
-    }
-  }
-  _getZlList();
-  showPopup.value = false;
-}
-//重置筛选条件
-function onReset() {
-  startTime.value = "";
-  endTime.value = "";
-  zlztIndex.value = -1;
-}
-//触底加载
-function onLoad() {
-  if (pageCurrent.value >= total.value) {
-    finished.value = true;
-    return;
-  }
-  pageCurrent.value += 1;
-  _getZlList();
-}
-</script>
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.sticky_box {
-  @include bg_color($background-color-theme);
-
-  .tabs_box {
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-    display: flex;
-
-    .tabs_item {
-      width: 25%;
-      text-align: center;
-
-      .tabs_count {
-        margin-top: 2vw;
-      }
-    }
-  }
-}
-
-.zl_sx_box {
-  @include font_size($font_medium_s);
-  padding: 4vw 0;
-
-  .item_title {
-    padding: 0 3.5vw;
-    font-weight: 600;
-  }
-
-  .zlzt_box {
-    padding: 4vw;
-
-    .tag_item {
-      margin: 0 3vw 3vw 0;
-      padding: 1vw 3vw;
-    }
-  }
-}
-
-.but_box {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 5vw;
-}
-
-.item_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  margin: 0 3.5vw 4vw 3.5vw;
-  padding: 2vw;
-
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .ststus {
-      font-size: 10px;
-      padding: 0 10px;
-      color: #fff;
-      border-radius: 10px;
-    }
-
-    .dfk {
-      background-color: rgb(242, 199, 6);
-    }
-
-    .yfk {
-      background-color: #3e6ee8;
-    }
-
-    .ywj {
-      background-color: #4fbe0d;
-    }
-
-    .ddc {
-      background-color: orangered;
-    }
-
-    .djc {
-      background-color: orange;
-    }
-  }
-
-  >div {
-    line-height: 20px;
-  }
-
-  .title {
-    @include font_size($font_medium);
-    font-weight: bold;
-  }
-}
-</style>
diff --git a/src/pages/newTwoHome/wqtsChart.vue b/src/pages/newTwoHome/wqtsChart.vue
deleted file mode 100644
index 7c6daf5..0000000
--- a/src/pages/newTwoHome/wqtsChart.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <div id="wqts" style="width: 60vw; height: 50vw"></div>
-</template>
-
-<script setup>
-import { ref, onMounted, onUnmounted, reactive, nextTick } from "vue";
-import * as echarts from "echarts";
-
-onMounted(() => {
-  hamdlegfChart();
-});
-function hamdlegfChart() {
-  var m2R2Data = [
-    {
-      value: 2,
-      itemStyle: { color: "#dd2024" },
-    },
-    {
-      value: 4,
-      itemStyle: { color: "#fb8734" },
-    },
-    {
-      value: 6,
-      itemStyle: { color: "#ecc617" },
-    },
-    {
-      value: 10,
-      itemStyle: { color: "#4399fc" },
-    },
-  ];
-
-  if (document.getElementById("wqts")) {
-    let myechart = echarts.init(document.getElementById("wqts"));
-    myechart.setOption({
-      title: [
-        {
-          text: 22 + "",
-          subtext: "预警总数",
-          textStyle: {
-            fontSize: 16,
-            color: "#4e5486",
-          },
-          subtextStyle: {
-            fontSize: 10,
-            color: "black",
-          },
-          textAlign: "center",
-          x: "37.5%",
-          y: "26%",
-        },
-      ],
-      legend: {
-        show: false,
-      },
-      series: [
-        {
-          type: "pie",
-          center: ["40%", "38%"],
-          radius: ["40%", "65%"],
-          itemStyle: {
-            borderWidth: 3,
-            borderColor: "#fff",
-          },
-          clockwise: false, //饼图的扇区是否是顺时针排布
-          avoidLabelOverlap: false,
-          labelLine: {
-            show: false,
-          },
-          label: {
-            show: false,
-          },
-          data: m2R2Data,
-        },
-      ],
-    });
-    window.addEventListener("resize", () => {
-      myechart.resize();
-    });
-  }
-}
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/newTwoHome/xd.vue b/src/pages/newTwoHome/xd.vue
deleted file mode 100644
index 1c54c32..0000000
--- a/src/pages/newTwoHome/xd.vue
+++ /dev/null
@@ -1,269 +0,0 @@
-<template>
-  <div class="" style="padding-top: 13vw">
-    <TopNav navTitle="巡大" :showRight="false" :showLeft="true" />
-    <div class="jq_box topM">
-      <span class="jmsfjq_total_title">街面六类</span>
-    </div>
-    <div class="jq_box">
-      <div class="jq_item left_item" style="padding: 0">
-        <div class="jrjqzs_total jq_total_item" @click="onClickJqTotal(1)">
-          <span class="jmsfjq_total_title">抢夺</span>
-          <div style="margin: 1vw 0">
-            <span class="jq_num">{{ jqTotal.lqCount }} </span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">较昨日<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.lqUp > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.lqCount > 0 ? 'red' : 'green'">
-                  {{ jqTotal.lqUp > 0 ? "+" + jqTotal.lqUp : jqTotal.lqUp }}%</span>
-              </span>
-            </span>
-          </div>
-        </div>
-        <div class="jrjqzs_total jq_total_item" @click="onClickJqTotal(2)">
-          <span class="jmsfjq_total_title">抢劫</span>
-          <div style="margin: 1vw 0 0 0">
-            <span class="red jq_num">{{ jqTotal.lqCount }}</span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">
-              较昨日<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.lqUp > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.lqCount > 0 ? 'red' : 'green'">
-                  {{ jqTotal.lqUp > 0 ? "+" + jqTotal.lqUp : jqTotal.lqUp }}%</span></span>
-            </span>
-          </div>
-        </div>
-        <!-- zdjqzs_total jq_total_item wffzzs_total jq_total_item-->
-        <div class="zdjqzs_total jq_total_item" @click="onClickJqTotal(3)">
-          <span class="jmsfjq_total_title">盗窃汽车</span>
-          <div style="margin: 1vw 0">
-            <span class="jq_num">{{ jqTotal.qcCount }}</span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">
-              较昨日<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.qcUp > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.qcUp > 0 ? 'red' : 'green'">
-                  {{ jqTotal.qcUp > 0 ? "+" + jqTotal.qcUp : jqTotal.qcUp }}%</span></span>
-            </span>
-          </div>
-          <!-- <div class="xz_xs_total">
-            <span>刑事 {{ jqTotal.xsCount }} </span>
-            <span class="sx"></span>
-            <span>行政 {{ jqTotal.xzCount }}</span>
-          </div> -->
-        </div>
-        <div class="zdjqzs_total jq_total_item" @click="onClickJqTotal(1)">
-          <span class="jmsfjq_total_title">盗窃车内财物</span>
-          <div style="margin: 1vw 0">
-            <span class="jq_num">{{ jqTotal.ccCount }} </span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">较昨日<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.ccUp > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.ccUp > 0 ? 'red' : 'green'">
-                  {{ jqTotal.ccUp > 0 ? "+" + jqTotal.ccUp : jqTotal.ccUp }}%</span>
-              </span>
-            </span>
-          </div>
-        </div>
-        <div class="wffzzs_total jq_total_item" @click="onClickJqTotal(2)">
-          <span class="jmsfjq_total_title">扒窃</span>
-          <div style="margin: 1vw 0 0 0">
-            <span class="red jq_num">{{ jqTotal.pqCount }}</span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">
-              较昨日<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.pqUp > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.pqUp > 0 ? 'red' : 'green'">
-                  {{ jqTotal.pqUp > 0 ? "+" + jqTotal.pqUp : jqTotal.pqUp }}%</span></span>
-            </span>
-          </div>
-        </div>
-        <div class="wffzzs_total jq_total_item" @click="onClickJqTotal(3)">
-          <span class="jmsfjq_total_title">盗窃三车</span>
-          <div style="margin: 1vw 0">
-            <span class="jq_num">{{ jqTotal.dqscCount }}</span>
-            件
-            <span style="display: inline-block; margin-left: 6vw">
-              较昨日<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="jqTotal.dqscUp > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="jqTotal.dqscUp > 0 ? 'red' : 'green'">
-                  {{ jqTotal.dqscUp > 0 ? "+" + jqTotal.dqscUp : jqTotal.dqscUp }}%</span></span>
-            </span>
-          </div>
-          <!-- <div class="xz_xs_total">
-            <span>刑事 {{ jqTotal.xsCount }} </span>
-            <span class="sx"></span>
-            <span>行政 {{ jqTotal.xzCount }}</span>
-          </div> -->
-        </div>
-      </div>
-    </div>
-
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../components/topNav.vue";
-import { ref, onMounted, onUnmounted, onActivated, reactive } from "vue";
-import { dateFormat } from "../../utils/tools.js";
-import { baseUrl2 } from "../../utils/request";
-import router from "../../router";
-import axios from "axios";
-const jqTotal = ref({}); //今日警情统计
-const zrjqTotal = ref(0); //昨日警情数据
-const QWLX = ref([]); //勤务类型
-onMounted(() => {
-  _getJqTotal();
-  _getJqTotal(true);
-});
-//点击警情统计查看列表
-function onClickJqTotal(status) {
-  router.push(`/newTwoHome/jq/xzjqlist?status=${status}`);
-}
-//获取警情统计  type 是否是昨日
-function _getJqTotal(type) {
-  let data = {
-    orgId: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0]
-      .deptCode,
-    startTime: `${dateFormat("z")} 16:00:00`,
-    endTime: `${dateFormat()} 16:00:00`,
-    type: 1,
-    keyword: "",
-  };
-  if (type) {
-    data.startTime = `${dateFormat("z2")} 16:00:00`;
-    data.endTime = `${dateFormat("z")} 16:00:00`;
-  }
-  axios.post(`${baseUrl2}/xz1Api/api/alarm/count`, data).then((res) => {
-    if (res.data) {
-      if (type) {
-        let num =
-          res.data.data.lqCount +
-          res.data.data.qcCount +
-          res.data.data.ccCount +
-          res.data.data.pqCount +
-          res.data.data.dqscCount;
-        zrjqTotal.value = jqTotal.value.jmsfTotal - num;
-      } else {
-        jqTotal.value = res.data.data;
-        jqTotal.value.jmsfTotal =
-          res.data.data.lqCount +
-          res.data.data.qcCount +
-          res.data.data.ccCount +
-          res.data.data.pqCount +
-          res.data.data.dqscCount;
-      }
-    }
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.jq_box {
-  display: flex;
-  justify-content: space-between;
-  @include font_size($font_medium_s);
-  margin: 0 3vw 3vw 3vw;
-
-  .jmsfjq_box {
-    background: linear-gradient(0deg, #f4f8fb 35%, #e1eeff 100%);
-  }
-
-  .left_item {
-    display: flex;
-    // flex-direction: column;
-    justify-content: space-between;
-  }
-
-  .jq_item {
-    // flex-shrink: 0;
-    flex-wrap: wrap;
-    border-radius: 2vw;
-    padding: 1.5vw;
-
-    .mk_jq_total_box {
-      margin: 5vw 0;
-
-      .jq_total {
-        @include font_size($font_medium);
-        display: flex;
-        justify-content: space-between;
-
-        .jq_total_unit {
-          @include font_size($font_medium_s);
-        }
-      }
-
-      .jqhb {
-        display: inline-block;
-        margin-top: 1vw;
-        color: #999;
-      }
-    }
-
-    .jq_total_item {
-      width: 37vw;
-      padding: 2.5vw;
-      border-radius: 2vw;
-      margin: 2vw;
-    }
-
-    .dxzp_item {
-      background: rgba(81, 193, 242, 0.1);
-    }
-
-    .zdjqzs_total {
-      background: url("../../assets/images/new/zdjqzs.png");
-      background-size: 100%;
-    }
-
-    .jrjqzs_total {
-      background: #7d9ef8;
-    }
-
-    .wffzzs_total {
-      background: #fae9e1;
-
-      .xz_xs_total {
-        display: flex;
-        justify-content: space-between;
-        color: #7c4e19;
-
-        .sx {
-          width: 1px;
-          background: #7c4e19;
-        }
-      }
-    }
-  }
-}
-
-.topM {
-  padding-top: 2vw;
-}
-
-.bl_img {
-  width: 2vw;
-  height: 2.5vw;
-  margin-right: 1vw;
-}
-
-.jq_num {
-  font-size: 6vw;
-  font-weight: 700;
-  margin: 2vw 0;
-}
-</style>
diff --git a/src/pages/newTwoHome/yclList.vue b/src/pages/newTwoHome/yclList.vue
deleted file mode 100644
index 2e4d633..0000000
--- a/src/pages/newTwoHome/yclList.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <div style="padding-top: 14vw">
-    <TopNav navTitle="已处理任务" :showRight="false" :showLeft="true" />
-    <div class="rw_list_box" v-for="item in list" :key="item.id">
-      <SwiperCell :item="item" :dict="{ D_BZ_GRRWZT }"></SwiperCell>
-    </div>
-    <van-empty description="暂无信息" image="default" v-if="showEmpty" />
-  </div>
-</template>
-
-<script setup>
-import SwiperCell from "../../components/swiperCell.vue";
-import TopNav from "../../components/topNav.vue";
-import { getYclTaskList } from "../../api/ldjsc.js";
-import { onMounted, ref } from "vue";
-import { getDictList } from "../../utils/dict";
-const { D_BZ_GRRWZT } = getDictList("D_BZ_GRRWZT");
-const list = ref([]);
-const showEmpty = ref(false);
-const queryLsit = ref({
-  pageCurrent: 1,
-  pageSize: 20,
-});
-function getList() {
-  getYclTaskList(queryLsit.value)
-    .then((res) => {
-      if (res && res.records.length > 0) {
-        list.value = res.records;
-      } else {
-        showEmpty.value = true;
-      }
-    })
-    .catch((err) => {
-      showEmpty.value = true;
-    });
-}
-onMounted(() => {
-  getList();
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-.rw_list_box {
-  padding: 3vw 0;
-  margin: 0 3vw;
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  @include item_bottom_color($bottom-border-top-clore-theme);
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/newTwoHome/zbbbList.vue b/src/pages/newTwoHome/zbbbList.vue
deleted file mode 100644
index 120c2c2..0000000
--- a/src/pages/newTwoHome/zbbbList.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div style="padding-top: 14vw">
-    <TopNav navTitle="值班情况" :showRight="false" :showLeft="true" />
-    <div class="list_item" v-for="(item,index) in list" :key="index+'zbqk'">
-        <span>{{item.ssbmmc}}</span>
-        <span>{{setDict(item.type,dict)}}</span>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../components/topNav.vue";
-import { getBbListByDept } from "../../api/ldjsc.js";
-import { setDict } from "../../utils/dict";
-import { onMounted, ref } from "vue";
-import { Toast } from "vant";
-const dict = [
-    {text:'未排班',value:'wpb'},
-    {text:'已报备',value:'ybb'},
-    {text:'未报备',value:'wbb'}
-]
-const list = ref([]);
-function getList() {
-    Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  getBbListByDept().then((res) => {
-    list.value = res;
-    Toast.clear();
-  });
-}
-onMounted(() => {
-  getList();
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-.list_item{
-    width: 95vw;
-    margin: 2vw auto;
-    background: rgb(240, 242, 246);
-    @include font_size($font_medium_s);
-    padding: 6px 10px;
-    display: flex;
-    box-sizing: border-box;
-    color: #333;
-    justify-content: space-between;
-    >span:nth-child(1){
-        flex: 1;
-    }
-    >span:nth-child(2){
-        width: 15vw;
-        text-align: right;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/newTwoHome/zjq.vue b/src/pages/newTwoHome/zjq.vue
deleted file mode 100644
index b0854ad..0000000
--- a/src/pages/newTwoHome/zjq.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-<template>
-  <div class="" style="padding-top: 13vw">
-    <TopNav navTitle="总警情分类" :showRight="false" :showLeft="true" />
-    <div class="jq_box">
-      <div class="jq_item left_item" style="padding: 0">
-        <div class="jq_total_item" v-for="(item, index) in Tabslist" :class="index == 0 || index == 1 ? 'jrjqzs_total' :
-          index == 2 || index == 3 ? 'zdjqzs_total' : 'wffzzs_total'" :key="index"
-          @click="onClickJqTotal(item.type)">
-          <span class="jmsfjq_total_title">{{ item.name }}</span>
-          <div style="margin: 1vw 0">
-            <span class="jq_num">{{ item.count }} </span>件
-            <span style="display: inline-block; margin-left: 6vw">环比<br />
-              <span style="display: inline-block; margin-top: 1vw">
-                <img src="../../assets/images/leader/arrow-up@2x.png" class="bl_img" v-if="item.hb > 0" />
-                <img src="../../assets/images/leader/arrow-down@2x.png" class="bl_img" v-else />
-                <span :class="item.hb > 0 ? 'red' : 'green1'">{{ item.hb }}%</span>
-              </span>
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-</script>
-<script setup>
-import TopNav from "../../components/topNav.vue";
-import { ref, onMounted, onUnmounted, onActivated, reactive } from "vue";
-import { dateFormat } from "../../utils/tools.js";
-import { baseUrl2 } from "../../utils/request";
-import router from "../../router";
-import axios from "axios";
-import { onBeforeRouteLeave } from "vue-router";
-const jqTotal = ref({}); //今日警情统计
-const zrjqTotal = ref(0); //昨日警情数据
-const QWLX = ref([]); //勤务类型
-const Tabslist = ref([
-  { name: "刑事", count: 0, hb: 0, type: 5 },//4
-  { name: "行政", count: 0, hb: 0, type: 4 },//3
-  { name: "纠纷", count: 0, hb: 0, type: 13 },//12
-  { name: "求助", count: 0, hb: 0, type: 14 },//13
-  { name: "其他", count: 0, hb: 0, type: 15 },//14
-])
-onMounted(() => {
-  getCount()//// 获取统计
-  _getJqTotal();
-  _getJqTotal(true);
-});
-
-// 获取统计
-function getCount() {
-  let data = {
-    orgId: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0].deptCode,
-    startTime: `${dateFormat("z")} 16:00:00`,
-    endTime: `${dateFormat()} 16:00:00`,
-    type: 1,
-    keyword: "",
-  };
-  axios.post(`${baseUrl2}/xz1Api/api/alarm/count`, data).then((res) => {
-    if (res.data) {
-      Tabslist.value[0].count = res.data.data.xsCount //刑事
-      Tabslist.value[0].hb = res.data.data.xsHb //刑事环比
-      Tabslist.value[1].count = res.data.data.xzCount //行政
-      Tabslist.value[1].hb = res.data.data.xzHb //行政环比
-      Tabslist.value[2].count = res.data.data.jfCount //纠纷
-      Tabslist.value[2].hb = res.data.data.jfHb //纠纷环比
-      Tabslist.value[3].count = res.data.data.qzCount //求助
-      Tabslist.value[3].hb = res.data.data.qcHb //求助环比
-      Tabslist.value[4].count = res.data.data.qtCount //其他
-      Tabslist.value[4].hb = res.data.data.qtHb //其他环比
-    }
-  });
-}
-
-//点击警情统计查看列表
-function onClickJqTotal(status) {
-  router.push(`/newTwoHome/jq/xzjqlist?status=${status}`);
-}
-//获取警情统计  type 是否是昨日
-function _getJqTotal(type) {
-  let data = {
-    orgId: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0]
-      .deptCode,
-    startTime: `${dateFormat("z")} 16:00:00`,
-    endTime: `${dateFormat()} 16:00:00`,
-    type: 1,
-    keyword: "",
-  };
-  if (type) {
-    data.startTime = `${dateFormat("z2")} 16:00:00`;
-    data.endTime = `${dateFormat("z")} 16:00:00`;
-  }
-  axios.post(`${baseUrl2}/xz1Api/api/alarm/count`, data).then((res) => {
-    if (res.data) {
-      if (type) {
-        let num =
-          res.data.data.lqCount +
-          res.data.data.qcCount +
-          res.data.data.ccCount +
-          res.data.data.pqCount +
-          res.data.data.dqscCount;
-        zrjqTotal.value = jqTotal.value.jmsfTotal - num;
-      } else {
-        jqTotal.value = res.data.data;
-        jqTotal.value.jmsfTotal =
-          res.data.data.lqCount +
-          res.data.data.qcCount +
-          res.data.data.ccCount +
-          res.data.data.pqCount +
-          res.data.data.dqscCount;
-      }
-    }
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.jq_box {
-  display: flex;
-  justify-content: space-between;
-  @include font_size($font_medium_s);
-  margin: 0 3vw 3vw 3vw;
-
-  .jmsfjq_box {
-    background: linear-gradient(0deg, #f4f8fb 35%, #e1eeff 100%);
-  }
-
-  .left_item {
-    display: flex;
-    // flex-direction: column;
-    justify-content: space-between;
-  }
-
-  .jq_item {
-    // flex-shrink: 0;
-    flex-wrap: wrap;
-    border-radius: 2vw;
-    padding: 1.5vw;
-
-    .mk_jq_total_box {
-      margin: 5vw 0;
-
-      .jq_total {
-        @include font_size($font_medium);
-        display: flex;
-        justify-content: space-between;
-
-        .jq_total_unit {
-          @include font_size($font_medium_s);
-        }
-      }
-
-      .jqhb {
-        display: inline-block;
-        margin-top: 1vw;
-        color: #999;
-      }
-    }
-
-    .jq_total_item {
-      width: 37vw;
-      padding: 2.5vw;
-      border-radius: 2vw;
-      margin: 2vw;
-    }
-
-    .dxzp_item {
-      background: rgba(81, 193, 242, 0.1);
-    }
-
-    .zdjqzs_total {
-      background: url("../../assets/images/new/zdjqzs.png");
-      background-size: 100%;
-    }
-
-    .jrjqzs_total {
-      background: #7d9ef8;
-    }
-
-    .wffzzs_total {
-      background: #fae9e1;
-
-      .xz_xs_total {
-        display: flex;
-        justify-content: space-between;
-        color: #7c4e19;
-
-        .sx {
-          width: 1px;
-          background: #7c4e19;
-        }
-      }
-    }
-  }
-}
-
-.topM {
-  padding-top: 2vw;
-}
-
-.bl_img {
-  width: 2vw;
-  height: 2.5vw;
-  margin-right: 1vw;
-}
-
-.jq_num {
-  font-size: 6vw;
-  font-weight: 700;
-  margin: 2vw 0;
-}
-
-.green1 {
-  color: #57fc48;
-}
-</style>
diff --git a/src/pages/patrolList/copmonents/patrolWrapper.vue b/src/pages/patrolList/copmonents/patrolWrapper.vue
deleted file mode 100644
index af6cd63..0000000
--- a/src/pages/patrolList/copmonents/patrolWrapper.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<script setup>
-const props = defineProps({
-  list: {
-    type: Array,
-    required: true,
-    default: () => []
-  }
-})
-
-const emits = defineEmits(["click"]);
-
-const handleClockInPage = (item) => {
-  emits("click", item);
-}
-</script>
-
-<template>
-  <div class="item-wrapper">
-    <template v-for="(item, index) in list" :key="index">
-      <div class="item" @click="handleClockInPage(item)">
-        <div class="rowWrapper">
-          <div class="title">{{ item?.fgMc }}</div>
-          <div class="progress">{{ item?.bddAllProgress || 0 }}%</div>
-        </div>
-
-        <div class="rowWrapper mt co99 fz12">
-          <div>预警等级：{{ item?.fgYjdjLabel }}</div>
-          <div>任务日期：{{ item?.rwRq }}</div>
-        </div>
-        <div class="rowWrapper mt co99 fz12">
-          <div>高发类型：{{ item?.fgJqtjLx }}</div>
-        </div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.item-wrapper {
-  margin: 2vw;
-
-  .item {
-    padding: 2vw;
-    border-top: 0.13333vw solid #f4f5f1;
-
-    .rowWrapper {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .title {
-        font-size: 14px;
-      }
-
-      .progress {
-        font-weight: 400;
-        font-size: 3.73vw;
-        color: #3E6EE8;
-      }
-    }
-
-    .fz12 {
-      font-size: 3.2vw;
-    }
-
-    .co99 {
-      color: #999999;
-    }
-
-    .mt {
-      margin-top: 2vw;
-    }
-  }
-}
-</style>
diff --git a/src/pages/patrolList/index.vue b/src/pages/patrolList/index.vue
deleted file mode 100644
index 0d3bd69..0000000
--- a/src/pages/patrolList/index.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<script setup>
-import { ref, reactive, onMounted } from "vue";
-import TopNav from "@/components/topNav.vue";
-import Tabs from "@/components/tabs.vue";
-import Search from "@/components/search.vue";
-import PatrolWrapper from "@/pages/patrolList/copmonents/patrolWrapper.vue";
-import {fetchPatrolList} from "@/api/patrolList";
-import {getDictListByCode} from "@/api/common";
-import router from "@/router";
-import SxPopup from "@/components/SxPopup.vue";
-import SelectTime from "@/components/SelectTime.vue";
-const tabsIndex = ref(1);
-const showPopup = ref(false);
-const timeShow = ref(false);
-const finished = ref(false);
-const loading = ref(false);
-const rwlx=ref('1')
-const loadingRefresh = ref(false);
-const searchValue = ref("")
-const tabs = ref([
-  {
-    name: "警情任务",
-    value: "1",
-  },
-  {
-    name: "自定义任务",
-    value: "2",
-  },
-]);
-const pageData = reactive({
-  pageSize: 10,
-  pageCurrent: 1,
-  total: 0,
-})
-
-const data = reactive({
-  list: [],
-  dictList: [],
-  startTime: ''
-})
-
-const onSearch = () => {
-  loading.value = true;
-  pageData.pageCurrent = 1;
-  data.list = []
-  getData()
-}
-
-const onRefresh = () => {
-  tabsIndex.value++;
-  loading.value = false;
-  loadingRefresh.value = true;
-  finished.value = false;
-  pageData.pageCurrent = 1;
-  data.list = []
-  getData()
-}
-
-const onLoad = () => {
-  if (data.list.length >= pageData?.total) {
-    finished.value = true;
-    return
-  }
-
-  pageData.pageCurrent++
-  getData()
-}
-
-const handleClockInPage = (item) => {
-  router.push({ path: '/clockInPage', query: { id: item.id, current: pageData.pageCurrent } });
-}
-
-const parseAndJoinLx = (jsonString, type = 'lx') => {
-  if (!jsonString) return '';
-
-  try {
-    let data = jsonString;
-    // 如果是字符串，尝试解析为JSON
-    if (typeof jsonString === 'string') {
-      data = JSON.parse(jsonString);
-    }
-
-    // 处理数组情况
-    if (Array.isArray(data)) {
-      return data.map(item => item?.[type]).filter(Boolean).join(",");
-    }
-    // 处理对象情况
-    if (typeof data === 'object' && data !== null) {
-      return data?.[type] || '';
-    }
-    return '';
-
-  } catch (error) {
-    console.warn('数据处理失败:', error);
-    return '';
-  }
-};
-
-const getData = async () => {
-  const { total, ...ret }  = pageData
-  loading.value = true;
-  try {
-    const res = await fetchPatrolList({ ...ret, fgMc: searchValue.value, rwRq: data.startTime,rwlx:rwlx.value })
-    if (res?.records.length > 0) {
-      data.list = data.list.concat(res?.records)?.map((item) => ({
-        ...item,
-        fgJqtjLx: parseAndJoinLx(item?.fgJqtjLx, 'lx'),
-        fgYjdjLabel: data.dictList?.find(i => i.dm === item.fgYjdj)?.zdmc || item.fgYjdj
-      })) || []
-
-      pageData.total = res?.total
-      loading.value = false;
-
-    }
-    loadingRefresh.value = false;
-
-  } catch (error) {
-    loading.value = false;
-    loadingRefresh.value = false;
-  }
-}
-
-const getDictList = async () => {
-  const res = await getDictListByCode({ dictCode: 'D_ZDXL_FGXLRW_YJDJ' })
-  if (res && res?.itemList?.length > 0) {
-    data.dictList = res?.itemList
-  }
-}
-//按类型查询
-function onSelect(val) {
-  data.list = [];
-  pageData.pageCurrent = 1;
-  switch (val) {
-    case 0:
-      rwlx.value="1"
-      break;
-    default:
-      rwlx.value="2"
-      break;
-  }
-  getData();
-  finished.value = false;
-}
-const onSelectTime = (val) => {
-  data.startTime = val;
-  timeShow.value = false
-}
-
-const onClickTime = () => {
-  timeShow.value = true;
-}
-
-const onConfirm = () => {
-  pageData.pageCurrent = 1;
-  data.list = []
-  getData()
-  showPopup.value = false;
-}
-
-const handleReset = () => {
-  data.startTime = ""
-  onConfirm()
-}
-
-
-onMounted(async () => {
-  await getDictList()
-  await getData()
-})
-</script>
-
-<template>
-  <div>
-    <TopNav nav-title="巡逻列表" show-left />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs :list="tabs" @onYjjb="onSelect" :type="'car'" :key="tabsIndex"></Tabs>
-        <search
-          :isSx="true"
-          placeholder="请输入方格名称进行查询"
-          v-model="searchValue"
-          @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"
-        />
-      </div>
-    </van-sticky>
-
-    <sx-popup :showPopup="showPopup" :p_top="110" @update:close="showPopup = false"
-              @update:onConfirm="onConfirm" @reset="handleReset">
-      <div class="time_box">
-        <van-field
-          v-model="data.startTime"
-          label-width="60px"
-          placeholder="请选择时间"
-          input-align="left"
-          right-icon="arrow-down"
-          readonly
-          @click.stop="onClickTime"
-        />
-      </div>
-    </sx-popup>
-
-    <select-time v-if="timeShow" time-type="选择任务日期" @update:time="onSelectTime" @update:cancelTime="timeShow = false" />
-
-    <div class="content">
-      <van-pull-refresh v-model="loadingRefresh" @refresh="onRefresh">
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="onLoad" offset="1" :immediate-check="false">
-          <patrol-wrapper :list="data?.list" @click="handleClockInPage" />
-
-          <van-empty description="暂无采集数据" image="default" v-if="data.list.length <= 0 && loadingRefresh === false" />
-        </van-list>
-      </van-pull-refresh>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.time_box {
-  padding: 0 3vw 3vw;
-}
-
-.header {
-  margin-top: 13vw;
-}
-
-.content {
-  margin-bottom: 16vw;
-}
-</style>
diff --git a/src/pages/rw/index.vue b/src/pages/rw/index.vue
deleted file mode 100644
index 8466a54..0000000
--- a/src/pages/rw/index.vue
+++ /dev/null
@@ -1,360 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="待办" :showRight="false" :showLeft="false" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs :list="tabs" @onYjjb="onSelect" :type="'car'" :checked="tabsKey" :key="tabsIndex"></Tabs>
-        <Search v-model="kwd" :isSx="true" @update:sx="showPopup = !showPopup" placeholder="请输入关键字"
-          @update:modelValue="onClickSearch"></Search>
-      </div>
-    </van-sticky>
-    <SxPopup :showPopup="showPopup" :list="queryData.sxList" :p_top="145" @update:close="showPopup = false"
-      @update:onConfirm="onConfirm" />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list :finished="finished" finished-text=" " @load="onLoad" offset="1" :immediate-check="false">
-        <div class="rw_list_box" v-for="item in rwObj.rwList" :key="item.id" @click="
-          onLookRw(
-            item.id,
-            item.rwxl,
-            item.rwlx,
-            item.ywid,
-            item.rwzt,
-            item.grrwzt,
-            item.rwid
-          )
-          ">
-          <SwiperCell :item="item" @click:Transmit="onClickTransmit" @click:onDown="onClickDown"
-            :dict="{ D_BZ_GRRWZT }"></SwiperCell>
-        </div>
-      </van-list>
-      <van-loading style="text-align: center" v-if="listLoading">加载中...</van-loading>
-      <van-empty description="暂无任务信息" v-if="showEmpty" />
-    </van-pull-refresh>
-    <!-- 底部tas -->
-    <BottomTabs type="rw" />
-    <div style="height: 15.8666vw"></div>
-    <!-- 转发人数据 -->
-    <van-popup v-model:show="showfzrPicker" position="bottom">
-      <van-search v-model="list.phone" placeholder="请输入电话号码" @update:model-value="getLdList()" />
-      <van-picker :columns="list.fzrList" @confirm="onfzrConfirm" @cancel="showfzrPicker = false"
-        :columns-field-names="customfzrFieldNamed" />
-    </van-popup>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "rw",
-};
-</script>
-<script setup>
-import { ref, onMounted, reactive, watch } from "vue";
-import SxPopup from "../../components/SxPopup.vue";
-import SwiperCell from "../../components/swiperCell.vue";
-import Tabs from "../../components/tabs.vue";
-import BottomTabs from "../../components/bottomTabs.vue";
-import TopNav from "../../components/topNav.vue";
-import { getMyTaskList, getMyTaskTotal, upGrzt } from "../../api/rwzx.js";
-import router from "../../router/index.js";
-import { sysUser } from "../../api/patrolBasicInfo.js";
-import { Dialog } from "vant";
-import { setTimeQuantum } from "../../utils/tools";
-import Search from "../../components/search.vue";
-import { transmitTask } from "../../api/yyzxApi.js";
-import { getDictList, setDict } from "../../utils/dict";
-import { useRoute, onBeforeRouteLeave } from "vue-router";
-
-const { D_BZ_GRRWZT, D_BZ_RWXL } = getDictList("D_BZ_GRRWZT", "D_BZ_RWXL"); //字典信息
-const showfzrPicker = ref(false); //是否显示转发人弹窗
-const showPopup = ref(false);
-//搜索配置
-const queryData = reactive({
-  sxList: [setTimeQuantum()],
-});
-const list = reactive({
-  phone: "", //转发人手机号
-  fzrList: [], //转发人数据
-});
-const tabsIndex = ref(1);
-//指定picker选择器字段
-const customfzrFieldNamed = {
-  text: "userName",
-};
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    value: "all",
-  },
-]);
-watch(
-  () => D_BZ_RWXL.value,
-  () => {
-    tabs.value.push(
-      ...D_BZ_RWXL.value.map((item) => {
-        return {
-          name: item.text,
-          count: 0,
-          value: item.value,
-        };
-      })
-    );
-    _getMyTaskTotal();
-  },
-  {
-    deep: true,
-  }
-);
-const themeType = ref(getStorage("themeSetting"));
-const active = ref(1);
-const kwd = ref(""); //搜索关键字
-const pageSize = ref(10);
-const pageCurrent = ref(1);
-const tabsKey = ref(0);
-const userInfo = JSON.parse(window.localStorage.getItem("userInfo"));
-const rwObj = reactive({
-  rwList: [], //任务数据
-  rwTotal: {}, //任务统计
-});
-const rwjxzt = ref(""); //查询类型
-const listLoading = ref(false);
-const loadingPull = ref(false);
-const finished = ref(false);
-const total = ref(0);
-const rwId = ref(""); //操作的任务ID
-const showEmpty = ref(false);
-
-//搜索框背景颜色
-const searchBack = ref({});
-onMounted(() => {
-  if (useRoute().query.tabsType) {
-    tabsKey.value = useRoute().query.tabsType;
-
-    rwjxzt.value = "05";
-  }
-  // rwjxzt.value
-  _getMyTaskList();
-  // _getMyTaskTotal();
-  getLdList();
-});
-//下拉刷新
-function onRefresh() {
-  tabs.value[0].count = 0;
-  rwObj.rwList = [];
-  pageCurrent.value = 1;
-  kwd.value = "";
-  tabsIndex.value++;
-  finished.value = false;
-  _getMyTaskList();
-  _getMyTaskTotal();
-}
-//判断任务是暂停和关闭
-function _setRwNotify(rwzt) {
-  if (rwzt == 1) {
-    hintToast("任务已关闭！！！");
-    return false;
-  }
-  if (rwzt == 2) {
-    hintToast("任务已暂停！！！");
-    return false;
-  }
-  return true;
-}
-//点击转发按钮打开人员选择器
-function onClickTransmit(val) {
-  if (!_setRwNotify(val.rwzt)) {
-    return;
-  }
-  rwId.value = val.id;
-  showfzrPicker.value = true;
-}
-//驳回任务
-function onClickDown(val) {
-  if (!_setRwNotify(val.rwzt)) {
-    return;
-  }
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认驳回该条任务信息！",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    _setTransmitTask(rwId.value, 4);
-  });
-}
-//确认转发任务
-function onfzrConfirm(val) {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认转发任务!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    _setTransmitTask(rwId.value, 3, val.id);
-  });
-}
-/**
- * 设置任务状态
- * @export
- * @param {*} rwid
- * @param {*} rwzt 1 进行中  2 已完成  3 已转发  4 已驳回
- * @param {*} zfjsrid 转发人ID
- */
-function _setTransmitTask(rwid, rwzt, zfjsrid) {
-  let data = { rwid, rwzt, zfjsrid };
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    data.jd = location.app_x;
-    data.wd = location.app_y;
-  } catch (error) { }
-  transmitTask(data).then((res) => {
-    showfzrPicker.value = false;
-    if (rwzt != 1) {
-      hintToast("成功");
-    }
-    _getMyTaskList();
-  });
-}
-// 查询转发人数据
-function getLdList() {
-  sysUser({
-    current: 1,
-    size: 50,
-    phone: list.phone,
-  }).then((res) => {
-    list.fzrList = res.records;
-  });
-}
-//查看任务详情
-function onLookRw(id, rwxl, rwlx, ywid, rwzt, grrwzt, rwid) {
-  if (!_setRwNotify(rwzt)) {
-    return;
-  }
-  if (grrwzt === "0") {
-    upGrzt({ rwid: rwid, rwzt: "1" });
-  }
-  //通知任务
-  if (rwlx == 1) {
-    router.push(`/rw/views/rwDetail?id=${rwid}`);
-    return;
-  }
-  //值班任务
-  if (rwxl == "04") {
-    router.push("/yyzx/views/addZbbb");
-    return;
-  }
-  //巡防任务
-  if (rwxl == "03") {
-    router.push("/yyzx/xfbb/addXfbb");
-    return;
-  }
-  //指令任务
-  if (rwxl == "05") {
-    router.push(`/yyzx/zlzx/zlDetail?id=${ywid}`);
-    return;
-  }
-  //实有人口任务
-  if (rwxl == "01") {
-    router.push(`/rw/views/syrkRwDetail?id=${rwid}`);
-    return;
-  }
-}
-function onConfirm(val) {
-  rwObj.rwList = [];
-  timeObj.kssj = val.startTime;
-  timeObj.jssj = val.endTime;
-  _getMyTaskList();
-  showPopup.value = false;
-}
-//关键字搜索
-function onClickSearch(e) {
-  rwObj.rwList = [];
-  pageCurrent.value = 1;
-  _getMyTaskList();
-}
-//按类型查询
-function onSelect(val) {
-  rwObj.rwList = [];
-  pageCurrent.value = 1;
-  switch (val) {
-    case 0:
-      rwjxzt.value = "";
-      break;
-    default:
-      rwjxzt.value = tabs.value[val].value;
-      break;
-  }
-  _getMyTaskList();
-}
-//获取任务统计
-function _getMyTaskTotal() {
-  getMyTaskTotal({ sfzh: userInfo.idEntityCard }).then((res) => {
-    if (res) {
-      res.forEach((e) => {
-        tabs.value[0].count += e.count;
-      });
-      tabs.value.forEach((v) => {
-        const tjarr = res.filter((item) => item.rwxl === v.value);
-        if (tjarr.length > 0) {
-          v.count = tjarr[0].count;
-        }
-      });
-    }
-  });
-}
-//触底加载
-function onLoad() {
-  if (pageCurrent.value >= total.value) {
-    finished.value = true;
-    return;
-  }
-  pageCurrent.value += 1;
-  _getMyTaskList();
-}
-const timeObj = reactive({
-  kssj: "",
-  jssj: "",
-});
-//获取任务列表
-function _getMyTaskList() {
-  listLoading.value = true;
-  showEmpty.value = false;
-  let data = {
-    pageSize: pageSize.value,
-    pageCurrent: pageCurrent.value,
-    jsrsfzh: userInfo.idEntityCard,
-    rwnr: kwd.value,
-    // grrwzt: rwjxzt.value,
-    rwxl: rwjxzt.value,
-    kssj: timeObj.kssj,
-    jssj: timeObj.jssj,
-  };
-  getMyTaskList(data)
-    .then((res) => {
-      total.value = res.pages;
-      listLoading.value = false;
-      loadingPull.value = false;
-      if (res.records.length > 0) {
-        res.records.forEach((item) => {
-          rwObj.rwList.push(item);
-        });
-      } else {
-        showEmpty.value = true;
-      }
-    })
-    .catch((err) => {
-      listLoading.value = false;
-      showEmpty.value = true;
-    });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.rw_list_box {
-  padding: 3vw 0;
-  margin: 0 3vw;
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  @include item_bottom_color($bottom-border-top-clore-theme);
-}
-</style>
diff --git a/src/pages/rw/rwlist.vue b/src/pages/rw/rwlist.vue
deleted file mode 100644
index 005a0eb..0000000
--- a/src/pages/rw/rwlist.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="任务列表" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs :list="tabs" @onYjjb="onSelect" :type="'car'" :key="tabsIndex"></Tabs>
-        <Search v-model="kwd" :isSx="true" @update:sx="showPopup = !showPopup" placeholder="请输入关键字"
-          @update:modelValue="onClickSearch"></Search>
-      </div>
-    </van-sticky>
-    <SxPopup :showPopup="showPopup" :list="queryData.sxList" :p_top="145" @update:close="showPopup = false"
-      @update:onConfirm="onConfirm" />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list v-show="!showPopup" :finished="finished" finished-text=" " @load="onLoad" offset="1"
-        :immediate-check="false">
-        <div class="rw_list_box" v-for="item in rwObj.rwList" :key="item.id"
-          @click="onLookRw(item.id, item.rwxl, item.rwlx, item.ywid, item.rwzt)">
-          <SwiperCell :isMy="true" :item="item" @click:Transmit="onClickTransmit" @click:onDown="onClickDown"
-            :dict="{ D_BZ_GRRWZT }"></SwiperCell>
-        </div>
-      </van-list>
-      <van-loading style="text-align: center" v-if="listLoading">加载中...</van-loading>
-      <van-empty description="暂无任务信息" v-if="showEmpty" />
-    </van-pull-refresh>
-    <div style="height: 15.8666vw"></div>
-    <!-- 转发人数据 -->
-    <van-popup v-model:show="showfzrPicker" position="bottom">
-      <van-search v-model="list.phone" placeholder="请输入电话号码" @update:model-value="getLdList()" />
-      <van-picker :columns="list.fzrList" @confirm="onfzrConfirm" @cancel="showfzrPicker = false"
-        :columns-field-names="customfzrFieldNamed" />
-    </van-popup>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "rwlist",
-};
-</script>
-<script setup>
-import { ref, onMounted, reactive, watch } from "vue";
-import SxPopup from "../../components/SxPopup.vue";
-import SwiperCell from "../../components/swiperCell.vue";
-import Tabs from "../../components/tabs.vue";
-import BottomTabs from "../../components/bottomTabs.vue";
-import TopNav from "../../components/topNav.vue";
-import { getRwList, getTjRw, isMyTask } from "../../api/rwzx.js";
-import router from "../../router/index.js";
-import { sysUser } from "../../api/patrolBasicInfo.js";
-import { Dialog } from "vant";
-import { setTimeQuantum, hintToast } from "../../utils/tools";
-import Search from "../../components/search.vue";
-import { transmitTask } from "../../api/yyzxApi.js";
-import { getDictList, setDict } from "../../utils/dict";
-import { useRoute, onBeforeRouteLeave } from "vue-router";
-import store from "../../store";
-
-const { D_BZ_GRRWZT, D_BZ_RWJXZT, D_BZ_RWJSDX, D_BZ_RWXL } = getDictList(
-  "D_BZ_GRRWZT",
-  "D_BZ_RWJXZT",
-  "D_BZ_RWJSDX",
-  "D_BZ_RWXL"
-); //字典信息
-const showfzrPicker = ref(false); //是否显示转发人弹窗
-const showPopup = ref(false);
-const tabsIndex = ref(1);
-//搜索配置
-const queryData = reactive({
-  sxList: [
-    {
-      title: "任务接收对象",
-      isCheckBox: true,
-      array: [],
-    },
-    {
-      title: "任务细类",
-      isCheckBox: true,
-      array: [],
-    },
-    setTimeQuantum(),
-  ],
-});
-watch(
-  () => D_BZ_RWJSDX.value,
-  () => {
-    queryData.sxList[0].array = D_BZ_RWJSDX.value.map((item) => {
-      return {
-        name: item.text,
-        key: item.value,
-        isCheck: false,
-      };
-    });
-  },
-  { deep: true }
-);
-watch(
-  () => D_BZ_RWXL.value,
-  () => {
-    queryData.sxList[1].array = D_BZ_RWXL.value.map((item) => {
-      return {
-        name: item.text,
-        key: item.value,
-        isCheck: false,
-      };
-    });
-  },
-  { deep: true }
-);
-const list = reactive({
-  phone: "", //转发人手机号
-  fzrList: [], //转发人数据
-});
-//指定picker选择器字段
-const customfzrFieldNamed = {
-  text: "userName",
-};
-const themeType = ref(getStorage("themeSetting"));
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    value: "all",
-  },
-]);
-// watch()
-watch(
-  () => D_BZ_RWJXZT.value,
-  () => {
-    tabs.value.push(
-      ...D_BZ_RWJXZT.value.map((item) => {
-        return {
-          name: item.text,
-          count: 0,
-          value: item.value,
-        };
-      })
-    );
-    _getMyTaskTotal();
-  },
-  { deep: true }
-);
-const active = ref(1);
-const kwd = ref(""); //搜索关键字
-const pageSize = ref(10);
-const pageCurrent = ref(1);
-const userInfo = JSON.parse(window.localStorage.getItem("userInfo"));
-const rwObj = reactive({
-  rwList: [], //任务数据
-  rwTotal: {}, //任务统计
-});
-const rwjxzt = ref(""); //查询类型
-const listLoading = ref(false);
-const loadingPull = ref(false);
-const finished = ref(false);
-const total = ref(0);
-const rwId = ref(""); //操作的任务ID
-const showEmpty = ref(false);
-//搜索框背景颜色
-const searchBack = ref({});
-onMounted(() => {
-  _getMyTaskList();
-  _getMyTaskTotal();
-  getLdList();
-});
-//下拉刷新
-function onRefresh() {
-  tabsIndex.value++;
-  rwObj.rwList = [];
-  pageCurrent.value = 1;
-  kwd.value = "";
-  // rwjxzt.value = "";
-  finished.value = false;
-  _getMyTaskList();
-  _getMyTaskTotal();
-}
-//判断任务是暂停和关闭
-function _setRwNotify(rwzt) {
-  if (rwzt == 1) {
-    hintToast("任务已关闭！！！");
-    return false;
-  }
-  if (rwzt == 2) {
-    hintToast("任务已暂停！！！");
-    return false;
-  }
-  return true;
-}
-//点击转发按钮打开人员选择器
-function onClickTransmit(val) {
-  if (!_setRwNotify(val.rwzt)) {
-    return;
-  }
-  rwId.value = val.id;
-  showfzrPicker.value = true;
-}
-//驳回任务
-function onClickDown(val) {
-  if (!_setRwNotify(val.rwzt)) {
-    return;
-  }
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认驳回该条任务信息！",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    _setTransmitTask(rwId.value, 4);
-  });
-}
-//确认转发任务
-function onfzrConfirm(val) {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认转发任务!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    _setTransmitTask(rwId.value, 3, val.id);
-  });
-}
-/**
- * 设置任务状态
- * @export
- * @param {*} rwid
- * @param {*} rwzt 1 进行中  2 已完成  3 已转发  4 已驳回
- * @param {*} zfjsrid 转发人ID
- */
-function _setTransmitTask(rwid, rwzt, zfjsrid) {
-  let data = { rwid, rwzt, zfjsrid };
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    data.jd = location.app_x;
-    data.wd = location.app_y;
-  } catch (error) { }
-  transmitTask(data).then((res) => {
-    showfzrPicker.value = false;
-    if (rwzt != 1) {
-      hintToast("成功");
-    }
-    _getMyTaskList();
-  });
-}
-// 查询转发人数据
-function getLdList() {
-  sysUser({
-    current: 1,
-    size: 50,
-    phone: list.phone,
-  }).then((res) => {
-    list.fzrList = res.records;
-  });
-}
-//查看任务详情
-function onLookRw(id, rwxl, rwlx, ywid, rwzt) {
-  isMyTask(id).then((res) => {
-    if (res) {
-      if (!_setRwNotify(rwzt)) {
-        return;
-      }
-      //通知任务
-      if (rwlx == 1) {
-        router.push(`/rw/views/rwDetail?id=${id}`);
-        return;
-      }
-      //值班任务
-      if (rwxl == "04") {
-        router.push("/yyzx/views/addZbbb");
-        return;
-      }
-      //巡防任务
-      if (rwxl == "03") {
-        router.push("/yyzx/xfbb/addXfbb");
-        return;
-      }
-      //指令任务
-      if (rwxl == "05") {
-        router.push(`/yyzx/zlzx/zlDetail?id=${ywid}`);
-        return;
-      }
-    } else {
-      hintToast("只能查看本人任务");
-    }
-  });
-}
-function onConfirm(val) {
-  rwObj.rwList = [];
-  pageCurrent.value = 1;
-  queryRw.kssj = val.startTime;
-  queryRw.jssj = val.endTime;
-  queryRw.rwxl = val.list[1].array
-    .filter((item) => item.isCheck)
-    .map((item) => item.key)
-    .join(",");
-  queryRw.rwjsdx = val.list[0].array
-    .filter((item) => item.isCheck)
-    .map((item) => item.key)
-    .join(",");
-  _getMyTaskList();
-  _getMyTaskTotal();
-  showPopup.value = false;
-}
-//关键字搜索
-function onClickSearch(e) {
-  rwObj.rwList = [];
-  pageCurrent.value = 1;
-  _getMyTaskList();
-}
-//按类型查询
-function onSelect(val) {
-  rwObj.rwList = [];
-  pageCurrent.value = 1;
-  switch (val) {
-    case 0:
-      rwjxzt.value = "";
-      break;
-    default:
-      rwjxzt.value = tabs.value[val].value;
-      break;
-  }
-  finished.value = false;
-  _getMyTaskList();
-}
-//获取任务统计
-function _getMyTaskTotal() {
-  // const queryRw
-  getTjRw(queryRw).then((res) => {
-    tabs.value[0].count = 0;
-    if (res) {
-      tabs.value.forEach((v) => {
-        const tjarr = res.filter((item) => item.rwjxzt === v.value);
-        if (tjarr.length > 0) {
-          v.count = tjarr[0].count;
-        } else {
-          v.count = 0;
-        }
-      });
-      res.forEach((e) => {
-        tabs.value[0].count += e.count;
-      });
-    }
-  });
-}
-//触底加载
-function onLoad() {
-  if (pageCurrent.value >= total.value) {
-    finished.value = true;
-    return;
-  }
-  pageCurrent.value += 1;
-  _getMyTaskList();
-}
-const queryRw = reactive({
-  rwjsdx: "",
-  rwxl: "",
-  kssj: "",
-  jssj: "",
-});
-//获取任务列表
-function _getMyTaskList() {
-  listLoading.value = true;
-  showEmpty.value = false;
-  let data = {
-    pageSize: pageSize.value,
-    pageCurrent: pageCurrent.value,
-    jsrsfzh: userInfo.idEntityCard,
-    rwnr: kwd.value,
-    rwjxzt: rwjxzt.value,
-    rwjsdx: queryRw.rwjsdx,
-    rwxl: queryRw.rwxl,
-    kssj: queryRw.kssj,
-    jssj: queryRw.jssj,
-  };
-  getRwList(data)
-    .then((res) => {
-      total.value = res.pages;
-      listLoading.value = false;
-      loadingPull.value = false;
-      if (res.records.length > 0) {
-        res.records.forEach((item) => {
-          rwObj.rwList.push(item);
-        });
-      } else {
-        showEmpty.value = true;
-      }
-    })
-    .catch((err) => {
-      listLoading.value = false;
-      showEmpty.value = true;
-    });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.rw_list_box {
-  padding: 3vw 0;
-  margin: 0 3vw;
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  @include item_bottom_color($bottom-border-top-clore-theme);
-}
-</style>
diff --git a/src/pages/rw/views/rwDetail.vue b/src/pages/rw/views/rwDetail.vue
deleted file mode 100644
index 121ee76..0000000
--- a/src/pages/rw/views/rwDetail.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="任务详情" :showRight="false" :showLeft="true" />
-    <div class="detail_box" v-if="reDetail">
-      <div class="item">
-        <span class="label">名称</span>
-        <span class="text">{{ reDetail.rwmc }}</span>
-      </div>
-      <div class="item">
-        <span class="label">内容</span>
-        <span class="text">{{ reDetail.rwnr }}</span>
-      </div>
-      <!-- <div class="item">
-        <span class="label">链接</span>
-        <span class="text">{{ reDetail.rwlj }}</span>
-      </div> -->
-      <div class="item">
-        <span class="label">状态</span>
-        <span class="text" :class="{
-                    green: reDetail.rwzt == 0,
-                    yellow: reDetail.rwzt == 1 || reDetail.rwzt == 2,
-                  }">{{ setDict(reDetail.rwzt, D_BZ_RWZT) }}</span>
-      </div>
-      <!-- <div class="item">
-        <span class="label">执行人员数</span>
-        <span class="text">{{ reDetail.rwzxrysl }}</span>
-      </div> -->
-
-      <div class="item">
-        <span class="label">发起人</span>
-        <span class="text">{{ reDetail.cjrxm }}{{ reDetail.cjrlxdh }}</span>
-      </div>
-      <div class="item">
-        <span class="label">紧急程度</span>
-        <span class="text">{{ setDict(reDetail.rwjjcd, D_BZ_RWJJCD) }}</span>
-      </div>
-      <div class="item">
-        <span class="label">任务细类</span>
-        <span class="text">{{ setDict(reDetail.rwxl, D_BZ_RWXL) }}</span>
-      </div>
-      <div class="item">
-        <span class="label">进行状态</span>
-        <span class="text" :class="{
-                    bule: reDetail.rwjxzt == 1,
-                    yellow: reDetail.rwjxzt == 4,
-                    green: reDetail.rwjxzt == 3,
-                    red: reDetail.rwjxzt == 2,
-                  }">{{ setDict(reDetail.rwjxzt, D_BZ_RWJXZT) }}</span>
-      </div>
-
-      <div class="item">
-        <span class="label">发起时间</span>
-        <span class="text">{{ reDetail.rwfqsj }}</span>
-      </div>
-      <div class="item">
-        <span class="label">要求完成时间</span>
-        <span class="text">{{ reDetail.rwyqwcsj }}</span>
-      </div>
-      <div class="item">
-        <span class="label">个人执行状态</span>
-        <span class="text">{{ setDict(userRwzt, D_BZ_GRRWZT) }}</span>
-      </div>
-
-      <div class="item" v-if="reDetail.rwwcsj">
-        <span class="label">完成时间</span>
-        <span class="text">{{ reDetail.rwwcsj }}</span>
-      </div>
-      <div class="item" style="border: none" v-if="reDetail.fjid">
-        <span class="label">附件</span>
-        <div>
-          <div class="fj_item" v-for="(item, index) in fjList" :key="index + 'file'">
-            <van-image width="120px" height="120px" fit="cover" :src="baseUrl + reDetail.fjid.split(',')[index]"
-              @click="onClickImg(baseUrl + reDetail.fjid.split(',')[index])" v-if="item && item.fileFormat == 'png'">
-              <template v-slot:loading>
-                <van-loading type="spinner" size="20" />
-              </template>
-            </van-image>
-            <a :href="baseUrl + reDetail.fjid.split(',')[index]" style="text-decoration: underline" v-else>{{ item.name
-                          }}</a>
-          </div>
-        </div>
-      </div>
-      <!-- 通知任务 -->
-      <div v-if="
-                reDetail.rwlx == 1 &&
-                reDetail.rwjxzt !== '3' &&
-                reDetail.rwjxzt !== '4'
-              " class="btn_box">
-        <van-button :loading="loading" round block type="success" style="margin: 0 2vw" @click="onConfirm">
-          确认
-        </van-button>
-      </div>
-    </div>
-    <van-loading type="spinner" style="padding-top: 50vw; text-align: center" v-if="loading" />
-    <van-empty v-if="showEmpty" description="错误" image="error" />
-  </div>
-</template>
-
-<script setup>
-import axios from "axios";
-import { ref, onMounted, reactive } from "vue";
-import TopNav from "../../../components/topNav.vue";
-import { getMyTaskDetail, getFjInfo } from "../../../api/rwzx.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { baseUrl2 } from "../../../utils/request.js";
-import { Dialog, ImagePreview } from "vant";
-import { transmitTask } from "../../../api/yyzxApi.js";
-import router from "../../../router/index.js";
-import { IS_PNG, hintToast } from "../../../utils/tools.js";
-const {
-  D_BZ_RWXL,
-  D_BZ_RWJJCD,
-  D_BZ_RWJXZT,
-  D_BZ_RWZT,
-  D_BZ_GRRWZT,
-} = getDictList(
-  "D_BZ_RWXL",
-  "D_BZ_RWJJCD",
-  "D_BZ_RWJXZT",
-  "D_BZ_RWZT",
-  "D_BZ_GRRWZT"
-); //字典信息
-import { useRoute } from "vue-router";
-import { format } from "echarts";
-const id = ref("");
-const reDetail = ref(null); //任务详情数据
-const loading = ref(true);
-const showEmpty = ref(false);
-const showImage = ref(false); //是否预览图片
-const userRwzflx = ref(""); //用户任务类型
-const userRwzt = ref(""); //个人任务状态
-const baseUrl = `${baseUrl2}/mosty-api/mosty-base/minio/image/download/`;
-
-const list = reactive({
-  phone: "", //转发人手机号
-  fzrList: [], //转发人数据
-});
-const rwId = ref("");
-
-onMounted(() => {
-  rwId.value = useRoute().query.id;
-  _getMyTaskDetail();
-});
-//预览图片
-function onClickImg(url) {
-  ImagePreview([url]);
-}
-//处置任务下一步
-function onNext() {
-  if (reDetail.value.rwxl == "04") {
-    router.push("/yyzx/views/addZbbb");
-  } else if (reDetail.value.rwxl == "03") {
-    router.push("/yyzx/xfbb/addXfbb");
-  }
-}
-
-//确认任务
-function onConfirm() {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否知晓任务信息!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    _setTransmitTask(reDetail.value.id, 2);
-  });
-}
-
-/**
- * 设置任务状态
- * @export
- * @param {*} rwid
- * @param {*} rwzt 1 进行中  2 已完成  3 已转发  4 已驳回
- * @param {*} zfjsrid 转发人ID
- */
-function _setTransmitTask(rwid, rwzt, zfjsrid) {
-  let data = {
-    rwid,
-    rwzt,
-    zfjsrid,
-  };
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    data.jd = location.app_x;
-    data.wd = location.app_y;
-  } catch (error) { }
-  transmitTask(data).then((res) => {
-    if (rwzt != 1) {
-      hintToast("成功")
-    }
-    // _getMyTaskDetail();
-    router.go(-1);
-  });
-}
-
-//获取任务详情
-function _getMyTaskDetail() {
-  getMyTaskDetail(rwId.value)
-    .then((res) => {
-      loading.value = false;
-      reDetail.value = res;
-      if (res.fjid) {
-        _getFile(res.fjid);
-        _getUserRwzflx();
-      }
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-/**
- *
- * @param {Object} fjid
- */
-const fjList = ref([]);
-function _getFile(fjid) {
-  const requestArr = fjid.split(",").map((item) => {
-    return getFjInfo(item);
-  });
-  Promise.all(requestArr).then((resArr) => {
-    resArr.forEach((res) => {
-      if (IS_PNG(res.suffix.substring(1, res.suffix.length))) {
-        res.fileFormat = "png";
-      } else {
-        res.fileFormat = "file";
-      }
-      fjList.value.push(res);
-    });
-  });
-}
-//获取用户任务转发类型
-function _getUserRwzflx() {
-  if (reDetail.value && reDetail.value.userDtoList.length > 0) {
-    let info = reDetail.value.userDtoList[0];
-    userRwzflx.value = info.rwzflx;
-    userRwzt.value = info.rwzt;
-    //如果是待查看 改为进行中
-    // if (userRwzt.value == 0) _setTransmitTask(reDetail.value.id, 1);
-  }
-  //   let userInfo = JSON.parse(getStorage("userInfo"));
-  //   switch (reDetail.value.rwjsdx) {
-  //     case "01":
-  //       if (reDetail.value && reDetail.value.userDtoList.length > 0) {
-  //         let info = reDetail.value.userDtoList.find((item) => {
-  //           return userInfo.idEntityCard == item.jsrsfzh;
-  //         });
-  //         userRwzflx.value = info.rwzflx;
-  //         userRwzt.value = info.rwzt;
-  //         //如果是待查看 改为进行中
-  //         // if (userRwzt.value == 0) _setTransmitTask(reDetail.value.id, 1);
-  //       }
-  //       break;
-  //     case "02":
-  // 		if (reDetail.value && reDetail.value.userDtoList.length > 0) {
-  //         let info = reDetail.value.userDtoList.find((item) => {
-  //           return userInfo.deptList[0].deptId == item.jsbmdm;
-  //         });
-  //         userRwzflx.value = info.rwzflx;
-  //         userRwzt.value = info.rwzt;
-  //         //如果是待查看 改为进行中
-  //         // if (userRwzt.value == 0) _setTransmitTask(reDetail.value.id, 1);
-  //       }
-  //       break;
-  //     case "03":
-  //       break;
-  //   }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.detail_box {
-  padding: 3vw;
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-
-  .item {
-    display: flex;
-    justify-content: space-between;
-    padding: 3vw 0;
-    @include item_bottom_color($bottom-border-top-clore-theme);
-
-    .label {
-      width: 25%;
-    }
-
-    .text {
-      width: 70%;
-      text-align: right;
-    }
-  }
-}
-
-.fj_item {
-  padding: 8px 0;
-}
-
-.btn_box {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 5vw;
-}
-</style>
diff --git a/src/pages/rw/views/syrkRwDetail.vue b/src/pages/rw/views/syrkRwDetail.vue
deleted file mode 100644
index efd6c92..0000000
--- a/src/pages/rw/views/syrkRwDetail.vue
+++ /dev/null
@@ -1,441 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="'人口核实详情'" />
-    <van-form @submit="onSubmit">
-      <div class="title_tab">基本信息</div>
-      <van-field
-        v-model="normalForm.gmsfhm"
-        label="身份证号"
-        placeholder="请输入身份证号"
-        input-align="right"
-      />
-      <van-field
-        v-model="normalForm.xm"
-        label="姓名"
-        placeholder="请输入姓名"
-        input-align="right"
-      />
-
-      <div class="title_tab">核实信息</div>
-      <van-field
-        v-model="normalForm.reason"
-        label="任务类型"
-        placeholder="请输入任务类型"
-        input-align="right"
-      />
-      <van-field
-        v-model="normalForm.createdAt"
-        label="生成时间"
-        placeholder="请输入生成时间"
-        input-align="right"
-      />
-      <van-cell-group>
-        <van-cell clickable title="处理结果" :border="false">
-          <template #right-icon>
-            <van-radio-group v-model="cljgRadio" direction="horizontal">
-              <van-radio name="1">属实</van-radio>
-              <van-radio name="9">不属实</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
-      </van-cell-group>
-      <van-field
-        v-model="normalForm.jzxqmc"
-        label="所属小区"
-        placeholder="请输入所属小区"
-        input-align="right"
-        v-if="cljgRadio == 1"
-      />
-      <van-field
-        v-model="normalForm.dzmc"
-        @click="popupShow = true"
-        label="小区地址"
-        type="textarea"
-        placeholder="请输入小区地址"
-        input-align="right"
-        v-if="cljgRadio == 1"
-      />
-      <van-cell-group v-if="cljgRadio == 9">
-        <van-cell clickable title="识别情况" :border="false">
-          <template #right-icon>
-            <van-radio-group v-model="rysfsbqkRadio" direction="horizontal">
-              <van-radio name="1">准确</van-radio>
-              <van-radio name="5">错误</van-radio>
-              <van-radio name="9">不确定</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
-      </van-cell-group>
-      <van-field
-        rows="3"
-        type="textarea"
-        v-model="normalForm.clbz"
-        placeholder="处理说明"
-      />
-
-      <div class="title_tab">
-        <s></s>
-        <span>通行轨迹({{ txTotal }})</span>
-        <span class="all" @click="routerPush(normalForm.gmsfhm)"
-          >更多
-          <van-icon name="arrow"></van-icon>
-        </span>
-      </div>
-
-      <div class="txgj_box">
-        <div
-          class="item_img_box"
-          v-for="(item, index) in txgjList"
-          :key="item.id"
-        >
-          <van-image
-            width="100%"
-            height="30vw"
-            :src="item.baseUrl"
-            style="flex: 1"
-            @click.stop="onClickImg(item.ryPhoto, index)"
-          >
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-          </van-image>
-          <div class="time">{{ item.djsj }}</div>
-          <div
-            class="jcFlag"
-            :class="{
-              bg_green: item.inOut === 'in',
-              bg_orange: item === 'out',
-            }"
-          >
-            {{ item.inOut === "out" ? "出" : "进" }}
-          </div>
-        </div>
-      </div>
-      <div style="margin: 16px 0; padding: 0 5vw">
-        <van-button
-          :loading="loading"
-          round
-          native-type="submit"
-          block
-          type="primary"
-        >
-          提交
-        </van-button>
-      </div>
-    </van-form>
-    <van-popup
-      v-model:show="popupShow"
-      round
-      position="center"
-      style="width: 90%"
-    >
-      <van-cascader
-        active-color="#1989fa"
-        v-model="list.check"
-        title="选择具体地址"
-        :options="list.ldList"
-        @close="popupShow = false"
-        @change="onCascaderChange"
-        @finish="onFinish"
-      ></van-cascader>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import { getBase64 } from "../../../utils/tools.js";
-import TopNav from "../../../components/topNav.vue";
-import { Dialog, Toast } from "vant";
-import {
-  dateFormat,
-  ymGetRequest,
-  ymPostRequest,
-  getYmToken,
-  hintToast,
-} from "../../../utils/tools.js";
-import { computed, ref, reactive, onMounted, watch } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { ImagePreview } from "vant";
-import router from "../../../router";
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, item.ryPhoto);
-}
-const cljgRadio = ref("1");
-const rysfsbqkRadio = ref("5"); // 人员身份识别情况
-const popupShow = ref(false);
-const cascaderValue = ref(""); //级联默认值
-const copyToken = ref("");
-const list = reactive({
-  ldList: [], //楼栋数据
-  check: "",
-});
-//通行轨迹数据
-const txgjList = ref([]);
-//表单数据
-const normalForm = ref({
-  gmsfhm: "",
-  xm: "",
-  jzxqmc: "",
-  dzmc: "",
-  zzzhz: "",
-  createdAt: "",
-  clbz: "",
-  reason: "",
-  cljg: "",
-});
-//不属实 置空
-watch(
-  () => cljgRadio.value,
-  (newValue) => {
-    if (newValue == 9) normalForm.value.clbz = "";
-  }
-);
-//选择数据
-onMounted(() => {
-  let userCrd = JSON.parse(window.localStorage.getItem("userInfo"))
-    .idEntityCard;
-  let rwid = useRoute().query.id;
-  getYmToken(
-    {
-      userid: userCrd,
-      code: "GxGA510109",
-    },
-    (res) => {
-      copyToken.value = res.data.token;
-      _getData(res.data.token, "001d902c4aee42cd89f0dc3fa470abb7");
-    }
-  );
-});
-//获取任务数据数据
-function _getData(token, id) {
-  ymGetRequest(`/person/taskDetail`, { id }, token, (res) => {
-    normalForm.value = res.data;
-    normalForm.value.clbz = "核实为实有人口";
-    _getLdData(res.data.jzxqid, token);
-    getRytxList(res.data.gmsfhm);
-  });
-}
-//获取楼栋数据
-function _getLdData(placeId, token) {
-  ymGetRequest(`/place/placeBuild`, { placeId }, token, (res) => {
-    if (res.data.length > 0) {
-      for (let i = 0; i < res.data.lengt; i++) {
-        res.data[i].text = res.data[i].dzmc;
-        res.data[i].value = res.data[i].parentid;
-        res.data[i].children = [];
-      }
-      list.ldList = res.data.map((item) => {
-        return {
-          text: item.dzmc,
-          value: item.id,
-          children: [],
-        };
-      });
-    }
-  });
-}
-//单元 楼栋 房号数据
-function onCascaderChange(value) {
-  if (value.tabIndex === 0) {
-    const index = list.ldList.map((item) => item.value).indexOf(value.value);
-    ymGetRequest(
-      `/place/placeBzdz`,
-      { parentId: value.value },
-      copyToken.value,
-      (res) => {
-        list.ldList[index].children = res.data.map((item) => {
-          return {
-            text: item.dzjc,
-            value: item.id,
-          };
-        });
-      }
-    );
-  }
-}
-//人员通行列表
-const txTotal = ref(0);
-function getRytxList(gmsfhm) {
-  ymPostRequest(
-    "/person/record_list",
-    { gmsfhm, page: 1, psize: 3 },
-    copyToken.value,
-    (res) => {
-      txgjList.value = res.data.content;
-      txgjList.value.map((item) => {
-        _getBase64(item);
-      });
-      txTotal.value = res.data.totalElements;
-    }
-  );
-}
-function onFinish({ selectedOptions }) {
-  popupShow.value = false;
-  normalForm.value.dzmc = selectedOptions.map((option) => option.text).join("");
-  normalForm.value.dzid = selectedOptions[selectedOptions.length - 1].value;
-}
-function onClickImg(url, index) {
-  ImagePreview({
-    images: txgjList.value.map((item) => item.baseUrl),
-    startPosition: index,
-  });
-}
-function routerPush(sfzh) {
-  router.push({
-    path: "/rw/views/txgj",
-    query: {
-      sfzh: sfzh,
-      token: copyToken.value,
-    },
-  });
-}
-function onSubmit() {
-  const data = {
-    addWhiteList: 0,
-    clbz: normalForm.value.clbz,
-    cljg: normalForm.value.cljg,
-    cljgfk: 0,
-    dzid: normalForm.value.dzid,
-    id: normalForm.value.id,
-    whiteRemark: "",
-    whiteTime: "",
-  };
-  ymPostRequest("/person/taskHandle", { ...data }, copyToken.value, (res) => {
-    if (res.status === 200) {
-      hintToast("处理成功");
-      router.go(-1);
-    } else {
-      hintToast(res.message);
-    }
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.container {
-  margin-top: 2vw;
-}
-.nav_tab {
-  padding: 2vw;
-  display: flex;
-  justify-content: space-around;
-  .tab {
-    background: #a4aec8;
-    color: #fff;
-    height: 32px;
-    line-height: 32px;
-    width: 40vw;
-    text-align: center;
-    border-radius: 16px 16px 16px 0;
-  }
-  .tab.active {
-    background: #517cea;
-  }
-}
-
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-.title_tab {
-  @include font_color($font-color-theme);
-  padding: 0 3vw 0 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .all {
-    @include font_size($font_medium_s);
-  }
-}
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-.van-cell:after {
-  display: none;
-}
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 4%;
-  width: 92%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-.popupTitle {
-  color: #fff;
-}
-.txgj_box {
-  display: flex;
-  padding: 0 4.5%;
-  justify-content: space-between;
-  flex-wrap: wrap;
-}
-.item_img_box {
-  //   border: 1px solid red;
-  position: relative;
-  width: 31%;
-  .time {
-    font-size: 11px;
-    // @include font_size($font_medium_s);
-  }
-  .jcFlag {
-    position: absolute;
-    top: 0;
-    right: 0;
-    color: #fff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    @include font_size($font_medium_s);
-    padding: 1vw;
-  }
-}
-</style>
diff --git a/src/pages/rw/views/txgjList.vue b/src/pages/rw/views/txgjList.vue
deleted file mode 100644
index 0f71516..0000000
--- a/src/pages/rw/views/txgjList.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="'通行轨迹'" :showLeft="true" />
-    <van-list
-      :finished="finished"
-      finished-text="没有更多数据了"
-      @load="onLoad"
-      offset="1"
-      :immediate-check="false"
-    >
-      <div class="txgj_box">
-        <div class="item_img_box" v-for="(item, index) in list" :key="item.id">
-          <van-image
-            width="100%"
-            height="30vw"
-            :src="item.baseUrl"
-            style="flex: 1"
-            @click.stop="onClickImg(item.ryPhoto, index)"
-          >
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-          </van-image>
-          <div class="time">{{ item.djsj }}</div>
-          <div
-            class="jcFlag"
-            :class="{
-              bg_green: item.inOut === 'in',
-              bg_orange: item === 'out',
-            }"
-          >
-            {{ item.inOut === "out" ? "出" : "进" }}
-          </div>
-        </div>
-      </div>
-    </van-list>
-  </div>
-</template>
-
-<script setup>
-import { onMounted, ref } from "vue";
-import { getBase64 } from "../../../utils/tools.js";
-import TopNav from "../../../components/topNav.vue";
-import { ImagePreview } from "vant";
-import { ymPostRequest } from "../../../utils/tools.js";
-import { useRoute } from "vue-router";
-const route = useRoute();
-const list = ref([]);
-const finished = ref(false);
-const queryList = ref({
-  page: 1,
-  psize: 10,
-  gmsfhm: route.query.sfzh,
-});
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, item.ryPhoto);
-}
-const total = ref(0);
-const getList = () => {
-  ymPostRequest(
-    "/person/record_list",
-    { ...queryList.value },
-    route.query.token,
-    (res) => {
-      if (queryList.value.page === 1) {
-        list.value = res.data.content;
-        list.value.map((item) => {
-        _getBase64(item);
-      });
-      } else {
-        res.data.content.map(item=>{
-          _getBase64(item);
-          list.value.push(item)
-        })
-      }
-      total.value = res.data.totalElements;
-    }
-  );
-};
-function onLoad() {
-  if (list.value.length === total.value) {
-    finished.value = true;
-  } else {
-    queryList.value.page++;
-    getList();
-  }
-}
-function onClickImg(url, index) {
-  ImagePreview({
-    images: list.value.map((item) => item.baseUrl),
-    startPosition: index,
-  });
-}
-onMounted(() => {
-  getList();
-});
-</script>
-
-<style lang='scss' scoped>
-@import "../../../assets/styles/mixin.scss";
-.txgj_box {
-  display: flex;
-  padding: 16px 4.5% 0;
-  justify-content: space-between;
-  flex-wrap: wrap;
-}
-.item_img_box {
-  //   border: 1px solid red;
-  position: relative;
-  width: 48%;
-  .time {
-    font-size: 11px;
-    // @include font_size($font_medium_s);
-  }
-  .jcFlag {
-    position: absolute;
-    top: 0;
-    right: 0;
-    color: #fff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    @include font_size($font_medium_s);
-    padding: 1vw;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/scyy/cl.vue b/src/pages/scyy/cl.vue
deleted file mode 100644
index 5a1ebf0..0000000
--- a/src/pages/scyy/cl.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-  <div class="container" style="padding-top:13vw">
-    <TopNav navTitle="车辆" />
-    <div class="search-boxSJY">
-      <van-search v-model="clList.cph" placeholder="请输入车牌号" style="width: 100%" @update:model-value="getList(1)" />
-    </div>
-    <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-      <div class="item-box jwz-line" v-for="(item, index) in clList.list" :key="index">
-        <div class="ps-title">{{ item.cph }}</div>
-        <div class="lineSJY">所属部门: {{ item.ssbm }}</div>
-        <div class="lineSJY">
-          车辆状态: {{ item.zbzt == "1" ? "正常" : "非正常" }}
-        </div>
-        <div class="lineSJY">
-          <div class="first-one">车牌号: {{ item.cph }}</div>
-          <div class="first-one">车辆年款: {{ item.clnk }}</div>
-        </div>
-        <div class="lineSJY">
-          <div style="display: flex; width: 50%">
-            号牌种类:{{ setDict(item.cllx, D_BZ_CLLX) }}
-          </div>
-          <div style="display: flex; width: 50%">
-            车辆品牌：{{ item.clpp }}
-          </div>
-        </div>
-        <div class="lineSJY">
-          <div class="first-one">购置日期: {{ item.gmrq }}</div>
-          <div class="first-one">报废日期: {{ item.bfrq }}</div>
-        </div>
-      </div>
-    </van-list>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../components/topNav.vue";
-import { getClList } from "../../api/scyy.js";
-import { ref, reactive, onMounted } from "vue";
-import { getDictList, setDict } from "../../utils/dict";
-import { useRouter } from "vue-router";
-const router = useRouter();
-function onClickLeft() {
-  router.push("/home");
-}
-const { D_BZ_CLLX } = getDictList("D_BZ_CLLX");
-const clList = reactive({
-  list: [],
-  cph: "",
-});
-onMounted(() => {
-  getList();
-});
-const loading = ref(false);
-const finished = ref(false);
-const page = ref(1);
-const total = ref(0);
-function getList(val) {
-  loading.value = false;
-  if (val === 1) {
-    page.value = 1
-  }
-  getClList({
-    pageCurrent: page.value,
-    pageSize: 10,
-    cph: clList.cph,
-  })
-    .then((res) => {
-      if (val === 1) {
-        clList.list = res.records;
-      } else {
-        res.records.forEach((ele) => {
-          clList.list.push(ele);
-        });
-      }
-      total.value = res.total;
-      onLoad();
-      finished.value = true;
-    })
-    .catch((err) => {
-      finished.value = true;
-    });
-}
-function onLoad() {
-  if (page.value * 10 < total.value) {
-    page.value++;
-    getList();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.item-box {
-  line-height: 1.8em;
-  margin: 0 5vw;
-  border-bottom: 1px solid #f3f3f3;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-.ps-title {
-  color: #1F6CEC;
-  font-weight: bold;
-  @include font_size($font_medium);
-  line-height: 6vw;
-}
-</style>
diff --git a/src/pages/scyy/jwz.vue b/src/pages/scyy/jwz.vue
deleted file mode 100644
index fd1ba98..0000000
--- a/src/pages/scyy/jwz.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav navTitle="警务站" />
-    <div class="search-box">
-      <van-search v-model="jwzList.jwzMc" placeholder="请输入警务站名称" style="width: 100%" @update:model-value="getList(1)" />
-    </div>
-    <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-      <div class="listInfoBox">
-        <List :labelData="jwzList.list">
-          <template v-slot="{ item }">
-            <div class="ps-title">{{ item.jwzMc }}</div>
-
-            <div class="line">
-              警务站类型：{{ setDict(item.jwzLx, D_BZ_JWZLX) }}
-            </div>
-            <div class="line"><van-icon name="location-o" /> 详细地址: {{ item.jwzDz }}</div>
-            <div class="line"><van-icon name="underway-o" /> 建立日期: {{ item.xjSj }}</div>
-            <div class="line">
-              <van-icon name="user-o" /> 负责人:
-              {{ item.fzrXm }}&nbsp;&nbsp;&nbsp;{{ item.ssbm }}
-            </div>
-            <div class="lineGap"></div>
-          </template>
-        </List>
-      </div>
-    </van-list>
-  </div>
-</template>
-
-<script setup>
-import List from "../../components/ListItem.vue";
-import TopNav from "../../components/topNav.vue";
-import { getJwzList } from "../../api/scyy.js";
-import { ref, reactive, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import { getDictList, setDict } from "../../utils/dict";
-const router = useRouter();
-function onClickLeft() {
-  router.push("/home");
-}
-const { D_BZ_JWZLX } = getDictList("D_BZ_JWZLX");
-const jwzList = reactive({
-  list: [],
-  jwzMc: "",
-});
-function goCreatePoliceStation() {
-  router.push("/createPoliceStation");
-}
-onMounted(() => {
-  getList();
-});
-// 查询警务站列表
-const loading = ref(false);
-const finished = ref(false);
-const page = ref(1);
-const total = ref(0);
-function getList(val) {
-  loading.value = false;
-  getJwzList({
-    pageNo: page.value,
-    pageSize: 10,
-    jwzMc: jwzList.jwzMc,
-  })
-    .then((res) => {
-      if (val === 1) {
-        jwzList.list = res.records;
-      } else {
-        res.records.forEach((ele) => {
-          jwzList.list.push(ele);
-        });
-      }
-      total.value = res.total;
-      onLoad();
-      finished.value = true;
-    })
-    .catch((err) => {
-      finished.value = true;
-    });
-}
-function onLoad() {
-  if (page.value * 10 < total.value) {
-    page.value++;
-    getList();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.search-box {
-  display: flex;
-  align-items: center;
-}
-
-// 列表
-.listInfoBox {
-  @include font_size($font_medium_s);
-  padding: 0 4vw;
-  box-sizing: border-box;
-
-  .ps-title {
-    color: #1f6cec;
-    font-weight: bold;
-    line-height: 6vw;
-    @include font_size($font_medium);
-  }
-
-  .line {
-    line-height: 5vw;
-  }
-
-  .lineGap {
-    height: 4px;
-    border-bottom: 1px solid #e9e9e9;
-  }
-
-}
-</style>
diff --git a/src/pages/scyy/kfd.vue b/src/pages/scyy/kfd.vue
deleted file mode 100644
index 60de9cb..0000000
--- a/src/pages/scyy/kfd.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav navTitle="快反点" />
-    <van-search v-model="kfdList.kfdMc" placeholder="请输入快反点名称" @update:model-value="serachData" />
-    <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-      <div class="item-box" v-for="(item, index) in kfdList.list" :key="index">
-        <div class="titleSJY">{{ item.kfdMc }}</div>
-        <!-- <div><van-icon name="underway-o" /> 建立日期: {{ item.xtCjsj }}</div> -->
-        <div><van-icon name="user-o" /> 市所属部门: {{ item.ssbm }}</div>
-        <div><van-icon name="location-o" /> 地址: {{ item.kfdDz }}</div>
-      </div>
-    </van-list>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../components/topNav.vue";
-import { getKfdList } from "../../api/scyy.js";
-import { ref, reactive, onMounted } from "vue";
-import { useRouter } from "vue-router";
-const router = useRouter();
-const kfdList = reactive({
-  list: [],
-  kfdMc: "",
-});
-onMounted(() => {
-  serachData();
-});
-const loading = ref(false);
-const finished = ref(false);
-const page = ref(1);
-const total = ref(0);
-function serachData() {
-  page.value = 1
-  getList()
-}
-function getList() {
-  loading.value = false;
-  let params = {
-    pageNum: page.value,
-    pageSize: 10,
-    kfdMc: kfdList.kfdMc,
-  };
-  getKfdList(params)
-    .then((res) => {
-      if (page.value === 1) {
-        kfdList.list = res.records;
-      } else {
-        kfdList.list = kfdList.list.concat(res.records);
-      }
-      total.value = res.total;
-      onLoad();
-      finished.value = true;
-    })
-    .catch((err) => {
-      finished.value = true;
-    });
-}
-function onLoad() {
-  if (page.value * 10 < total.value) {
-    page.value++;
-    getList();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.item-box {
-  line-height: 1.8em;
-  margin: 0 5vw;
-  border-bottom: 1px solid #f3f3f3;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-.titleSJY {
-  color: #1f6cec;
-  font-weight: bold;
-  @include font_size($font_medium);
-}
-</style>
diff --git a/src/pages/scyy/xfll.vue b/src/pages/scyy/xfll.vue
deleted file mode 100644
index b418f43..0000000
--- a/src/pages/scyy/xfll.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <van-sticky :offset-top="0">
-      <TopNav navTitle="巡防力量" />
-      <div class="search-boxSJY">
-        <van-search v-model="xlllList.xm" placeholder="请输入搜索关键词" style="width: 100%" @update:model-value="getList(1)" />
-      </div>
-    </van-sticky>
-    <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad"
-      :immediate-check="false">
-      <div class="item-boxxfll" :class="item.fl === '01' ? 'bgColorm' : 'bgColorf'"
-        v-for="(item, index) in xlllList.list" :key="index">
-        <div class="image-box">
-          <van-image fill="cover" :src="require('../../assets/images/tx.png')" />
-        </div>
-        <div class="xlll-info-box">
-          <div :class="item.fl === '01' ? 'title-box1' : 'title-box2'">
-            <div :class="item.fl === '01' ? 'line-y1' : 'line-y2'"></div>
-            <span>{{ item.xm }}</span>&nbsp;&nbsp;&nbsp;
-            <span>
-              <dict-tag :options="D_BZ_XB" :value="item.xbdm" :tag="false" /> </span>&nbsp;&nbsp;&nbsp;
-            <span>{{ item.fl === "01" ? "民警" : "辅警" }}</span>
-          </div>
-          <div>{{ item.sfzh }}</div>
-          <div>所在部门: {{ item.ssbm }}</div>
-          <div>警员编号: {{ item.jh }}</div>
-          <div>联系电话: {{ item.lxdh }}</div>
-        </div>
-      </div>
-    </van-list>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../components/topNav.vue";
-import { getXfllList } from "../../api/scyy.js";
-import { ref, reactive, onMounted } from "vue";
-import { useRouter } from "vue-router";
-import { getDictList, setDict } from "../../utils/dict";
-const { D_BZ_XB } = getDictList("D_BZ_XB");
-const router = useRouter();
-const xlllList = reactive({
-  list: [],
-  xm: "",
-  total: 0,
-});
-onMounted(() => {
-  getList(1);
-});
-const loading = ref(false);
-const finished = ref(false);
-const page = ref(1);
-const total = ref(0);
-function getList(val) {
-  loading.value = true;
-  getXfllList({
-    pageCurrent: page.value,
-    pageSize: 10,
-    xm: xlllList.xm,
-  })
-    .then((res) => {
-      total.value = res.total;
-      if (val === 1) {
-        xlllList.list = res.records;
-      } else {
-        res.records.forEach((ele) => {
-          xlllList.list.push(ele);
-        });
-      }
-      loading.value = false;
-    })
-    .catch((err) => {
-      finished.value = true;
-    });
-}
-function onLoad() {
-  if (page.value * 10 < total.value) {
-    page.value++;
-    getList();
-  } else {
-    finished.value = true;
-  }
-}
-// 添加民警
-function goCreatePeoplePolice() {
-  router.push("/createMJ");
-}
-// 添加辅警
-function goCreateAssistantPolice() {
-  router.push("/createFJ");
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.item-boxxfll {
-  line-height: 1.8em;
-  margin: 2vw;
-  padding: 2vw;
-  box-sizing: border-box;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-  display: flex;
-
-  .image-box {
-    flex: 1;
-    margin: 2vw;
-  }
-
-  .xlll-info-box {
-    flex: 3;
-  }
-}
-
-.bgColorm {
-  background-color: #f0f6ff;
-}
-
-.bgColorf {
-  background-color: #f9eeff;
-}
-
-.titleSJY {
-  color: #1f6cec;
-  font-weight: bold;
-  @include font_size($font_medium);
-}
-</style>
diff --git a/src/pages/scyy/xfq.vue b/src/pages/scyy/xfq.vue
deleted file mode 100644
index c1ca2a8..0000000
--- a/src/pages/scyy/xfq.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <div class="container" style="padding-top:13vw">
-    <TopNav navTitle="巡防区" />
-    <van-search v-model="xfqList.xfqMc" placeholder="请输入巡防区名称" @update:model-value="getList(1)" />
-    <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-      <div class="item-box" v-for="(item, index) in xfqList.list" :key="index">
-        <div class="titleSJY">{{ item.xfqMc }}</div>
-        <div>建立时间: {{ item.xtCjsj }}</div>
-        <div><van-icon name="user-o" /> 负责人: {{ item.xfqFzr }}</div>
-        <div>负责人身份证号：{{ item.xfqFzrSfz }}</div>
-        <div>所属部门：{{ item.ssbm }}</div>
-        <div class="line">巡防区等级:{{ setDict(item.xfqDj, D_BZ_XFQDJ) }}</div>
-        <div class="line">巡防区类型:{{ setDict(item.xfqLx, D_BZ_XQLX) }}</div>
-      </div>
-    </van-list>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../components/topNav.vue";
-import { getXfqList } from "../../api/scyy.js";
-import { ref, reactive, onMounted } from "vue";
-import { getDictList, setDict } from "../../utils/dict";
-import { useRouter } from "vue-router";
-const router = useRouter();
-const { D_BZ_XFQDJ, D_BZ_XQLX } = getDictList("D_BZ_XFQDJ", "D_BZ_XQLX");
-const xfqList = reactive({
-  list: [],
-  xfqMc: "",
-});
-onMounted(() => {
-  getList();
-});
-const loading = ref(false);
-const finished = ref(false);
-const page = ref(1);
-const total = ref(0);
-function getList(val) {
-  loading.value = false;
-  getXfqList({
-    pageCurrent: page.value,
-    pageSize: 10,
-    xfqMc: xfqList.xfqMc,
-  })
-    .then((res) => {
-      if (val === 1) {
-        xfqList.list = res.records;
-      } else {
-        res.records.forEach((ele) => {
-          xfqList.list.push(ele);
-        });
-      }
-      total.value = res.total;
-      onLoad();
-      finished.value = true;
-    })
-    .catch((err) => {
-      finished.value = true;
-    });
-}
-function onLoad() {
-  if (page.value * 10 < total.value) {
-    page.value++;
-    getXfqList();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.item-box {
-  line-height: 1.8em;
-  margin: 0 5vw;
-  border-bottom: 1px solid #f3f3f3;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-.titleSJY {
-  color: #1F6CEC;
-  font-weight: bold;
-  @include font_size($font_medium);
-}
-</style>
diff --git a/src/pages/scyy/zb.vue b/src/pages/scyy/zb.vue
deleted file mode 100644
index 5595a12..0000000
--- a/src/pages/scyy/zb.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-  <div class="container" style="padding-top:13vw">
-    <TopNav navTitle="装备" />
-    <van-tabs v-model:active="active" background="#fff" color="#1989fa">
-      <van-tab title="智能装备管理">
-        <div class="search-boxSJY">
-          <van-search v-model="zbList.sbmc" placeholder="请输入智能装备名称" style="width: 100%"
-            @update:model-value="getList(1)" />
-        </div>
-        <van-list v-model:loading="loading1" :finished="finished1" finished-text="没有更多了" @load="onLoad1">
-          <div class="item-box" v-for="(item, index) in zbList.list" :key="index">
-            <div class="titleSJY">{{ item.sbmc }}</div>
-            <div class="lineSJY">所属部门: {{ item.ssbm }}</div>
-            <div class="lineSJY">
-              <div class="first-one">装备型号: {{ item.xh }}</div>
-              <div style="display: flex">
-                装备类型:&nbsp;<dict-tag :options="D_BZ_ZNZBFL" :value="item.scode" :tag="false" />
-              </div>
-            </div>
-            <div class="lineSJY">
-              <div>生产厂商: {{ item.sccs }}</div>
-            </div>
-            <div class="lineSJY">
-              <div class="first-one">采购日期: {{ item.cgrq }}</div>
-              <div>到期时间: {{ item.dqsj }}</div>
-            </div>
-          </div>
-        </van-list>
-      </van-tab>
-      <van-tab title="警用器械管理">
-        <div class="search-boxSJY">
-          <van-search v-model="zbList.qxMc" placeholder="请输入警用器械名称" style="width: 100%"
-            @update:model-value="getJyqxList(1)" />
-        </div>
-        <van-list v-model:loading="loading2" :finished="finished2" finished-text="没有更多了" @load="onLoad2">
-          <div class="item-box" v-for="(item, index) in zbList.jyqxList" :key="index">
-            <div class="titleSJY">
-              <div class="line-y"></div>
-              &nbsp;&nbsp;{{ item.qxMc }}
-            </div>
-            <div class="lineSJY">
-              <div class="first-one">器械编码: {{ item.qxbh }}</div>
-              <div>器械名称: {{ item.qxMc }}</div>
-            </div>
-            <div class="lineSJY">
-              <div class="first-one">
-                器械类型:&nbsp;<dict-tag :options="D_BZ_JYQXFL" :value="item.scode" :tag="false" />
-              </div>
-              <div>生产厂商: {{ item.sccs }}</div>
-            </div>
-            <div class="lineSJY">
-              <div class="first-one">采购日期: {{ item.cgrq }}</div>
-              <div>到期时间: {{ item.dqsj }}</div>
-            </div>
-            <div class="lineSJY">
-              <div class="first-one">所属部门: {{ item.ssbm }}</div>
-              <div>录入批次: {{ item.qxPch }}</div>
-            </div>
-          </div>
-        </van-list>
-      </van-tab>
-    </van-tabs>
-  </div>
-</template>
-
-<script setup>
-import { getZnzb, selectJyqx } from "../../api/scyy.js";
-import TopNav from "../../components/topNav.vue";
-import { ref, reactive, onMounted, watch } from "vue";
-import { getDictList, setDict } from "../../utils/dict";
-import { useRouter, useRoute } from "vue-router";
-const router = useRouter();
-const route = useRoute();
-const { D_BZ_ZNZBFL, D_BZ_JYQXFL } = getDictList("D_BZ_ZNZBFL", "D_BZ_JYQXFL");
-function goCreateEquipment(val) {
-  router.push({ name: "CreateEquipment", params: { sign: val } });
-}
-const active = ref(0);
-watch(active, (newVal, oldVal) => {
-  if (newVal === 0) {
-    zbList.list = [];
-    getList();
-  } else {
-    zbList.jyqxList = [];
-    getJyqxList();
-  }
-});
-watch(route.params.flag, (val) => {
-  active.value = val;
-});
-const zbList = reactive({
-  list: [],
-  sbmc: "",
-  jyqxList: [],
-  qxMc: "",
-});
-onMounted(() => {
-  getList();
-});
-// 获取智能装备
-const loading1 = ref(false);
-const finished1 = ref(false);
-const page1 = ref(1);
-const total1 = ref(0);
-function getList(val) {
-  loading1.value = false;
-  getZnzb({
-    pageNo: page1.value,
-    pageSize: 10,
-    sbmc: zbList.sbmc,
-  })
-    .then((res) => {
-      if (val === 1) {
-        zbList.list = res.records;
-      } else {
-        res.records.forEach((ele) => {
-          zbList.list.push(ele);
-        });
-      }
-      total1.value = res.total;
-      onLoad();
-      finished1.value = true;
-    })
-    .catch((err) => {
-      finished1.value = true;
-    });
-}
-function onLoad1() {
-  if (page1.value * 10 < total1.value) {
-    page1.value++;
-    getList();
-  }
-}
-
-// 查询警用器械
-const loading2 = ref(false);
-const finished2 = ref(false);
-const page2 = ref(1);
-const total2 = ref(0);
-function getJyqxList(val) {
-  loading2.value = false;
-  selectJyqx({
-    pageNo: page2.value,
-    pageSize: 10,
-    qxMc: zbList.qxMc,
-  })
-    .then((res) => {
-      if (val === 1) {
-        zbList.jyqxList = res.records;
-      } else {
-        res.records.forEach((ele) => {
-          zbList.jyqxList.push(ele);
-        });
-      }
-      total2.value = res.total;
-      finished2.value = true;
-    })
-    .catch((err) => {
-      finished2.value = true;
-    });
-}
-function onLoad2() {
-  if (page2.value * 10 < total2.value) {
-    page2.value++;
-    getJyqxList();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-.item-box {
-  line-height: 1.8em;
-  margin: 0 5vw;
-  border-bottom: 1px solid #f3f3f3;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-.titleSJY {
-  color: #1F6CEC;
-  font-weight: bold;
-  @include font_size($font_medium);
-  line-height: 6vw;
-}
-</style>
diff --git a/src/pages/spsHome/components/checkCar.vue b/src/pages/spsHome/components/checkCar.vue
deleted file mode 100644
index 6b53318..0000000
--- a/src/pages/spsHome/components/checkCar.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
-  <div class="container">
-    <!-- 盘车 -->
-    <van-popup v-model:show="peopleCarShow" round :style="{ width: '90%' }" close-icon="close" :overlay="true"
-      @close="handleClose">
-      <div class="checkPeoplePopup">
-        <div class="select-box">
-          <div class="item-boxs" v-for="(item, index) in checkCList" :key="index" @click="getCItem(item, index)">
-            <span :class="cCheckFlag === item.value ? 'checkText' : ''">{{ item.label }}</span>
-          </div>
-        </div>
-        <div class="content-boxs">
-          <div v-if="cCheckFlag === 'plateNum'">
-            <div class="plateNum">
-              <van-field v-model="from.value" readonly is-link placeholder="请选择车辆类型"
-                @click="isShowCommonPicker = true;">
-              </van-field>
-              <van-icon @click="ocrSb" style="padding: 0 12px" name="photograph" color="#969799" />
-            </div>
-            <div class="input-number flex">
-              <div class="p_div" v-for="(item, index) in cpList.licensePlateNumber" :key="index"
-                :class="{ current: cpList.currentValIndex === index }" @click="showKeyboardFn(index)">
-                {{ item }}
-              </div>
-              <div class="add-number" v-if="from.hplx == '02'"
-                @click="cpList.licensePlateNumber.push(''), from.hplx = '52'">
-                <van-icon name="plus" color="rgb(34,146,254)" />
-                <span style="font-size: 12px">新能源</span>
-              </div>
-
-              <div class="add-number" v-if="from.hplx == '52'"
-                @click="cpList.licensePlateNumber.pop(0), from.hplx = '02'">
-                <van-icon name="plus" color="rgb(34,146,254)" />
-                <span style="font-size: 12px">汽车</span>
-              </div>
-            </div>
-          </div>
-          <van-field v-model="from.value" placeholder="请输入车辆识别码" v-if="cCheckFlag === 'plateCode'"
-            :rules="[{ required: true, message: '请输入车辆识别码' }]" right-icon="photograph">
-          </van-field>
-          <svg-icon icon="chuzu" />
-        </div>
-        <div class="footBtn">
-          <van-button native-type="submit" @click="checkC('sd')" type="primary" round block>查询</van-button>
-          <div class="toolsTip">请根据工作需求使用功能，您的每次查询将记录日志！</div>
-        </div>
-      </div>
-    </van-popup>
-    <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-      <van-picker :columns="D_BZ_HPZL" @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-    </van-popup>
-    <!-- 车牌键盘 -->
-    <VehicleKeyboard ref="vehicleKeyboards" @setValue="setValue" />
-  </div>
-</template>
-
-<script setup>
-import { Toast } from "vant";
-import VehicleKeyboard from "../../../components/VehicleKeyboard.vue";
-import {
-  ref,
-  reactive,
-  watch,
-  defineProps,
-  defineEmits,
-  defineExpose,
-  toRefs,
-  onMounted,
-  onUnmounted,
-} from "vue";
-import { useRouter } from "vue-router";
-import { getDictList, setDict } from "../../../utils/dict";
-const { D_BZ_HPZL } = getDictList("D_BZ_HPZL");
-const router = useRouter();
-const peopleCarShow = ref(false);
-const props = defineProps({
-  zlId: String,
-});
-const baseInfo = ref({
-  baseImage: '',//回显图片
-})
-function handleOpen() {
-  peopleCarShow.value = true;
-  window.addEventListener("message", receivePost);
-}
-function handleClose() {
-  peopleCarShow.value = false;
-  window.removeEventListener("message", receivePost);
-}
-defineExpose({
-  handleOpen,
-});
-const from = reactive({
-  value: "小型汽车号牌",
-  hplx: "02",
-  pcsrlx: "2",
-});
-const vehicleKeyboards = ref();
-const cpList = reactive({
-  licensePlateNumber: ["", "", "", "", "", "", ""],
-  currentValIndex: 0,
-});
-function showKeyboardFn(index) {
-  cpList.currentValIndex = index;
-  const showProvince = index === 0;
-  const showNumber = index > 1;
-  if (index === cpList.licensePlateNumber.length) {
-    vehicleKeyboards.value.changeDialogShow(false, showProvince, showNumber);
-  } else {
-    vehicleKeyboards.value.changeDialogShow(true, showProvince, showNumber);
-  }
-}
-function setValue(val) {
-  if (val === "delete") {
-    if (cpList.currentValIndex > 2) {
-      cpList.licensePlateNumber[cpList.currentValIndex] = "";
-      cpList.currentValIndex--;
-    } else {
-      cpList.licensePlateNumber[cpList.currentValIndex] = "";
-    }
-  } else {
-    cpList.licensePlateNumber[cpList.currentValIndex] = val;
-    cpList.currentValIndex += 1;
-    showKeyboardFn(cpList.currentValIndex);
-  }
-}
-function ocrSb() {
-  try {
-    bridge.pZ("pzsbcphm");
-  } catch (error) {
-    window.setcphm("川RRF435");
-  }
-}
-
-
-//接收postMessage消息
-function receivePost(mes) {
-  var str = "";
-  try {
-    str = mes.data.type;
-  } catch (error) { }
-  switch (str) {
-    case 'PHOTO':
-      let str = mes.data.data;
-      baseInfo.value.baseImage = str;
-      break;
-    case "cphm":
-      try {
-        getCphm(mes.data.data);
-      } catch (error) { }
-      break;
-    case "color":
-      try {
-        console.log(mes.data);
-        getColor(mes.data.data);
-      } catch (error) { }
-      break;
-  }
-}
-
-//通过ocr获取车牌
-function getCphm(data) {
-  var cparr = ["", "", "", "", "", "", ""];
-  try {
-    if (data && data.length > 6) {
-      cparr = data.split("");
-    } else {
-      Toast.fail("OCR识别失败");
-    }
-  } catch (error) { }
-  cpList.licensePlateNumber = cparr;
-}
-
-//ocr获取车牌颜色
-function getColor(val) {
-  D_BZ_HPZL.value.forEach(item => {
-    if (item.dm == val) {
-      from.hplx = item.dm;
-      from.value = item.zdmc
-    }
-  });
-}
-
-// 盘车
-function checkC(val) {
-  let hphm = cpList.licensePlateNumber.join("");
-  let hplx = from.hplx;
-  let pcsrlx = val ? '2' : '7' //有参数是手动盘查，没有是ocr识别
-  peopleCarShow.value = false
-  router.push({
-    path: "/canVehicle",
-    query: { hphm: hphm, hplx: hplx, pcsrlx: pcsrlx, zlId: props.zlId, }
-  });
-}
-function onConfirm(val) {
-  isShowCommonPicker.value = false;
-  from.value = val.text;
-  from.hplx = val.value;
-}
-const checkCList = [
-  { label: "车牌", value: "plateNum" },
-  { label: "车辆识别码", value: "plateCode" },
-];
-const cCheckFlag = ref("plateNum");
-function getCItem(item, index) {
-  cCheckFlag.value = item.value;
-  console.log(D_BZ_HPZL.value);
-}
-// 弹出层数据
-const columns = ref(["测试1", "测试2", "测试3"]);
-const isShowCommonPicker = ref(false);
-
-</script>
-
-<style lang="scss" scoped>
-.input-number {
-  height: 7vh;
-  // line-height: 6vh;
-  overflow: hidden;
-  margin: 10px 5vw 0;
-  text-align: center;
-
-  // border-radius: 5px;
-  // border: 1px rgb(81, 81, 81) solid;
-  .p_div {
-    background-color: #f5f5f5;
-    height: 7vh;
-    line-height: 7vh;
-    width: 12%;
-    box-sizing: border-box;
-
-    &:not(:last-child) {
-      border-left: 1px #e5e5e5 solid;
-      border-top: 1px #e5e5e5 solid;
-      border-bottom: 1px #e5e5e5 solid;
-      background: #f5f5f5;
-      // border-radius: 5px;
-    }
-  }
-
-  .p_div:nth-child(8) {
-    border: 1px #e5e5e5 solid;
-  }
-
-  .add-number {
-    width: 52px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #1143ca;
-    border: 1px solid #1143ca;
-  }
-
-  .p_div.current {
-    border: 1px solid #66aef6;
-    border-radius: 5px;
-  }
-}
-
-.plateNum {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-bottom: 1px solid #e5e5e5;
-  margin: 0 5vw;
-}
-
-.flex {
-  display: flex;
-}
-
-.plateNum .van-cell {
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.footBtn {
-  margin: 10px 5vw;
-
-  .toolsTip {
-    color: red;
-    font-size: 12px;
-    //  transform: scale(.9);
-    margin: 1vw 0;
-    text-align: center;
-  }
-}
-</style>
diff --git a/src/pages/spsHome/components/checkCarNew.vue b/src/pages/spsHome/components/checkCarNew.vue
deleted file mode 100644
index 4e6afe7..0000000
--- a/src/pages/spsHome/components/checkCarNew.vue
+++ /dev/null
@@ -1,298 +0,0 @@
-<template>
-  <div class="container">
-    <!-- 盘车 -->
-    <!-- <van-popup v-model:show="peopleCarShow" round :style="{ width: '90%' }" close-icon="close" :overlay="true"
-      @close="handleClose"> -->
-      <div class="checkPeoplePopup">
-        <!-- <div class="select-box">
-          <div class="item-boxs" v-for="(item, index) in checkCList" :key="index" @click="getCItem(item, index)">
-            <span :class="cCheckFlag === item.value ? 'checkText' : ''">{{ item.label }}</span>
-          </div>
-        </div> -->
-        <div class="content-boxs">
-          <div v-if="cCheckFlag === 'plateNum'">
-            <div class="plateNum">
-              <van-field v-model="from.value" readonly is-link placeholder="请选择车辆类型"
-                @click="isShowCommonPicker = true;">
-              </van-field>
-              <van-icon @click="ocrSb" style="padding: 0 12px" name="photograph" color="#969799" />
-            </div>
-            <div class="input-number flex">
-              <div class="p_div" v-for="(item, index) in cpList.licensePlateNumber" :key="index"
-                :class="{ current: cpList.currentValIndex === index }" @click="showKeyboardFn(index)">
-                {{ item }}
-              </div>
-              <div class="add-number" v-if="from.hplx == '02'"
-                @click="cpList.licensePlateNumber.push(''), from.hplx = '52'">
-                <van-icon name="plus" color="rgb(34,146,254)" />
-                <span style="font-size: 12px">新能源</span>
-              </div>
-
-              <div class="add-number" v-if="from.hplx == '52'"
-                @click="cpList.licensePlateNumber.pop(0), from.hplx = '02'">
-                <van-icon name="plus" color="rgb(34,146,254)" />
-                <span style="font-size: 12px">汽车</span>
-              </div>
-            </div>
-          </div>
-          <van-field v-model="from.value" placeholder="请输入车辆识别码" v-if="cCheckFlag === 'plateCode'"
-            :rules="[{ required: true, message: '请输入车辆识别码' }]" right-icon="photograph">
-          </van-field>
-          <svg-icon icon="chuzu" />
-        </div>
-        <div class="footBtn">
-          <van-button native-type="submit" @click="checkC('sd')" type="primary" round block>查询</van-button>
-          <div class="toolsTip">请根据工作需求使用功能，您的每次查询将记录日志！</div>
-        </div>
-      </div>
-    <!-- </van-popup> -->
-    <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-      <van-picker :columns="D_BZ_HPZL" @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-    </van-popup>
-    <!-- 车牌键盘 -->
-    <VehicleKeyboard ref="vehicleKeyboards" @setValue="setValue" />
-  </div>
-</template>
-
-<script setup>
-import { Toast } from "vant";
-import VehicleKeyboard from "../../../components/VehicleKeyboard.vue";
-import {
-  ref,
-  reactive,
-  watch,
-  defineProps,
-  defineEmits,
-  defineExpose,
-  toRefs,
-  onMounted,
-  onUnmounted,
-} from "vue";
-import { useRouter } from "vue-router";
-import { getDictList, setDict } from "../../../utils/dict";
-import emitter from "@/utils/eventBus";
-const { D_BZ_HPZL } = getDictList("D_BZ_HPZL");
-const router = useRouter();
-const peopleCarShow = ref(false);
-const props = defineProps({
-  zlId: String,
-});
-const baseInfo = ref({
-  baseImage: '',//回显图片
-})
-function handleOpen() {
-  peopleCarShow.value = true;
-  window.addEventListener("message", receivePost);
-}
-function handleClose() {
-  peopleCarShow.value = false;
-  window.removeEventListener("message", receivePost);
-}
-onMounted(()=>{
-  emitter.on('closeCarJp',(res)=>{
-    console.log(res,'res');
-    vehicleKeyboards.value.changeDialogShow(false, 0, 0);
-  })
-})
-defineExpose({
-  handleOpen,
-});
-const from = reactive({
-  value: "小型汽车号牌",
-  hplx: "02",
-  pcsrlx: "2",
-});
-const vehicleKeyboards = ref();
-const cpList = reactive({
-  licensePlateNumber: ["", "", "", "", "", "", ""],
-  currentValIndex: 0,
-});
-function showKeyboardFn(index) {
-  cpList.currentValIndex = index;
-  const showProvince = index === 0;
-  const showNumber = index > 1;
-  if (index === cpList.licensePlateNumber.length) {
-    vehicleKeyboards.value.changeDialogShow(false, showProvince, showNumber);
-  } else {
-    vehicleKeyboards.value.changeDialogShow(true, showProvince, showNumber);
-  }
-}
-function setValue(val) {
-  if (val === "delete") {
-    if (cpList.currentValIndex > 2) {
-      cpList.licensePlateNumber[cpList.currentValIndex] = "";
-      cpList.currentValIndex--;
-    } else {
-      cpList.licensePlateNumber[cpList.currentValIndex] = "";
-    }
-  } else {
-    cpList.licensePlateNumber[cpList.currentValIndex] = val;
-    cpList.currentValIndex += 1;
-    showKeyboardFn(cpList.currentValIndex);
-  }
-}
-function ocrSb() {
-  try {
-    bridge.pZ("pzsbcphm");
-  } catch (error) {
-    window.setcphm("川RRF435");
-  }
-}
-
-
-//接收postMessage消息
-function receivePost(mes) {
-  var str = "";
-  try {
-    str = mes.data.type;
-  } catch (error) { }
-  switch (str) {
-    case 'PHOTO':
-      let str = mes.data.data;
-      baseInfo.value.baseImage = str;
-      break;
-    case "cphm":
-      try {
-        getCphm(mes.data.data);
-      } catch (error) { }
-      break;
-    case "color":
-      try {
-        console.log(mes.data);
-        getColor(mes.data.data);
-      } catch (error) { }
-      break;
-  }
-}
-
-//通过ocr获取车牌
-function getCphm(data) {
-  var cparr = ["", "", "", "", "", "", ""];
-  try {
-    if (data && data.length > 6) {
-      cparr = data.split("");
-    } else {
-      Toast.fail("OCR识别失败");
-    }
-  } catch (error) { }
-  cpList.licensePlateNumber = cparr;
-}
-
-//ocr获取车牌颜色
-function getColor(val) {
-  D_BZ_HPZL.value.forEach(item => {
-    if (item.dm == val) {
-      from.hplx = item.dm;
-      from.value = item.zdmc
-    }
-  });
-}
-
-// 盘车
-function checkC(val) {
-  let hphm = cpList.licensePlateNumber.join("");
-  let hplx = from.hplx;
-  let pcsrlx = val ? '2' : '7' //有参数是手动盘查，没有是ocr识别
-  peopleCarShow.value = false
-  router.push({
-    path: "/canVehicle",
-    query: { hphm: hphm, hplx: hplx, pcsrlx: pcsrlx, zlId: props.zlId, }
-  });
-}
-function onConfirm(val) {
-  isShowCommonPicker.value = false;
-  from.value = val.text;
-  from.hplx = val.value;
-}
-const checkCList = [
-  { label: "车牌", value: "plateNum" },
-  // { label: "车辆识别码", value: "plateCode" },
-];
-const cCheckFlag = ref("plateNum");
-function getCItem(item, index) {
-  cCheckFlag.value = item.value;
-  console.log(D_BZ_HPZL.value);
-}
-// 弹出层数据
-const columns = ref(["测试1", "测试2", "测试3"]);
-const isShowCommonPicker = ref(false);
-onUnmounted(()=>{
-  emitter.off('closeCarJp')
-})
-</script>
-
-<style lang="scss" scoped>
-.input-number {
-  height: 7vh;
-  // line-height: 6vh;
-  overflow: hidden;
-  margin: 10px 5vw 0;
-  text-align: center;
-
-  // border-radius: 5px;
-  // border: 1px rgb(81, 81, 81) solid;
-  .p_div {
-    background-color: #f5f5f5;
-    height: 7vh;
-    line-height: 7vh;
-    width: 12%;
-    box-sizing: border-box;
-
-    &:not(:last-child) {
-      border-left: 1px #e5e5e5 solid;
-      border-top: 1px #e5e5e5 solid;
-      border-bottom: 1px #e5e5e5 solid;
-      background: #f5f5f5;
-      // border-radius: 5px;
-    }
-  }
-
-  .p_div:nth-child(8) {
-    border: 1px #e5e5e5 solid;
-  }
-
-  .add-number {
-    width: 52px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #1143ca;
-    border: 1px solid #1143ca;
-  }
-
-  .p_div.current {
-    border: 1px solid #66aef6;
-    border-radius: 5px;
-  }
-}
-
-.plateNum {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-bottom: 1px solid #e5e5e5;
-  margin: 0 5vw;
-}
-
-.flex {
-  display: flex;
-}
-
-.plateNum .van-cell {
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.footBtn {
-  margin: 10px 5vw;
-
-  .toolsTip {
-    color: red;
-    font-size: 12px;
-    //  transform: scale(.9);
-    margin: 1vw 0;
-    text-align: center;
-  }
-}
-</style>
diff --git a/src/pages/spsHome/components/checkPeople.vue b/src/pages/spsHome/components/checkPeople.vue
deleted file mode 100644
index 78afaf7..0000000
--- a/src/pages/spsHome/components/checkPeople.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-  <div class="container">
-    <!-- 盘人 -->
-    <van-popup v-model:show="peoplePopupShow" round :style="{ width: '90%' }" close-icon="close" :overlay="true"
-      @close="handleClose">
-      <div class="checkPeoplePopup">
-        <div class="select-box">
-          <div class="item-boxs" v-for="(item, index) in checkPList" :key="index" @click="pCheckFlag = item.value">
-            <span :class="pCheckFlag === item.value ? 'checkText' : ''">{{ item.label }}</span>
-          </div>
-        </div>
-        <div class="content-box">
-          <van-form @submit="onSubmit">
-            <van-field class="border" v-model="form.sfzh" placeholder="请输入身份证号" v-if="pCheckFlag === 'sfzh'"
-              right-icon="photograph" @click-right-icon="handleOCR" :rules="sfzhRuls">
-            </van-field>
-            <van-field class="border" v-model="form.value" placeholder="请输入手机号" right-icon="graphic"
-              v-if="pCheckFlag === 'phoneNum'" :rules="dhhmRuls">
-            </van-field>
-            <div class="photo" v-if="pCheckFlag === 'photo'" @click="takePhoto">
-              <img :src="require('../../../assets/images/new/photoin.png')" alt="" width="100" height="100" />
-              <span>开始拍照</span>
-            </div>
-            <div class="footBtn" v-if="pCheckFlag != 'photo'">
-              <van-button native-type="submit" type="primary" round block>查询</van-button>
-            </div>
-            <div class="toolsTip">请根据工作需求使用功能，您的每次查询将记录日志！</div>
-          </van-form>
-        </div>
-
-
-      </div>
-    </van-popup>
-    <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-      <van-picker :columns="columns" @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import { ref, defineProps, defineExpose } from "vue";
-import { Toast } from "vant";
-import { useRouter } from "vue-router";
-import { IdCardValidator, phoneValidator } from "../../../utils/rules.js"
-import { login } from "@/api/user.js";
-const props = defineProps({ zlId: String });
-const router = useRouter();
-const peoplePopupShow = ref(false);
-const form = ref({
-  sfzh: "",
-  lxdh: "",
-});
-const pCheckFlag = ref("sfzh");
-// 弹出层数据
-const columns = ref(["测试1", "测试2", "测试3"]);
-const checkPList = [
-  { label: "身份证", value: "sfzh" },
-  { label: "手机号", value: "phoneNum" },
-  { label: "人像", value: "photo" },
-];// 盘人弹框按钮List
-const isShowCommonPicker = ref(false);
-const sfzhRuls = ref([
-  { required: true, message: '身份证号码不能为空', trigger: 'onChange/onBlur' },
-  { validator: (value) => { return IdCardValidator(value) }, trigger: 'onChange/onBlur' }
-])
-const dhhmRuls = ref([
-  { required: true, message: '电话号码不能为空', trigger: 'onChange/onBlur' },
-  { validator: (value) => { return phoneValidator(value) }, trigger: 'onChange/onBlur' }
-])
-
-// 打开弹窗
-function handleOpen() {
-  peoplePopupShow.value = true;
-  window.addEventListener("message", receivePost);
-}
-function handleClose() {
-  peoplePopupShow.value = false
-  window.removeEventListener("message", receivePost);
-}
-
-// 处理人OCR
-function handleOCR() {
-  try {
-    window.bridge.openOcrDiscern();
-  } catch (error) { }
-}
-//接收postMessage消息
-function receivePost(mes) {
-  var str = "";
-  try {
-    str = mes.data.type;
-  } catch (error) { }
-
-  switch (str) {
-    case 'PHOTO':
-      try {
-        if (mes.data.data) {
-          let str = mes.data.data
-          router.push({ path: "/peopleList", query: { info: str, pcsrlx: "5" } });
-        } else {
-          Toast.fail("人像识别失败");
-        }
-      } catch (error) { }
-      break;
-    case "sfzh":
-      try {
-        if (mes.data.data) {
-          let info = JSON.parse(mes.data.data)
-          localStorage.setItem('OCR', mes.data.data)
-          let data = { sfzh: info.num, pcsrlx: 7, zlId: props.zlId }
-          router.push({ path: "/quarantinePersonnel", query: data });
-        } else {
-          Toast.fail("OCR识别失败");
-        }
-      } catch (error) { }
-      break;
-    case "NFC":
-      try {
-        if (mes.data.data) {
-          let obj = mes.data.data
-          let data = { sfzh: obj.data.sfzh, pcsrlx: 1, zlId: props.zlId }
-          window.localStorage.setItem("NFC", JSON.stringify(mes.data.data));
-          router.push({ path: "/quarantinePersonnel", query: data });
-        } else {
-          Toast.fail("NFC识别失败");
-        }
-      } catch (error) { }
-      break;
-
-  }
-}
-
-// 人像
-function takePhoto() {
-  try {
-    bridge.pZ('pz_system_rxsb_yk')
-  } catch (error) { }
-}
-
-// 盘人提交按钮
-function onSubmit(values) {
-  switch (pCheckFlag.value) {
-    case "sfzh":
-      let data = { sfzh: form.value.sfzh, pcsrlx: "2", zlId: props.zlId }
-      localStorage.setItem('NFC', JSON.stringify(data))
-      router.push({ path: "/quarantinePersonnel", query: data });
-      break;
-    case "phoneNum":
-      let prams = { dhhm: form.value.value, isPc: 1, pcsrlx: "6" }
-      router.push({ path: "/yyzx/dhcr", query: prams });
-      break;
-  }
-  peoplePopupShow.value = false;
-}
-
-defineExpose({ handleOpen });
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.item-boxs {
-  @include font_size($font_medium_s);
-}
-
-.sub-btn {
-  @include font_size($font_medium);
-}
-
-.border {
-  border: 1px solid #ccc;
-  background: #f5f5f5;
-}
-
-.photo {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  margin-bottom: 4vh;
-  align-items: center;
-
-  span {
-    text-align: center;
-    line-height: 2em;
-    color: #ec6b2b;
-    @include font_size($font_medium);
-    font-weight: bold;
-    font-family: PingFang SC;
-  }
-}
-
-.footBtn {
-  margin: 10px 0px;
-}
-
-.van-form {
-  width: 83%;
-}
-
-::v-deep .van-uploader__wrapper {
-  justify-content: center;
-}
-
-.toolsTip {
-  color: red;
-  font-size: 12px;
-  margin: 2vw 0;
-  text-align: center;
-}
-</style>
diff --git a/src/pages/spsHome/components/checkPeopleNew.vue b/src/pages/spsHome/components/checkPeopleNew.vue
deleted file mode 100644
index cb4fad5..0000000
--- a/src/pages/spsHome/components/checkPeopleNew.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-  <div class="container">
-    <!-- 盘人 -->
-    <!-- <van-popup v-model:show="peoplePopupShow" round :style="{ width: '90%' }" close-icon="close" :overlay="true"
-      @close="handleClose"> -->
-      <div class="checkPeoplePopup">
-        <!-- <div class="select-box">
-          <div class="item-boxs" v-for="(item, index) in checkPList" :key="index" @click="pCheckFlag = item.value">
-            <span :class="pCheckFlag === item.value ? 'checkText' : ''">{{ item.label }}</span>
-          </div>
-        </div> -->
-        <div class="content-box">
-          <van-form @submit="onSubmit">
-            <van-field class="border" v-model="form.sfzh" placeholder="请输入身份证号" v-if="pCheckFlag === 'sfzh'"
-              right-icon="photograph" @click-right-icon="handleOCR" :rules="sfzhRuls">
-            </van-field>
-            <van-field class="border" v-model="form.value" placeholder="请输入手机号" right-icon="graphic"
-              v-if="pCheckFlag === 'phoneNum'" :rules="dhhmRuls">
-            </van-field>
-            <div class="photo" v-if="pCheckFlag === 'photo'" @click="takePhoto">
-              <img :src="require('../../../assets/images/new/photoin.png')" alt="" width="100" height="100" />
-              <span>开始拍照</span>
-            </div>
-            <div class="footBtn" v-if="pCheckFlag != 'photo'">
-              <van-button native-type="submit" type="primary" round block>查询</van-button>
-            </div>
-            <div class="toolsTip">请根据工作需求使用功能，您的每次查询将记录日志！</div>
-          </van-form>
-        </div>
-
-
-      </div>
-    <!-- </van-popup> -->
-    <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-      <van-picker :columns="columns" @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import { ref, defineProps, defineExpose } from "vue";
-import { Toast } from "vant";
-import { useRouter } from "vue-router";
-import { IdCardValidator, phoneValidator } from "../../../utils/rules.js"
-import { login } from "@/api/user.js";
-const props = defineProps({ zlId: String });
-const router = useRouter();
-const peoplePopupShow = ref(false);
-const form = ref({
-  sfzh: "",
-  lxdh: "",
-});
-const pCheckFlag = ref("sfzh");
-// 弹出层数据
-const columns = ref(["测试1", "测试2", "测试3"]);
-const checkPList = [
-  { label: "身份证", value: "sfzh" },
-  // { label: "手机号", value: "phoneNum" },
-  // { label: "人像", value: "photo" },
-];// 盘人弹框按钮List
-const isShowCommonPicker = ref(false);
-const sfzhRuls = ref([
-  { required: true, message: '身份证号码不能为空', trigger: 'onChange/onBlur' },
-  { validator: (value) => { return IdCardValidator(value) }, trigger: 'onChange/onBlur' }
-])
-const dhhmRuls = ref([
-  { required: true, message: '电话号码不能为空', trigger: 'onChange/onBlur' },
-  { validator: (value) => { return phoneValidator(value) }, trigger: 'onChange/onBlur' }
-])
-
-// 打开弹窗
-function handleOpen() {
-  peoplePopupShow.value = true;
-  window.addEventListener("message", receivePost);
-}
-function handleClose() {
-  peoplePopupShow.value = false
-  window.removeEventListener("message", receivePost);
-}
-
-// 处理人OCR
-function handleOCR() {
-  try {
-    window.bridge.openOcrDiscern();
-  } catch (error) { }
-}
-//接收postMessage消息
-function receivePost(mes) {
-  var str = "";
-  try {
-    str = mes.data.type;
-  } catch (error) { }
-
-  switch (str) {
-    case 'PHOTO':
-      try {
-        if (mes.data.data) {
-          let str = mes.data.data
-          router.push({ path: "/peopleList", query: { info: str, pcsrlx: "5" } });
-        } else {
-          Toast.fail("人像识别失败");
-        }
-      } catch (error) { }
-      break;
-    case "sfzh":
-      try {
-        if (mes.data.data) {
-          let info = JSON.parse(mes.data.data)
-          localStorage.setItem('OCR', mes.data.data)
-          let data = { sfzh: info.num, pcsrlx: 7, zlId: props.zlId }
-          router.push({ path: "/quarantinePersonnel", query: data });
-        } else {
-          Toast.fail("OCR识别失败");
-        }
-      } catch (error) { }
-      break;
-    case "NFC":
-      try {
-        if (mes.data.data) {
-          let obj = mes.data.data
-          let data = { sfzh: obj.data.sfzh, pcsrlx: 1, zlId: props.zlId }
-          window.localStorage.setItem("NFC", JSON.stringify(mes.data.data));
-          router.push({ path: "/quarantinePersonnel", query: data });
-        } else {
-          Toast.fail("NFC识别失败");
-        }
-      } catch (error) { }
-      break;
-
-  }
-}
-
-// 人像
-function takePhoto() {
-  try {
-    bridge.pZ('pz_system_rxsb_yk')
-  } catch (error) { }
-}
-
-// 盘人提交按钮
-function onSubmit(values) {
-  switch (pCheckFlag.value) {
-    case "sfzh":
-      let data = { sfzh: form.value.sfzh, pcsrlx: "2", zlId: props.zlId }
-      localStorage.setItem('NFC', JSON.stringify(data))
-      router.push({ path: "/quarantinePersonnel", query: data });
-      break;
-    case "phoneNum":
-      let prams = { dhhm: form.value.value, isPc: 1, pcsrlx: "6" }
-      router.push({ path: "/yyzx/dhcr", query: prams });
-      break;
-  }
-  peoplePopupShow.value = false;
-}
-
-defineExpose({ handleOpen });
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.item-boxs {
-  @include font_size($font_medium_s);
-}
-
-.sub-btn {
-  @include font_size($font_medium);
-}
-
-.border {
-  border: 1px solid #ccc;
-  background: #f5f5f5;
-}
-
-.photo {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  margin-bottom: 4vh;
-  align-items: center;
-
-  span {
-    text-align: center;
-    line-height: 2em;
-    color: #ec6b2b;
-    @include font_size($font_medium);
-    font-weight: bold;
-    font-family: PingFang SC;
-  }
-}
-
-.footBtn {
-  margin: 10px 0px;
-}
-
-.van-form {
-  width: 90%;
-}
-
-::v-deep .van-uploader__wrapper {
-  justify-content: center;
-}
-
-.toolsTip {
-  color: red;
-  font-size: 12px;
-  margin: 2vw 0;
-  text-align: center;
-}
-</style>
diff --git a/src/pages/spsHome/components/peopleList.vue b/src/pages/spsHome/components/peopleList.vue
deleted file mode 100644
index 1d9c8cd..0000000
--- a/src/pages/spsHome/components/peopleList.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="人员列表" :showRight="false" :showLeft="true" />
-    <ul class="people-box">
-      <li class="people-item boxItem" v-for="(item, index) in dataList" @click="lookDetail(item)" :key="index">
-        <div class="text">相似度{{ item.xsd }}%</div>
-        <div class="item-left">
-          <van-image @click.stop="ImagePreview([item.baseUrl])" :src="item.baseUrl">
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-          </van-image>
-        </div>
-        <div class="item-right">
-          <div class="info">姓名 ：{{ item.xm }}</div>
-          <div class="info">性别 ：{{ item.xbdm == "1" ? "男" : "女" }}</div>
-          <div class="info">出生日期 ：{{ item.csrq }}</div>
-          <div class="info">身份证号 ：{{ item.sfzh }}</div>
-        </div>
-      </li>
-    </ul>
-  </div>
-</template>
-<script>
-export default {
-  name: "peopleList",
-};
-</script>
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { onMounted, ref } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { selectRx } from "../../../api/common.js";
-import { ImagePreview } from "vant";
-import { hintToast, getBase64 } from "../../../utils/tools.js";
-const router = useRouter();
-const route = useRoute();
-const dataList = ref([]);
-onMounted(() => {
-  let str = route.query.info;
-  let data = new FormData();
-  data.append("base64Str", str);
-  selectRx(data).then((res) => {
-    if (res && res.length > 0) {
-      dataList.value = res.slice(0, 10);
-      dataList.value.forEach((item) => {
-        getBase64((url) => {
-          item.baseUrl = url;
-        }, item.url);
-      });
-    } else {
-      hintToast("未查到人员信息");
-    }
-  });
-});
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, item.url);
-}
-// 查看详情
-function lookDetail(item) {
-  router.push({
-    path: "/quarantinePersonnel",
-    query: { sfzh: item.sfzh, pcsrlx: "5" },
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-.people-box {
-  padding: 4vw;
-  box-sizing: border-box;
-
-  .people-item {
-    display: flex;
-    border: 1px solid #e9e9e9;
-    padding: 2vw;
-    border-radius: 1vw;
-    margin-bottom: 2vw;
-    position: relative;
-    overflow: hidden;
-
-    .text {
-      position: absolute;
-      right: -21px;
-      top: 17px;
-      width: 106px;
-      text-align: center;
-      height: 22px;
-      line-height: 24px;
-      background: red;
-      font-size: 12px;
-      color: #fff;
-      transform: rotate(42deg);
-    }
-
-    .item-left {
-      width: 22vw;
-      margin-right: 2vw;
-      text-align: center;
-
-      ::v-deep .van-image {
-        width: 22vw;
-        max-height: 27vw;
-
-        img {
-          width: 22vw;
-          max-height: 27vw;
-        }
-      }
-
-    }
-
-    .item-right {
-      flex: 1;
-
-      .info {
-        line-height: 7vw;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/spsHome/components/prpcPopup.vue b/src/pages/spsHome/components/prpcPopup.vue
deleted file mode 100644
index bee60a5..0000000
--- a/src/pages/spsHome/components/prpcPopup.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-  <div class="container">
-    <!-- 盘人 -->
-    <van-popup v-model:show="peoplePopupShow" round :style="{ width: '90%' }" teleport="body" close-icon="close" :overlay="true"
-      @close="handleClose">
-      <van-tabs v-model:active="active" @change="tabChange">
-        <van-tab title="盘人">
-          <CheckPeople />
-        </van-tab>
-        <van-tab title="盘车">
-          <CheckCar />
-        </van-tab>
-      </van-tabs>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import { ref, defineProps, defineExpose } from "vue";
-import { Toast } from "vant";
-import { useRouter } from "vue-router";
-import CheckCar from "./checkCarNew.vue";
-import CheckPeople from "./checkPeopleNew.vue";
-import { login } from "@/api/user.js";
-import emitter from "@/utils/eventBus";
-const props = defineProps({ zlId: String });
-const router = useRouter();
-const peoplePopupShow = ref(false);
-const active=ref('0')
-// 打开弹窗
-function handleOpen() {
-  peoplePopupShow.value = true;
-}
-function handleClose() {
-  peoplePopupShow.value = false
-}
-const tabChange=()=>{
-  emitter.emit('closeCarJp',false)
-}
-
-defineExpose({ handleOpen });
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.item-boxs {
-  @include font_size($font_medium_s);
-}
-
-.sub-btn {
-  @include font_size($font_medium);
-}
-
-.border {
-  border: 1px solid #ccc;
-  background: #f5f5f5;
-}
-
-.photo {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  margin-bottom: 4vh;
-  align-items: center;
-
-  span {
-    text-align: center;
-    line-height: 2em;
-    color: #ec6b2b;
-    @include font_size($font_medium);
-    font-weight: bold;
-    font-family: PingFang SC;
-  }
-}
-
-.footBtn {
-  margin: 10px 0px;
-}
-
-.van-form {
-  width: 90%;
-}
-
-::v-deep .van-uploader__wrapper {
-  justify-content: center;
-}
-
-.toolsTip {
-  color: red;
-  font-size: 12px;
-  margin: 2vw 0;
-  text-align: center;
-}
-</style>
diff --git a/src/pages/taskList/copmonents/patrolWrapper.vue b/src/pages/taskList/copmonents/patrolWrapper.vue
deleted file mode 100644
index fcda2af..0000000
--- a/src/pages/taskList/copmonents/patrolWrapper.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup>
-import { qcckPost, qcckGet } from "@/api/qcckApi";
-const props = defineProps({
-  list: {
-    type: Array,
-    required: true,
-    default: () => []
-  },
-  showReceive: {
-    type: Boolean,
-    default: true
-  }
-})
-
-const emits = defineEmits(["click", "claim"]);
-
-const handleClockInPage = (item) => {
-  emits("click", item);
-}
-
-const handleClaim = (item) => {
-  qcckGet({ fgrwid: item.id }, "/mosty-yjzl/tbZdyrw/getLqrw").then(res => {
-    if (res) {
-      emits("claim", item);
-    }
-  })
-}
-</script>
-
-<template>
-  <div class="item-wrapper">
-    <template v-for="(item, index) in list" :key="index">
-      <div class="card" @click="handleClockInPage(item)">
-        <div class="title">{{ item.fgRwmc }}</div>
-        <div class="row">
-          <div class="col">方格编号：{{ item.fgmc }}</div>
-          <div class="col right">任务日期：{{ item?.xfrq }}</div>
-        </div>
-        <div class="btn" v-if="showReceive" @click.stop="handleClaim(item)">领取</div>
-      </div>
-    </template>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.item-wrapper {
-  padding: 3vw;
-
-  .card {
-    background: #fff;
-    border-radius: 3.73vw;
-    padding: 4vw;
-    margin-bottom: 3vw;
-    box-shadow: 0 1.6vw 4vw rgba(0, 0, 0, 0.04);
-
-    .title {
-      font-size: 4vw;
-      font-weight: bold;
-      color: #333;
-      margin-bottom: 3vw;
-    }
-
-    .row {
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 4vw;
-      font-size: 3.4vw;
-      color: #999;
-
-      .col {
-        &.right {
-          text-align: right;
-        }
-      }
-    }
-
-    .btn {
-      height: 11vw;
-      line-height: 11vw;
-      text-align: center;
-      border-radius: 6vw;
-      color: #ffffff;
-      background: linear-gradient(90deg, #28A5FF 0%, #3E6EE8 100%);
-      font-size: 4vw;
-      box-shadow: 0 2vw 4vw rgba(62, 110, 232, 0.3);
-
-      &.disabled {
-        background: #ccc;
-        box-shadow: none;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/pages/taskList/historyDetail.vue b/src/pages/taskList/historyDetail.vue
deleted file mode 100644
index f5e11c8..0000000
--- a/src/pages/taskList/historyDetail.vue
+++ /dev/null
@@ -1,377 +0,0 @@
-<script setup>
-import TopNav from "@/components/topNav.vue";
-import { qcckPost, qcckGet } from "@/api/qcckApi";
-import { onMounted, ref, reactive, onUnmounted } from "vue";
-import { useRoute } from "vue-router";
-import { selectByTaskInfo } from "@/api/patrolList";
-import { getBase64, hintToast } from "@/utils/tools";
-import { ImagePreview } from "vant";
-import MapWrapper from "@/pages/clockInPage/components/mapWrapper.vue";
-import emitter from "@/utils/eventBus";
-
-const route = useRoute();
-const info = ref({});
-const pointsList = ref([]);
-const listQuery = ref({
-  dktp: "",
-  jd: "",
-  wd: "",
-});
-const zxdksj = ref("");
-const dwIndex = ref();
-const imageMap = new Map();
-const getImageUrl = async (fileId) => {
-  if (!fileId) return null;
-  if (imageMap.has(fileId)) return imageMap.get(fileId);
-  const res = await qcckGet({}, `/mosty-base/minio/file/download/${fileId}`);
-  if (res?.url) {
-    const base64 = await getBase64("", res.url);
-    imageMap.set(fileId, base64);
-    return base64;
-  }
-  return null;
-};
-const getImageUrlOld = (item) => {
-  qcckGet({}, `/mosty-base/minio/file/download/${item}`).then((res) => {
-    console.log(res.url, 'res.url');
-    _getBase64(res.url);
-  });
-};
-const preview = (url) => {
-  if (url) ImagePreview([url]);
-};
-
-const loadData = async () => {
-  const id = route.query.id || "";
-  const detail = await selectByTaskInfo({ fgrwid: id });
-  if (detail) {
-    getUserLocation();
-    // 删除方格
-    emitter.emit("deletePointArea", "zdxl_fzyc");
-    // 生成方格
-    const { x1, y1, x2, y2, fgId, zxX, zxY, fgMc } = detail.fgdwVO;
-    const centerPoint = [zxX, zxY];
-    const position = [
-      [Number(x1), Number(y1)],
-      [Number(x2), Number(y2)],
-    ];
-    const text = fgMc;
-    const obj = [{ position: position, text, id: fgId, userData: detail.bxds }];
-    emitter.emit("echoPlane", {
-      fontColor: "#12fdb8",
-      coords: obj,
-      type: "rectangle",
-      flag: "zdxl_fzyc",
-      color: "rgba(2,20,51,0.5)",
-      linecolor: "#1C97FF",
-    });
-    emitter.emit("setMapCenter", { location: centerPoint, zoomLevel: 12 });
-    // 获取所有唯一的图片ID
-    const uniqueImageIds = new Set();
-    detail.bxds?.forEach((item) => {
-      if (item?.dktp) uniqueImageIds.add(item.dktp);
-    });
-    // 批量获取图片URL
-    const imageEntries = await Promise.allSettled(
-      Array.from(uniqueImageIds).map(async (id) => {
-        try {
-          const url = await getImageUrl(id);
-          return { id, url };
-        } catch (error) {
-          return { id, url: null };
-        }
-      })
-    );
-    // 创建图片映射表
-    const imageMap = new Map();
-    imageEntries.forEach((entry) => {
-      if (entry.status === "fulfilled") {
-        imageMap.set(entry.value.id, entry.value.url);
-      }
-    });
-    // 设置数据
-    pointsList.value = detail.bxds.map((item, index) => ({
-      ...item,
-      imgUrlDkFj: item?.dktp ? imageMap.get(item.dktp) : null,
-    }));
-    // 为每个必到点添加图片URL
-    zxdksj.value = detail.zxdksj;
-    info.value = detail.fgrw;
-    listQuery.value.fgrwid = info.value.id;
-  }
-};
-//获取当前位置信息
-function getUserLocation(sfdw) {
-  let { lng, lat } = getLocation();
-  if (lng && lat) {
-    emitter.emit("deletePointArea", "dw");
-    //地图撒点然后移动
-    emitter.emit("addPointArea", {
-      coords: [{ jd: lng, wd: lat }],
-      icon: require("../../assets/lz/dw.png"),
-      flag: "dw",
-      sfdw: sfdw,
-      sizeX: 30,
-      sizeY: 35,
-    });
-  } else {
-    hintToast("暂无坐标信息");
-  }
-}
-function isInThirtyMinutes(targetTime, jgsj) {
-  let flag = false
-  // 获取当前时间
-  const now = new Date();
-  // 最新打卡时间
-  const targetDate = new Date(targetTime);
-  let nowMin = now.getTime();//当前时间
-  let newMin = targetDate.getTime();//最新打卡时间
-  let count = nowMin - newMin;
-  if (count > jgsj * 60 * 1000) {
-    flag = true
-  } else {
-    flag = false
-  }
-  return flag
-}
-// 点击上传
-const photoFn = (val, index) => {
-  dwIndex.value = index;
-  listQuery.value.bxdid = val.bxdid;
-  // 判断此任务最新打卡时间如果在打卡间隔时间之后才能继续打卡
-  if (zxdksj.value) {
-    if (!isInThirtyMinutes(zxdksj.value, info.value.dkjgsj)) {
-      const nowtime = new Date();
-      const time1 = new Date(zxdksj.value);//最新打卡时间
-      let newMin = time1.getTime() + Number(info.value.dkjgsj) * 60 * 1000;//30分钟后的时间
-      let max = Math.floor((newMin - nowtime.getTime()) / 1000 / 60);//最大可打卡时间
-      hintToast(`请于${max}分钟后打卡`);
-      return;
-    }
-    try {
-      bridge.pZ("photo");
-    } catch (err) {
-      console.log(err, "err");
-    }
-    // handleClick()
-  } else {
-    try {
-      bridge.pZ("photo");
-    } catch (err) {
-      console.log(err, "err");
-    }
-    // handleClick()
-  }
-};
-// 打卡
-const handleClick = () => {
-  const { lng, lat } = getLocation();
-  listQuery.value.jd = lng;
-  listQuery.value.wd = lat;
-  qcckPost(listQuery.value, "/mosty-yjzl/tbZdyrw/zdyRwdk")
-    .then((res) => {
-      if (res) {
-        hintToast(`打卡成功`);
-        loadData()
-      }
-    })
-    .catch((err) => {
-      console.log(err, "err");
-      hintToast("打卡失败");
-      loadData()
-    });
-};
-function setimage_base64(pzid, base64) {
-  pointsList.value[dwIndex.value].imgUrlDkFj = `data:image/jpeg;base64,${base64}`;
-  qcckPost({ base64: base64 }, "/mosty-base/minio/image/upload/base64").then(
-    (res) => {
-      listQuery.value.dktp = res;
-      handleClick();
-    },
-  );
-}
-onMounted(async () => {
-  await loadData();
-  window.setimagebase64 = setimage_base64;
-  setInterval(() => {
-    getUserLocation()
-  }, 2000);
-});
-
-onUnmounted(() => {
-  emitter.emit("deletePointArea", "historyPoints");
-});
-</script>
-
-<template>
-  <div class="page-container">
-    <TopNav nav-title="任务详情" show-left />
-    <div class="content">
-      <!-- Header Card -->
-      <div class="card header-card">
-        <div class="title">{{ info.fgRwmc }}</div>
-        <div class="row info-row">
-          <div class="sub">方格编号：{{ info.fgmc }}</div>
-          <div class="sub">任务日期：{{ info.xfrq }}</div>
-        </div>
-        <div class="sub">
-          打卡间隔时间：{{ info.dkjgsj ? info.dkjgsj : "100min" }}
-        </div>
-      </div>
-      <!-- Point List -->
-      <div class="list">
-        <div v-for="(item, index) in pointsList" :key="index" class="card point-card">
-          <div class="row header-row">
-            <div class="name">{{ item.bxdMc }}</div>
-            <div class="status-tag">{{ item.dkzt }}</div>
-          </div>
-          <!-- Checked In: Show Image -->
-          <div v-if="item.imgUrlDkFj" class="img-container" @click="preview(item.imgUrlDkFj)">
-            <img :src="item.imgUrlDkFj" alt="打卡图片" />
-            <div class="time-overlay">{{ item.dksj }}</div>
-          </div>
-          <!-- Not Checked In: Show Button (Visual only) -->
-          <div v-else class="btn-container">
-            <div class="btn" @click="photoFn(item, index)">打卡拍照</div>
-          </div>
-        </div>
-      </div>
-      <!-- Map Section -->
-      <div class="card map-card">
-        <div class="map-title">当前位置</div>
-        <div class="map-box">
-          <MapWrapper />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.page-container {
-  min-height: 100vh;
-  background: #f5f7fa;
-  padding-bottom: 5vw;
-}
-
-.content {
-  padding: 16vw 3vw 5vw; // Top padding for fixed nav
-}
-
-.card {
-  background: #fff;
-  border-radius: 3.73vw;
-  padding: 4vw;
-  margin-bottom: 3vw;
-  box-shadow: 0 1.6vw 4vw rgba(0, 0, 0, 0.04);
-}
-
-.header-card {
-  .title {
-    font-size: 4.2vw;
-    font-weight: bold;
-    color: #333;
-    margin-bottom: 3vw;
-  }
-
-  .info-row {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 1.5vw;
-  }
-
-  .sub {
-    font-size: 3.4vw;
-    color: #999;
-  }
-}
-
-.point-card {
-  .header-row {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin-bottom: 3vw;
-
-    .name {
-      font-size: 4vw;
-      font-weight: bold;
-      color: #333;
-      margin-right: 2vw;
-    }
-
-    .status-tag {
-      font-size: 3vw;
-      color: #3e6ee8;
-      border: 1px solid #3e6ee8;
-      padding: 0.5vw 1.5vw;
-      border-radius: 1vw;
-    }
-  }
-
-  .img-container {
-    position: relative;
-    width: 100%;
-    height: 40vw;
-    border-radius: 2vw;
-    overflow: hidden;
-
-    img {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-    }
-
-    .time-overlay {
-      position: absolute;
-      top: 2vw;
-      left: 2vw;
-      color: #fff;
-      font-size: 3.5vw;
-      text-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
-    }
-  }
-
-  .btn-container {
-    margin-top: 2vw;
-
-    .btn {
-      height: 11vw;
-      line-height: 11vw;
-      text-align: center;
-      border-radius: 6vw;
-      color: #ffffff;
-      background: linear-gradient(90deg, #28a5ff 0%, #3e6ee8 100%);
-      font-size: 4vw;
-      box-shadow: 0 2vw 4vw rgba(62, 110, 232, 0.3);
-    }
-  }
-}
-
-.map-card {
-  padding: 0; // Remove default padding for map card to let map fill or have custom padding
-  overflow: hidden;
-
-  .map-title {
-    padding: 4vw;
-    font-size: 4vw;
-    font-weight: bold;
-    color: #333;
-    border-bottom: 1px solid #eee;
-  }
-
-  .map-box {
-    height: 50vw;
-    width: 100%;
-    position: relative;
-
-    // Adjust MapWrapper internal style via deep selector if needed,
-    // but MapWrapper has fixed height in its scoped style usually.
-    // We might need to override it.
-    :deep(.mapWrapper) {
-      margin-top: 0;
-      height: 100%;
-    }
-  }
-}
-</style>
diff --git a/src/pages/taskList/historyDetail1.vue b/src/pages/taskList/historyDetail1.vue
deleted file mode 100644
index 717f26d..0000000
--- a/src/pages/taskList/historyDetail1.vue
+++ /dev/null
@@ -1,708 +0,0 @@
-<script setup>
-import TopNav from "@/components/topNav.vue";
-import {
-  onMounted,
-  reactive,
-  ref,
-  computed,
-  nextTick,
-  onUnmounted,
-  watch,
-} from "vue";
-import { useRoute } from "vue-router";
-import Timeline from "@/pages/clockInPage/components/Timeline.vue";
-import {
-  selectByTaskInfo,
-  fetchSelectByBddxlrwId,
-  fetchSelectListByBddxlrwId,
-  fetchTbZdxlFgdwBddxlrwJlClockIn,
-} from "@/api/patrolList";
-import { getBase64, hintToast } from "@/utils/tools";
-import { ImagePreview } from "vant";
-import { qcckPost, qcckGet } from "@/api/qcckApi";
-import MapWrapper from "@/pages/clockInPage/components/mapWrapper.vue";
-import emitter from "@/utils/eventBus";
-
-const route = useRoute();
-const active = ref(0);
-const nextStep = ref(0);
-const baseUrl = ref("");
-const fileId = ref("");
-const startTime = ref("2025-09-18 18:15:00");
-const useCountdownFromTime = () => {
-  const timeLeft = ref(0); // 剩余毫秒数
-  const timer = ref(null);
-  const isRunning = ref(false); // 是否运行中
-  const isExpired = ref(false); // 是否过期
-  const expirationTime = ref(null); // 过期时间
-  // 计算过期时间
-  const calculateExpirationTime = (time, minutes = 10) => {
-    if (!time) return null;
-    try {
-      const startDate = new Date(time);
-      if (isNaN(startDate.getTime())) return null;
-      return new Date(startDate.getTime() + minutes * 60000);
-    } catch {
-      return null;
-    }
-  };
-  // 更新倒计时
-  const update = () => {
-    if (!expirationTime.value) {
-      isExpired.value = true;
-      isRunning.value = false;
-      return;
-    }
-    const now = new Date();
-    timeLeft.value = expirationTime.value - now;
-    if (timeLeft.value <= 0) {
-      timeLeft.value = 0;
-      isExpired.value = true;
-      isRunning.value = false;
-      stop();
-      return;
-    }
-    if (timeLeft.value > 0) {
-      timer.value = setTimeout(update, 1000);
-    }
-  };
-  // 开始倒计时
-  const start = (startTime, minutes) => {
-    stop();
-    expirationTime.value = calculateExpirationTime(startTime, minutes);
-
-    if (!expirationTime.value) {
-      isExpired.value = true;
-      return;
-    }
-    isRunning.value = true;
-    isExpired.value = false;
-    update();
-  };
-  // 停止倒计时
-  const stop = () => {
-    if (timer.value) {
-      clearTimeout(timer.value);
-      timer.value = null;
-    }
-    isRunning.value = false;
-  };
-  // 格式化时间显示
-  const formattedTime = computed(() => {
-    if (timeLeft.value <= 0) return '00:00';
-    const totalSeconds = Math.floor(timeLeft.value / 1000);
-    const mins = Math.floor(totalSeconds / 60);
-    const secs = totalSeconds % 60;
-    return `${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`;
-  });
-
-  // 过期时间显示
-  const expirationTimeFormatted = computed(() => {
-    if (!expirationTime.value) return '';
-    return expirationTime.value.toLocaleTimeString('zh-CN', {
-      hour: '2-digit',
-      minute: '2-digit',
-      second: '2-digit',
-      hour12: false
-    });
-  });
-  // 自动清理
-  onUnmounted(stop);
-  return {
-    timeLeft,
-    formattedTime,
-    expirationTime: expirationTimeFormatted,
-    isRunning,
-    isExpired,
-    start,
-    stop
-  };
-};
-
-const data = reactive({
-  patroObj: {},
-  info: [],
-  query: {},
-});
-
-const infoData = computed(() => {
-  return data.info?.[nextStep.value];
-});
-const activeInfoData = computed(() => data.patroObj?.bxds?.[active.value]);
-const { formattedTime, isExpired, expirationTime, start, stop } =
-  useCountdownFromTime();
-// 删除打卡图片
-const clearImage = () => {
-  baseUrl.value = "";
-  fileId.value = "";
-};
-
-// 浏览图片
-const onClickImg = (url) => {
-  ImagePreview([url]);
-};
-
-// 点击上传
-const photoFn = () => {
-  try {
-    bridge.pZ("photo");
-  } catch (err) {
-    console.log(err, "err");
-  }
-};
-
-// 支持更大数字的转换
-const getChineseNumber = (num) => {
-  const numbers = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十"];
-  if (num <= 10) {
-    return numbers[num - 1];
-  } else if (num <= 19) {
-    return `十${numbers[num - 11] || ""}`;
-  } else if (num <= 99) {
-    const tens = Math.floor(num / 10);
-    const units = num % 10;
-    return `${numbers[tens - 1]}十${units > 0 ? numbers[units - 1] : ""}`;
-  } else {
-    return num.toString(); // 超过99返回阿拉伯数字
-  }
-};
-// 切换tab
-const onChange = (value) => {
-  active.value = value;
-  nextStep.value = 0;
-  baseUrl.value = "";
-  fileId.value = "";
-  getData();
-};
-
-const handleNext = (index) => {
-  stop();
-  nextStep.value = index;
-  start(infoData?.value?.dkKsSj, activeInfoData.value.dkjgsj);
-};
-
-function setimage_base64(pzid, base64) {
-  baseUrl.value = `data:image/jpeg;base64,${base64}`;
-  qcckPost({ base64: base64 }, "/mosty-base/minio/image/upload/base64").then(
-    (res) => {
-      fileId.value = res;
-    }
-  );
-}
-
-const imageCache = new Map();
-const getImageUrl = async (fileId) => {
-  if (!fileId) return null;
-  // 检查缓存
-  if (imageCache.has(fileId)) {
-    return imageCache.get(fileId);
-  }
-  try {
-    const res = await qcckGet({}, `/mosty-base/minio/file/download/${fileId}`);
-    if (res?.url) {
-      const base64 = await getBase64("", res.url);
-      // 存入缓存
-      imageCache.set(fileId, base64);
-      return base64;
-    }
-    return null;
-  } catch (error) {
-    console.warn("获取图片失败:", error);
-    return null;
-  }
-};
-
-const getData = async () => {
-  try {
-    const res = await fetchSelectListByBddxlrwId({
-      bddxlrwId: activeInfoData.value.id || "",
-    });
-    if (res && res?.length > 0) {
-      // 获取所有唯一的图片ID
-      const uniqueImageIds = new Set();
-      res?.forEach((item) => {
-        if (item?.dkJsFj) uniqueImageIds.add(item.dkJsFj);
-        if (item?.dkKsFj) uniqueImageIds.add(item.dkKsFj);
-      });
-      // 批量获取图片URL
-      const imageEntries = await Promise.allSettled(
-        Array.from(uniqueImageIds).map(async (id) => {
-          try {
-            const url = await getImageUrl(id);
-            return { id, url };
-          } catch (error) {
-            return { id, url: null };
-          }
-        })
-      );
-      // 创建图片映射表
-      const imageMap = new Map();
-      imageEntries.forEach((entry) => {
-        if (entry.status === "fulfilled") {
-          imageMap.set(entry.value.id, entry.value.url);
-        }
-      });
-
-      // 设置数据
-      data.info = res.map((item, index) => ({
-        ...item,
-        count: getChineseNumber(index + 1),
-        imgUrlDkJsFj: item?.dkJsFj ? imageMap.get(item.dkJsFj) : null,
-        imgUrlDkKsFj: item?.dkKsFj ? imageMap.get(item.dkKsFj) : null,
-      }));
-      // 打卡结束经纬度
-      const dkJs = res?.map((i) => ({ jd: i?.dkJsJd, wd: i?.dkJsWd }));
-      // 打卡开始经纬度
-      const dkKs = res?.map((i) => ({ jd: i?.dkKsJd, wd: i?.dkKsWd }));
-      // 删除标注
-      emitter.emit("deletePointArea", "annotationDkKs");
-      //地图撒点然后移动
-      emitter.emit("addPointArea", {
-        coords: [...dkJs, ...dkKs],
-        icon: require("../../assets/images/11.png"),
-        flag: "annotationDkKs",
-      });
-
-      await nextTick(() => {
-        const firstItem = data.info[nextStep.value || 0];
-        if (firstItem?.dkKsSj) {
-          startTime.value = infoData?.value?.dkKsSj;
-          start(startTime.value, activeInfoData.value.dkjgsj);
-        } else {
-          start("");
-        }
-      });
-    }
-    if (activeInfoData.value) {
-      const result = await fetchSelectByBddxlrwId(
-        activeInfoData?.value?.id || ""
-      );
-      if (result) {
-        const { jd, wd } = result;
-        // 删除标注
-        emitter.emit("deletePointArea", "checkPoint");
-        //地图撒点然后移动
-        emitter.emit("addPointArea", {
-          coords: [{ jd, wd }],
-          icon: require("../../assets/lz/peoplePolice.png"),
-          flag: "checkPoint",
-        });
-      }
-    }
-  } catch (error) {
-    console.error(error);
-  }
-};
-
-//获取当前位置信息
-function getUserLocation(sfdw) {
-  let { lng, lat } = getLocation();
-  if (lng && lat) {
-    emitter.emit("deletePointArea", "dw");
-    //地图撒点然后移动
-    emitter.emit("addPointArea", {
-      coords: [{ jd: lng, wd: lat }],
-      icon: require("../../assets/lz/dw.png"),
-      flag: "dw",
-      sfdw: sfdw,
-      sizeX: 30,
-      sizeY: 35,
-    });
-  } else {
-    hintToast("暂无坐标信息");
-  }
-}
-
-const getPatrolList = async ({ id }) => {
-  const res = await selectByTaskInfo({ fgrwid: id });
-  if (res) {
-    getUserLocation();
-    data.patroObj = res;
-    // 删除方格
-    emitter.emit("deletePointArea", "zdxl_fzyc");
-    // 生成方格
-    const { x1, y1, x2, y2, fgId, zxX, zxY, fgMc } = data.patroObj.fgdwVO;
-    const centerPoint = [zxX, zxY];
-    const position = [
-      [Number(x1), Number(y1)],
-      [Number(x2), Number(y2)],
-    ];
-    const text = fgMc;
-    const obj = [
-      { position: position, text, id: fgId, userData: activeInfoData?.value },
-    ];
-    emitter.emit("echoPlane", {
-      fontColor: "#12fdb8",
-      coords: obj,
-      type: "rectangle",
-      flag: "zdxl_fzyc",
-      color: "rgba(2,20,51,0.5)",
-      linecolor: "#1C97FF",
-    });
-    emitter.emit("setMapCenter", { location: centerPoint, zoomLevel: 12 });
-    await getData();
-  }
-};
-
-// 简单的时间加法函数
-const addTenMinutes = (timeString) => {
-  if (!timeString) return "";
-  const date = new Date(timeString);
-  if (isNaN(date.getTime())) return "";
-  date.setMinutes(date.getMinutes() + 10);
-  return date
-    .toLocaleString("zh-CN", {
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit",
-      hour12: false,
-    })
-    .replace(/\//g, "-");
-};
-
-// 判断是否超过10分钟
-const isTenMinutesPassed = (startTime) => {
-  if (!startTime) return false;
-  try {
-    const startDate = new Date(startTime);
-    if (isNaN(startDate.getTime())) return false;
-    // 计算10分钟后的时间
-    const tenMinutesLater = new Date(startDate.getTime() + 10 * 60 * 1000);
-    const now = new Date();
-    // 判断当前时间是否超过10分钟后
-    return now > tenMinutesLater;
-  } catch (error) {
-    console.error("时间判断错误:", error);
-    return false;
-  }
-};
-
-// 打卡
-const handleClick = async () => {
-  if (data.info.length == 0) {
-    hintToast("此方格没有必打卡点位！");
-    return;
-  }
-  const { id } = data.info?.[nextStep.value];
-  if (!isTenMinutesPassed(infoData?.value.dkKsSj) && infoData?.value.dkKsSj) {
-    const newTime = addTenMinutes(infoData?.value.dkKsSj);
-    hintToast(`请于${newTime.split(" ")[1]}后打卡`);
-    return;
-  }
-  if (fileId.value === "") {
-    hintToast("请拍照再打卡");
-    return;
-  }
-  const { lng, lat } = getLocation();
-  try {
-    const res = await fetchTbZdxlFgdwBddxlrwJlClockIn({
-      id,
-      dkWd: lat,
-      dkJd: lng,
-      dkFj: fileId.value,
-    });
-
-    if (res) {
-      hintToast(`打卡成功`);
-      baseUrl.value = ""; //打卡成功需要把图片删除掉
-      fileId.value = "";
-      await getData();
-      start();
-    }
-  } catch (error) {
-    hintToast(`打卡异常`);
-    stop();
-    console.log(error);
-  }
-};
-
-onMounted(() => {
-  if (route?.query) {
-    data.query = route?.query;
-    getPatrolList(route?.query);
-  }
-  window.setimagebase64 = setimage_base64;
-});
-</script>
-
-<template>
-  <div>
-    <top-nav navTitle="打卡" :showLeft="true" />
-    <div class="clockInWrapper">
-      <van-tabs v-model:active="active" @click="onChange">
-        <template v-for="(item, index) in data.patroObj?.bxds" :key="index">
-          <van-tab :title="item.bxdMc" />
-        </template>
-      </van-tabs>
-      <div class="clockInList">
-        <template v-for="(item, index) in data.info" :key="index">
-          <div :class="['clockInList_item', { active: nextStep === index }]" @click="handleNext(index)">
-            <div class="label">{{ `第${item?.count}次打卡` }}</div>
-            <div class="dec">
-              <van-icon v-if="item?.dkKsSj" name="checked" color="#007DE9" />
-              <div>开始</div>
-              <div v-if="item?.dkKsSj" class="time">
-                {{ item?.dkKsSj?.split(" ")[1] }}已打卡
-              </div>
-            </div>
-            <div class="dec">
-              <van-icon v-if="item?.dkJsSj" name="checked" color="#007DE9" />
-              <div>离开</div>
-              <div v-if="item?.dkJsSj" class="time">
-                {{ item?.dkJsSj?.split(" ")[1] }}已打卡
-              </div>
-            </div>
-          </div>
-        </template>
-      </div>
-      <div class="upload_box">
-        <div class="image_box" v-if="baseUrl">
-          <van-icon name="close" class="close_icon" @click="clearImage" color="#000" size="24px" />
-          <van-image :src="baseUrl" @click="onClickImg(baseUrl)" style="flex: 1">
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-          </van-image>
-        </div>
-        <div class="upload_icon_box" v-else>
-          <van-icon @click="photoFn" color="#1DB1FF" name="plus" />
-          <span>点击拍照</span>
-        </div>
-        <!-- <van-uploader v-model="clockList" :max-count="1" :after-read="afterRead" capture="camera"
-          :before-read="beforeRead" accept="image/*" /> -->
-        <div class="upload_tip">
-          <span style="color: red">*</span>须拍摄实景图才可进行打卡
-        </div>
-      </div>
-      <div class="clockWrapper">
-        <div v-if="!infoData?.dkJsSj || !infoData?.dkKsSj" class="circleWrapper" :class="{
-          disabled: (!isExpired && expirationTime) || infoData?.dkJsSj,
-        }" @click="handleClick">
-          <div v-if="!isExpired && expirationTime" class="time">
-            {{ formattedTime }}后
-          </div>
-          <div class="title">{{ !infoData?.dkKsSj ? `开始` : `离开` }}</div>
-          <div class="info">{{ `第${infoData?.count || ""}次打卡` }}</div>
-        </div>
-        <div v-else class="circleWrapper" :class="{ disabled: (!isExpired && expirationTime) || infoData?.dkJsSj, }">
-          <div class="title">已结束</div>
-        </div>
-        <div class="circleWrapperTip">
-          <van-icon name="success" color="#FFFFFF" />
-          <div>已进入考勤范围：{{ activeInfoData?.bddMc }}</div>
-        </div>
-      </div>
-      <timeline v-if="data.info.length > 0" :data="[data.info?.[nextStep]]" />
-      <map-wrapper />
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.clockInWrapper {
-  margin-top: 13vw;
-  padding: 2vw;
-
-  .clockWrapper {
-    margin-top: 23.47vw;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-
-    .circleWrapperTip {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-top: 7.2vw;
-      font-family: PingFang HK, PingFang HK;
-      font-weight: 400;
-      font-size: 3.73vw;
-      color: #707070;
-
-      ::v-deep {
-        .van-icon-success {
-          margin-right: 1.33vw;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 3.73vw;
-          height: 3.73vw;
-          background: #11aa66;
-          border-radius: 13.33vw;
-        }
-      }
-    }
-
-    .circleWrapper {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      width: 42.67vw;
-      height: 42.67vw;
-      background: linear-gradient(180deg, #1db1ff 0%, #007de9 100%);
-      border-radius: 26.67vw;
-      color: #fff;
-      font-family: PingFang HK, PingFang HK;
-
-      .time {
-        font-weight: 400;
-        font-size: 4.8vw;
-        margin-bottom: 1.33vw;
-      }
-
-      .title {
-        font-weight: 400;
-        font-size: 4.8vw;
-      }
-
-      .info {
-        font-weight: 400;
-        font-size: 3.73vw;
-        margin-top: 1.33vw;
-      }
-    }
-
-    .disabled {
-      background: #ededed !important;
-      color: #75787f !important;
-    }
-  }
-
-  .upload_box {
-    margin-top: 4vw;
-    display: flex;
-    padding-bottom: 4vw;
-    border-bottom: 0.27vw solid #d9d9d9;
-
-    .upload_tip {
-      color: #999999;
-      font-size: 2.67vw;
-      margin-left: 2.67vw;
-    }
-
-    .image_box {
-      position: relative;
-      width: 40vw;
-      height: 24vw;
-
-      .close_icon {
-        position: absolute;
-        right: 0;
-        top: 0;
-        z-index: 20;
-      }
-
-      ::v-deep .van-image {
-        width: 100%;
-      }
-    }
-
-    .upload_icon_box {
-      font-size: 3.2vw;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      color: #1db1ff;
-      border: 0.27vw dashed #1db1ff;
-      text-align: center;
-      width: 29.33vw;
-      height: 16.53vw;
-      border-radius: 2.67vw;
-    }
-  }
-
-  .clockInList {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 4vw;
-    overflow-y: auto;
-
-    .clockInList_item {
-      padding: 4vw 2vw;
-      width: 43vw;
-      height: 18vw;
-      background: #ededed;
-      border-radius: 2.67vw;
-      flex-shrink: 0;
-      margin-right: 2.67vw;
-
-      &:last-child {
-        margin-right: 0;
-      }
-
-      .label {
-        font-weight: 400;
-        font-size: 4.27vw;
-      }
-
-      .dec {
-        display: flex;
-        align-items: center;
-        color: #75787f;
-        font-size: 3.73vw;
-        margin-top: 1.33vw;
-
-        .van-icon-checked {
-          margin-right: 1.33vw;
-        }
-
-        .time {
-          margin-left: 1.33vw;
-        }
-      }
-    }
-
-    .active {
-      background: rgba(62, 110, 232, 0.2);
-    }
-  }
-
-  ::v-deep {
-    .van-tabs__nav {
-      flex-wrap: wrap;
-    }
-
-    .van-tabs__nav--line {
-      padding-bottom: 0 !important;
-    }
-
-    .van-tabs__wrap {
-      height: auto !important;
-    }
-
-    .van-tabs__line {
-      opacity: 0;
-    }
-
-    .van-tab {
-      flex: initial;
-      font-size: 4vw;
-      width: auto !important;
-      height: 9.33vw;
-      padding: 0 2.67vw;
-      border: 0.27vw solid #ededed;
-      color: #75787f;
-      flex-shrink: 0;
-      border-radius: 2vw;
-      margin-right: 2vw;
-      margin-bottom: 4px;
-
-      &:last-child {
-        margin-right: 0 !important;
-      }
-    }
-
-    .van-tab--active {
-      background: rgba(62, 110, 232, 0.2);
-      border: 0.27vw solid #3e6ee8;
-      color: #3e6ee8 !important;
-    }
-  }
-}
-</style>
diff --git a/src/pages/taskList/index.vue b/src/pages/taskList/index.vue
deleted file mode 100644
index 63c4121..0000000
--- a/src/pages/taskList/index.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<script setup>
-import { ref, reactive, onMounted } from "vue";
-import TopNav from "@/components/topNav.vue";
-import Search from "@/components/search.vue";
-import PatrolWrapper from "./copmonents/patrolWrapper.vue";
-import { fetchTaskList } from "@/api/patrolList";
-import { getDictListByCode } from "@/api/common";
-import router from "@/router";
-import SxPopup from "@/components/SxPopup.vue";
-import SelectTime from "@/components/SelectTime.vue";
-import { hintToast } from "@/utils/tools";
-const tabsIndex = ref(1);
-const showPopup = ref(false);
-const timeShow = ref(false);
-const finished = ref(false);
-const loading = ref(false);
-const loadingRefresh = ref(false);
-const searchValue = ref("")
-const pageData = reactive({
-  pageSize: 10,
-  pageCurrent: 1,
-  total: 0,
-})
-
-const data = reactive({
-  list: [],
-  dictList: [],
-  startTime: '',
-  appRwlx: '01',//app任务类型 01当日任务 02历史任务
-})
-
-const onSearch = () => {
-  loading.value = true;
-  pageData.pageCurrent = 1;
-  data.list = []
-  getData()
-}
-
-const onRefresh = () => {
-  tabsIndex.value++;
-  loading.value = false;
-  loadingRefresh.value = true;
-  finished.value = false;
-  pageData.pageCurrent = 1;
-  data.list = []
-  getData()
-}
-
-const onLoad = () => {
-  if (data.list.length >= pageData?.total) {
-    finished.value = true;
-    return
-  }
-  pageData.pageCurrent++
-  getData()
-}
-
-const handleClaim = (item) => {
-  hintToast("领取成功");
-  setTab('history')
-}
-
-const handleClockInPage = (item) => {
-  if (activeTab.value === 'history') {
-    router.push({ path: '/taskHistoryDetail', query: { id: item.id, current: pageData.pageCurrent } });
-  }
-}
-
-const getData = async () => {
-  const { total, ...ret } = pageData
-  loading.value = true;
-  try {
-    const res = await fetchTaskList({ ...ret, fgMc: searchValue.value, rwRq: data.startTime, appRwlx: data.appRwlx })
-    if (res?.records.length > 0) {
-      data.list = data.list.concat(res?.records) || []
-    }
-    pageData.total = res?.total
-    loading.value = false;
-    loadingRefresh.value = false;
-  } catch (error) {
-    loading.value = false;
-    loadingRefresh.value = false;
-  }
-}
-
-const getDictList = async () => {
-  const res = await getDictListByCode({ dictCode: 'D_ZDXL_FGXLRW_YJDJ' })
-  if (res && res?.itemList?.length > 0) {
-    data.dictList = res?.itemList
-  }
-}
-const onSelectTime = (val) => {
-  data.startTime = val;
-  timeShow.value = false
-}
-
-const onClickTime = () => {
-  timeShow.value = true;
-}
-
-const activeTab = ref('today');
-const setTab = (tab) => {
-  activeTab.value = tab;
-  if (tab === 'today') {
-    data.appRwlx = '01'
-  } else {
-    data.appRwlx = '02'
-  }
-  pageData.pageCurrent = 1;
-  data.list = [];
-  getData();
-};
-
-const onConfirm = () => {
-  pageData.pageCurrent = 1;
-  data.list = []
-  getData()
-  showPopup.value = false;
-}
-
-const handleReset = () => {
-  data.startTime = ""
-  onConfirm()
-}
-
-
-onMounted(async () => {
-  await getDictList()
-  await getData()
-})
-</script>
-
-<template>
-  <div>
-    <TopNav nav-title="任务中心" show-left />
-    <van-sticky>
-      <div class="sticky_box">
-        <div class="segment">
-          <div class="segment-bg">
-            <div class="segment-item" :class="{ active: activeTab === 'today' }" @click="setTab('today')">当日任务</div>
-            <div class="segment-item" :class="{ active: activeTab === 'history' }" @click="setTab('history')">历史任务</div>
-          </div>
-        </div>
-        <search :isSx="true" placeholder="请输入方格名称进行查询" v-model="searchValue" @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch" />
-      </div>
-    </van-sticky>
-
-    <sx-popup :showPopup="showPopup" :p_top="150" @update:close="showPopup = false" @update:onConfirm="onConfirm"
-      @reset="handleReset">
-      <div class="time_box">
-        <van-field v-model="data.startTime" label-width="60px" placeholder="请选择时间" input-align="left"
-          right-icon="arrow-down" readonly @click.stop="onClickTime" />
-      </div>
-    </sx-popup>
-
-    <select-time v-if="timeShow" time-type="选择任务日期" @update:time="onSelectTime" @update:cancelTime="timeShow = false" />
-
-    <div class="content">
-      <van-pull-refresh v-model="loadingRefresh" @refresh="onRefresh">
-        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="onLoad" offset="1"
-          :immediate-check="false">
-          <patrol-wrapper :list="data?.list" :show-receive="activeTab === 'today'" @click="handleClockInPage"
-            @claim="handleClaim" />
-
-          <van-empty description="暂无采集数据" image="default" v-if="data.list.length <= 0 && loadingRefresh === false" />
-        </van-list>
-      </van-pull-refresh>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.time_box {
-  padding: 0 3vw 3vw;
-}
-
-.segment {
-  padding: 0 4vw 3vw;
-  box-sizing: border-box;
-  margin-top: 13.5vw;
-
-  .segment-bg {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    background: #f2f3f5;
-    border-radius: 6vw;
-    padding: 1vw;
-  }
-
-  .segment-item {
-    flex: 1;
-    text-align: center;
-    padding: 2.5vw 0;
-    border-radius: 5vw;
-    font-size: 3.73vw;
-    color: #999999;
-  }
-
-  .segment-item.active {
-    color: #ffffff;
-    background: linear-gradient(90deg, #28A5FF 0%, #3E6EE8 100%);
-    box-shadow: 0 1vw 2vw rgba(62, 110, 232, 0.2);
-  }
-}
-
-.header {
-  margin-top: 13vw;
-}
-
-.content {
-  margin-bottom: 16vw;
-}
-</style>
diff --git a/src/pages/views/CanVehicle/components/checkPeople.vue b/src/pages/views/CanVehicle/components/checkPeople.vue
deleted file mode 100644
index 6a3bf64..0000000
--- a/src/pages/views/CanVehicle/components/checkPeople.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <div class="container">
-    <!-- 盘人 -->
-    <van-popup v-model:show="peoplePopupShow" round :style="{ width: '80%' }" close-icon="close" :overlay="true"
-      @close="handlePClose">
-      <div class="checkPeoplePopup">
-        <div class="select-box">
-          <div class="item-boxs" v-for="(item, index) in checkPList" :key="index" @click="getPItem(item, index)">
-            <span :class="pCheckFlag === item.value ? 'checkText' : ''">{{
-              item.label
-            }}</span>
-          </div>
-        </div>
-        <div class="content-box">
-          <van-field v-model="form.sfzh" placeholder="请输入身份证号" v-if="pCheckFlag === 'sfzh'" right-icon="photograph"
-            :rules="[{ required: true, message: '请输入身份证号码' }]">
-          </van-field>
-          <van-field v-model="form.value" placeholder="请输入手机号" right-icon="graphic" v-if="pCheckFlag === 'phoneNum'"
-            :rules="[{ required: true, message: '请输入手机号码' }]">
-          </van-field>
-          <div v-if="pCheckFlag === 'photo'">
-            <img :src="require('../../../../assets/images/new/photoin.png')" alt="" width="100" height="100" />
-          </div>
-          <div v-if="pCheckFlag === 'scanf'">
-            <!-- <van-icon name="scan" /> -->
-          </div>
-          <!-- 综合 -->
-          <div v-if="pCheckFlag === 'comprehensive'" style="width: 100%">
-            <van-field v-model="form.value" placeholder="请输入姓名" :rules="[{ required: true, message: '请输入姓名' }]"
-              right-icon="user-o">
-            </van-field>
-            <!-- <van-field
-              v-model="value"
-              readonly
-              name="calendar"
-              placeholder="请输入出生日期"
-              @click="showCalendar = true"
-            >
-            <template #right-icon>
-                <i class="iconfontorange">&#xe613;</i>
-              </template>
-</van-field> -->
-            <van-field v-model="form.value" name="csrq" placeholder="请输入生日,格式为2020-01-01" right-icon="calendar-o"
-              @touchstart.stop="showDateKeyboard = true" :rules="[
-                {
-                  pattern: /\d{4}-\d{2}-\d{2}/,
-                  required: true,
-                  message: '请输入生日,格式为2020-01-01',
-                },
-              ]">
-            </van-field>
-            <van-field v-model="form.result" name="picker" clickable placeholder="请选择性别" right-icon="award-o"
-              @click="getCommonPop('sex')">
-            </van-field>
-          </div>
-        </div>
-        <div class="checkPeopleSubmit" @click="checkP(pCheckFlag)" v-if="pCheckFlag != 'photo'">
-          <div class="sub-btn">
-            <img :src="require('../../../../assets/images/new/faceR.png')" alt="" width="17"
-              height="17" />&nbsp;&nbsp;盘查人员
-          </div>
-        </div>
-      </div>
-    </van-popup>
-    <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-      <van-picker :columns="columns" @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import {
-  ref,
-  reactive,
-  watch,
-  defineProps,
-  defineEmits,
-  defineExpose,
-  toRefs,
-  toRef,
-} from "vue";
-import { hintToast } from "../../../../utils/tools.js";
-import { useRouter } from "vue-router";
-const router = useRouter();
-const peoplePopupShow = ref(false);
-function handleOpen() {
-  peoplePopupShow.value = true;
-}
-function handlePClose() {
-  peoplePopupShow.value = false;
-}
-defineExpose({
-  handleOpen,
-});
-const form = ref({
-  sfzh: "",
-  lxdh: "",
-});
-// 盘人
-function checkP(e) {
-  switch (e) {
-    case "sfzh":
-      if (form.value.sfzh) {
-        router.push({
-          path: "/quarantinePersonnel",
-          query: {
-            sfzh: form.value.sfzh,
-            pcsrlx: "2",
-          },
-        });
-      } else {
-        hintToast("请输入身份证号码");
-      }
-      break;
-  }
-}
-// 盘人弹框按钮List
-const checkPList = [
-  { label: "身份证", value: "sfzh" },
-  { label: "手机号", value: "phoneNum" },
-  // { label: "人像", value: "photo" },
-  // { label: "扫码", value: "scanf" },
-  // { label: "综合", value: "comprehensive" },
-];
-const pCheckFlag = ref("sfzh");
-function getPItem(item, index) {
-  pCheckFlag.value = item.value;
-}
-// 弹出层数据
-const columns = ref(["测试1", "测试2", "测试3"]);
-const isShowCommonPicker = ref(false);
-function getCommonPop(val) {
-  switch (val) {
-    case "cllx":
-      columns.value = ["1", "2", "3"];
-      break;
-    case "sex":
-      columns.value = ["男", "女", "未知"];
-      break;
-  }
-  isShowCommonPicker.value = true;
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../../assets/styles/mixin.scss";
-
-.item-boxs {
-  @include font_size($font_medium_s);
-}
-
-.sub-btn {
-  @include font_size($font_medium_s);
-}
-</style>
diff --git a/src/pages/views/CanVehicle/index.vue b/src/pages/views/CanVehicle/index.vue
deleted file mode 100644
index 88857cf..0000000
--- a/src/pages/views/CanVehicle/index.vue
+++ /dev/null
@@ -1,776 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav navTitle="车辆盘查" :showRight="false" :showLeft="true" />
-    <div class="tip_text">
-      盘查结果：{{ clxx.pcbqsm }}
-    </div>
-    <!-- <div class="head-nav-banner" v-if="clxx.jdcsyr"></div>
-    <div class="top" v-if="clxx.jdcsyr">
-      <div class="basic-info">
-        <div class="img-box">
-          <img :class="_getBase64(clxx)" :src="clxx.baseUrl" width="60" />
-        </div>
-        <div class="IDcard-info">
-          <div class="text">{{ clxx.hphm }}</div>
-          <div>所有人: {{ clxx.jdcsyr }}</div>
-          <div>车主身份证：{{ clxx.jdcsyrsfzh }}</div>
-          <div>识别代码: {{ clxx.clsbdh }}</div>
-        </div>
-      </div>
-    </div>
-    <div class="bg_ban"></div>
-    <div class="center" v-if="clxx.jdcsyr">
-      <div class="associated-information">
-        <div class="sign-title">关联信息</div>
-        <div class="content1">
-          <div class="item-box" @click="goCanTrack">
-            <div class="ass-item-box">
-              <div class="circlebox bg2"></div>
-              <span>盘查轨迹</span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="pick-up-information">
-        <div class="sign-title">采集信息</div>
-        <div class="pick-box">
-          <van-badge class="pick-item-box pbg3" :content="wpdjList.length" @click="isShowSignIn = true">
-            <div>物品登记</div>
-            <div class="tp"></div>
-          </van-badge>
-          <van-popup v-model:show="isShowSignIn" :style="{ width: '90vw' }">
-            <van-form @submit="onSubmitWp">
-              <van-cell-groub>
-                <van-field name="uploader" label="物品图片">
-                  <template #input>
-                    <van-uploader v-model="wpTpIdList" multiple :max-count="3" :after-read="upLoadImg2" />
-                  </template>
-                </van-field>
-              </van-cell-groub>
-              <van-cell-groub>
-                <van-field v-model="wpdjForm.wpms" label="物品描述" placeholder="物品描述" rows="2" maxlength="50"
-                  show-word-limit></van-field>
-              </van-cell-groub>
-              <van-cell-groub>
-                <van-field :rules="[{ required: true, message: '请填写物品数量' }]" v-model="wpdjForm.wpsl" label="物品数量"
-                  placeholder="物品数量" type="number"></van-field>
-              </van-cell-groub>
-              <van-cell-groub>
-                <van-field :rules="[{ required: true, message: '请选择物品类型' }]" readonly is-link v-model="wpdjForm.wplx"
-                  label="物品类型" placeholder="选择物品类型" @click="showPicker = true"></van-field>
-              </van-cell-groub>
-              <div style="margin: 16px">
-                <van-button round block type="primary" native-type="submit" size="small">提交</van-button>
-              </div>
-            </van-form>
-          </van-popup>
-        </div>
-      </div>
-      <div class="vehicular">
-        <div class="sign-title">
-          <span>同乘人员</span><span class="chooseP" @click="isWithStaff = true;">选择人员</span>
-        </div>
-        <div class="ry_item">
-          <div v-if="rypcidList.length === 0" style="text-align: center">
-            暂无数据
-          </div>
-          <div v-else>
-            <div class="item_flex" v-for="(item, index) in rypcidList" :key="index + 'ryid'">
-              <van-badge>
-                <div class="item_tcry">
-                  <span style="width: 15vw">{{
-                    rypcOptions.filter((e) => e.value === item)[0].xm
-                  }}</span>
-                  &emsp;
-                  <span>{{
-                    rypcOptions.filter((e) => e.value === item)[0].sfzh
-                  }}</span>
-                </div>
-                <template #content>
-                  <van-icon name="cross" class="badge-icon" @click="deleterypc(index)" />
-                </template>
-              </van-badge>
-              <van-button v-if="
-                rypcOptions.filter((e) => e.value === item)[0].pcclJg == 1
-              " round class="fxBtn" type="default" style="padding: 0 12px" size="mini">放行</van-button>
-              <van-button v-else-if="
-                rypcOptions.filter((e) => e.value === item)[0].pcclJg == 2
-              " round class="yjBtn" style="padding: 0 12px" type="default" size="mini">移交</van-button>
-              <van-button v-else round class="fxBtn" style="padding: 0 12px" type="default" size="mini">盘查</van-button>
-            </div>
-          </div>
-        </div>
-        <van-popup v-model:show="isWithStaff" :style="{ height: '55%', width: '70%', borderRadius: '8px' }">
-          <div class="staff-title">选择同乘人员</div>
-          <div class="staff-content">
-            <div style="text-align: center; margin-top: 16px" v-if="rypcOptions.length === 0">
-              暂无同乘人员~
-            </div>
-            <div v-else>
-              <van-checkbox-group v-model="rypcidList">
-                <van-cell-group inset>
-                  <van-cell v-for="(item, index) in rypcOptions" :key="index + 'rypcid'" :title="item.xm"
-                    @click="toggle(index)">
-                    <template #right-icon>
-                      <van-checkbox :name="item.value" :ref="(el) => (checkboxRefs[index] = el)"
-                        @click.stop></van-checkbox>
-                    </template>
-                  </van-cell>
-                </van-cell-group>
-              </van-checkbox-group>
-            </div>
-          </div>
-          <div class="staff-sure">
-            <van-button size="small" class="yjBtn" type="default" block @click="prLoad">盘人</van-button>
-            <van-button size="small" class="fxBtn" type="default" @click="onOkTcry" block>确认</van-button>
-          </div>
-        </van-popup>
-         <div class="veh-box">
-          <div class="no-veh">暂无乘坐车辆~</div>
-        </div> 
-      </div>
-    </div>
-    <div class="bg_ban"></div>
-    <div class="upload" v-if="clxx.jdcsyr">
-      <div class="tsxx" v-show="fileList.length === 0">
-        点击上传图片
-        <br />
-        最多可上传 3 张照片
-      </div>
-      <van-uploader v-model="fileList" multiple :max-count="3" :after-read="upLoadImg">
-        <van-button class="up_btn" icon="plus"></van-button>
-      </van-uploader>
-    </div> -->
-    <!-- <div class="bg_ban" style="height: 100px"></div> -->
-    <div class="bottom-box">
-      <div @click="save('1')">
-        <img src="../../../assets/images/new/fangxing.png" />
-        放行
-      </div>
-      <div @click="save('2')" class="yj">
-        <img src="../../../assets/images/new/yijiao.png" />
-        移交
-      </div>
-    </div>
-    <van-popup v-model:show="showPicker" position="bottom">
-      <van-picker :columns="D_BZ_BPCRCWP" @confirm="onConfirmWp" @cancel="showPicker = false" />
-    </van-popup>
-    <!-- 移交弹窗 -->
-    <van-popup v-model:show="showYj" round :style="{ width: '90vw' }">
-      <van-form @submit="onYj">
-        <van-cell-groub>
-          <van-field :rules="[{ required: true, message: '请填写移交单位' }]" v-model="yjForm.pcclYjdw" label="移交单位"
-            placeholder="移交单位"></van-field>
-        </van-cell-groub>
-        <van-cell-groub>
-          <van-field :rules="[{ required: true, message: '请选择移交原因' }]" readonly is-link v-model="yjForm.pcclYjyy"
-            label="移交原因" placeholder="选择移交原因" @click="showYjyy = true"></van-field>
-        </van-cell-groub>
-        <div style="margin: 16px">
-          <van-button round block type="primary" native-type="submit" size="small">移交</van-button>
-        </div>
-      </van-form>
-    </van-popup>
-    <!-- 移交原因 -->
-    <van-popup round v-model:show="showYjyy" position="bottom">
-      <van-picker :columns="D_BZ_BPCCLYJYY" @cancel="showYjyy = false" @confirm="onConfirmYjyy"></van-picker>
-    </van-popup>
-    <checkedPeople ref="peo" />
-  </div>
-</template>
-
-<script setup>
-import ImageCompressor from "image-compressor.js";
-import TopNav from "../../../components/topNav";
-import checkedPeople from "./components/checkPeople";
-import { ref, reactive, onMounted, onBeforeUpdate, watch } from "vue";
-import { useRouter } from "vue-router";
-import { selectCl, saveBpccl, upImage, getClry2h } from "../../../api/common";
-import { getDictList, setDict } from "../../../utils/dict";
-import { zlPrPc } from "../../../api/zlzx.js";
-import { getBase64, hintToast } from "../../../utils/tools.js";
-const router = useRouter();
-//移交表单
-const { D_BZ_BPCRCWP, D_BZ_BPCCLYJYY } = getDictList("D_BZ_BPCRCWP", "D_BZ_BPCCLYJYY");
-const yjForm = ref({});
-const zlId = ref("");
-const loading = ref(true);
-const showEmpty = ref(false);
-const copyCphm = ref("");
-const wpTpIdList = ref([]);
-const peo = ref(null);
-const fileList = ref([]);
-const isWithStaff = ref(false);
-const showYj = ref(false);
-const gps = ref({});
-const clxx = ref({});
-const showYjyy = ref(false);
-const rypcidList = ref([]);//人员盘查id集合
-const rypcOptions = ref([]);
-const checkboxRefs = ref([]);
-const wpdjList = ref([]);//物品登记数据
-const wpdjForm = ref({
-  wpms: "",
-  wpTpIdList: [],
-  wpsl: 1,
-  wplx: "",
-});
-const tpIdList = ref([]);
-const isShowSignIn = ref(false);// 物品登记
-const addfileList = ref([]);
-const result = ref("");
-const showPicker = ref(false);
-onBeforeUpdate(() => {
-  checkboxRefs.value = [];
-});
-onMounted(() => {
-  zlId.value = router.currentRoute.value.query.zlId;
-  copyCphm.value = router.currentRoute.value.query.hphm;
-  getTcry();
-  try {
-    gps = JSON.parse(bridge.getLocation());
-  } catch (error) { }
-  let hphm = router.currentRoute.value.query.hphm;
-  if (hphm) {
-    clxxQueryDetail(hphm);
-  } else {
-    hintToast("无车辆信息,请重试！");
-    showEmpty.value = true;
-    loading.value = false;
-  }
-});
-
-function toggle(index) {
-  checkboxRefs.value[index].toggle();
-}
-function onOkTcry() {
-  isWithStaff.value = false;
-}
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => { item.baseUrl = res; }, `http://10.64.201.128:2366/xlpcAdminNew/requestservice/czrk/ryxp.jpg?sfzh=${item.jdcsyrsfzh}`);
-}
-// 盘查人员
-function prLoad() {
-  peo.value.handleOpen();
-}
-// 移交原因
-function onConfirmYjyy(val) {
-  showYjyy.value = false;
-  yjForm.value.pcclYjyy = val.text;
-}
-
-function deleterypc(e) {
-  rypcidList.value.splice(e, 1);
-}
-function onSubmitWp() {
-  isShowSignIn.value = false;
-  wpdjList.value.push({
-    wpms: wpdjForm.value.wpms,
-    wpTpIdList: wpdjForm.value.wpTpIdList,
-    wplx: wpdjForm.value.wplxdm,
-    wpsl: wpdjForm.value.wpsl,
-  });
-  wpTpIdList.value = [];
-  wpdjForm.value = {
-    wpms: "",
-    wpTpIdList: [],
-    wpsl: 1,
-    wplx: "",
-  };
-}
-function onConfirmWp(val) {
-  showPicker.value = false;
-  wpdjForm.value.wplx = val.text;
-  wpdjForm.value.wplxdm = val.dm;
-}
-function getTcry() {
-  getClry2h().then((res) => {
-    rypcOptions.value = res.map((item) => {
-      return {
-        xm: item.xm,
-        value: item.id,
-        sfzh: item.sfzh,
-        pcclJg: item.pcclJg,
-      };
-    });
-  });
-}
-
-function clxxQueryDetail(hphm) {
-  let hplx = router.currentRoute.value.query.hplx
-  selectCl({
-    hphm: hphm,
-    hpzl: hplx,
-    jd: gps.app_x,
-    wd: gps.app_y,
-    sjly: "",
-    zdxh: gps.zdxh,
-    pcsrlx: router.currentRoute.value.query.pcsrlx,
-    zdch: gps.zdch,
-    zdsim: gps.zdsim,
-    glxtdm: "",
-    glxtid: "",
-    jzid: "",
-    bbid: "",
-    pcfs: "",
-  }).then((res) => {
-    loading.value = false;
-    if (res) {
-      clxx.value = res;
-    } else {
-      hintToast("查无此车,请核对信息！");
-      router.go(-1);
-    }
-    //如果是指令页面跳转过来 嗲用
-    if (zlId.value) {
-      zlPrPc({ pclxdm: 2, pcryclId: clxx.value.id, zlId: zlId.value }).then((res) => { });
-    }
-  });
-}
-// 关联信息
-function goCanTrack() {
-  router.push({
-    path: "/TrackInventory", query: { hphm: clxx.value.hphm },
-  });
-}
-// 放行移交
-function save(val) {
-  if (val === "1") {
-    clxx.value.pcclJg = val;
-    clxx.value.pcclJgmc = "放行";
-    clxx.value.jd = gps.app_x;
-    clxx.value.wd = gps.app_y;
-    const formData = {
-      id: clxx.value.id,
-      pcclJg: "1",
-      pcclJgmc: "放行",
-      tpIdList: tpIdList.value,
-      clWpList: wpdjList.value,
-      rypcidList: rypcidList.value,
-    };
-    saveBpccl(formData).then((res) => {
-      hintToast("放行成功！");
-      router.go(-1);
-    });
-  } else {
-    clxx.value.pcclJg = val;
-    clxx.value.pcclJgmc = "移交";
-    showYj.value = true;
-  }
-}
-// 移交
-function onYj() {
-  const formData = {
-    id: clxx.value.id,
-    pcclJg: "2",
-    pcclJgmc: "移交",
-    pcclYjdw: yjForm.value.pcclYjdw,
-    pcclYjyy: yjForm.value.pcclYjyy,
-    tpIdList: tpIdList.value,
-    clWpList: wpdjList.value,
-    rypcidList: rypcidList.value,
-  };
-  saveBpccl(formData).then((res) => {
-    hintToast("移交成功！");
-    router.go(-1);
-  });
-}
-// 上传图片
-async function upLoadImg(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  upImage(data).then((res) => {
-    file.status = "done";
-    file.message = "上传成功";
-    if (!tpIdList.value.includes(res)) tpIdList.value.push(res);
-  });
-}
-// 上传图片
-async function upLoadImg2(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  upImage(data).then((res) => {
-    file.status = "done";
-    file.message = "上传成功";
-    if (!wpdjForm.value.wpTpIdList.includes(res)) wpdjForm.value.wpTpIdList.push(res);
-  });
-}
-//压缩图片
-const _compressImage = (file) => {
-  return new Promise((resolve, reject) => {
-    new ImageCompressor(file, {
-      quality: 0.6, //压缩质量
-      success(res) {
-        resolve(res);
-      },
-      error(e) {
-        reject(e);
-      },
-    });
-  });
-};
-
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.bg_ban {
-  background: #eff0f5;
-  height: 12px;
-}
-
-.container {
-  // height: 100vh;
-  margin-bottom: 8vh;
-}
-
-.top {
-  background-image: url("../../../assets/images/new/cl_bg.png");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  height: 22vw;
-  padding: 3vh 5vw;
-  margin: 0 4vw 12px;
-  position: relative;
-  z-index: 2;
-}
-
-.basic-info {
-  color: #4d4d4d;
-  display: flex;
-  flex-direction: row;
-
-  .img-box {
-    flex: 1;
-
-    >img {
-      border-radius: 5px;
-      border: 1px solid #1143ca;
-      overflow: hidden;
-    }
-  }
-
-  .IDcard-info {
-    flex: 3;
-    @include font_size($font_medium_s);
-
-    .text {
-      // @include font_size($font_large);
-      @include font_size($font_medium);
-      font-weight: bold;
-      color: #1f6cec;
-    }
-  }
-}
-
-.contact-way {
-  margin-top: 3vh;
-  line-height: 3vh;
-  @include font_size($font_medium_s);
-
-  .one-line {
-    display: flex;
-
-    .phoneNum {
-      width: 50%;
-    }
-  }
-}
-
-.fxBtn {
-  background: linear-gradient(148deg, #5897ff, #1862de);
-  color: #f2f2f2;
-}
-
-.yjBtn {
-  background: linear-gradient(148deg, #ffbb6b, #ff7a45);
-  color: #f2f2f2;
-}
-
-.center {
-  padding: 0 3vw;
-
-  .sign-title {
-    padding-left: 14px;
-    position: relative;
-    line-height: 3vh;
-    @include font_size($font_medium);
-    font-weight: bold;
-    display: flex;
-    justify-content: space-between;
-    margin: 1vh 0;
-
-    .chooseP {
-      @include font_size($font_medium_s);
-      color: rgb(0, 102, 255);
-      font-weight: normal;
-    }
-  }
-
-  .sign-title::after {
-    content: "";
-    position: absolute;
-    left: 0;
-    top: 2px;
-    bottom: 2px;
-    width: 4px;
-    background: linear-gradient(0deg, #7ec2ff 0%, #0e8aff 100%);
-    border-radius: 1px;
-  }
-
-  .associated-information {
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-
-    .item-box {
-      margin: 2vw 4vw;
-      display: flex;
-
-      .ass-item-box {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-      }
-    }
-
-    .content1 {
-      display: flex;
-
-      .circlebox {
-        width: 15vw;
-        height: 15vw;
-        // border-radius: 15vw;
-        text-align: center;
-        line-height: 15vw;
-        margin-bottom: 2vw;
-      }
-
-      .bg1 {
-        background: url("../../../assets/images/new/zhda.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-
-      .bg2 {
-        background: url("../../../assets/images/new/pcgj.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-
-      .bg3 {
-        background: url("../../../assets/images/new/tcry.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-    }
-  }
-
-  .pick-up-information {
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-
-    .pick-box {
-      display: flex;
-      justify-content: flex-start;
-      margin: 3vw 0;
-    }
-
-    .pick-item-box {
-      padding: 3vw 3vw 10vw;
-      width: 30%;
-      margin-right: 2vw;
-      // border-radius: 3vw;
-      position: relative;
-
-      .tp {
-        position: absolute;
-        bottom: 0;
-        right: 0;
-      }
-    }
-
-    .pbg1 {
-      background: url("../../../assets/images/new/bg-blue.png") no-repeat;
-      background-size: cover;
-    }
-
-    .pbg2 {
-      background: url("../../../assets/images/new/bg-orgin.png") no-repeat;
-      background-size: cover;
-    }
-
-    .pbg3 {
-      color: #397361;
-      background: url("../../../assets/images/new/wpdj.png") no-repeat;
-      background-size: 100% 100%;
-    }
-  }
-
-  .vehicular {
-    @include font_color($font-color-theme);
-
-    .no-veh {
-      text-align: center;
-    }
-
-    .veh-box {
-      margin: 1vh 0;
-    }
-  }
-}
-
-.line1 {
-  width: 100vw;
-  background-color: #eee;
-  height: 1vh;
-}
-
-.upload {
-  padding: 1vh 3vw;
-  height: 80px;
-  position: relative;
-
-  .tsxx {
-    position: absolute;
-    color: #a8a8a8;
-    top: 0;
-    left: 30%;
-    bottom: 0;
-    padding: 8% 0;
-    font-size: 14px;
-  }
-
-  .up_btn {
-    height: 80px;
-    width: 80px;
-    color: #a8a8a8;
-    font-size: 24px;
-    background: #f2f2f2 url("../../../assets/images/new/upimg_bg.png") no-repeat;
-    background-size: 100% 100%;
-  }
-}
-
-.bottom-box {
-  text-align: center;
-  background: #fff;
-  border-top: 1px solid #ddddde;
-  position: fixed;
-  bottom: 0;
-  width: 100vw;
-  height: 6vh;
-  line-height: 6vh;
-  display: flex;
-
-  >div {
-    height: 6vh;
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    >img {
-      width: 20px;
-      margin-right: 8px;
-    }
-  }
-
-  .yj {
-    background: #f0f0f0;
-  }
-}
-
-.upload-box {
-  margin: 1vh 3vw;
-}
-
-.ry_item {
-  background: #f8f8f8;
-  opacity: 0.7;
-  margin-bottom: 16px;
-  line-height: 1.8em;
-}
-
-.staff-title {
-  height: 6vh;
-  background-color: rgb(13, 106, 245);
-  text-align: center;
-  line-height: 6vh;
-  color: #fff;
-}
-
-.staff-sure {
-  position: fixed;
-  bottom: 5vw;
-  right: 5vw;
-  left: 5vw;
-
-  .yjBtn {
-    margin-bottom: 12px;
-    border-radius: 8px;
-  }
-
-  .fxBtn {
-    border-radius: 8px;
-  }
-}
-
-.head-nav-banner {
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  height: 35vw;
-  z-index: 1;
-  background: #1143ca;
-}
-
-::v-deep .headBlue {
-  background-color: #1143ca !important;
-}
-
-.navTitle {
-  position: absolute;
-  top: 0;
-  color: #fff;
-  // @include font_size($font_large);
-  font-size: 5.5vw;
-  text-align: center;
-  width: 100%;
-  padding: 3vw 0;
-}
-
-.item_tcry {
-  padding: 2px 24px;
-  background: #d2e3ff;
-  border-radius: 8px;
-
-  >span {
-    display: inline-block;
-  }
-}
-
-.badge-icon {
-  display: block;
-  font-size: 10px;
-  line-height: 16px;
-}
-
-.item_flex {
-  padding: 6px 0;
-  display: flex;
-  justify-content: space-between;
-}
-.tip_text{
-  font-size: 18px;
-  margin-top: 10px;
-}
-</style>
diff --git a/src/pages/views/Declaration/addEdit copy.vue b/src/pages/views/Declaration/addEdit copy.vue
deleted file mode 100644
index 27750f6..0000000
--- a/src/pages/views/Declaration/addEdit copy.vue	
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav :navTitle="title" />
-    <van-form @submit="onSubmit" style="height: calc(100vh - 13vw);">
-      <div class="infoBox">
-        <ul class="cardInfo">
-          <li class="item">
-            <van-field v-model="normalForm.sbsj" required name="申报时间" readonly label="申报时间" input-align="right"
-              :rules="[{ required: true, message: '请选择时间' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.sblxmc" required name="申报类型" is-link readonly label="申报类型" placeholder="点击设置"
-              input-align="right" :rules="[{ required: true, message: '请选择申报类型' }]" @click="getCommonPop('sblx')" />
-          </li>
-          <li class="item">
-            <van-field required name="申报原因" readonly label="申报原因" />
-          </li>
-          <van-field placeholder="请输入相关内容" v-model="normalForm.sbyy" rows="4" autosize accept=".txt,.png,.zip,jpg,jpeg"
-            maxlength="500" show-word-limit type="textarea"></van-field>
-          <li class="item">
-            <div><span class="mark"></span>添加附件</div>
-          </li>
-          <!-- 附件 -->
-          <div class="fjBox">
-            <van-uploader v-model="fileList" multiline :max-count="3" :after-read="afterRead"></van-uploader>
-          </div>
-        </ul>
-        <div class="footer">
-          <van-button round block type="primary" native-type="submit" :loading="isLoading" loading-type="spinner"
-            loading-text="登录中...">提交</van-button>
-        </div>
-      </div>
-    </van-form>
-    <!-- 弹窗 -->
-    <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-      <van-picker v-if="clickType == 'sblx'" :columns="columns" @cancel="isShowCommonPicker = false"
-        @confirm="onConfirm" />
-    </van-popup>
-  </div>
-</template>
-<script setup>
-import { baseUrl2 } from "@/utils/request.js";
-import { upImage } from "@/api/common";
-import ImageCompressor from "image-compressor.js";
-import TopNav from "../../../components/topNav.vue";
-import { getDictList, setDict } from "@/utils/dict";
-import { timeValidate ,hintToast} from "@/utils/tools.js";
-import { zgDetail, editDataZg, addDataZg } from "../../../api/xfgl.js";
-import { useRouter, useRoute } from "vue-router";
-import { ref, onMounted, reactive, defineProps } from "vue";
-const urlImg = `${baseUrl2}/mosty-api/mosty-base/minio/image/download/`;
-const { D_SB_SBLX } = getDictList("D_SB_SBLX");
-const route = useRoute();
-const router = useRouter();
-const message = ref("");
-const normalForm = ref({
-  sbsj:timeValidate(),
-  ssbmdm:JSON.parse(window.localStorage.getItem("userInfo")).deptList[0].deptCode
-});
-const isLoading = ref(false)
-const isShowCommonPicker = ref(false);
-const clickType = ref('');
-const columns = ref([]);
-const fileList = ref([])
-const wpTpIdList = ref([])
-const title = ref('')
-onMounted(()=>{
-   title.value = route.query.id ? "编辑战果申报" : "新增战果申报";
-  if (route.query.id) {
-   _getDetailById(); //根据id获取详情
-  }
-})
-//根据id获取详情
-function _getDetailById() {
-  zgDetail(route.query.id).then((res) => {
-    D_SB_SBLX.value.forEach((element) => {
-      if (element.dm == res.sblx) res.sblxmc = element.text;
-    });
-    let ids = res.sbfjid.split(',')
-    fileList.value = []
-    ids.forEach(item => {
-      let img = baseUrl2 + "/mosty-api/mosty-base/minio/image/download/" + item;
-      let obj = {
-        url: img,
-        codeId: item,
-        isImage: true,
-        status: "done",
-        message: "上传成功",
-      };
-      fileList.value.push(obj)
-    });
-    normalForm.value = res;
-  });
-}
-// 选择
-function getCommonPop(val) {
-  clickType.value = val;
-  switch (val) {
-    case "sblx":
-      columns.value = D_SB_SBLX.value;
-      break;
-  }
-  isShowCommonPicker.value = true;
-}
-
-// 确定选择
-function onConfirm(val) {
-  isShowCommonPicker.value = false;
-  switch (clickType.value) {
-    case "sblx":
-      normalForm.value.sblx = val.dm;
-      normalForm.value.sblxmc = val.zdmc;
-      break;
-  }
-}
-
-// 提交
-function onSubmit(){
-  let params = { ...normalForm.value }
-  delete params.sblxmc
-  let ids1 = fileList.value.filter(item=>{return item.codeId}).map(v=>{return v.codeId})
-  let ids2 = wpTpIdList.value.join(',')
-  params.sbfjid = (ids1.concat(ids2)).join(',')
-  
-  isLoading.value = true;
-  if(title.value == '编辑战果申报'){
-    editDataZg(params).then(res=>{
-      hintToast('编辑成功')
-      router.go(-1);
-    })
-  }else{
-    addDataZg(params).then(res=>{
-      hintToast('新增成功')
-      router.go(-1);
-    })
-  }
-}
-
-// 文件预览
-async function afterRead(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  file.status = "uploading";
-  upImage(data).then((res) => {
-    file.status = "done";
-    file.message = "上传成功";
-    if (!wpTpIdList.value.includes(res)) wpTpIdList.value.push(res);
-  });
-}
-
-//压缩图片
-const _compressImage = (file) => {
-  return new Promise((resolve, reject) => {
-    new ImageCompressor(file, {
-      quality: 0.6, //压缩质量
-      success(res) {
-        resolve(res);
-      },
-      error(e) {
-        reject(e);
-      },
-    });
-  });
-};
-
-</script>
-<style lang="less" scoped>
-.infoBox {
-  height: 100%;
-  position: relative;
-
-  .cardInfo {
-    height: calc(100vh - 13vw);
-    padding: 1vw 4vw;
-    box-sizing: border-box;
-    overflow: hidden;
-    overflow-y: auto;
-
-    .item {
-      position: relative;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      height: 8vw;
-      width: 100%;
-      border-bottom: 1px solid #e5e5e5;
-
-      .mark {
-        margin: 0 10px;
-        color: red;
-        font-size: 16px;
-      }
-
-      .text {
-        color: #767676;
-      }
-    }
-
-    .item::before {
-      position: absolute;
-      content: "";
-      left: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      background: #0066ff;
-      width: 2px;
-      height: 12px;
-      z-index: 11;
-    }
-  }
-
-  .footer {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 60px;
-    text-align: center;
-
-    .btn {
-      padding: 2vw 6vw;
-      background: #1989fa;
-      color: #fff;
-      border-radius: 4px;
-    }
-  }
-}
-
-::v-deep .van-field__control {
-  background: #f8fafd;
-  padding-left: 4px;
-}
-
-.fjBox {
-  padding: 4vw;
-  box-sizing: border-box;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/addEdit.vue b/src/pages/views/Declaration/addEdit.vue
deleted file mode 100644
index 07367c4..0000000
--- a/src/pages/views/Declaration/addEdit.vue
+++ /dev/null
@@ -1,529 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav :navTitle="title" />
-    <van-form @submit="onSubmit" style="height: calc(100vh - 13vw);">
-      <div class="infoBox">
-        <ul class="cardInfo">
-          <li class="item">
-            <van-field v-model="normalForm.xfsj" required name="时间" is-link readonly label="时间" placeholder="点击设置"
-              input-align="right" :rules="[{ required: true, message: '请选择时间' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xfzzXm" required name="巡访主责人" is-link readonly label="巡访主责人"
-              placeholder="点击设置" input-align="right" :rules="[{ required: true, message: '请选择巡访主责人' }]"
-              @click="showDialogfn('xfzz')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xfzzSfzh" required name="身份证号" readonly input-align="right" label="身份证号"
-              :rules="[{ required: true, message: '请输入组长身份证号' }]" />
-
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xfmj" name="巡访同行人(民警)" is-link label-width="108px" readonly label="巡访同行人(民警)"
-              placeholder="点击设置" input-align="right" @click="showDialogfn('xfmj')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xffj" name="巡访同行人(辅警)" is-link label-width="108px" readonly label="巡访同行人(辅警)"
-              placeholder="点击设置" input-align="right" @click="showDialogfn('xffj')" />
-          </li>
-
-          <li class="item">
-            <van-field v-model="normalForm.sfdw" name="巡访单位" is-link readonly label="巡访单位" placeholder="点击设置"
-              input-align="right" required :rules="[{ required: true, message: '请选择巡访单位' }]"
-              @click="showDialogfn('xfdw')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.dz" required name="巡访地点" label="巡访地点" placeholder="输入地点" input-align="right"
-              :rules="[{ required: true, message: '请选择巡访地点' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xflxmc" required name="巡访类型" is-link readonly label="巡访类型" placeholder="点击设置"
-              input-align="right" :rules="[{ required: true, message: '请选择巡访类型' }]" @click="getCommonPop('xflx')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.rwztmc" name="任务状态" is-link readonly label="任务状态" placeholder="选择任务状态"
-              input-align="right" @click="getCommonPop('rwzt')" />
-          </li>
-
-          <li class="item">
-            <van-field name="巡访内容" @click="showDialogfn('xfnr')" readonly label="巡访内容" />
-          </li>
-          <div class="textarea">
-            <van-field placeholder="请输相关内容" v-model="normalForm.xfnr" rows="4" autosize maxlength="500" show-word-limit
-              type="textarea"></van-field>
-          </div>
-          <li class="item">
-            <div class="itemlabel"><span class="mark"></span>拍照打卡</div>
-          </li>
-
-          <!-- 附件 -->
-          <div class="fjBox">
-            <van-uploader v-model="fileList" multiline :max-count="3" :after-read="afterRead"
-              :before-delete="deleteFj"></van-uploader>
-          </div>
-          <li class="item">
-            <van-field v-model="sbsj" required name="申报时间" readonly label="申报时间" input-align="right"
-              :rules="[{ required: true, message: '请选择时间' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.sblxmc" required name="申报类型" is-link readonly label="申报类型" placeholder="点击设置"
-              input-align="right" :rules="[{ required: true, message: '请选择申报类型' }]" @click="getCommonPop('sblx')" />
-          </li>
-          <li class="item">
-            <van-field required name="申报原因" readonly label="申报原因" />
-          </li>
-          <van-field placeholder="请输入相关内容" v-model="normalForm.sbyy" rows="4" autosize accept=".txt,.png,.zip,jpg,jpeg"
-            maxlength="500" show-word-limit type="textarea"></van-field>
-          <li class="item">
-            <div class="itemlabel"><span class="mark"></span>添加附件</div>
-          </li>
-          <!-- 附件 -->
-          <div class="fjBox">
-            <van-uploader v-model="fjData" multiline :max-count="3" accept="" :after-read="afterReadFjsb"
-              :before-delete="beforeDeletefJ">
-            </van-uploader>
-          </div>
-
-          <li class="item">
-            <div class="itemlabel"><span class="mark"></span>附件列表</div>
-          </li>
-          <div class="fjBox">
-            <div v-for="(it, idex) in fileBoxs" :key="idex" class="listitem">
-              <span class="name">{{ it.name }}</span>
-              <span> <van-icon name="close" color="#ff0000" @click="deletDate(it, idex)"></van-icon> </span>
-            </div>
-          </div>
-        </ul>
-        <div class="footer">
-          <van-button round block type="primary" native-type="submit" :loading="isLoading" loading-type="spinner"
-            loading-text="登录中...">提交</van-button>
-        </div>
-      </div>
-    </van-form>
-
-    <!-- 弹窗 -->
-    <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-      <van-picker :columns="columns" @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-    </van-popup>
-
-    <!-- 弹窗 -->
-    <Select v-if="showSelect" :checked="r_checked" :selectType="selectType" :show="showSelect"
-      :checkedList="hasCheckedList" @update:cancel="showSelect = false" @update:confirm="onComfirm"
-      :key="selectIndex" />
-  </div>
-</template>
-<script setup>
-import { baseUrl2 } from "@/utils/request.js";
-import ImageCompressor from "image-compressor.js";
-import { upImage } from "@/api/common";
-import Select from "./components/Select.vue";
-import { hintToast, timeValidate } from "../../../utils/tools";
-import { rwDetail, eidtRw, addRw } from "../../../api/xfgl.js";
-import TopNav from "../../../components/topNav.vue";
-import { useRouter, useRoute } from "vue-router";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, onMounted, reactive, defineProps, nextTick } from "vue";
-const { D_BZ_XFLX, D_BZ_RWZT, D_SB_SBLX } = getDictList("D_BZ_XFLX", "D_BZ_RWZT", "D_SB_SBLX");
-const route = useRoute();
-const router = useRouter();
-const fileList = ref([]);
-const fjData = ref([]) //附件
-const normalForm = ref({
-  xfsj: timeValidate(),
-  sbsj: timeValidate(),
-  rwztmc: '正常',
-  rwzt: 0,
-  ssbmdm: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0].deptCode
-});
-const sbsj = timeValidate()
-const title = ref("新增巡防任务");
-const clickType = ref(""); //点击选择
-const columns = ref([]);
-const time = ref();
-const isShowCommonPicker = ref(false);
-const showSelect = ref(false);
-const selectType = ref(""); //选择的类型
-const r_checked = ref(""); //选择的类型
-const hasCheckedList = ref([]); //选择的类型
-const selectIndex = ref(1); //选择器组件KEY
-const wpTpIdList = ref([]);
-const sbTpIdList = ref([]);
-const isLoading = ref(false)
-const fileBoxs = ref([]) //附件其他类型
-const urlImg = `${baseUrl2}/mosty-api/mosty-base/minio/image/download/`;
-
-const dataList = reactive({
-  fzrList: [], //巡访组长
-  nrList: [], //巡访内容
-  mjList: [], //组员民警
-  fjList: [], //组员辅警
-  xfdwList: [],//巡访单位
-});
-
-onMounted(() => {
-  title.value = route.query.id ? "编辑战果申报" : "新增战果申报";
-  if (route.query.id) {
-    nextTick(() => {
-      _getDetailById(); //根据id获取详情
-    });
-  }
-});
-// 打开弹窗
-function showDialogfn(type) {
-  selectType.value = type; //选取的类型
-  showSelect.value = true; //打开弹窗
-  hasCheckedList.value = [];
-  r_checked.value = "";
-  selectIndex.value++;
-  hasChooseData();
-}
-// 已经选取的数据回显
-function hasChooseData() {
-  switch (selectType.value) {
-    case "xfzz":
-      if (!dataList.fzrList.length) return false;
-      r_checked.value = dataList.fzrList[0].key;
-      break;
-    case "xfnr":
-      if (!dataList.nrList.length) return false;
-      r_checked.value = dataList.nrList[0].key;
-      break;
-    case "xfmj":
-      if (!dataList.mjList.length) return false;
-      hasCheckedList.value = dataList.mjList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "xffj":
-      if (!dataList.fjList.length) return false;
-      hasCheckedList.value = dataList.fjList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "xfdw":
-      if (!dataList.xfdwList.length) return false;
-      hasCheckedList.value = dataList.xfdwList.map((item) => {
-        return item.key;
-      });
-      break;
-  }
-}
-
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return false;
-  switch (selectType.value) {
-    case "xfzz":
-      dataList.fzrList = val; //选取的负责人数据
-      normalForm.value.xfzzXm = val[0].xm;
-      normalForm.value.xfzzSfzh = val[0].sfzh;
-      break;
-    case "xfnr":
-      dataList.nrList = val; //巡防内容
-      normalForm.value.xfnr = val[0].nr;
-      break;
-    case "xfmj":
-      dataList.mjList = val; //选取的组员民警
-      normalForm.value.xfmj = val.map(v => { return v.xm }).join(',')
-      break;
-    case "xffj":
-      dataList.fjList = val; //选取的组员辅警
-      normalForm.value.xffj = val.map(v => { return v.xm }).join(',')
-      break;
-    case "xfdw":
-      dataList.xfdwList = val; //选取的单位
-      normalForm.value.sfdw = val.map(v => { return v.dwmc }).join(',')
-      normalForm.value.dz = val[0].dz
-      break;
-  }
-}
-
-//根据id获取详情
-function _getDetailById() {
-  rwDetail(route.query.id).then((res) => {
-    let List = JSON.parse(res.xfzy);
-    dataList.mjList = List.filter(v => { return v.fl == '01' })
-    res.xfmj = dataList.mjList.map(it => { return it.xm }).join(',')
-    dataList.fjList = List.filter(v => { return v.fl == '02' })
-    res.xffj = dataList.fjList.map(it => { return it.xm }).join(',')
-    dataList.xfdwList = JSON.parse(res.xfdw)
-    res.sfdw = dataList.xfdwList.map(it => { return it.dwmc }).join(',')
-    res.dz = dataList.xfdwList.length > 0 ? dataList.xfdwList[0].dz : '';
-    let ids = res.xfzp ? res.xfzp.split(',') : []
-    fileList.value = []
-    wpTpIdList.value = []
-    ids.forEach(item => {
-      wpTpIdList.value.push(item)
-      let img = baseUrl2 + "/mosty-api/mosty-base/minio/image/download/" + item;
-      let obj = {
-        url: img,
-        codeId: item,
-        isImage: true,
-        status: "done",
-        message: "上传成功",
-      };
-      fileList.value.push(obj)
-    });
-
-    fjData.value = []
-    fileBoxs.value = []
-    sbTpIdList.value = []
-    let fjarr = res.sbfj ? JSON.parse(res.sbfj) : [];
-    let imgType = ['image/png', 'image/jpeg', 'image/jpg']
-    fjarr.forEach(item => {
-      sbTpIdList.value.push(item)
-      if (imgType.includes(item.type)) {
-        let img1 = baseUrl2 + "/mosty-api/mosty-base/minio/image/download/" + item.id;
-        let obj1 = {
-          url: img1,
-          codeId: item.id,
-          isImage: true,
-          status: "done",
-          message: "上传成功",
-        };
-        fjData.value.push(obj1)
-      } else {
-        fileBoxs.value.push(item)
-      }
-    })
-    normalForm.value = res;
-    setTimeout(() => {
-      D_SB_SBLX.value.forEach((element) => {
-        if (element.dm == res.sblx) normalForm.value.sblxmc = element.text;
-      });
-      D_BZ_XFLX.value.forEach((element) => {
-        if (element.dm == res.xflx) normalForm.value.xflxmc = element.text;
-      });
-      D_BZ_RWZT.value.forEach((element) => {
-        if (element.dm == res.rwzt) normalForm.value.rwztmc = element.text;
-      });
-    }, 500)
-  });
-}
-
-// 删除其他文件
-function deletDate(it, idex) {
-  fileBoxs.value.splice(idex, 1)
-  let index = sbTpIdList.value.findIndex(item => {
-    return item.id == it.id
-  })
-  if (index != -1) sbTpIdList.value.splice(index, 1)
-}
-
-// 打开弹窗
-function getCommonPop(val) {
-  clickType.value = val;
-  switch (val) {
-    case "xflx":
-      columns.value = D_BZ_XFLX.value;
-      break;
-    case "rwzt":
-      columns.value = D_BZ_RWZT.value;
-      break;
-    case "sblx":
-      columns.value = D_SB_SBLX.value;
-      break;
-  }
-  isShowCommonPicker.value = true;
-}
-
-// 确定选择
-function onConfirm(val) {
-  isShowCommonPicker.value = false;
-  switch (clickType.value) {
-    case "xflx":
-      normalForm.value.xflxmc = val.text;
-      normalForm.value.xflx = val.dm;
-      break;
-    case "rwzt":
-      normalForm.value.rwztmc = val.text;
-      normalForm.value.rwzt = val.dm;
-      break;
-    case "sblx":
-      normalForm.value.sblx = val.dm;
-      normalForm.value.sblxmc = val.zdmc;
-      break;
-  }
-}
-
-// 删除神宝宝附件
-const beforeDeletefJ = (url, val) => {
-  fjData.value.splice(val.index, 1)
-  let index = sbTpIdList.value.findIndex(item => {
-    return item.id == url.codeId
-  })
-  if (index != -1) sbTpIdList.value.splice(index, 1)
-}
-
-// 申报附件
-async function afterReadFjsb(file) {
-  file.message = "上传中...";
-  let imgType = ['image/png', 'image/jpeg', 'image/jpg']
-  let type = file.file.type;
-  const data = new FormData();
-  if (imgType.includes(type)) {
-    let fileBlob = await _compressImage(file.file);
-    let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-    data.append("file", fileData);
-  } else {
-    data.append("file", file.file);
-  }
-  file.status = "uploading";
-  upImage(data).then((res) => {
-    file.status = "done";
-    file.message = "上传成功";
-    sbTpIdList.value.push({ id: res, type: type, name: file.file.name });
-  });
-}
-
-// 删除照片上传
-const deleteFj = (url, val) => {
-  fileList.value.splice(val.index, 1)
-  wpTpIdList.value.splice(val.index, 1)
-}
-
-// 文件预览
-async function afterRead(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  file.status = "uploading";
-  upImage(data).then((res) => {
-    file.status = "done";
-    file.message = "上传成功";
-    if (!wpTpIdList.value.includes(res)) wpTpIdList.value.push(res);
-  });
-}
-//压缩图片
-const _compressImage = (file) => {
-  return new Promise((resolve, reject) => {
-    new ImageCompressor(file, {
-      quality: 0.6, //压缩质量
-      success(res) {
-        resolve(res);
-      },
-      error(e) {
-        reject(e);
-      },
-    });
-  });
-};
-
-// 提交
-function onSubmit() {
-  let arr = [...dataList.mjList, ...dataList.fjList]
-  let params = {
-    ...normalForm.value,
-    xfzy: JSON.stringify(arr),
-    xfdw: JSON.stringify(dataList.xfdwList),
-  }
-  params.xfzp = wpTpIdList.value.join(',')
-  params.sbfj = JSON.stringify(sbTpIdList.value)
-  isLoading.value = true;
-  if (title.value == '编辑战果申报') {
-    eidtRw(params).then(res => {
-      hintToast('编辑成功')
-      router.go(-1);
-    }).catch(() => {
-      isLoading.value = false
-    })
-  } else {
-    addRw(params).then(res => {
-      hintToast('新增成功')
-      router.go(-1);
-    }).catch(() => {
-      isLoading.value = false
-    })
-  }
-}
-</script>
-<style lang="less" scoped>
-.infoBox {
-  height: 100%;
-  position: relative;
-
-  .cardInfo {
-    height: calc(100vh - 13vw);
-    padding: 1vw 4vw;
-    box-sizing: border-box;
-    overflow: hidden;
-    overflow-y: auto;
-
-    .item {
-      position: relative;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      width: 100%;
-      border-bottom: 1px solid #e5e5e5;
-
-      .itemlabel {
-        height: 30px;
-        line-height: 30px;
-        font-size: 14px;
-        color: #646566;
-      }
-
-      .mark {
-        margin: 0 10px;
-        font-size: 16px;
-      }
-
-      .text {
-        color: #767676;
-      }
-    }
-
-    .item::before {
-      position: absolute;
-      content: "";
-      left: 0;
-      top: 32%;
-      background: #0066ff;
-      width: 2px;
-      height: 12px;
-      z-index: 11;
-    }
-  }
-
-  .footer {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 60px;
-    text-align: center;
-
-    .btn {
-      padding: 2vw 6vw;
-      background: #1989fa;
-      color: #fff;
-      border-radius: 4px;
-    }
-  }
-}
-
-.textarea {
-  ::v-deep .van-field__control {
-    background: #f8fafd;
-    padding-left: 4px;
-  }
-}
-
-.fjBox {
-  padding: 4vw;
-  box-sizing: border-box;
-
-  .listitem {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 4vw;
-    font-size: 16px;
-
-    .name {
-      color: blue;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/addEditCyry.vue b/src/pages/views/Declaration/addEditCyry.vue
deleted file mode 100644
index efdc78b..0000000
--- a/src/pages/views/Declaration/addEditCyry.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav :navTitle="title" />
-    <van-form @submit="onSubmit" style="height: calc(100vh - 13vw);">
-      <div class="infoBox">
-        <ul class="cardInfo">
-          <li class="item">
-            <van-field v-model="normalForm.xm" required name="姓名" label="姓名" :disabled="disabled" placeholder="输入姓名"
-              input-align="right" :rules="[{ required: true, message: '请输入姓名' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.sfzh" required :disabled="disabled" name="身份证号" label="身份证号"
-              placeholder="输入身份证号" input-align="right" :rules="sfzhRuls" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xbmc" required :disabled="disabled" name="性别" label="性别" placeholder="请选择性别"
-              input-align="right" readonly :rules="[{ required: true, message: '请选择性别' }]"
-              @click="getCommonPop('sex')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.csrq" :disabled="disabled" required name="出生日期" label="出生日期"
-              placeholder="点击设置" input-align="right" :rules="[{ required: true, message: '请选择出生日期' }]"
-              @click="getCommonPop('time')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.lxdh" required name="联系电话" label="联系电话" placeholder="请输入联系电话"
-              input-align="right" :rules="lxdhRuls" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xxdz" required name="现住址" label="现住址" placeholder="请输入住址名称"
-              input-align="right" :rules="[{ required: true, message: '请输入住址名称' }]" />
-          </li>
-          <li class="item">
-            <van-field name="备注" readonly label="备注" />
-          </li>
-          <div class="textarea">
-            <van-field placeholder="请输备注" v-model="normalForm.bz" rows="4" autosize maxlength="500" show-word-limit
-              type="textarea"></van-field>
-          </div>
-        </ul>
-        <div class="footer">
-          <van-button round block type="primary" native-type="submit" :loading="isLoading" loading-type="spinner"
-            loading-text="登录中...">提交</van-button>
-        </div>
-      </div>
-    </van-form>
-  </div>
-
-  <!-- 弹窗 -->
-  <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-    <van-picker v-if="clickType == 'sex'" :columns="columns" @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-    <van-datetime-picker @cancel="isShowCommonPicker = false" @confirm="onConfirm" v-if="clickType == 'time'" v-model="time" type="date" title="选择年月日">
-    </van-datetime-picker>
-  </van-popup>
-</template>
-<script setup>
-import { IdCardValidator, phoneValidator } from "../../../utils/rules.js"
-import { cyryDetail, editDetail, addDetail } from "../../../api/xfgl.js";
-import { useRouter, useRoute } from "vue-router";
-import TopNav from "../../../components/topNav.vue";
-import { hintToast, timeValidate } from "../../../utils/tools";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, onMounted, reactive, defineProps } from "vue";
-const { D_BZ_XB } = getDictList("D_BZ_XB");
-const route = useRoute();
-const router = useRouter();
-const message = ref("");
-const normalForm = ref({});
-const columns = ref([]);
-const time = ref();
-const isLoading = ref(false);
-const disabled = ref(false)
-const isShowCommonPicker = ref(false);
-const clickType = ref(""); //点击选择
-const title = ref("新增人员");
-const sfzhRuls = ref([
-  { required: true, message: '身份证号码不能为空', trigger: 'onChange/onBlur' },
-  { validator: (value) => { return IdCardValidator(value) }, trigger: 'onChange/onBlur' }
-])
-const lxdhRuls = ref([
-  { required: true, message: '联系电话不能为空', trigger: 'onChange/onBlur' },
-  { validator: (value) => { return phoneValidator(value) }, trigger: 'onChange/onBlur' }
-])
-
-onMounted(() => {
-  title.value = route.query.id ? "编辑人员" : "新增人员";
-  disabled.value = route.query.id ? true : false;
-  if (route.query.id) _getDetailById(); //根据id获取详情
-});
-//根据id获取详情
-function _getDetailById() {
-  cyryDetail(route.query.id).then((res) => {
-    normalForm.value = res;
-    D_BZ_XB.value.forEach((element) => {
-      if (element.dm == res.xb) normalForm.value.xbmc = element.text;
-    });
-  });
-}
-// 选择性别
-function getCommonPop(val) {
-  if (disabled.value) return false;
-  clickType.value = val;
-  switch (val) {
-    case "sex":
-      columns.value = D_BZ_XB.value;
-      break;
-  }
-  isShowCommonPicker.value = true;
-}
-// 确定选择
-function onConfirm(val) {
-  isShowCommonPicker.value = false;
-  switch (clickType.value) {
-    case "sex":
-      normalForm.value.xbmc = val.text;
-      normalForm.value.xb = val.dm;
-      break;
-    case "time":
-      normalForm.value.csrq = timeValidate(val, "ymd");
-      break;
-  }
-}
-
-// 提交
-function onSubmit() {
-  isLoading.value = true;
-  delete normalForm.value.xbmc
-  if (title.value == '编辑人员') {
-    editDetail(normalForm.value).then(res => {
-      hintToast('编辑成功')
-      router.go(-1);
-    })
-  } else {
-    addDetail(normalForm.value).then(res => {
-      hintToast('新增成功')
-      router.go(-1);
-    })
-  }
-}
-</script>
-<style lang="less" scoped>
-.infoBox {
-  height: 100%;
-  position: relative;
-
-  .cardInfo {
-    height: calc(100vh - 13vw);
-    padding: 1vw 4vw;
-    box-sizing: border-box;
-    overflow: hidden;
-    overflow-y: auto;
-
-    .item {
-      position: relative;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      // height: 8vw;
-      width: 100%;
-      border-bottom: 1px solid #e5e5e5;
-
-      .mark {
-        margin: 0 10px;
-        color: red;
-        font-size: 16px;
-      }
-
-      .text {
-        color: #767676;
-      }
-    }
-
-    .item::before {
-      position: absolute;
-      content: "";
-      left: 0;
-      top: 20%;
-      // transform: translateY(-50%);
-      background: #0066ff;
-      width: 2px;
-      height: 12px;
-      z-index: 11;
-    }
-  }
-
-  .footer {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 60px;
-    text-align: center;
-
-    .btn {
-      padding: 2vw 6vw;
-      background: #1989fa;
-      color: #fff;
-      border-radius: 4px;
-    }
-  }
-}
-
-.textarea {
-  ::v-deep .van-field__control {
-    background: #f8fafd;
-    padding-left: 4px;
-  }
-}
-
-.fjBox {
-  padding: 4vw;
-  box-sizing: border-box;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/addEditDw.vue b/src/pages/views/Declaration/addEditDw.vue
deleted file mode 100644
index b2c32ad..0000000
--- a/src/pages/views/Declaration/addEditDw.vue
+++ /dev/null
@@ -1,348 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav :navTitle="title" />
-    <van-form @submit="onSubmit" style="height: calc(100vh - 13vw);">
-      <div class="infoBox">
-        <ul class="cardInfo">
-          <li class="item">
-            <van-field v-model="normalForm.dwlxmc" required name="单位类型" label="单位类型" :disabled="disabled"
-              placeholder="请选择单位类型" input-align="right" readonly is-link
-              :rules="[{ required: true, message: '请选择单位类型' }]" @click="getCommonPop('dwlx')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.dwmc" required name="单位名称" label="单位名称" :disabled="disabled"
-              placeholder="请输入单位名称" input-align="right" :rules="[{ required: true, message: '请输入单位名称' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.dwflmc" required name="单位分类" label="单位分类" is-link :disabled="disabled"
-              placeholder="请选择单位分类" input-align="right" readonly :rules="[{ required: true, message: '请选择单位分类' }]"
-              @click="getCommonPop('dwfl')" />
-          </li>
-
-          <li class="item">
-            <van-field v-model="normalForm.lxdh" required :disabled="disabled" name="联系电话" label="联系电话"
-              placeholder="请输入联系电话" input-align="right" :rules="[{ required: true, message: '请输入联系电话' }]" />
-          </li>
-
-          <li class="item">
-            <van-field v-model="normalForm.dws" required :disabled="disabled" name="单位数" label="单位数"
-              placeholder="请输入单位数" input-align="right" type="digit" :rules="[{ required: true, message: '请输入单位数' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.addreess" required :disabled="disabled" name="地址" label="地址" readonly />
-            <div @click="addDz"><van-icon name="location" color="#4788e1" size="6vw" /></div>
-          </li>
-          <ul>
-            <li class="item-li" v-for="(it, idx) in dzList" :key="idx">
-              <span class="text">地址{{ idx + 1 }}：</span>
-              <span class="info"><van-field v-model="it.dz" /></span>
-              <span @click="deletItem('dz', idx)" class="iconClose"><van-icon name="close" color="red" size="6vw" /></span>
-            </li>
-          </ul>
-          <li class="item">
-            <van-field v-model="normalForm.addreess" required :disabled="disabled" name="从业人员" label="从业人员" readonly />
-            <div @click="showDialogfn('cyry')"><van-icon name="add-o" color="#4788e1" size="6vw" /></div>
-          </li>
-          <ul>
-            <li class="item-li" v-for="(it, idx) in dataList.ryList" :key="idx">
-              <span class="text">人员：</span>
-              <span class="info"><van-field readonly v-model="it.info" /></span>
-              <span @click="deletItem('ry', idx)" class="iconClose"><van-icon name="close" color="red" size="6vw" /></span>
-            </li>
-          </ul>
-          <li class="item">
-            <van-field name="备注" readonly label="备注" />
-          </li>
-          <div class="textarea">
-            <van-field placeholder="请输备注" v-model="normalForm.bz" :disabled="disabled" rows="4" autosize maxlength="500" show-word-limit type="textarea"></van-field>
-          </div>
-        </ul>
-        <div class="footer">
-          <van-button round block type="primary" native-type="submit" :loading="isLoading" loading-type="spinner" loading-text="登录中...">提交</van-button>
-        </div>
-      </div>
-    </van-form>
-  </div>
-
-  <!-- 弹窗 -->
-  <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-    <van-picker v-if="clickType == 'dwlx' || clickType == 'dwfl'" :columns="columns"
-      @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-  </van-popup>
-  <!-- 弹窗 -->
-  <Select v-if="showSelect" :checked="r_checked" :selectType="selectType" :show="showSelect"
-    :checkedList="hasCheckedList" @update:cancel="showSelect = false" @update:confirm="onComfirm" :key="selectIndex" />
-</template>
-<script setup>
-import Select from "./components/Select.vue";
-import { dwglDetail, editDwgl, addDwgl } from "../../../api/xfgl.js";
-import { useRouter, useRoute } from "vue-router";
-import TopNav from "../../../components/topNav.vue";
-import { hintToast, timeValidate } from "../../../utils/tools";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, onMounted, reactive, defineProps } from "vue";
-const { D_BZ_DWLX, D_BZ_DWFL } = getDictList("D_BZ_DWLX", "D_BZ_DWFL");
-const route = useRoute();
-const router = useRouter();
-const message = ref("");
-const normalForm = ref({
-  ssbmdm: JSON.parse(window.localStorage.getItem("userInfo")).deptList[0].deptCode
-});
-const columns = ref([]);
-const isLoading = ref(false);
-const disabled = ref(false)
-const isShowCommonPicker = ref(false);
-const clickType = ref(""); //点击选择
-const showSelect = ref(false);
-const r_checked = ref(""); //选择的类型
-const hasCheckedList = ref([]); //选择的类型
-const selectIndex = ref(1); //选择器组件KEY
-const title = ref("新增单位");
-const dzList = ref([])
-const selectType = ref('')
-const dataList = reactive({
-  ryList: [], //人员
-});
-onMounted(() => {
-  title.value = route.query.id ? "编辑单位" : "新增单位";
-  // disabled.value = route.query.id ? true : false;
-  if (route.query.id) _getDetailById(); //根据id获取详情
-});
-//根据id获取详情
-function _getDetailById() {
-  dwglDetail(route.query.id).then((res) => {
-    normalForm.value = res;
-    D_BZ_DWLX.value.forEach((element) => {
-      if (element.dm == res.dwlx) normalForm.value.dwlxmc = element.text;
-    });
-    D_BZ_DWFL.value.forEach((element) => {
-      if (element.dm == res.dwfl) normalForm.value.dwflmc = element.text;
-    });
-    let list = res.cyry ? JSON.parse(res.cyry) : []
-    dataList.ryList = list.map(item => {
-      if (!item.info) item.xm + '(' + item.sfzh + ')'
-      return item
-    })
-    hasCheckedList.value = dataList.ryList.map((item) => {
-      return item.key;
-    });
-    dzList.value = []
-    for (let key in res) {
-      if (key.search('dz') != -1) dzList.value.push({ dz: res[key] });
-    }
-  });
-}
-// 新增地址
-function addDz() {
-  if (disabled.value) return false;
-  dzList.value.push({ dz: '' })
-}
-// 打开弹窗
-function showDialogfn(type) {
-  if (disabled.value) return false;
-  selectType.value = type; //选取的类型
-  showSelect.value = true; //打开弹窗
-  hasCheckedList.value = [];
-  r_checked.value = "";
-  selectIndex.value++;
-  hasChooseData();
-}
-// 已经选取的数据回显
-function hasChooseData() {
-  switch (selectType.value) {
-    case "cyry":
-      if (!dataList.ryList.length) return false;
-      hasCheckedList.value = dataList.ryList.map((item) => {
-        return item.key;
-      });
-      break;
-  }
-}
-
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return false;
-  switch (selectType.value) {
-    case "cyry":
-      dataList.ryList = val.map(v => {
-        v.info = v.xm + '(' + v.sfzh + ')'
-        return v
-      }); //选取的组员
-      normalForm.value.cyry = JSON.stringify(val)
-      break;
-  }
-}
-
-// 选择
-function getCommonPop(val) {
-  if (disabled.value) return false;
-  clickType.value = val;
-  switch (val) {
-    case "dwlx":
-      columns.value = D_BZ_DWLX.value;
-      break;
-    case "dwfl":
-      columns.value = D_BZ_DWFL.value;
-      break;
-  }
-  isShowCommonPicker.value = true;
-}
-// 确定选择
-function onConfirm(val) {
-  isShowCommonPicker.value = false;
-  switch (clickType.value) {
-    case "dwlx":
-      normalForm.value.dwlxmc = val.text;
-      normalForm.value.dwlx = val.dm;
-      break;
-    case "dwfl":
-      normalForm.value.dwflmc = val.text;
-      normalForm.value.dwfl = val.dm;
-      break;
-  }
-}
-
-// 删除选择的人员-地址
-function deletItem(type, index) {
-  if (disabled.value) return false;
-  switch (type) {
-    case 'dz':
-      dzList.value.splice(index, 1)
-      break;
-    case 'cyry':
-      dataList.ryList.splice(index, 1);
-      hasCheckedList.value = dataList.ryList.map((item) => {
-        return item.key;
-      });
-      normalForm.value.cyry = JSON.stringify(dataList.ryList)
-      break;
-  }
-}
-
-// 提交
-function onSubmit() {
-  let pramas = {
-    ...normalForm.value
-  }
-  dzList.value.forEach((item, idex) => {
-    if (idex > 0) {
-      pramas['dz' + idex] = item.dz
-    } else {
-      pramas['dz'] = item.dz
-    }
-  })
-  isLoading.value = true;
-  if (title.value == '编辑单位') {
-    editDwgl(pramas).then(res => {
-      hintToast('编辑成功')
-      router.push({ path: "/Declaration" });
-    })
-  } else {
-    addDwgl(pramas).then(res => {
-      hintToast('新增成功')
-      router.push({ path: "/Declaration" });
-    })
-  }
-}
-</script>
-<style lang="less" scoped>
-.infoBox {
-  height: 100%;
-  position: relative;
-
-  .cardInfo {
-    height: calc(100vh - 13vw);
-    padding: 1vw 4vw;
-    box-sizing: border-box;
-    overflow: hidden;
-    overflow-y: auto;
-
-    .item {
-      position: relative;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      // height: 8vw;
-      width: 100%;
-      border-bottom: 1px solid #e5e5e5;
-
-      .mark {
-        margin: 0 10px;
-        color: red;
-        font-size: 16px;
-      }
-
-      .text {
-        color: #767676;
-      }
-    }
-
-    .item::before {
-      position: absolute;
-      content: "";
-      left: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      background: #0066ff;
-      width: 2px;
-      height: 12px;
-      z-index: 11;
-    }
-  }
-
-  .footer {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 60px;
-    text-align: center;
-
-    .btn {
-      padding: 2vw 6vw;
-      background: #1989fa;
-      color: #fff;
-      border-radius: 4px;
-    }
-  }
-}
-
-.item-li {
-  display: flex;
-  justify-content: space-between;
-  padding: 2vw 4vw;
-  box-sizing: border-box;
-
-  .info {
-    margin: 0 10px;
-    flex: 1;
-
-    ::v-deep .van-cell__value {
-      background: #e5eff5;
-      padding-left: 10px;
-      box-sizing: border-box;
-    }
-
-    ::v-deep .van-cell {
-      padding: 0;
-    }
-  }
-
-  .text {
-    color: #8b8b94;
-    width: 16vw;
-  }
-
-  .iconClose {
-    display: inline-block;
-    width: 6vw;
-  }
-
-}
-
-.textarea {
-  ::v-deep .van-field__control {
-    background: #f8fafd;
-    padding-left: 4px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/addEditRw.vue b/src/pages/views/Declaration/addEditRw.vue
deleted file mode 100644
index 053f68a..0000000
--- a/src/pages/views/Declaration/addEditRw.vue
+++ /dev/null
@@ -1,386 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav :navTitle="title" />
-    <van-form @submit="onSubmit" style="height: calc(100vh - 13vw);">
-      <div class="infoBox">
-        <ul class="cardInfo">
-          <li class="item">
-            <van-field v-model="normalForm.xfsj" required name="时间" is-link readonly label="时间" placeholder="点击设置"
-              input-align="right" :rules="[{ required: true, message: '请选择时间' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xfzzXm" required name="巡访主责人" is-link readonly label="巡访主责人"
-              placeholder="点击设置" input-align="right" :rules="[{ required: true, message: '请选择巡访主责人' }]"
-              @click="showDialogfn('xfzz')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xfzzSfzh" required name="身份证号" readonly input-align="right" label="身份证号"
-              :rules="[{ required: true, message: '请输入组长身份证号' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xfmj" name="巡访同行人(民警)" is-link label-width="108px" readonly label="巡访同行人(民警)"
-              placeholder="点击设置" input-align="right" @click="showDialogfn('xfmj')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xffj" name="巡访同行人(辅警)" is-link label-width="108px" readonly label="巡访同行人(辅警)"
-              placeholder="点击设置" input-align="right" @click="showDialogfn('xffj')" />
-          </li>
-
-          <li class="item">
-            <van-field v-model="normalForm.sfdw" name="巡访单位" is-link readonly label="巡访单位" placeholder="点击设置"
-              input-align="right" required :rules="[{ required: true, message: '请选择巡访单位' }]"
-              @click="showDialogfn('xfdw')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.dz" required name="巡访地点" label="巡访地点" placeholder="输入地点" input-align="right"
-              :rules="[{ required: true, message: '请选择巡访地点' }]" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.xflxmc" required name="巡访类型" is-link readonly label="巡访类型" placeholder="点击设置"
-              input-align="right" :rules="[{ required: true, message: '请选择巡访类型' }]" @click="getCommonPop('xflx')" />
-          </li>
-          <li class="item">
-            <van-field v-model="normalForm.rwztmc" name="任务状态" is-link readonly label="任务状态" placeholder="选择任务状态"
-              input-align="right" @click="getCommonPop('rwzt')" />
-          </li>
-
-          <li class="item">
-            <van-field name="巡访内容" @click="showDialogfn('xfnr')" readonly label="巡访内容" />
-          </li>
-          <div class="textarea">
-            <van-field placeholder="请输相关内容" v-model="normalForm.xfnr" rows="4" autosize maxlength="500" show-word-limit type="textarea"></van-field>
-          </div>
-          <li class="item">
-            <div><span class="mark"></span>拍照打卡</div>
-          </li>
-          <!-- 附件 -->
-          <div class="fjBox">
-            <van-uploader v-model="fileList" multiline :max-count="3" :after-read="afterRead"></van-uploader>
-          </div>
-        </ul>
-        <div class="footer">
-          <van-button round block type="primary" native-type="submit" :loading="isLoading" loading-type="spinner" loading-text="登录中...">提交</van-button>
-        </div>
-      </div>
-    </van-form>
-    <!-- 弹窗 -->
-    <van-popup v-model:show="isShowCommonPicker" round position="bottom">
-      <van-picker :columns="columns" @cancel="isShowCommonPicker = false" @confirm="onConfirm" />
-    </van-popup>
-
-    <!-- 弹窗 -->
-    <Select v-if="showSelect" :checked="r_checked" :selectType="selectType" :show="showSelect"
-      :checkedList="hasCheckedList" @update:cancel="showSelect = false" @update:confirm="onComfirm"
-      :key="selectIndex" />
-  </div>
-</template>
-<script setup>
-import { baseUrl2 } from "@/utils/request.js";
-import ImageCompressor from "image-compressor.js";
-import { upImage } from "@/api/common";
-import Select from "./components/Select.vue";
-import { hintToast, timeValidate } from "../../../utils/tools";
-import { rwDetail, eidtRw, addRw } from "../../../api/xfgl.js";
-import TopNav from "../../../components/topNav.vue";
-import { useRouter, useRoute } from "vue-router";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, onMounted, reactive, defineProps, nextTick } from "vue";
-const { D_BZ_XFLX, D_BZ_RWZT } = getDictList("D_BZ_XFLX", "D_BZ_RWZT");
-const route = useRoute();
-const router = useRouter();
-const fileList = ref([]);
-
-const normalForm = ref({
-  xfsj: timeValidate(),
-  rwztmc: '正常',
-  rwzt: 0
-});
-const title = ref("新增巡防任务");
-const clickType = ref(""); //点击选择
-const columns = ref([]);
-const time = ref();
-const isShowCommonPicker = ref(false);
-const showSelect = ref(false);
-const selectType = ref(""); //选择的类型
-const r_checked = ref(""); //选择的类型
-const hasCheckedList = ref([]); //选择的类型
-const selectIndex = ref(1); //选择器组件KEY
-const wpTpIdList = ref([]);
-const isLoading = ref(false)
-const urlImg = `${baseUrl2}/mosty-api/mosty-base/minio/image/download/`;
-
-const dataList = reactive({
-  fzrList: [], //巡访组长
-  nrList: [], //巡访内容
-  mjList: [], //组员民警
-  fjList: [], //组员辅警
-  xfdwList: [],//巡访单位
-});
-onMounted(() => {
-  title.value = route.query.id ? "编辑巡防任务" : "新增巡防任务";
-  if (route.query.id) {
-    nextTick(() => {
-      _getDetailById(); //根据id获取详情
-    });
-  }
-});
-// 打开弹窗
-function showDialogfn(type) {
-  selectType.value = type; //选取的类型
-  showSelect.value = true; //打开弹窗
-  hasCheckedList.value = [];
-  r_checked.value = "";
-  selectIndex.value++;
-  hasChooseData();
-}
-// 已经选取的数据回显
-function hasChooseData() {
-  switch (selectType.value) {
-    case "xfzz":
-      if (!dataList.fzrList.length) return false;
-      r_checked.value = dataList.fzrList[0].key;
-      break;
-    case "xfnr":
-      if (!dataList.nrList.length) return false;
-      r_checked.value = dataList.nrList[0].key;
-      break;
-    case "xfmj":
-      if (!dataList.mjList.length) return false;
-      hasCheckedList.value = dataList.mjList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "xffj":
-      if (!dataList.fjList.length) return false;
-      hasCheckedList.value = dataList.fjList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "xfdw":
-      if (!dataList.xfdwList.length) return false;
-      hasCheckedList.value = dataList.xfdwList.map((item) => {
-        return item.key;
-      });
-      break;
-  }
-}
-
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return false;
-  switch (selectType.value) {
-    case "xfzz":
-      dataList.fzrList = val; //选取的负责人数据
-      normalForm.value.xfzzXm = val[0].xm;
-      normalForm.value.xfzzSfzh = val[0].sfzh;
-      break;
-    case "xfnr":
-      dataList.nrList = val; //巡防内容
-      normalForm.value.xfnr = val[0].nr;
-      break;
-    case "xfmj":
-      dataList.mjList = val; //选取的组员民警
-      normalForm.value.xfmj = val.map(v => { return v.xm }).join(',')
-      break;
-    case "xffj":
-      dataList.fjList = val; //选取的组员辅警
-      normalForm.value.xffj = val.map(v => { return v.xm }).join(',')
-      break;
-    case "xfdw":
-      dataList.xfdwList = val; //选取的单位
-      normalForm.value.sfdw = val.map(v => { return v.dwmc }).join(',')
-      normalForm.value.dz = val[0].dz
-      break;
-  }
-}
-
-//根据id获取详情
-function _getDetailById() {
-  rwDetail(route.query.id).then((res) => {
-    let List = JSON.parse(res.xfzy);
-    dataList.mjList = List.filter(v => { return v.fl == '01' })
-    res.xfmj = dataList.mjList.map(it => { return it.xm }).join(',')
-    dataList.fjList = List.filter(v => { return v.fl == '02' })
-    res.xffj = dataList.fjList.map(it => { return it.xm }).join(',')
-
-    D_BZ_XFLX.value.forEach((element) => {
-      if (element.dm == res.xflx) res.xflxmc = element.text;
-    });
-    D_BZ_RWZT.value.forEach((element) => {
-      if (element.dm == res.rwzt) res.rwztmc = element.text;
-    });
-    dataList.xfdwList = JSON.parse(res.xfdw)
-    res.sfdw = dataList.xfdwList.map(it => { return it.dwmc }).join(',')
-    res.dz = dataList.xfdwList.length > 0 ? dataList.xfdwList[0].dz : '';
-    let ids = res.xfzp.split(',')
-    fileList.value = []
-    ids.forEach(item => {
-      let img = baseUrl2 + "/mosty-api/mosty-base/minio/image/download/" + item;
-      let obj = {
-        url: img,
-        codeId: item,
-        isImage: true,
-        status: "done",
-        message: "上传成功",
-      };
-      fileList.value.push(obj)
-    });
-    normalForm.value = res;
-  });
-}
-
-// 打开弹窗
-function getCommonPop(val) {
-  clickType.value = val;
-  switch (val) {
-    case "xflx":
-      columns.value = D_BZ_XFLX.value;
-      break;
-    case "rwzt":
-      columns.value = D_BZ_RWZT.value;
-      break;
-  }
-  isShowCommonPicker.value = true;
-}
-
-// 确定选择
-function onConfirm(val) {
-  isShowCommonPicker.value = false;
-  switch (clickType.value) {
-    case "xflx":
-      normalForm.value.xflxmc = val.text;
-      normalForm.value.xflx = val.dm;
-      break;
-    case "rwzt":
-      normalForm.value.rwztmc = val.text;
-      normalForm.value.rwzt = val.dm;
-      break;
-
-  }
-}
-
-// 文件预览
-async function afterRead(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  file.status = "uploading";
-  upImage(data).then((res) => {
-    file.status = "done";
-    file.message = "上传成功";
-    if (!wpTpIdList.value.includes(res)) wpTpIdList.value.push(res);
-  });
-}
-//压缩图片
-const _compressImage = (file) => {
-  return new Promise((resolve, reject) => {
-    new ImageCompressor(file, {
-      quality: 0.6, //压缩质量
-      success(res) {
-        resolve(res);
-      },
-      error(e) {
-        reject(e);
-      },
-    });
-  });
-};
-
-// 提交
-function onSubmit() {
-  let arr = [...dataList.mjList, ...dataList.fjList]
-  let params = {
-    ...normalForm.value,
-    xfzy: JSON.stringify(arr),
-    xfdw: JSON.stringify(dataList.xfdwList),
-  }
-  let ids1 = fileList.value.filter(item => { return item.codeId }).map(v => { return v.codeId })
-  let ids2 = wpTpIdList.value.join(',')
-  params.xfzp = (ids1.concat(ids2)).join(',')
-  isLoading.value = true;
-  if (title.value == '编辑巡防任务') {
-    eidtRw(params).then(res => {
-      hintToast('编辑成功')
-      router.go(-1);
-    })
-  } else {
-    addRw(params).then(res => {
-      hintToast('新增成功')
-      router.go(-1);
-    })
-  }
-}
-</script>
-<style lang="less" scoped>
-.infoBox {
-  height: 100%;
-  position: relative;
-
-  .cardInfo {
-    height: calc(100vh - 13vw);
-    padding: 1vw 4vw;
-    box-sizing: border-box;
-    overflow: hidden;
-    overflow-y: auto;
-
-    .item {
-      position: relative;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      width: 100%;
-      border-bottom: 1px solid #e5e5e5;
-
-      .mark {
-        margin: 0 10px;
-        color: red;
-        font-size: 16px;
-      }
-
-      .text {
-        color: #767676;
-      }
-    }
-
-    .item::before {
-      position: absolute;
-      content: "";
-      left: 0;
-      top: 32%;
-      background: #0066ff;
-      width: 2px;
-      height: 12px;
-      z-index: 11;
-    }
-  }
-
-  .footer {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 60px;
-    text-align: center;
-
-    .btn {
-      padding: 2vw 6vw;
-      background: #1989fa;
-      color: #fff;
-      border-radius: 4px;
-    }
-  }
-}
-
-.textarea {
-  ::v-deep .van-field__control {
-    background: #f8fafd;
-    padding-left: 4px;
-  }
-}
-
-.fjBox {
-  padding: 4vw;
-  box-sizing: border-box;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/components/Select.vue b/src/pages/views/Declaration/components/Select.vue
deleted file mode 100644
index 389889d..0000000
--- a/src/pages/views/Declaration/components/Select.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <van-popup v-model:show="props.show" style="width: 90%">
-    <div class="popupTitle">{{ popupTitle }}</div>
-    <van-search v-model="kwd" :placeholder="placeholder" @search="onUpdate" @clear="onClear" />
-    <div class="check-data-box" ref="listBox" :loading="loading">
-      <!-- 单选 -->
-      <van-radio-group v-model="radioChecked" v-if="isRadio">
-        <van-cell-group>
-          <van-cell v-for="item in list.mulChooseList" clickable :key="item" :title="`${item.value}`" :border="false">
-            <template #right-icon>
-              <van-radio :name="item.key" @click="onRadionChange(item.key)" />
-            </template>
-          </van-cell>
-        </van-cell-group>
-      </van-radio-group>
-      <!-- 多选 -->
-      <van-checkbox-group v-model="checkedLists" v-else @change="onCheckboxnChange">
-        <van-cell-group>
-          <van-cell v-for="item in list.mulChooseList" clickable :key="item" :title="`${item.value}`">
-            <template #right-icon>
-              <van-checkbox shape="square" :name="item.key" />
-            </template>
-            <template #label v-if="title === '选择警用器械'">
-              数量：
-              <van-stepper v-model="item.sl" integer />
-            </template>
-          </van-cell>
-        </van-cell-group>
-      </van-checkbox-group>
-      <van-empty description="没有数据" image="default" v-if="list.mulChooseList.length <= 0 && showEmpty" />
-    </div>
-    <div class="popbtn-box">
-      <van-button style="flex: 1" type="default" @click="onCancel">取消
-      </van-button>
-      <van-button style="flex: 1" type="primary" @click="onConfirm">确定</van-button>
-    </div>
-  </van-popup>
-</template>
-
-<script setup>
-import { getBBData } from "@/api/xfbbAndZbbb.js";
-import { defineProps, ref, defineEmits, watch, reactive, onMounted } from "vue";
-import { dateFormat, hintToast } from "@/utils/tools";
-const props = defineProps({
-  selectType: String, //查询的类型  详情见watch 监听
-  show: Boolean, //是否显示
-  checkedList: Array, //默认选中 多选
-  checked: String, //单选
-});
-const emits = defineEmits([
-  "update:cancel",
-  "update:confirm",
-  "update:kwd",
-  "update:tabs",
-  "update:tag",
-]);
-const hasChoosZb = ref([]);
-const listBox = ref(null);
-const page = ref(1);
-const size = ref(10);
-const total = ref(0);
-const radioChecked = ref("");
-const checkedLists = ref([]);
-const loading = ref(false);
-const finished = ref(false);
-const selectObj = ref([]); //选中的数据
-const tagCode = ref(""); //智能设备选中状态
-const placeholder = ref(""); //占位字符
-const showEmpty = ref(false);
-const kwd = ref(""); //选择器关键字
-const selectType = ref(""); //选择的类型
-const znzbCode = ref(""); //智能装备类型筛选
-const popupTitle = ref(""); //标题
-const isRadio = ref(false); //是否是单选
-const list = reactive({
-  mulChooseList: []
-});
-
-watch(
-  () => props.selectType,
-  (newValue) => {
-    checkedLists.value = props.checkedList;
-    radioChecked.value = props.checked;
-  },
-  { immediate: true, deep: true }
-);
-onMounted(() => {
-  _getSelectData(props.selectType);
-  scroll();
-});
-
-//触底加载
-function scroll() {
-  let scrollTargetBox = listBox.value;
-  if (!scrollTargetBox) return false;
-  scrollTargetBox.onscroll = (e) => {
-    var scrollHeight = scrollTargetBox.scrollHeight; //251
-    var scrollTop = scrollTargetBox.scrollTop; //0-18
-    var clientHeight = scrollTargetBox.clientHeight; //233
-    if (scrollHeight - clientHeight == scrollTop) {
-      //滚动条滚到最底部
-      if (list.mulChooseList.length < total.value) {
-        page.value++;
-        _getSelectData(props.selectType);
-      }
-    }
-  };
-}
-
-//获取数据
-function _getSelectData(val) {
-  let obj = {}; //亲求路径及参数
-  switch (val) {
-    case "xfzz":
-    case "xfmj":
-    case "xffj":
-      popupTitle.value = "选择民警";
-      placeholder.value = "请输入姓名";
-      obj["url"] = "/mosty-jcgl/tbJcglXfll/getXfllList";
-      obj["jllx"] = "01";
-      if (val == 'xffj') {
-        popupTitle.value = "选择辅警";
-        obj["jllx"] = "02";
-      }
-      isRadio.value = false;
-      if (val == "xfzz") isRadio.value = true;
-      break;
-    case "xfdw":
-      popupTitle.value = "选择巡访单位";
-      placeholder.value = "请输入单位名称";
-      obj["url"] = "/mosty-jcgl/tbJcglXfDwgl";
-      isRadio.value = false;
-      break;
-    case "xfnr":
-      popupTitle.value = "选择巡访内容";
-      placeholder.value = "请输入巡访内容";
-      obj["url"] = "/mosty-jcgl/tbJcglXfNrmb";
-      isRadio.value = true;
-      break;
-    case "cyry":
-      popupTitle.value = "选择从业人员";
-      placeholder.value = "选择从业人员";
-      obj["url"] = "/mosty-jcgl/tbJcglXfCyry";
-      isRadio.value = false;
-      break;
-  }
-  if (Object.keys(obj).length > 0) _getBBData(obj, val);
-}
-//获取数据
-function _getBBData(obj, type) {
-  //url 请求地址，jllx 警力类型  有需要就传，scode 智能装备筛选条件  有需要就传
-  let { url, jllx, xz } = obj;
-  loading.value = true;
-  let data = { keyword: kwd.value, jllx, pageCurrent: page.value, pageSize: size.value };
-  if (type == 'xfnr') {
-    data = { nr: kwd.value, pageCurrent: page.value, pageSize: size.value }
-  }
-  getBBData(url, data)
-    .then((res) => {
-      loading.value = false;
-      total.value = res.total;
-      if (jllx) {
-        if (res && res.records && res.records.length > 0) {
-          _setData(res.records, type);
-        } else {
-          showEmpty.value = true;
-        }
-      } else {
-        if (res && res.length > 0 && !res.records) {
-          _setData(res, type);
-        } else if (res && res.records) {
-          _setData(res.records, type);
-        } else {
-          showEmpty.value = true;
-        }
-      }
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-
-//搜索关键词
-function onUpdate(val) {
-  page.value = 1;
-  list.mulChooseList = [];
-  _getSelectData(props.selectType);
-}
-//清空关键字
-function onClear() {
-  list.mulChooseList = [];
-  _getSelectData(props.selectType);
-}
-//关闭弹窗
-function onCancel() {
-  emits("update:cancel", false);
-}
-//点击单选
-function onRadionChange(val) {
-  _backData(val);
-}
-//点击多选
-function onCheckboxnChange(val) {
-  _backData(val);
-}
-
-//确认选择
-function onConfirm() {
-  emits("update:confirm", selectObj.value);
-  emits("update:cancel", false);
-}
-//处理返回父组件数据
-function _backData(val) {
-  if (typeof val == "string") {
-    //单选数据
-    let obj = list.mulChooseList.find((item) => {
-      return item.key == val;
-    });
-    selectObj.value = [obj];
-  } else {
-    //多选数据
-    let arr = [];
-    for (let i = 0; i < val.length; i++) {
-      for (let j = 0; j < list.mulChooseList.length; j++) {
-        if (val[i] == list.mulChooseList[j].key) {
-          arr.push(list.mulChooseList[j]);
-        }
-      }
-    }
-    selectObj.value = arr;
-  }
-}
-
-//设置数据
-function _setData(res, type) {
-  for (let i = 0; i < res.length; i++) {
-    switch (type) {
-      case "xfzz":
-      case "xfzy":
-      case "xfmj":
-        res[i].value = `${res[i].ssbm}-${res[i].xm}`;
-        res[i].key = res[i].ryid;
-        break;
-      case "xffj":
-        res[i].value = `${res[i].ssbm}-${res[i].xm}`;
-        res[i].key = res[i].id;
-        break;
-      case "xfdw":
-        res[i].value = `${res[i].dwmc}（电话：${res[i].lxdh}）`;
-        res[i].key = res[i].id;
-        break;
-      case "xfnr":
-        res[i].value = `${res[i].nr}`;
-        res[i].key = res[i].id;
-        break;
-      case "cyry":
-        res[i].value = `${res[i].xm}（${res[i].sfzh}）`;
-        res[i].key = res[i].id;
-        break;
-    }
-  }
-  if (page.value == 1) {
-    list.mulChooseList = res;
-  } else {
-    list.mulChooseList = list.mulChooseList.concat(res);
-  }
-  loading.value = false;
-}
-</script>
-<style lang="scss" scoped>
-@import "@/assets/styles/mixin.scss";
-
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-  color: #fff;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  padding-top: 2vw;
-}
-
-.check-data-box {
-  height: 100vw;
-  overflow: auto;
-}
-
-::v-deep .van-stepper__input {
-  width: 100px;
-}
-
-.zn_tag_select {
-  padding: 2vw 3.5vw;
-  display: flex;
-  align-items: center;
-
-  .squre {
-    display: inline-block;
-    width: 20px;
-    height: 20px;
-    border: 1px solid #cccccc;
-    border-radius: 4px;
-    margin-left: 10px;
-    text-align: center;
-    line-height: 20px;
-  }
-
-  .isActiveAll {
-    background: #1989fa;
-  }
-}
-
-::v-deep .van-cell {
-  align-items: flex-start;
-}
-
-::v-deep .van-cell__title,
-.van-cell__value {
-  margin-right: 1vw;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/components/cyryItem.vue b/src/pages/views/Declaration/components/cyryItem.vue
deleted file mode 100644
index 5c61091..0000000
--- a/src/pages/views/Declaration/components/cyryItem.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <van-swipe-cell>
-    <div class="XFItem-box">
-      <div class="name">
-        {{props.data.xm}}
-        <span v-for="v in props.dic.D_BZ_XB " :key="v"> 
-          <span class="xb" v-if="v.dm == props.data.xb">{{v.text}}</span>
-        </span>
-      </div>
-      <div class="text">
-        身份证号：<span class="mess">{{props.data.sfzh}}</span>
-      </div>
-      <div class="text">籍贯：<span class="mess">{{props.data.jg}}</span></div>
-      <div class="text">联系电话：<span class="mess">{{props.data.lxdh}}</span></div>
-    </div>
-    <template #right>
-      <van-button style="height: 100%; width: 60px" type="primary" @click="gotoEdit">编辑</van-button>
-      <van-button style="height: 100%; width: 60px" type="danger" @click="deleteItem" >删除</van-button>
-    </template>
-  </van-swipe-cell>
-</template>
-
-<script setup>
-import { useRouter } from "vue-router";
-import { ref, onMounted, reactive, defineEmits, defineProps } from "vue";
-const emits = defineEmits(["deletedata"]);
-const router = useRouter();
-const props = defineProps({
-  data: {
-    type: Object,
-    default: {},
-  },
-  dic:{
-    type: Object,
-    default: {},
-  }
-});
-
-// 编辑
-function gotoEdit() {
-  localStorage.setItem('XF_Active',0)
-  router.push({ path: "/Declaration/addEditCyry", query: { id: props.data.id } });
-}
-// 删除
-function deleteItem() {
-  emits("deletedata", props.data.id);
-}
-</script>
-
-<style lang="scss" scoped>
-.XFItem-box {
-  padding: 3vw 4vw;
-  box-sizing: border-box;
-  background-color: #f6fafd;
-  position: relative;
-  .name {
-    color: #4788e1;
-    line-height: 6vw;
-    .xb {
-      margin: 0 14px;
-    }
-  }
-  .text {
-    color: #9f9f9f;
-    line-height: 6vw;
-    .mess {
-      color: #000;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/components/dwglItem.vue b/src/pages/views/Declaration/components/dwglItem.vue
deleted file mode 100644
index 4ef8f3a..0000000
--- a/src/pages/views/Declaration/components/dwglItem.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-  <van-swipe-cell>
-    <div class="XFItem-box">
-      <div class="item-tip" :class="changeBq(props.data.dwlx)">{{ setDict(props.data.dwlx, props.dic.D_BZ_DWLX) }}</div>
-      <div class="text">归属单位：<span class="mess">{{props.data.dwmc}}</span></div>
-      <div class="text">单位名称：<span class="mess">{{props.data.ssbm}}</span></div>
-      <div class="text">单位地址：<span class="mess">{{props.data.dz}}</span></div>
-      <div class="text">单位分类：<span class="mess">{{ setDict(props.data.dwfl, props.dic.D_BZ_DWFL) }}</span></div>
-    </div>
-    <template #right>
-        <van-button style="height:100%;width:60px;" type="primary" @click="gotoEdit">编辑</van-button>
-        <van-button style="height:100%;width:60px;" type="danger" @click="deleteItem">删除</van-button>
-    </template>
-  </van-swipe-cell>
-</template>
-
-<script setup>
-import { useRouter } from "vue-router";
-import { setDict } from "../../../../utils/dict";
-import { ref, onMounted, reactive, defineEmits,defineProps } from "vue";
-const emits = defineEmits(['deletedata'])
-const router = useRouter();
-const props = defineProps({
-  data:{
-    type:Object,
-    default:{}
-  },
-  dic:{
-    type:Object,
-    default:{}
-  }
-});
-
-// 编辑
-function gotoEdit(){
-  localStorage.setItem('XF_Active',1)
-  router.push({path: "/Declaration/addEditDw", query: {id:props.data.id}});
-}
-// 删除
-function deleteItem(){
-  emits('deletedata',props.data.id)
-}
-// 标签
-function changeBq(val){
-    switch(val){
-        case '02':
-          return 'green';
-        break;
-        case '01':
-            return 'blue';
-        break;
-        default:
-            return 'blue';
-    }
-
-}
-</script>
-
-<style lang="scss" scoped>
-.XFItem-box {
-  padding: 3vw 4vw;
-  box-sizing: border-box;
-  background-color: #f6fafd;
-  position: relative;
-.item-tip {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 60px;
-    height: 26px;
-    color: #fff;
-    text-align: center;
-    line-height: 26px;
-    font-size: 14px;
-  }
-  .red {
-    background: url("../../../../assets/images/red.png") no-repeat;
-  }
-  .green {
-    background: url("../../../../assets/images/green.png") no-repeat;
-  }
-  .blue {
-    background: url("../../../../assets/images/blue.png") no-repeat;
-  }
-  .orange {
-    background: url("../../../../assets/images/orange.png") no-repeat;
-  }
-  .text {
-    color: #9f9f9f;
-    line-height: 6vw;
-    .mess {
-      color: #000;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/components/rwItem.vue b/src/pages/views/Declaration/components/rwItem.vue
deleted file mode 100644
index a3e8923..0000000
--- a/src/pages/views/Declaration/components/rwItem.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <van-swipe-cell>
-    <div class="XFItem-box">
-      <div class="time"><van-icon name="clock-o" />{{props.data.xfsj}}</div>
-      <div class="text">巡防主责人：<span class="mess">{{props.data.xfzzXm}}</span></div>
-      <div class="text">巡防商铺：
-        <span class="mess">
-          <span class="tag" v-for="it in props.data.xfdw" :key="it.id" style="margin:0 4px;">{{it.dwmc}}</span>
-        </span>
-      </div>
-      <div class="text">巡防类型：
-        <span class="mess">{{ setDict(props.data.xflx, props.dic.D_BZ_XFLX) }}</span></div>
-      <div class="text text_detail">
-        巡防内容：<span class="mess">{{props.data.xfnr}}</span>
-      </div>
-    </div>
-    <template #right>
-        <van-button style="height:100%;width:60px;" type="primary" @click="gotoEdit">编辑</van-button>
-        <van-button style="height:100%;width:60px;" type="danger" @click="deleteItem">删除</van-button>
-    </template>
-  </van-swipe-cell>
-</template>
-
-<script setup>
-import { setDict } from "../../../../utils/dict";
-import { useRouter } from "vue-router";
-import { ref, onMounted, reactive, defineEmits,defineProps } from "vue";
-const emits = defineEmits(['deletedata'])
-const router = useRouter();
-const props = defineProps({
-  data:{
-    type:Object,
-    default:{}
-  },
-  dic:{
-    type:Object,
-    default:{}
-  }
-});
-
-// 编辑
-function gotoEdit(){
-  localStorage.setItem('XF_Active',2)
-  router.push({path: "/Declaration/addEditRw", query: {id:props.data.id}});
-}
-// 删除
-function deleteItem(){
-  emits('deletedata',props.data.id)
-}
-</script>
-
-<style lang="scss" scoped>
-.XFItem-box {
-  padding: 3vw 4vw;
-  box-sizing: border-box;
-  background-color: #f6fafd;
-  position: relative;
-  .time {
-    font-size: 16px;
-    line-height: 5vw;
-    .van-icon-clock-o {
-      margin-right: 2vw;
-      font-size: 16px;
-    }
-  }
-  .text {
-    color: #9f9f9f;
-    line-height: 6vw;
-    .mess {
-      color: #000;
-    }
-  }
-}
-.tag{
-  border: 1px solid #5e9fdd;
-  border-radius: 4px;
-  font-size: 14px;
-  color: #409eff;
-  padding: 1px 4px;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/components/zgItem copy.vue b/src/pages/views/Declaration/components/zgItem copy.vue
deleted file mode 100644
index 504b602..0000000
--- a/src/pages/views/Declaration/components/zgItem copy.vue	
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-  <van-swipe-cell>
-    <div class="XFItem-box">
-      <!-- <div class="item-tip" :class="changeBq(props.data.lx)">{{props.data.ztmc}}</div> -->
-      <div class="time"><van-icon name="clock-o" />{{props.data.sbsj}}</div>
-      <div class="text">申报类型：<span class="mess">{{ setDict(props.data.sblx, props.dic.D_SB_SBLX) }}</span></div>
-      <div class="text text_detail">
-        申报内容：<span class="mess">{{props.data.sbyy}}</span>
-      </div>
-    </div>
-    <template #right>
-        <van-button style="height:100%;width:60px;" type="primary" @click="gotoEdit">编辑</van-button>
-        <van-button style="height:100%;width:60px;" type="danger" @click="deleteItem">删除</van-button>
-    </template>
-  </van-swipe-cell>
-</template>
-
-<script setup>
-import { useRouter } from "vue-router";
-import { setDict } from "../../../../utils/dict";
-import { ref, onMounted, reactive, defineEmits,defineProps } from "vue";
-const emits = defineEmits(['deletedata'])
-const router = useRouter();
-const props = defineProps({
-   data:{
-       type:Object,
-       default:{lx:0}
-   } ,
-   dic:{
-     type:Object,
-     default:{}
-   }
-});
-// 标签
-function changeBq(val){
-    switch(val){
-        case 0:
-            return 'orange';
-        break;
-        case 1:
-            return 'green';
-        break;
-        case 2:
-            return 'red';
-        break;
-        case 3:
-            return 'blue';
-        break;
-        default:
-            return 'blue';
-    }
-
-}
-// 编辑
-function gotoEdit(){
-  localStorage.setItem('XF_Active',3)
-  router.push({path: "/Declaration/addEdit", query: {id:props.data.id}});
-}
-// 删除
-function deleteItem(){
-  emits('deletedata',props.data.id)
-}
-</script>
-
-<style lang="scss" scoped>
-.XFItem-box {
-  padding: 3vw 4vw;
-  box-sizing: border-box;
-  background-color: #f6fafd;
-  position: relative;
-  .time {
-    font-size: 16px;
-    line-height: 5vw;
-    .van-icon-clock-o {
-      margin-right: 2vw;
-      font-size: 16px;
-    }
-  }
-  .text {
-    color: #9f9f9f;
-    line-height: 6vw;
-    .mess {
-      color: #000;
-    }
-  }
-  .item-tip {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 60px;
-    height: 26px;
-    color: #fff;
-    text-align: center;
-    line-height: 26px;
-    font-size: 14px;
-  }
-  .red {
-    background: url("../../../../assets/images/red.png") no-repeat;
-  }
-  .green {
-    background: url("../../../../assets/images/green.png") no-repeat;
-  }
-  .blue {
-    background: url("../../../../assets/images/blue.png") no-repeat;
-  }
-  .orange {
-    background: url("../../../../assets/images/orange.png") no-repeat;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/components/zgItem.vue b/src/pages/views/Declaration/components/zgItem.vue
deleted file mode 100644
index e515e94..0000000
--- a/src/pages/views/Declaration/components/zgItem.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-  <van-swipe-cell>
-    <div class="XFItem-box" @click.stop="handleItem(props.data)">
-      <div class="isCheck" v-show="props.data.isCheck" :class="props.data.isCheck ? 'isCheck-y':''"><van-icon name="success" color="#ffffff"></van-icon></div>
-      <div class="time"><van-icon name="clock-o" />{{props.data.xfsj}}</div>
-      <div class="text">巡防主责人：<span class="mess">{{props.data.xfzzXm}}</span></div>
-      <div class="text">巡防商铺：
-        <span class="mess">
-          <span class="tag" v-for="it in props.data.xfdw" :key="it.id" style="margin:0 4px;">{{it.dwmc}}</span>
-        </span>
-      </div>
-      <div class="text">巡防类型：
-        <span class="mess">{{ setDict(props.data.xflx, props.dic.D_BZ_XFLX) }}</span></div>
-      <div class="text text_detail">
-        巡防内容：<span class="mess">{{props.data.xfnr}}</span>
-      </div>
-    </div>
-    <template #right>
-        <van-button style="height:100%;width:60px;" type="primary" @click="gotoEdit">编辑</van-button>
-        <van-button style="height:100%;width:60px;" type="danger" @click="deleteItem">删除</van-button>
-    </template>
-  </van-swipe-cell>
-</template>
-
-<script setup>
-import { setDict } from "../../../../utils/dict";
-import { useRouter } from "vue-router";
-import { ref, onMounted, reactive, defineEmits,defineProps } from "vue";
-const emits = defineEmits(['deletedata','chooseData'])
-const router = useRouter();
-const props = defineProps({
-  data:{
-    type:Object,
-    default:{}
-  },
-  dic:{
-    type:Object,
-    default:{}
-  }
-});
-
-// 编辑
-function gotoEdit(){
-  localStorage.setItem('XF_Active',3)
-  router.push({path: "/Declaration/addEdit", query: {id:props.data.id}});
-}
-// 删除
-function deleteItem(){
-  emits('deletedata',props.data.id)
-}
-// 点击
-function handleItem(item){
-  emits('chooseData',item)
-}
-</script>
-
-<style lang="scss" scoped>
-.XFItem-box {
-  padding: 3vw 4vw;
-  box-sizing: border-box;
-  background-color: #f6fafd;
-  position: relative;
-  .isCheck{
-    position: absolute;
-    top: 0vw;
-    right: 0vw;
-    width: 6vw;
-    height: 6vw;
-    border-radius: 50%;
-    border: 1px solid #c8c9cc;
-    text-align: center;
-    line-height: 6vw;
-  }
-  .isCheck-y{
-    background: #1989fa;
-  }
-  .time {
-    font-size: 16px;
-    line-height: 5vw;
-    .van-icon-clock-o {
-      margin-right: 2vw;
-      font-size: 16px;
-    }
-  }
-  .text {
-    color: #9f9f9f;
-    line-height: 6vw;
-    .mess {
-      color: #000;
-    }
-  }
-}
-.tag{
-  border: 1px solid #5e9fdd;
-  border-radius: 4px;
-  font-size: 14px;
-  color: #409eff;
-  padding: 1px 4px;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/Declaration/index.vue b/src/pages/views/Declaration/index.vue
deleted file mode 100644
index e94c850..0000000
--- a/src/pages/views/Declaration/index.vue
+++ /dev/null
@@ -1,515 +0,0 @@
-<template>
-  <div class="container">
-    <TopNav navTitle="巡访管理" :rightTitle="rightTitle" @clickRight="clickRight" />
-    <div>
-      <Tabs :checked="isActive" :list="zdModule" @onYjjb="changeTab" />
-      <Search placeholder="请输入关键字" v-model="keyWord" :isSx="true" @update:sx="handleSx" @update:modelValue="onSearch">
-      </Search>
-      <SxPopup :showPopup="showPopup" :list="sxList" :p_top="145" :showTime="isShowTime" @update:close="showPopup = false" @update:onConfirm="onConfirm" @reset="reset">
-      </SxPopup>
-
-      <!-- 列表数据 -->
-      <ul class="listBox" :loading="isLoading" ref="dateScroll">
-        <li style="margin-bottom: 2vw" v-for="(item, idex) in list" :key="idex">
-          <CyryItem v-if="isActive == 0" @deletedata="deletedata" :dic="{ D_BZ_XB }" :data="item" />
-          <DwglItem v-if="isActive == 1" @deletedata="deletedata" :dic="{ D_BZ_DWLX, D_BZ_DWFL }" :data="item" />
-          <RwItem v-if="isActive == 2" @deletedata="deletedata" :data="item" :dic="{ D_BZ_XFLX }" />
-          <ZgItem v-if="isActive == 3" @deletedata="deletedata" @chooseData="chooseData" :data="item"
-            :dic="{ D_BZ_XFLX }" />
-          <!-- <ZgItem v-if="isActive == 3" @deletedata="deletedata" :data="item" :dic="{D_SB_SBLX}" /> -->
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import Tabs from "../../../components/tabs.vue";
-import Search from "../../../components/search.vue";
-import SxPopup from "../../../components/SxPopupNew.vue";
-import ZgItem from "./components/zgItem.vue";
-import CyryItem from "./components/cyryItem.vue";
-import RwItem from "./components/rwItem.vue";
-import DwglItem from "./components/dwglItem.vue";
-import { useRouter, useRoute } from "vue-router";
-import { Dialog, Notify } from "vant";
-import { getdataCyry, deletedataCyry, getdataDwgl, deletedataDw, deletedataZg, getdataRw, plsbData, deletedataRw, getdataZg } from "../../../api/xfgl.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { setTimeQuantum, dateFormat, hintToast } from "../../../utils/tools.js";
-import { ref, reactive, watch, onMounted, nextTick } from "vue";
-const { D_BZ_XB, D_BZ_DWFL, D_BZ_DWLX, D_BZ_XFLX, D_SB_SBLX } = getDictList("D_BZ_XB", "D_BZ_DWFL", "D_BZ_DWLX", "D_BZ_XFLX", "D_SB_SBLX");
-const router = useRouter();
-const route = useRoute();
-const dateScroll = ref(null)
-const isLoading = ref(false) //加载
-const zdModule = ref([
-  { name: "从业人员管理" },
-  { name: "单位管理" },
-  { name: "巡防任务" },
-  { name: "战果管理" },
-]);
-const keyWord = ref(""); //关键字搜索
-const showPopup = ref(false); //赛选条件窗口
-const dateForm = ref({
-  sblxmc: "",
-  sblxdm: "",
-});
-const isShowTime = ref(true);
-const selectList = ref([]); //选择类型
-const List1 = ref([
-  { label: "类型1", value: "01" },
-  { label: "类型2", value: "02" },
-  { label: "类型3", value: "03" },
-]);
-
-const chooseType = ref(false); //选择类型
-
-const rightTitle = ref('新增')
-const sxList = ref([]); //筛选条件数据
-const pageCurrent = ref(1); //分页
-const total = ref(0); //总数
-const showEmpty = ref(false); //数据状态
-const list = ref([]); //列表数据
-const searchDate = ref({}); //查询条件
-const isActive = ref(); //当前位置
-const haschooseList = ref([]) //已选中的数据
-onMounted(() => {
-  let ac = localStorage.getItem('XF_Active')
-  isActive.value = ac ? parseInt(ac) : 0;
-  rightTitle.value = isActive.value == 3 ? '批量申报' : '新增'
-  nextTick(() => { getOtherDate(); })
-  scroll()
-});
-
-//触底加载
-function scroll() {
-  let scrollTargetBox = dateScroll.value;
-  if (!scrollTargetBox) return false;
-  scrollTargetBox.onscroll = (e) => {
-    var scrollHeight = scrollTargetBox.scrollHeight; //251
-    var scrollTop = scrollTargetBox.scrollTop; //0-18
-    var clientHeight = scrollTargetBox.clientHeight; //233
-    if (scrollHeight - clientHeight == scrollTop) {
-      //滚动条滚到最底部
-      if (list.value.length < total.value) {
-        pageCurrent.value++;
-        getOtherDate(); //根据不同类型掉接口
-      }
-    }
-  };
-}
-
-// 处理筛选
-function handleSx() {
-  isShowTime.value = true;
-  switch (isActive.value) {
-    case 0: //从业人员管理
-      isShowTime.value = false;
-      sxList.value = [
-        {
-          title: "身份证号",
-          type: "input",
-          lebel: "sfzh",
-          placeholder: "请输入身份证号",
-        },
-        {
-          title: "姓名",
-          type: "input",
-          lebel: "xm",
-          placeholder: "请输入姓名",
-        },
-      ];
-      break;
-    case 1: //单位管理
-      D_BZ_DWFL.value.forEach((element) => {
-        element.isCheck = false;
-        element.key = element.dm;
-      });
-      D_BZ_DWLX.value.forEach((element) => {
-        element.isCheck = false;
-        element.key = element.dm;
-      });
-      isShowTime.value = false;
-      sxList.value = [
-        {
-          title: "单位名称",
-          type: "input",
-          lebel: "dwmc",
-          placeholder: "请输入单位名称",
-        },
-        {
-          title: "单位分类",
-          isCheckBox: false,
-          type: "checkBox",
-          lebel: "dwfl",
-          array: D_BZ_DWFL.value,
-        },
-        {
-          title: "单位类型",
-          isCheckBox: false,
-          type: "checkBox",
-          lebel: "dwlx",
-          array: D_BZ_DWLX.value,
-        },
-      ];
-      break;
-    case 2: //寻巡访任务
-      D_BZ_XFLX.value.forEach((element) => {
-        element.isCheck = false;
-        element.key = element.dm;
-      });
-      sxList.value = [
-        { type: "checkBox", ...setTimeQuantum() },
-        {
-          type: "checkBox",
-          title: "巡防类型",
-          array: D_BZ_XFLX.value,
-        },
-      ];
-      break;
-    case 3: //战果申报
-      sxList.value = [
-        { type: "checkBox", ...setTimeQuantum() },
-        {
-          title: "申报类型",
-          type: "checkBox",
-          lebel: "sblx",
-          array: [
-            { isCheck: false, name: "类型1", value: "01", key: "fl1" },
-            { isCheck: false, name: "类型2", value: "02", key: "fl2" },
-          ],
-        },
-      ];
-      selectList.value = List1.value;
-      break;
-  }
-  showPopup.value = !showPopup.value;
-}
-
-// 搜索
-function onConfirm(val) {
-
-  searchDate.value = val;
-  getOtherDate();
-}
-// 选择类型
-function changeTab(val) {
-  pageCurrent.value = 1
-  isActive.value = val;
-  showPopup.value = false;
-  list.value = []
-  rightTitle.value = val == 3 ? '批量申报' : '新增'
-  getOtherDate() //获取列表数据
-}
-// 更具类型获取数据
-function getOtherDate() {
-  switch (isActive.value) {
-    case 0:
-      _getList_Cyry(); //从业人员管理
-      break;
-    case 1:
-      _getList_Dwgl()//单位管理
-      break;
-    case 2:
-      _getList_Rw()//寻巡访任务
-      break;
-    case 3:
-      _getList_Rw()//寻巡访任务
-      //  _getList_Zg()//战果申报
-      break;
-  }
-}
-
-// 获取从业人员列表
-function _getList_Cyry() {
-  let pramas = {
-    pageSize: 10,
-    pageCurrent: pageCurrent.value,
-    ...searchDate.value.data,
-  };
-  if (!searchDate.value.data) pramas.xm = keyWord.value;
-  if (searchDate.value.data && !searchDate.value.data.xm) pramas.xm = keyWord.value;
-  isLoading.value = true
-  getdataCyry(pramas).then((res) => {
-    let arr = res.records || [];
-    isLoading.value = false;
-    list.value = pageCurrent.value == 1 ? arr : list.value.concat(arr);
-    total.value = res.total;
-  }).catch(() => {
-    isLoading.value = false;
-  });
-}
-
-// 获取单位管理
-function _getList_Dwgl() {
-  let pramas = {
-    pageSize: 10,
-    pageCurrent: pageCurrent.value,
-    ...searchDate.value.data,
-  };
-  let brr = searchDate.value.list ? searchDate.value.list : []
-  let arr = brr.filter(item => {
-    return item.type == 'checkBox'
-  })
-  arr.forEach(v => {
-    v.array.forEach(it => {
-      if (it.isCheck) pramas[v.lebel] = it.value
-    })
-  })
-
-  if (!searchDate.value.data || (searchDate.value.data && !searchDate.value.data.dwmc)) {
-    pramas.dwmc = keyWord.value;
-  }
-  isLoading.value = true;
-  getdataDwgl(pramas).then((res) => {
-    let arr = res.records || [];
-    list.value = pageCurrent.value == 1 ? arr : list.value.concat(arr);
-    total.value = res.total;
-    isLoading.value = false;
-  }).catch(() => {
-    isLoading.value = false;
-  });
-}
-
-// 获取任务
-function _getList_Rw() {
-  let pramas = {
-    pageSize: 10,
-    pageCurrent: pageCurrent.value,
-    ...searchDate.value,
-  };
-  if (!searchDate.value.data) pramas.xfdw = keyWord.value;
-  if (searchDate.value.data && !searchDate.value.xfdw) pramas.xfdw = keyWord.value;
-  if (isActive.value == 2) {
-    pramas.xfnr = keyWord.value;
-    delete pramas.xfdw;
-    delete pramas.data;
-  }
-  if (pramas.list) {
-    let arr = pramas.list[0].array
-    let obj = arr.find(item => { return item.isCheck == true })
-    pramas.rwzt = obj.dm
-  }
-  isLoading.value = true;
-  getdataRw(pramas).then((res) => {
-    let arr = res.records || [];
-    isLoading.value = false;
-    arr.forEach(item => {
-      item.isCheck = false
-      item.xfdw = JSON.parse(item.xfdw)
-      item.xfzy = JSON.parse(item.xfzy)
-    })
-    list.value = pageCurrent.value == 1 ? arr : list.value.concat(arr);
-    total.value = res.total;
-  }).catch(() => {
-    isLoading.value = false;
-  });
-}
-
-// 点击内容
-function chooseData(item) {
-  if (isActive.value == 3) {
-    list.value.forEach(it => {
-      if (it.id == item.id) it.isCheck = !it.isCheck;
-    })
-    haschooseList.value = list.value.filter(v => { return v.isCheck == true })
-  }
-}
-// 获取任务
-function _getList_Zg() {
-  let pramas = {
-    pageSize: 10,
-    pageCurrent: pageCurrent.value,
-  };
-  if (searchDate.value) {
-    let kssj = searchDate.value.startTime
-    let jssj = searchDate.value.startTime
-    pramas.kssj = kssj ? kssj + ' 00:00:00' : '';
-    pramas.kssj = jssj ? jssj + ' 23:59:59' : '';
-    let arr = searchDate.value.list
-    if (arr) {
-      let list = arr[0].array.filter(v => { return v.isCheck == true }).map(it => { return it.value })
-      pramas.sblx = list.join(',');
-    }
-  }
-  isLoading.value = true;
-  getdataZg(pramas).then((res) => {
-    let arr = res.records || [];
-    isLoading.value = false;
-    list.value = pageCurrent.value == 1 ? arr : list.value.concat(arr);
-    total.value = res.total;
-  }).catch(() => {
-    isLoading.value = false;
-  });
-}
-
-
-// 点击新增
-function clickRight() {
-  localStorage.setItem('XF_Active', isActive.value)
-  switch (isActive.value) {
-    case 0: //从业人员管理
-      router.push({ path: "/Declaration/addEditCyry" });
-      break;
-    case 1: //单位管理
-      router.push({ path: "/Declaration/addEditDw" });
-      break;
-    case 2: //寻巡访任务
-      router.push({ path: "/Declaration/addEditRw" });
-      break;
-    case 3: //战果申报
-      plsbDate()// 批量申报
-      // router.push({ path: "/Declaration/addEdit"});
-      break;
-  }
-}
-
-// 批量申报
-function plsbDate() {
-  if (haschooseList.value.length == 0) return Notify({ type: 'warning', message: '请选择申报的内容' });
-  let isTrue = true; //判断内容是否填完
-  haschooseList.value.forEach(item => {
-    if (!item.sbyy) isTrue = false
-  })
-  if (!isTrue) Notify({ type: 'warning', message: '请核实申报数据核实原因是否填写!' });
-  if (isTrue) {
-    let ids = haschooseList.value.map(it => { return it.id })
-    plsbData(ids).then(res => {
-      hintToast('申报成功')
-      _getList_Rw()
-    })
-    // 查询接口
-  }
-}
-//关键字查询
-function onSearch(e) {
-  keyWord.value = e;
-  pageCurrent.value = 1;
-  showEmpty.value = false;
-  getOtherDate();//更具类型获取数据
-}
-// 选择类型
-function chooseItem(val) {
-  dateForm.value.sblxmc = val.label;
-  dateForm.value.sblxdm = val.value;
-  chooseType.value = false;
-}
-// 重置
-function reset() {
-  dateForm.value.sblxmc = "";
-  dateForm.value.sblxdm = "";
-  searchDate.value = {};
-  keyWord.value = ''
-  getOtherDate();
-}
-// 删除数据
-function deletedata(id) {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认删除该数据！",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    switch (isActive.value) {
-      case 0: //从业人员管理
-        deletedataCyry([id]).then(res => {
-          hintToast('删除成功')
-          _getList_Cyry()
-        })
-        break;
-      case 1: //单位管理
-        deletedataDw([id]).then(res => {
-          hintToast('删除成功')
-          _getList_Dwgl()
-        })
-        break;
-      case 2: //寻巡访任务
-      case 3: //战果申报
-        deletedataRw([id]).then(res => {
-          hintToast('删除成功')
-          _getList_Rw()
-        })
-        break;
-      // case 3: //战果申报
-      //   deletedataZg([id]).then(res=>{
-      //     hintToast('删除成功')
-      //     _getList_Zg()
-      //   })
-      //   break;
-    }
-  });
-}
-
-
-</script>
-<style lang="less" scoped>
-.chooseBox {
-  position: relative;
-  display: flex;
-  width: 100%;
-  justify-content: space-between;
-  align-content: center;
-  padding: 2vw 1vw;
-  box-sizing: border-box;
-  border: 1px solid #507ce9;
-  border-radius: 4px;
-  color: #d3d0d0;
-  font-size: 14px;
-
-  .outBox {
-    width: 100%;
-    position: absolute;
-    top: 38px;
-    background: #fff;
-    padding-top: 4vw;
-    z-index: 999;
-    border-radius: 4px;
-
-    .selectBox {
-      width: 100%;
-      padding: 4vw;
-      box-sizing: border-box;
-      border: 1px solid #ccc;
-      border-radius: 4px;
-
-      .selectItem {
-        padding-left: 4vw;
-        box-sizing: border-box;
-        border-bottom: 1px solid #e9e9e9;
-        line-height: 30px;
-        color: #4a4646;
-      }
-    }
-
-    .selectBox::before {
-      position: absolute;
-      content: "";
-      top: -4px;
-      left: 50%;
-      transform: translateX(-50%);
-      width: 0;
-      height: 0;
-      border: 10px solid;
-      border-color: transparent transparent #ccc transparent;
-    }
-  }
-
-  .hoverClose {
-    display: none;
-  }
-}
-
-.listBox {
-  height: calc(100vh - 20vw);
-  overflow: hidden;
-  overflow-y: auto;
-  padding: 1vw 4vw;
-  padding-bottom: 0;
-  box-sizing: border-box;
-
-  .listItem {
-    background-color: rgba(241, 241, 241, 0.5);
-    padding: 2vw;
-    border: 1px solid;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/QuarantinePersonnel/drivinglicence.vue b/src/pages/views/QuarantinePersonnel/drivinglicence.vue
deleted file mode 100644
index bbc57ae..0000000
--- a/src/pages/views/QuarantinePersonnel/drivinglicence.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-  <div class="container containerLicence" style="padding-top: 13vw; box-sizing: border-box">
-    <TopNav navTitle="核查驾驶证" />
-    <van-steps direction="vertical" active-color="#969799" :active="0">
-      <van-step>
-        <p>驾驶证号: 511525199910238410</p>
-        <p>姓名:周正伟</p>
-        <p>性别:男性</p>
-        <p>出生日期:1999年10月23日</p>
-        <p>国籍:</p>
-        <p>准驾车型: C1</p>
-        <p>发证机关:川Q</p>
-        <p>初次领证日期:2018-08-02 00:00:00</p>
-        <p>有效期限:2018-08-02 00:00:00-2024-08-02 00:00:00</p>
-        <p>住址:</p>
-        <p>现住址详址:四川省高县胜天镇马鞍村2组46号</p>
-      </van-step>
-    </van-steps>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { ref, reactive, onMounted, watch } from "vue";
-import { useRouter } from "vue-router";
-const router = useRouter();
-</script>
-
-<style lang="scss" scoped>
-
-</style>
-
-<style>
-.containerLicence .van-icon{
-  color: #148aec!important;
-}
-.containerLicence .van-step__line{
-  background-color: #148aec!important;
-}
-</style>
diff --git a/src/pages/views/QuarantinePersonnel/featureInfo.vue b/src/pages/views/QuarantinePersonnel/featureInfo.vue
deleted file mode 100644
index 818a116..0000000
--- a/src/pages/views/QuarantinePersonnel/featureInfo.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav navTitle="特征信息" />
-    <van-collapse v-model="activeName" @change="activeJs = false" accordion>
-      <van-collapse-item v-for="(item, i) in D_BZ_RYTZBQLB" :key="item.id" :title="item.py">
-        <span :class="it.zt === 1 ? 'coll_item active' : 'coll_item'" v-for="(it, index) in item.bqList" :key="index"
-          @click="checkBq(i, index, it.zt)">
-          {{ it.tzsx }}
-        </span>
-        <div class="coll_item_js" @click="activeJs = !activeJs">
-          查看代码解释>>>
-        </div>
-        <span :class="it.zt === 1 ? 'coll_item active' : 'coll_item'" v-show="activeJs" class="coll_item"
-          v-for="(it, index) in item.bqList" :key="index">
-          {{ it.tzbqmc }}
-        </span>
-      </van-collapse-item>
-    </van-collapse>
-    <div class="popbtn-box">
-      <van-button style="width: 100%" type="primary" @click="submit">确定</van-button>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { getDictList } from "../../../utils/dict";
-import { selectRytzbqList } from "../../../api/common";
-import { ref, reactive, onMounted, watch } from "vue";
-import { useRouter } from "vue-router";
-// 字典信息
-const { D_BZ_RYTZBQLB } = getDictList("D_BZ_RYTZBQLB");
-const router = useRouter();
-const activeJs = ref(false);
-const activeName = ref("");
-const checkList = ref([]);
-function checkBq(i, index, zt) {
-  if (zt == 1) {
-    D_BZ_RYTZBQLB.value[i].bqList[index].zt = 0;
-  } else {
-    D_BZ_RYTZBQLB.value[i].bqList[index].zt = 1;
-  }
-}
-function submit() {
-  const data = [];
-  D_BZ_RYTZBQLB.value.forEach((v) => {
-    v.bqList.forEach((v2) => {
-      if (v2.zt == 1) {
-        data.push({
-          tzbqdm: v2.tzbqdm,
-          tzbqlb: v2.tzbqlb,
-          tzbqmc: v2.tzbqmc,
-        });
-      }
-    });
-  });
-  try {
-    setStorage("LIST", JSON.stringify(data));
-  } catch (error) {
-    setStorage("LIST", data);
-  }
-  router.go(-1);
-}
-watch(
-  () => D_BZ_RYTZBQLB.value.length,
-  () => {
-    D_BZ_RYTZBQLB.value.forEach((item) => {
-      selectRytzbqList({ tzbqlb: item.dm }).then((res) => {
-        item.bqList = res;
-        item.bqList.forEach((v) => {
-          if (checkList.value.includes(v.tzbqdm)) {
-            v.zt = 1;
-          } else {
-            v.zt = 0;
-          }
-        });
-      });
-    });
-  }
-);
-
-onMounted(() => {
-  let item;
-  try {
-    item = JSON.parse(getStorage("LIST"));
-  } catch (error) {
-    item = getStorage("LIST");
-  }
-
-  checkList.value = item.map((item) => item.tzbqdm);
-});
-</script>
-
-<style lang="scss" scoped>
-.coll_item {
-  display: inline-block;
-  width: 30%;
-  text-align: center;
-  margin: 0 0 12px 3%;
-  padding: 2px 0;
-  background: #eee;
-  border-radius: 4px;
-}
-
-.coll_item.active {
-  background: #2698e4;
-  color: #fff;
-}
-
-.coll_item_js {
-  text-align: center;
-  color: #2698e4;
-  margin: 1px 0px 5px 0px;
-}
-
-.popbtn-box {
-  position: fixed;
-  bottom: 0;
-  right: 0;
-  left: 0;
-}
-</style>
diff --git a/src/pages/views/QuarantinePersonnel/index.vue b/src/pages/views/QuarantinePersonnel/index.vue
deleted file mode 100644
index e0e5c64..0000000
--- a/src/pages/views/QuarantinePersonnel/index.vue
+++ /dev/null
@@ -1,958 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw; box-sizing: border-box">
-    <TopNav navTitle="人员盘查" :showRight="false" :showLeft="true" />
-    <div class="tip_text">
-      盘查结果：{{ ryxx.pcbqsm }}
-    </div>
-    <div class="head-nav-banner" v-if="ryxx.xm"></div>
-    <!-- <div class="top" v-if="ryxx.xm">
-      <div class="basic-info">
-        <div class="IDcard-info">
-          <div class="info-item">
-            <span class="bt">姓名</span>
-            <span>{{ ryxx.xm }}</span>
-          </div>
-          <div class="info-item">
-            <span class="bt">性别</span>
-            <span class="text">{{ setDict(ryxx.xbdm, D_BZ_XB) }}</span>&emsp;
-            <span class="bt">民族</span>
-            <span>{{ setDict(ryxx.mzdm, D_BZ_MZ) || "汉" }}</span>
-          </div>
-          <div class="info-item">
-            <span class="bt">出生</span>{{ ryxx.csrq }}
-          </div>
-          <div class="info-item">
-            <span class="bt">住址</span>
-            <span class="text">{{ ryxx.zzxz }}</span>
-          </div>
-        </div>
-        <div class="img-box">
-          <img :src="ryxx.baseUrl" width="75" />
-        </div>
-      </div>
-      <div class="sfzh">
-        <span class="bt">公民身份证号码</span>
-        <span class="idNumber">{{ ryxx.sfzh }}</span>
-      </div>
-    </div>
-    <div class="ry_xgxx">
-      <div class="contact-way">
-        <div>
-          人员标签：
-          <span v-if="ryxx.bqxxsj">
-            <span class="rybq" v-for="(e, i) in ryxx.bqxxsj.split(',')" :key="i + 'bq'">{{ e }}</span>
-          </span>
-          <span style="color: #808080" v-else>暂无标签</span>
-        </div>
-      </div>
-      <div>
-        联系电话 :<span>{{ ryxx.lxdh || "未知" }}</span>
-      </div>
-      <div>从业单位 :<span>未知</span></div>
-    </div>
-    <div class="bg_ban"></div>
-    <div class="center" v-if="ryxx.xm">
-      <div class="associated-information">
-        <div class="sign-title">关联信息</div>
-        <div class="content1">
-          <div class="item-box" @click="goCanTrack">
-            <div class="ass-item-box">
-              <div class="circlebox bg2"></div>
-              <span>盘查轨迹</span>
-            </div>
-          </div>
-          <div class="item-box">
-            <div class="ass-item-box" @click="goLicence">
-              <div class="circlebox bg4"></div>
-              <span>核查驾驶证</span>
-            </div>
-          </div>
-          <div class="item-box" @click="goVhicol">
-            <div class="ass-item-box">
-              <div class="circlebox bg5"></div>
-              <span>核查机动车</span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="pick-up-information">
-        <div class="sign-title">采集信息</div>
-        <div class="pick-box">
-          <div class="pick-item-box pbg2" @click="goFeatureInfo">
-            <div>特征信息</div>
-          </div>
-          <van-badge @click="showWpdj = true" class="pick-item-box pbg3" :content="wpdjList.length">
-            <div>物品登记</div>
-          </van-badge>
-        </div>
-      </div>
-      <div class="vehicular">
-        <div class="sign-title">
-          乘坐车辆
-          <span @click="showCar" style="color: #153fba; font-size: 12px; font-weight: normal">手动输入</span>
-        </div>
-        <div class="veh-box">
-          <div @click="onConfirmCzcl(item)" v-for="item in clList"
-            :class="ryxx.pcclId === item.id ? 'active cp_item' : 'cp_item'" :key="item.id">
-            {{ item.text.substr(0, 2) }}
-            <span></span>
-            {{ item.text.substr(2, item.text.length - 2) }}
-          </div>
-          <div v-if="clList.length === 0" class="no-veh">暂无乘坐车辆~</div>
-        </div>
-      </div>
-    </div> -->
-    <!-- 物品登记弹窗 -->
-    <van-popup v-model:show="showWpdj" round :style="{ width: '90vw' }">
-      <van-form @submit="onSubmit">
-        <van-cell-groub>
-          <van-field name="uploader" label="物品图片">
-            <template #input>
-              <van-uploader v-model="wpTpIdList" multiple :max-count="3" :after-read="upLoadImg2" />
-            </template>
-          </van-field>
-        </van-cell-groub>
-        <van-cell-groub>
-          <van-field v-model="wpForm.wpms" label="物品描述" placeholder="物品描述" rows="2" maxlength="50"
-            show-word-limit></van-field>
-        </van-cell-groub>
-        <van-cell-groub>
-          <van-field v-model="wpForm.wpsl" label="物品数量" placeholder="物品数量" type="number"
-            :rules="[{ required: true, message: '请填写物品数量' }]"></van-field>
-        </van-cell-groub>
-        <van-cell-groub>
-          <van-field v-model="wpForm.wplx" label="物品类型" @click="showWplx = true" readonly is-link placeholder="选择物品类型"
-            :rules="[{ required: true, message: '请选择物品类型' }]"></van-field>
-        </van-cell-groub>
-        <div style="margin: 16px">
-          <van-button round block type="primary" native-type="submit" size="small">提交</van-button>
-        </div>
-      </van-form>
-    </van-popup>
-    <!-- 移交弹窗 -->
-    <van-popup v-model:show="showYj" round :style="{ width: '90vw' }">
-      <van-form @submit="onYj">
-        <van-cell-groub>
-          <van-field v-model="yjForm.pcclYjdw" label="移交单位" placeholder="移交单位"
-            :rules="[{ required: true, message: '请填写移交单位' }]"></van-field>
-        </van-cell-groub>
-        <van-cell-groub>
-          <van-field v-model="yjForm.pcclYjyy" label="移交原因" placeholder="选择移交原因" @click="showYjyy = true" readonly
-            is-link :rules="[{ required: true, message: '请选择移交原因' }]"></van-field>
-        </van-cell-groub>
-        <div style="margin: 16px">
-          <van-button round block type="primary" native-type="submit" size="small">移交</van-button>
-        </div>
-      </van-form>
-    </van-popup>
-    <!-- 物品类型 -->
-    <van-popup round v-model:show="showWplx" position="bottom">
-      <van-picker :columns="D_BZ_BPCRCWP" @cancel="showWplx = false" @confirm="onConfirmWplx"></van-picker>
-    </van-popup>
-    <!-- 移交原因 -->
-    <van-popup round v-model:show="showYjyy" position="bottom">
-      <van-picker :columns="D_BZ_BPCRYYJYY" @cancel="showYjyy = false" @confirm="onConfirmYjyy"></van-picker>
-    </van-popup>
-    <div class="bg_ban"></div>
-    <!-- <div class="upload" v-if="ryxx.xm">
-      <div class="tsxx" v-show="fileList.length === 0">
-        点击上传图片 <br />
-        最多可上传 3 张照片
-      </div>
-      <van-uploader v-model="fileList" multiple :max-count="3" :after-read="afterRead">
-        <van-button class="up_btn" icon="plus"></van-button>
-      </van-uploader>
-    </div>
-    <div class="foot_ban"></div> -->
-    <div class="bottom-box">
-      <div @click="save('1')">
-        <img src="../../../assets/images/new/fangxing.png" />放行
-      </div>
-      <div @click="save('2')" class="yj">
-        <img src="../../../assets/images/new/yijiao.png" /> 移交
-      </div>
-    </div>
-    <van-loading type="spinner" style="padding: 20vw 0; text-align: center" v-if="loading" />
-    <van-empty image="network" description="错误，请稍后再试" v-if="showEmpty" />
-    <!-- 盘车 -->
-    <checkedCar ref="car" />
-  </div>
-</template>
-
-<script setup>
-import ImageCompressor from "image-compressor.js";
-import TopNav from "../../../components/topNav";
-import checkedCar from "../../spsHome/components/checkCar.vue";
-import { ref, reactive, onMounted, watch } from "vue";
-import { useRouter } from "vue-router";
-import {
-  selectRy,
-  selectRybq,
-  saveBpcry,
-  upImage,
-  getClOf2h,
-} from "../../../api/common";
-import { getDictList, setDict } from "../../../utils/dict";
-import { zlPrPc, saveNFC } from "../../../api/zlzx.js";
-import { getBase64, hintToast } from "../../../utils/tools.js";
-const { D_BZ_BPCRCWP, D_BZ_MZ, D_BZ_BPCRYYJYY, D_BZ_XB } = getDictList(
-  "D_BZ_BPCRCWP",
-  "D_BZ_MZ",
-  "D_BZ_BPCRYYJYY",
-  "D_BZ_XB"
-);
-const clList = ref([]);
-const router = useRouter();
-const loading = ref(true);
-const showEmpty = ref(false);
-const car = ref(); //盘查车辆组件对象
-const zlId = ref("");
-const yjForm = ref({});
-const showYjyy = ref(false);
-const showCzcl = ref(false); //乘坐车辆数据
-const czclHp = ref(null);
-const wpdjList = ref([]); //物品登记集合
-const showYj = ref(false);
-const tpIdList = ref([]); //图片id集合
-const wpTpIdList = ref([]);
-const showWpdj = ref(false);
-const showWplx = ref(false);
-const fileList = ref([]);
-const wpForm = ref({
-  wpms: "",
-  wpTpIdList: [],
-  wpsl: 1,
-  wplx: "",
-});
-const gps = ref({});
-const gps1 = ref({});
-const ryxx = ref({
-  sfzh: "",
-  xm: "",
-  xbdm: "",
-  xb: "",
-  csrq: "",
-  zzxz: "",
-  pcclId: "",
-});
-const bbinfo = ref({}); //报备数据
-const userInfo = JSON.parse(getStorage("userInfo"));
-const pcsrlx = ref(null);
-onMounted(() => {
-  zlId.value = router.currentRoute.value.query.zlId;
-  getClDict(); //获取是否有乘坐车辆
-  let sfzh = router.currentRoute.value.query.sfzh;
-  pcsrlx.value = router.currentRoute.value.query.pcsrlx;
-  bbinfo.value = localStorage.getItem("GET_BBINFO")
-    ? JSON.parse(localStorage.getItem("GET_BBINFO"))
-    : "";
-  try {
-    gps = JSON.parse(bridge.getLocation());
-    gps1 = JSON.parse(bridge.getPhoneInfo());
-  } catch (error) { }
-  if (sfzh) {
-    if (pcsrlx.value == 2 || pcsrlx.value == 6 || pcsrlx.value == 5) {
-      czrkQueryDetail(sfzh); //获取人员信息
-    } else if (pcsrlx.value == 7) {
-      let data = localStorage.getItem("OCR");
-      if (data) {
-        // let obj = JSON.parse(data).data;
-        // saveNFCData(obj);
-      }
-    } else if (pcsrlx.value == 1) {
-      let data = localStorage.getItem("NFC");
-      if (data) {
-        let obj = JSON.parse(data).data;
-        saveNFCData(obj);
-      }
-    }
-  } else {
-    hintToast("身份证为空,请重试！");
-    showEmpty.value = true;
-    loading.value = false;
-  }
-});
-
-// NFC保存
-function saveNFCData(obj) {
-  let pramas = {
-    xm: obj.xm,
-    sfzh: obj.sfzh,
-    csrq: obj.csrq,
-    xbdm: obj.xb,
-    mzdm: obj.mz,
-    jgdm: obj.jgssx,
-    zzxz: obj.zzxz,
-    bbid: bbinfo.value ? bbinfo.value.id : "",
-    jd: gps.app_x,
-    wd: gps.app_y,
-    pcsrlx: "1",
-    pcfs: "02",
-    xjzdz: obj.zzxz,
-    zdch: gps.app_tfSn,
-    zdsim: gps1.zdlmei,
-    zdxh: gps.zdxh,
-  };
-  loading.value = true;
-  saveNFC(pramas)
-    .then((res) => {
-      ryxx.value = res;
-      // ryxx.value.baseUrl = "data:image/png;base64," + obj.zp;
-      ryxx.value.baseUrl =
-        "http://10.64.201.128:2366/xlpcAdminNew/requestservice/czrk/ryxp.jpg?sfzh=" +
-        res.sfzh;
-      loading.value = false;
-      // getPersonBq(res.id);
-    })
-    .catch(() => {
-      loading.value = false;
-    });
-}
-
-// 获取人员信息
-function czrkQueryDetail(sfzh) {
-  let params = {
-    sfzh: sfzh,
-    jd: gps.app_x,
-    wd: gps.app_y,
-    sjly: "",
-    zdxh: gps.zdxh,
-    zdch: gps.app_tfSn,
-    zdsim: gps1.zdlmei,
-    pcsrlx: pcsrlx.value,
-    glxtdm: "",
-    glxtid: "",
-    jzid: "",
-    bbid: bbinfo.value ? bbinfo.value.id : "",
-    pcfs: "",
-  };
-  loading.value = true;
-  selectRy(params)
-    .then((res) => {
-      loading.value = false;
-      if (res) {
-        ryxx.value = res;
-        ryxx.value.baseUrl =
-          "http://10.64.201.128:2366/xlpcAdminNew/requestservice/czrk/ryxp.jpg?sfzh=" +
-          res.sfzh;
-        // getPersonBq(res.id); //获取人员标签
-      } else {
-        hintToast("查无此人,请核对人员信息！");
-        router.go(-1);
-      }
-    })
-    .catch(() => {
-      loading.value = false;
-    });
-  //如果是指令页面跳转过来调用
-  if (zlId.value) {
-    zlPrPc({
-      pclxdm: 1,
-      pcryclId: ryxx.value.id,
-      zlId: zlId.value,
-    }).then((res) => { });
-  }
-}
-
-// 获取人员标签
-function getPersonBq(id) {
-  selectRybq({ id }).then((res1) => {
-    ryxx.value.bqxxsj = res1.bqxxsj;
-  });
-}
-
-// 获取是否有乘坐车辆
-function getClDict() {
-  getClOf2h().then((res) => {
-    clList.value = res.map((item) => {
-      return { id: item.id, text: item.hphm };
-    });
-  });
-}
-
-// 核查驾驶证
-function goLicence() {
-  router.push({ path: "/drivinglicence", query: { sfzh: ryxx.value.sfzh } });
-}
-// 核查机动车
-function goVhicol() {
-  router.push({ path: "/motorVehicle", query: { sfzh: ryxx.value.sfzh } });
-}
-
-// 关联信息
-function goCanTrack() {
-  router.push({ path: "/TrackInventory", query: { sfzh: ryxx.value.sfzh } });
-}
-//  移交原因
-function onConfirmYjyy(val) {
-  showYjyy.value = false;
-  yjForm.value.pcclYjyy = val.text;
-}
-// 物品类型
-function onConfirmWplx(val) {
-  showWplx.value = false;
-  wpForm.value.wplx = val.text;
-}
-
-// 特征信息
-function goFeatureInfo() {
-  router.push("/featureInfo");
-}
-
-// 打开查询车辆弹窗
-function showCar() {
-  car.value.handleOpen();
-}
-
-function onConfirmCzcl(val) {
-  czclHp.value = val.text;
-  if (ryxx.value.pcclId === val.id) {
-    ryxx.value.pcclId = "";
-  } else {
-    ryxx.value.pcclId = val.id;
-  }
-}
-
-// 物品登记提交
-function onSubmit() {
-  wpdjList.value.push(wpForm.value);
-  showWpdj.value = false;
-  wpForm.value = { wpms: "", wpTpIdList: [], wpsl: 1, wplx: "" };
-}
-
-//获取文件
-async function afterRead(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  upImage(data).then((res) => {
-    file.status = "done";
-    file.message = "上传成功";
-    if (!tpIdList.value.includes(res)) tpIdList.value.push(res);
-  });
-}
-// 上传图片
-async function upLoadImg2(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  file.status = "uploading";
-  upImage(data).then((res) => {
-    file.status = "done";
-    file.message = "上传成功";
-    if (!wpForm.value.wpTpIdList.includes(res))
-      wpForm.value.wpTpIdList.push(res);
-  });
-}
-
-//压缩图片
-const _compressImage = (file) => {
-  return new Promise((resolve, reject) => {
-    new ImageCompressor(file, {
-      quality: 0.6, //压缩质量
-      success(res) {
-        resolve(res);
-      },
-      error(e) {
-        reject(e);
-      },
-    });
-  });
-};
-// 移交或者放行
-function save(val) {
-  if (val === "1") {
-    const formData = {
-      pcclId: ryxx.value.pcclId,
-      id: ryxx.value.id,
-      pcclJg: "1",
-      pcclJgmc: "放行",
-      pcclYjdw: yjForm.value.pcclYjdw,
-      ryWpList: wpdjList.value,
-      tpIdList: tpIdList.value,
-      tzbqList: ryxx.value.tzList,
-    };
-    // if (pcsrlx.value != 7 && pcsrlx.value != 1 && fileList.value.length == 0) {
-    //   return hintToast("非刷二代证件盘查，必须采集照片！");
-    // }
-    saveBpcry(formData).then((res) => {
-      if (pcsrlx.value == "6" || pcsrlx.value == "5") {
-        router.go(-2); //保存成功退回上一级
-      } else {
-        router.go(-1); //保存成功退回上一级
-      }
-      hintToast("放行成功！");
-    });
-  } else {
-    ryxx.value.pcclJg = val;
-    ryxx.value.pcclJgmc = "移交";
-    showYj.value = true;
-  }
-}
-
-//移交表单
-function onYj() {
-  const formData = {
-    pcclId: ryxx.value.pcclId,
-    id: ryxx.value.id,
-    pcclJg: "2",
-    pcclJgmc: "移交",
-    pcclYjdw: yjForm.value.pcclYjdw,
-    ryWpList: wpdjList.value,
-    tpIdList: tpIdList.value,
-    tzbqList: ryxx.value.tzList,
-  };
-  // if (pcsrlx.value != 7 || (pcsrlx.value != 1 && fileList.value.length == 0)) {
-  //   return hintToast("非刷二代证件盘查，必须采集照片！");
-  // }
-  saveBpcry(formData).then((res) => {
-    hintToast("移交成功！"); //保存成功退回上一级
-    if (pcsrlx.value == "6" || pcsrlx.value == "5") {
-      router.go(-2); //保存成功退回上一级
-    } else {
-      router.go(-1); //保存成功退回上一级
-    }
-  });
-}
-
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, `http://10.64.201.128:2366/xlpcAdminNew/requestservice/czrk/ryxp.jpg?sfzh=${item.sfzh}`);
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.bg_ban {
-  background: #eff0f5;
-  height: 12px;
-}
-
-.foot_ban {
-  height: 12px;
-  background: #eff0f5;
-}
-
-.container {
-  margin-bottom: 6vh;
-}
-
-.top {
-  background-image: url("../../../assets/images/new/id_card.png");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  min-height: 28vw;
-  padding: 2vh 0 2vh 5vw;
-  margin: 0 2vw;
-  position: relative;
-  z-index: 2;
-
-  .basic-info {
-    color: #4d4d4d;
-    display: flex;
-    justify-content: space-between;
-
-    .IDcard-info {
-      flex: 1;
-      @include font_size($font_medium_s);
-
-      .info-item {
-        line-height: 6vw;
-
-        .bt {
-          display: inline-block;
-          width: 34px;
-          text-align-last: justify;
-          color: #1f6cec;
-          margin-right: 10px;
-        }
-      }
-    }
-
-    .img-box {
-      margin-right: 12px;
-      width: 74px;
-      height: 94px;
-
-      >img {
-        border-radius: 5px;
-        border: 1px solid #e5e5e5;
-        overflow: hidden;
-      }
-    }
-  }
-
-  .sfzh {
-    @include font_size($font_medium_s);
-    margin-top: 1vw;
-
-    .bt {
-      color: #1f6cec;
-      margin-right: 10px;
-    }
-
-    .idNumber {
-      font-size: 16px;
-      font-weight: bold;
-    }
-  }
-}
-
-.ry_xgxx {
-  margin: 0 2vw 12px;
-  background: #f3f6fe;
-  padding: 12px;
-  @include font_size($font_medium_s);
-
-  .bq {
-    margin-bottom: 8px;
-
-    >span {
-      display: inline-block;
-      padding: 2px 4px;
-      border: 1px solid #3a9687;
-      border-radius: 3px;
-      margin-right: 8px;
-      background: #e7f5f3;
-    }
-  }
-
-  div {
-    line-height: 1.8em;
-
-    >span {
-      color: #013791;
-    }
-  }
-
-  .contact-way {
-    line-height: 2vh;
-    @include font_size($font_medium_s);
-
-    .one-line {
-      display: flex;
-
-      .phoneNum {
-        width: 50%;
-      }
-    }
-  }
-}
-
-.fxBtn {
-  background: linear-gradient(148deg, #5897ff, #1862de);
-  color: #f2f2f2;
-}
-
-.yjBtn {
-  background: linear-gradient(148deg, #ffbb6b, #ff7a45);
-  color: #f2f2f2;
-}
-
-.center {
-  padding: 0 3vw;
-
-  .sign-title {
-    padding-left: 14px;
-    line-height: 3vh;
-    @include font_size($font_medium);
-    font-weight: bold;
-    display: flex;
-    position: relative;
-    justify-content: space-between;
-    margin: 1vh 0;
-
-    .chooseP {
-      @include font_size($font_medium_s);
-      color: rgb(0, 102, 255);
-      font-weight: normal;
-    }
-  }
-
-  .sign-title::after {
-    content: "";
-    position: absolute;
-    left: 0;
-    top: 2px;
-    bottom: 2px;
-    width: 4px;
-    background: linear-gradient(0deg, #7ec2ff 0%, #0e8aff 100%);
-    border-radius: 1px;
-  }
-
-  .associated-information {
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-
-    .item-box {
-      margin: 2vw 4vw;
-      display: flex;
-
-      .ass-item-box {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-      }
-    }
-
-    .content1 {
-      display: flex;
-
-      .circlebox {
-        width: 15vw;
-        height: 15vw;
-        text-align: center;
-        line-height: 15vw;
-        margin-bottom: 2vw;
-      }
-
-      .bg1 {
-        background: url("../../../assets/images/new/sydj_bg.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-
-      .bg2 {
-        background: url("../../../assets/images/new/pcgj.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-
-      .bg3 {
-        background: url("../../../assets/images/new/tcry.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-
-      .bg4 {
-        background: url("../../../assets/images/new/hcjsz.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-
-      .bg5 {
-        background: url("../../../assets/images/new/hcjdc.png");
-        background-size: contain;
-        background-repeat: no-repeat;
-      }
-    }
-  }
-
-  .pick-up-information {
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-
-    .pick-box {
-      display: flex;
-      justify-content: flex-start;
-      margin: 3vw 0;
-    }
-
-    .pick-item-box {
-      padding: 3vw 3vw 10vw;
-      width: 30%;
-      margin-right: 2vw;
-      // border-radius: 3vw;
-      position: relative;
-
-      .tp {
-        position: absolute;
-        bottom: 0;
-        right: 0;
-      }
-    }
-
-    .pbg1 {
-      background: url("../../../assets/images/new/bg-blue.png") no-repeat;
-      background-size: cover;
-    }
-
-    .pbg2 {
-      background: url("../../../assets/images/new/tzxx_bg.png") no-repeat;
-      background-size: 100% 100%;
-      color: #464d82;
-    }
-
-    .pbg3 {
-      color: #397361;
-      background: url("../../../assets/images/new/wpdj.png") no-repeat;
-      background-size: 100% 100%;
-    }
-  }
-
-  .vehicular {
-    @include font_color($font-color-theme);
-
-    .no-veh {
-      text-align: center;
-      @include font_size($font_medium_s);
-      color: #cccccc;
-      margin: 4vw 0;
-    }
-
-    .veh-box {
-      margin: 1vh 0;
-
-      .cp_item {
-        display: inline-block;
-        text-align: center;
-        line-height: 2em;
-        @include font_size($font_medium_s);
-        width: 31.33%;
-        margin-right: 2%;
-        background: url("../../../assets/images/new/cp_bg.png") no-repeat;
-        background-size: 100% 100%;
-
-        >span {
-          display: inline-block;
-          width: 4px;
-          height: 4px;
-          border-radius: 50%;
-          background: #333;
-          margin-bottom: 4%;
-        }
-      }
-
-      .active.cp_item {
-        background: url("../../../assets/images/new/cp_bg_active.png") no-repeat;
-        background-size: 100% 100%;
-        color: #fff;
-
-        >span {
-          background: #fff;
-        }
-      }
-    }
-  }
-}
-
-.line1 {
-  width: 100vw;
-  background-color: #eee;
-  height: 1vh;
-}
-
-.upload {
-  padding: 1vh 3vw;
-  height: 80px;
-  position: relative;
-
-  .tsxx {
-    position: absolute;
-    color: #a8a8a8;
-    top: 0;
-    left: 30%;
-    bottom: 0;
-    padding: 8% 0;
-    font-size: 14px;
-  }
-
-  .up_btn {
-    height: 80px;
-    width: 80px;
-    color: #a8a8a8;
-    font-size: 24px;
-    background: #f2f2f2 url("../../../assets/images/new/upimg_bg.png") no-repeat;
-    background-size: 100% 100%;
-  }
-}
-
-.bottom-box {
-  text-align: center;
-  background: #fff;
-  border-top: 1px solid #ddddde;
-  position: fixed;
-  bottom: 0;
-  width: 100vw;
-  height: 6vh;
-  line-height: 6vh;
-  display: flex;
-
-  >div {
-    height: 6vh;
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    >img {
-      width: 20px;
-      margin-right: 8px;
-    }
-  }
-
-  .yj {
-    background: #f0f0f0;
-  }
-}
-
-.upload-box {
-  margin: 1vh 3vw;
-}
-
-.staff-title {
-  height: 5vh;
-  background-color: rgb(13, 106, 245);
-  text-align: center;
-  line-height: 5vh;
-}
-
-.staff-sure {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-}
-
-.head-nav-banner {
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  height: 35vw;
-  z-index: 1;
-  background: #1143ca;
-}
-
-::v-deep .headBlue {
-  background-color: #1143ca !important;
-}
-
-.navTitle {
-  position: absolute;
-  top: 0;
-  color: #fff;
-  font-size: 5.5vw;
-  text-align: center;
-  width: 100%;
-  padding: 3vw 0;
-}
-
-.rybq {
-  display: inline-block;
-  padding: 0 4px;
-  background: #f00;
-  color: #f2f2f2;
-  border-radius: 4px;
-  margin: 4px;
-}
-
-.no-veh_cp {
-  display: flex;
-
-  >span {
-    flex: 1;
-  }
-}
-.tip_text{
-  font-size: 18px;
-  margin-top: 10px;
-}
-</style>
diff --git a/src/pages/views/QuarantinePersonnel/motorVehicle.vue b/src/pages/views/QuarantinePersonnel/motorVehicle.vue
deleted file mode 100644
index 2d92449..0000000
--- a/src/pages/views/QuarantinePersonnel/motorVehicle.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <div class="container containerLicence" style="padding-top: 13vw; box-sizing: border-box">
-    <TopNav navTitle="核查机动车" />
-    <van-steps direction="vertical" active-color="#969799" :active="0">
-      <van-step>
-        <p>号牌种类 : 小型车辆</p>
-        <p>号牌号码 : 穿A88888</p>
-        <p>车辆识别代码 : LVHR98545869852</p>
-        <p>发动机型号 : RWED12</p>
-        <p>发动机号 : 124525</p>
-        <p>车身颜色 : </p>
-        <p>车辆品牌 : </p>
-        <p>核定载重量 : </p>
-        <p>排量 : </p>
-        <p>功率 ：</p>
-        <p>载重量 : </p>
-        <p>机动车所有人 : </p>
-        <p>机动车所有人身份证号 : </p>
-        <p>登记住址详址 : </p>
-      </van-step>
-    </van-steps>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { ref, reactive, onMounted, watch } from "vue";
-import { useRouter } from "vue-router";
-const router = useRouter();
-</script>
-
-<style lang="scss" scoped>
-
-</style>
-
-<style>
-.containerLicence .van-icon{
-  color: #148aec!important;
-}
-.containerLicence .van-step__line{
-  background-color: #148aec!important;
-}
-</style>
diff --git a/src/pages/views/QuarantinePersonnel/pestilenceRelated.vue b/src/pages/views/QuarantinePersonnel/pestilenceRelated.vue
deleted file mode 100644
index 54e6083..0000000
--- a/src/pages/views/QuarantinePersonnel/pestilenceRelated.vue
+++ /dev/null
@@ -1,311 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav navTitle="涉疫登记" />
-    <div class="card">
-      <van-image class="img_van" :class="_getBase64(ryxx)" :src="ryxx.baseUrl"></van-image>
-      <div class="card_main">
-        <div>
-          <span class="main_one">姓名：{{ ryxx.xm }}</span>
-          <span>性别：{{ setDict(ryxx.sex, D_BZ_XB) }}</span>
-        </div>
-        <div>
-          <span class="main_one">出生年月：{{ ryxx.bird }}</span>
-          <span>民族：{{ setDict(ryxx.mz, D_BZ_MZ) }}</span>
-        </div>
-        <div>
-          <span>证件号码：{{ ryxx.sfzh }}</span>
-        </div>
-        <div>
-          <span>家庭住址：{{ ryxx.jtzz }}</span>
-        </div>
-      </div>
-    </div>
-    <div class="title_tag">天府健康码核验</div>
-    <div class="fydj_main">
-      <van-radio-group direction="horizontal" v-model="form.jkmzt">
-        <van-radio name="1" shape="square">
-          <template #default>
-            <span style="color: #4cdf58">绿码</span>
-          </template>
-        </van-radio>
-        <van-radio name="2" shape="square">
-          <template #default>
-            <span style="color: #e69529">黄码</span>
-          </template>
-        </van-radio>
-        <van-radio name="3" shape="square">
-          <template #default>
-            <span style="color: #ff0000">红码</span>
-          </template>
-        </van-radio>
-      </van-radio-group>
-    </div>
-    <div class="title_tag">疫苗接种情况</div>
-    <div class="fydj_main">
-      <van-radio-group v-model="form.ymjzqk" direction="horizontal">
-        <van-radio v-for="item in D_BZ_YMJZQK" :key="item.value" shape="square" :name="item.value" class="m_radio">{{
-          item.text }}</van-radio>
-      </van-radio-group>
-    </div>
-    <div class="title_tag">来源地与目的地</div>
-    <div class="fydj_main_n">
-      <div>
-        <div style="color: #1565eb; text-align: center">来源地</div>
-        <van-field readonly @click="show = true" class="bg" v-model="form.lz" placeholder="请输入来源地" type="textarea"
-          rows="2"></van-field>
-      </div>
-      <van-icon class="fy_icon" name="arrow"></van-icon>
-      <div>
-        <div style="color: #1565eb; text-align: center">目的地</div>
-        <van-field readonly class="bg" @click="showEnd = true" placeholder="请输入目的地" v-model="form.qw" type="textarea"
-          rows="2"></van-field>
-      </div>
-    </div>
-    <div class="title_tag">通行大数据行程卡是否带*</div>
-    <div class="fydj_main">
-      <van-radio-group v-model="form.txxck" direction="horizontal">
-        <van-radio v-for="item in D_BZ_SF" :key="item.value" shape="square" :name="item.value" class="m_radio">{{
-          item.text }}</van-radio>
-      </van-radio-group>
-    </div>
-    <div class="title_tag_s">14天内到达或途径城市</div>
-    <div class="fydj_main">
-      <van-field class="bg" v-model="form.ddhtjcs"></van-field>
-    </div>
-    <div class="title_tag">上传照片</div>
-    <div class="fydj_main">
-      <van-uploader v-model="imgList" multiple :max-count="3" :after-read="upLoadImg" />
-    </div>
-    <div style="margin: 16px">
-      <van-button round block type="primary" @click="onSubmit">提交</van-button>
-    </div>
-    <van-popup v-model:show="show" round position="bottom">
-      <van-cascader close-icon="success" v-model="cascaderVakue.city" title="请选择来源地" :options="city" @close="close"
-        @finish="onFinish"></van-cascader>
-      <van-field v-model="cascaderVakue.text" label="详细地址" placeholder="请输入详细地址"></van-field>
-    </van-popup>
-    <van-popup v-model:show="showEnd" round position="bottom">
-      <van-cascader close-icon="success" v-model="cascaderVakueEnd.city" title="请选择目的地" :options="city"
-        @close="closeEnd" @finish="onFinishEnd"></van-cascader>
-      <van-field v-model="cascaderVakueEnd.text" label="详细地址" placeholder="请输入详细地址"></van-field>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { useRouter } from "vue-router";
-import { upImage, getRySydjInfo, saveSydj } from "../../../api/common";
-import { ref, onMounted } from "vue";
-// import city from "../../../assets/jsonData/city.json";
-import { getBase64, hintToast } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { baseUrl2 } from "../../../utils/request.js";
-const { D_BZ_YMJZQK, D_BZ_SF, D_BZ_XB, D_BZ_MZ } = getDictList(
-  "D_BZ_YMJZQK",
-  "D_BZ_SF",
-  "D_BZ_XB",
-  "D_BZ_MZ"
-);
-const router = useRouter();
-const url = baseUrl2 + "/mosty-api/mosty-base/minio/image/download/";
-const show = ref(false);
-const showEnd = ref(false);
-const cascaderVakue = ref({
-  city: "",
-  text: "",
-});
-const cascaderVakueEnd = ref({
-  city: "",
-  text: "",
-});
-const form = ref({
-  ddhtjcs: "", //14天内到达或途径城市
-  jkmzt: "", //天府健康码状态
-  lz: "", //来自哪里
-  pcid: "", //盘查id
-  qw: "", //去往哪里
-  ryxm: "", //人员姓名
-  sfzh: "", //身份证号
-  tpid: "", //图片Id
-  txxck: "", //通讯行程卡是否带*
-  ymjzqk: "",
-});
-100;
-const imgList = ref([]);
-const ryxx = ref({
-  imgUrl: "",
-  xm: router.currentRoute.value.query.ryxm,
-  sfzh: router.currentRoute.value.query.sfzh,
-  sex: router.currentRoute.value.query.xbdm,
-  bird: router.currentRoute.value.query.csrq,
-  mz: router.currentRoute.value.query.mzdm,
-  jtzz: router.currentRoute.value.query.zzxz,
-});
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, `http://10.64.201.128:2366/xlpcAdminNew/requestservice/czrk/ryxp.jpg?sfzh=${item.sfzh}`);
-}
-function close() {
-  show.value = false;
-  form.value.lz += cascaderVakue.value.text;
-}
-function onFinish({ selectedOptions }) {
-  form.value.lz = selectedOptions.map((item) => item.text).join("/");
-}
-function closeEnd() {
-  showEnd.value = false;
-  form.value.qw += cascaderVakueEnd.value.text;
-}
-function onFinishEnd({ selectedOptions }) {
-  form.value.qw = selectedOptions.map((item) => item.text).join("/");
-}
-function upLoadImg(file) {
-  const data = new FormData();
-  data.append("file", file.file);
-  file.status = "uploading";
-  file.message = "上传中...";
-  upImage(data)
-    .then((res) => {
-      file.status = "done";
-      file.message = "上传成功";
-      file.id = res;
-    })
-    .catch(() => {
-      file.status = "failed";
-      file.message = "上传失败";
-    });
-}
-function onSubmit() {
-  form.value.pcid = router.currentRoute.value.query.pcid;
-  form.value.ryxm = router.currentRoute.value.query.ryxm;
-  form.value.sfzh = router.currentRoute.value.query.sfzh;
-  form.value.tpid = imgList.value.map((item) => item.id).join(",");
-  saveSydj(form.value).then(() => {
-    hintToast("保存成功")
-    router.go(-1);
-  });
-}
-function getSydjInfo() {
-  const data = {
-    pcid: router.currentRoute.value.query.pcid,
-    sfzh: router.currentRoute.value.query.sfzh,
-  };
-  getRySydjInfo(data).then((res) => {
-    form.value = res;
-    if (res.tpid) {
-      imgList.value = res.tpid.split(",").map((item) => {
-        return {
-          url: url + item,
-          id: item,
-          isImage: true,
-        };
-      });
-    }
-  });
-}
-onMounted(() => {
-  getSydjInfo();
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.card {
-  margin: 5vw;
-  width: 90vw;
-  @include font_color($font-color-theme);
-  border-radius: 2.5vw;
-  @include bg_color($background-color-theme);
-  @include border_outer_color($border-outer-color-theme);
-  display: flex;
-  font-size: 12px;
-  padding: 3vw;
-  box-sizing: border-box;
-
-  .img_van {
-    width: 65px;
-    height: 76px;
-    margin-right: 12px;
-  }
-
-  .card_main {
-    flex: 1;
-
-    >div {
-      display: flex;
-      line-height: 1.5em;
-
-      .main_one {
-        width: 65%;
-      }
-    }
-  }
-}
-
-.title_tag_s {
-  @include font_color($font-color-theme);
-  position: relative;
-  padding-left: 12px;
-  margin: 12px 5vw;
-}
-
-.title_tag {
-  position: relative;
-  padding-left: 12px;
-  margin: 12px 5vw;
-  @include font_color($font-color-theme);
-}
-
-.title_tag::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  width: 4px;
-  background: #1666eb;
-  border-radius: 2px;
-}
-
-.fydj_main {
-  box-sizing: border-box;
-  padding: 0 6vw;
-
-  .m_radio {
-    width: 50%;
-    margin: 6px 0;
-  }
-}
-
-.fydj_main_n {
-  box-sizing: border-box;
-  padding: 0 6vw;
-  display: flex;
-  align-items: center;
-
-  .bg {
-    background: #f0f0f0;
-    border-radius: 4px;
-    margin-top: 8px;
-  }
-
-  .fy_icon {
-    margin: 24px 5vw 0;
-    color: #1666eb;
-  }
-}
-
-.bg {
-  background: #f0f0f0;
-  border-radius: 4px;
-}
-
-::v-deep .van-radio__label {
-  @include font_color($font-color-theme);
-  color: #333;
-}
-</style>
diff --git a/src/pages/views/TrackInventory/index.vue b/src/pages/views/TrackInventory/index.vue
deleted file mode 100644
index 98f6e99..0000000
--- a/src/pages/views/TrackInventory/index.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-    <div class="container" style="padding-top: 13vw">
-        <TopNav :navTitle="title" />
-        <van-list v-model:loading="loading" :finished='finished' finished-text='沒有更多了' @load="onLoad">
-            <van-cell v-for="(item,index) in list" :key="index+'rygj'">
-                <div v-if="title==='人员轨迹'" class="item_main item_box">
-                    <div style="color:#027db4">{{item.pcsj}}</div>
-                    <div>姓名：{{item.xm}} <span style="color:f00">{{item.bqxxsj}}</span></div>
-                    <div>性别：{{item.xbdm==1?'男':'女'}}</div>
-                    <div>身份证号：{{item.sfzh}}</div>
-                    <div>所属单位：{{item.ssbm}}</div>
-                    <div>所乘车辆：暂无</div>
-                    <div @click="preview(item.tpList)">照片数量：{{item.tpList.length}}</div>
-                    <div>盘查特征：{{item.tzList==null?'暂无':item.tzList.join(',')}}</div>
-                    <div>盘查物品：
-                        <span v-for="(e,index) in item.wpVoList"
-                            :key="index+'pctp'">{{setDict(e.wplx,D_BZ_WPLX)+'*'+e.wpsl}}</span>
-                        <span v-show="item.wpVoList.length===0">暂无</span>
-
-                    </div>
-                    <div>处理结果：
-                        <span v-show="item.pcclJg==1">放行</span>
-                        <span v-show="item.pcclJg==2">移交</span>
-                        <span v-show="item.pcclJg==9">盘查</span>
-                    </div>
-                </div>
-                <div v-else class="item_main item_box">
-                    <div style="color:#027db4">{{item.pcsj}}</div>
-                    <div>车牌号：{{item.hphm}}</div>
-                    <div>车主姓名：{{item.jdcsyr}}</div>
-                    <div>身份证号：{{item.jdcsyrsfzh}}</div>
-                    <div>号牌种类：{{setDict(item.hpzl,D_BZ_HPZL)}}</div>
-                    <div>盘查结果：{{item.pcclJg==1?'放行':'移交'}}</div>
-                    <div>盘查方式：{{item.pcfs=='01'?'车牌设备自动':'民警手动'}}</div>
-                    <div>盘查物品：
-                        <span v-for="(e,index) in item.wpVoList"
-                            :key="index+'pctp'">{{setDict(e.wplx,D_BZ_WPLX)+'*'+e.wpsl}}</span>
-                        <span v-show="item.wpVoList.length===0">暂无</span>
-                    </div>
-                    <div>处理结果：
-                        <span v-show="item.pcclJg==1">放行</span>
-                        <span v-show="item.pcclJg==2">移交</span>
-                        <span v-show="item.pcclJg==9">盘查</span>
-                    </div>
-                </div>
-            </van-cell>
-        </van-list>
-    </div>
-</template>
-
-<script setup>
-import { ref,onMounted } from 'vue'
-import { useRouter } from "vue-router";
-import TopNav from "../../../components/topNav.vue";
-import {getDictList,setDict} from '../../../utils/dict'
-import { getRypcList,getClpcList } from '../../../api/common'
-import { ImagePreview } from 'vant'
-const { D_BZ_WPLX,D_BZ_HPZL } = getDictList('D_BZ_WPLX','D_BZ_HPZL')
-const router = useRouter();
-const loading = ref(false)
-const finished = ref(false)
-const total=ref(0)
-const title = router.currentRoute.value.query.sfzh?'人员轨迹':"车辆轨迹"
-const url = '/mosty-api/mosty-base/minio/image/download/'
-const queryList = ref({
-    pageCurrent:1,
-    pageSize:10,
-    sfzh:router.currentRoute.value.query.sfzh,
-    hphm:router.currentRoute.value.query.hphm
-})
-const list = ref([])
-function preview(e){
-    const imgIdList = e.map(e=>url+e.id)
-    if(imgIdList.length>0){
-        ImagePreview({imgIdList,closeable:true})
-    }
-}
-
-function onLoad(){
-    if(router.currentRoute.value.query.sfzh){
-     getRypcList(queryList.value).then(res=>{
-        list.value.push(...res.records)
-        total.value = res.total
-        loading.value = false
-        queryList.value.pageCurrent++
-        if(list.value.length>=res.total){
-            finished.value = true
-        }
-        })   
-    }else{
-        getClpcList(queryList.value).then(res=>{
-            list.value.push(...res.records)
-            total.value = res.total
-            loading.value = false
-            queryList.value.pageCurrent++
-            if(list.value.length>=res.total){
-                finished.value = true
-            }
-        })   
-    }
-    
-}
-onMounted(()=>{})
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.item_main {
-    box-sizing: border-box;
-    padding: 2.5vw;
-    border-radius: 4px;
-    margin: 16px 2.5vw;
-}
-
-.van-cell {
-    background-color: rgba(0, 0, 0, 0);
-}</style>
\ No newline at end of file
diff --git a/src/pages/views/jqfx/compareFx.vue b/src/pages/views/jqfx/compareFx.vue
deleted file mode 100644
index 41715c7..0000000
--- a/src/pages/views/jqfx/compareFx.vue
+++ /dev/null
@@ -1,677 +0,0 @@
-<template>
-  <div class="compare" v-if="showPage">
-    <div class="title-box">
-      <div class="title">
-        <span @click="isShowJqType = true">{{ jqTitle }}</span>
-        <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="isShowJqType = true" />
-        <van-action-sheet v-model:show="isShowJqType">
-          <van-picker :columns="jqTypeList" @confirm="onJqChange" @cancel="isShowJqType = false" />
-        </van-action-sheet>
-      </div>
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">分局{{ jqTitle }}走势图</div>
-      </div>
-      <jqChart :data1="jqzs.data1" :data2="jqzs.data2" :data3="jqzs.data3" :timeList="jqzs.timeList" :jqType="jqType"
-        v-if="jqzs.timeList.length > 0" />
-    </div>
-
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">城区分局{{ jqTitle }}环比</div>
-      </div>
-      <div class="all-box" v-if="m2List.length > 0">
-        <percent :list="m2List" :day="dqTime" :yesterday="sygTime" />
-      </div>
-      <div style="height: 10vh; text-align: center; line-height: 10vh" v-else>
-        没有数据
-      </div>
-    </div>
-
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">城区分局{{ jqTitle }}类别环比</div>
-      </div>
-      <div v-if="list3.length <= 0" style="height: 10vh; text-align: center; line-height: 10vh">
-        没有数据
-      </div>
-      <div class="fjAndCqfj-box" v-else>
-        <div class="first-line">
-          <div class="first-line-item"></div>
-          <div class="first-line-item" v-for="(item, index) in list3" :key="index">
-            {{ item.name }}
-          </div>
-        </div>
-        <div class="right-box">
-          <div class="right-box-line-item" v-for="(_item, i) in list3Title" :key="i">
-            <div class="right-line-box" v-if="_item">
-              <div class="first-line-item-right">{{ _item }}</div>
-              <div class="first-line-item-right" v-for="(item, index) in list3" :key="index + 'cc'">
-                <span v-if="_item == '对比'" :style="{
-                  color:
-                    item['高新区'] - item[list3Title[i - 1]] < 0
-                      ? 'green'
-                      : 'red',
-                }">{{ item["高新区"] - item[list3Title[i - 1]] }}</span>
-                <span v-else>{{ item[_item] }}</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">派出所{{ jqTitle }}环比</div>
-      </div>
-      <div v-if="m4List.length > 0">
-        <percent :list="m4List" :day="dqTime" :yesterday="sygTime" />
-      </div>
-      <div v-else style="height: 10vh; text-align: center; line-height: 10vh">
-        没有数据
-      </div>
-    </div>
-
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">派出所{{ jqTitle }}类别环比</div>
-      </div>
-      <div v-if="list5.length <= 0" style="height: 10vh; text-align: center; line-height: 10vh">
-        没有数据
-      </div>
-      <div class="fjAndCqfj-box" v-else>
-        <div class="first-line">
-          <div class="first-line-item"></div>
-          <div class="first-line-item"></div>
-          <div class="first-line-item" v-for="(item, index) in list5" :key="index">
-            {{ item.name }}
-          </div>
-        </div>
-        <div class="right-box">
-          <div class="right-box-line-item" v-for="(_item, i) in list5Title" :key="i">
-            <div class="right-line-box" v-if="_item" style="width: 45vw">
-              <div class="first-line-item-right">{{ _item }}</div>
-              <div class="first-line-item-right lb_title" style="color: #3e6ee8">
-                <span>{{ dqTime }}</span>
-                <span>{{ sygTime }}</span>
-                <span>环比</span>
-              </div>
-              <div class="first-line-item-right lb_title" v-for="(item, index) in list5" :key="index + 'cc'">
-                <template v-for="(val, key) in item" :key="val">
-                  <template v-if="
-                    _item === key.split('_')[0] && _item + '_data2' == key
-                  ">
-                    <span>{{ item[_item + "_data1"] }}</span>
-                    <span>{{ item[_item + "_data2"] }}</span>
-                    <span :style="{
-                      color:
-                        item[_item + '_data1'] - item[_item + '_data2'] <= 0
-                          ? 'green'
-                          : 'red',
-                    }">
-                      {{ item[_item + "_data1"] - item[_item + "_data2"] }}
-                    </span>
-                  </template>
-                </template>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import jqChart from "./components/lineChart.vue";
-import percent from "./percent.vue";
-import * as echarts from "echarts";
-import { jqfxCorrelation } from "../../../api/jqfxApi.js";
-import { Toast } from "vant";
-export default {
-  components: {
-    jqChart,
-    percent,
-  },
-  props: ["timeActive"],
-  watch: {
-    timeActive: {
-      handler(val) {
-        this.list3 = [];
-        this.list5 = [];
-        switch (val) {
-          case 0:
-            this.sygTime = "昨日";
-            this.dqTime = "今日";
-            break;
-          case 1:
-            this.sygTime = "上个7日";
-            this.dqTime = "近7日";
-            break;
-          case 2:
-            this.sygTime = "上个30日";
-            this.dqTime = "近30日";
-            break;
-          case 3:
-            this.sygTime = "上个90日";
-            this.dqTime = "近90日";
-            break;
-        }
-        this.tiemType = val + 1;
-        this._allRequest();
-        this.keyIndex += 1;
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
-  data() {
-    return {
-      showPage: false,
-      keyIndex: 1,
-      sygTime: "昨日",
-      dqTime: "今日",
-      tiemType: 0, //时间查询类型
-      jqType: 1, //警情类型
-      zlShow: false,
-      isShowJqType: false,
-      jqTitle: "总警情",
-      jqTypeList: ["总警情", "街面警情", "违法犯罪警情"],
-      //警情走势图数据
-      jqzs: {
-        data1: [],
-        data2: [],
-        data3: [],
-        timeList: [],
-      },
-      //城区总警情类别环比标题
-      list3Title: [
-        "",
-        "高新区",
-        "青羊区",
-        "对比",
-        "锦江区",
-        "对比",
-        "金牛区",
-        "对比",
-        "武侯区",
-        "对比",
-        "成华区",
-        "对比",
-        "天府新区",
-        "对比",
-      ],
-      list3: [], //城区总警情类别环比
-      list5: [], //派出所总警情类别环比
-      list5Title: [
-        "",
-        "中和派出所",
-        "合作派出所",
-        "和平派出所",
-        "新会展派出所",
-        "新川派出所",
-        "新益州派出所",
-        "桂溪派出所",
-        "石羊派出所",
-        "肖家河派出所",
-        "芳草街派出所",
-        "西园派出所",
-      ], //派出所总警情类别环比标题
-      m2List: [], //城区分局总警情环比
-      m4List: [], //派出所警情环比
-    };
-  },
-  mounted() {
-    try {
-      if (this.$route.query.jqlx === "jmjq") {
-        this.onJqChange("街面警情");
-      } else if (this.$route.query.jqlx === "zjq") {
-        this.onJqChange("总警情");
-      } else if (this.$route.query.jqlx === "wffzjq") {
-        this.onJqChange("违法犯罪警情");
-      }
-    } catch (error) {
-      this._allRequest();
-    }
-  },
-  methods: {
-    //切换警情类型
-    onJqChange(val) {
-      switch (val) {
-        case "总警情":
-          this.jqType = 1;
-          this.jqTitle = "总警情";
-          break;
-        case "违法犯罪警情":
-          this.jqType = 3;
-          this.jqTitle = "违法犯罪警情";
-          break;
-        case "街面警情":
-          this.jqType = 2;
-          this.jqTitle = "街面警情";
-          break;
-      }
-
-      this._allRequest();
-      this.isShowJqType = false;
-      this.keyIndex += 1;
-    },
-    //
-    _allRequest() {
-      Toast.loading({
-        message: "加载...",
-        forbidClick: true,
-        loadingType: "spinner",
-        duration: 0,
-      });
-      Promise.all([
-        this._getCqjqfjhbData(),
-        this._getCqjqlbhbData(),
-        this._getPcsjqhbData(),
-        this._getPcsjqlbhbData(),
-        this._getFjjqzstData(),
-      ]).then((res) => {
-        setTimeout(() => {
-          this.showPage = true;
-          Toast.clear();
-        }, 4e3);
-      });
-    },
-    //获取分局警情走势图
-    _getFjjqzstData() {
-      let data = {
-        type: this.tiemType,
-        ssfjdm: "510109000000",
-        jqType: this.jqType,
-      };
-      jqfxCorrelation("/tbJq/jqtjDbFjjqzs", data).then((res) => {
-        if (res) this.jqzs = res;
-      });
-    },
-    //派出所警情类别环比
-    _getPcsjqlbhbData() {
-      let data = {
-        type: this.tiemType,
-        jqType: this.jqType,
-        ssfjdm: "510109000000",
-      };
-      jqfxCorrelation("/tbJq/jqtjDbPcsHbTable", data).then((res) => {
-        this.list5 = res;
-      });
-    },
-    //派出所警情环比
-    _getPcsjqhbData() {
-      let data = {
-        type: this.tiemType,
-        jqType: this.jqType,
-        ssfjdm: "510109000000",
-      };
-      jqfxCorrelation("/tbJq/jqtjDbPcsHb", data).then((res) => {
-        for (let i = 0; i < res.length; i++) {
-          res[i].orgname = res[i].orgname.replace("派出所", "");
-        }
-        this.m4List = res;
-      });
-    },
-    //获取城区总警情类别环比
-    _getCqjqlbhbData() {
-      let data = {
-        type: this.tiemType,
-        jqType: this.jqType,
-      };
-      jqfxCorrelation("/tbJq/jqtjDbCqfjhbTable", data).then((res) => {
-        this.list3 = res;
-      });
-    },
-    //获取城区总警情环比
-    _getCqjqfjhbData() {
-      let data = {
-        type: this.tiemType,
-        jqType: this.jqType,
-      };
-      jqfxCorrelation("/tbJq/jqtjDbCqfjhb", data).then((res) => {
-        this.m2List = res;
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.title-box {
-  display: flex;
-  justify-content: center;
-}
-
-.title {
-  width: 92vw;
-  height: 4vw;
-  background: url("../../../assets/images/bigTitle@2x.png");
-  background-size: 100% 100%;
-  margin-top: 10px;
-  text-align: center;
-  line-height: 4vw;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-::v-deep .nav-box[data-v-19978886] {
-  border-bottom: 1px solid #203967;
-}
-
-.zst-box {
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-.zst-title-box {
-  width: 100vw;
-  margin-top: 20px;
-  display: flex;
-  justify-content: space-between;
-}
-
-.zst-title-left {
-  background: url("../../../assets/images/lanmu-title.png") no-repeat;
-  background-size: 100% 100%;
-  flex: 2;
-  height: 28px;
-  line-height: 28px;
-  padding-left: 10px;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium);
-}
-
-.zst-title-right {
-  flex: 1;
-  span-align: right;
-  height: 28px;
-  line-height: 28px;
-  padding-right: 10px;
-  color: #47b8ff;
-  text-align: right;
-}
-
-.zst-title-right1 {
-  flex: 1;
-  height: 28px;
-  line-height: 28px;
-  padding-right: 10px;
-  /* color: #47B8FF; */
-}
-
-.sendZL {
-  width: 70px;
-  height: 26px;
-  border-radius: 5px;
-  background-image: linear-gradient(#00c0fa, #015eea);
-  span-align: center;
-  margin-left: 16vw;
-  color: #fff;
-  font-size: 14px;
-  text-align: center;
-  line-height: 26px;
-}
-
-.img {
-  margin-left: 3px;
-}
-
-.assess-box {
-  padding: 10px;
-  line-height: 18px;
-  // @include font_size($font_medium_s);
-  // @include font_color($font-color-theme);
-}
-
-.fjAndCqfj-box {
-  margin: 0 auto;
-  width: 95vw;
-  /* height: 40vh; */
-  margin-top: 10px;
-  display: flex;
-  flex-direction: row;
-}
-
-.first-line {
-  flex: 1;
-  overflow: auto;
-  border: 1px solid #333;
-  display: flex;
-  flex-direction: column;
-  // justify-content: space-between;
-  align-items: center;
-  background-color: rgb(51, 157, 255, 0.2);
-}
-
-.first-line :first-child {
-  border-top: unset;
-}
-
-.first-line :last-child {
-  border-bottom: unset;
-}
-
-.first-line-item {
-  flex: 1;
-  height: 3.5vh;
-  border-bottom: 1px solid #333;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  padding-left: 1.5vw;
-  white-space: nowrap;
-  overflow-x: scroll;
-}
-
-.right-box {
-  flex: 4.5;
-  display: flex;
-  border-top: 1px solid #333;
-  border-bottom: 1px solid #333;
-  border-right: 1px solid #333;
-  overflow: auto;
-}
-
-.right-box-line-item {
-  /* width: 33vw; */
-  border-right: 1px solid #333;
-  display: flex;
-  position: relative;
-}
-
-.right-line-box-m5 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 42vw;
-}
-
-.right-line-box-m5 :last-child {
-  border-right: unset;
-}
-
-.table-content-m5 {
-  display: flex;
-  width: 42vw;
-}
-
-.right-line-box {
-  width: 14vw;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.first-line-item-right {
-  // flex: 1;
-  height: 3.5vh;
-  border-bottom: 1px solid #333;
-  //   border-right: 1px solid #18325e;
-  span-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  // padding-left: 1.5vw;
-}
-
-.lb_title {
-  display: flex;
-  justify-content: space-between;
-}
-
-.lb_title>span {
-  width: 33.3%;
-  text-align: center;
-
-  border-right: 1px solid #333;
-  height: 3.5vh;
-  line-height: 3.6vh;
-}
-
-.lb_title>span:last-child {
-  border: none;
-}
-
-.first-line-item-rightsss {
-  height: 3.5vh;
-  border-bottom: 1px solid #333;
-  span-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-}
-
-.first-line-item-rightsss:last-child {
-  border-bottom: none;
-  // border-right:none;
-}
-
-.first-line-item-right:last-child {
-  border-bottom: none;
-  // border-right:none;
-}
-
-.first-line-item-right-m5 {
-  height: 3.5vh;
-  border-top: 1px solid #333;
-  border-bottom: 0.5px solid #333;
-  span-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  padding-left: 1.5vw;
-}
-
-.first-line-item-right-m5:last-child {
-  // border-bottom:none;
-  border-right: none;
-}
-
-/* .right-line-box :first-child {
-		border-right: unset;
-	} */
-
-.right-title-box {
-  width: 42vw;
-  // span-align: center;
-  text-align: center;
-  line-height: 3.6vh;
-  white-space: nowrap;
-  overflow-x: scroll;
-}
-
-/* echarts */
-#jqChart {
-  width: 100%;
-  height: 40vh;
-}
-
-#chainChart1 {
-  width: 100%;
-  height: 43vh;
-}
-
-.zhanbi1 {
-  margin-top: 4.5vh;
-  height: 33.5vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  line-height: 4.5vh;
-}
-
-.zhanbi1-item {
-  flex: 1;
-}
-
-.all-box {
-  display: flex;
-}
-
-.pop-box {
-  padding: 2vw 4vw;
-}
-
-.span-zhanbi {
-  color: #ff7327;
-  font-size: 18px;
-}
-
-.slot-content {
-  padding: 2vw;
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-}
-
-.first-Line-content {
-  margin-bottom: 10px;
-}
-
-.other-content {
-  // height: 161px;
-  // background-color: #293647;
-  // overflow: auto;
-  padding: 2vw;
-  border-radius: 5px;
-  white-space: pre-line;
-  @include border_outer_color($border-outer-color-theme);
-}
-
-.empty-box {
-  line-height: 8vh;
-  span-align: center;
-}
-
-.content-module5 {
-  display: flex;
-  flex-direction: column;
-}
-
-.db_span {
-  color: #ed0000;
-}
-
-::v-deep .modal-box .u-popup__content[data-v-3a231fda] {
-  background-color: #333 !important;
-}
-
-::v-deep .modal-box .u-line {
-  border-right-color: #333 !important;
-  border-top-color: #333 !important;
-  border-left-color: #333 !important;
-  border-bottom: #333 !important;
-}
-
-::v-deep .modal-box .u-modal__button-group__wrapper__span[data-v-0156a215] {
-  color: #fff !important;
-}
-</style>
diff --git a/src/pages/views/jqfx/components/TopArea.vue b/src/pages/views/jqfx/components/TopArea.vue
deleted file mode 100644
index 706610c..0000000
--- a/src/pages/views/jqfx/components/TopArea.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-	<view class="box" v-if="ayList.length > 0">
-		<view class="total_box" v-for="(item,index) in list" :key="index">
-			<view class="total_name">
-				<span>{{item.ay ? _getayName(item.ay) : item.name}}</span>
-				<view v-if="item.text">{{item.text}}</view>
-			</view>
-			<view class="total_num">
-				<view class="percent" :class="index > 1 ? 'orange' : 'red'" style="width: 100%;" v-if="index == 0">
-				</view>
-				<view class="percent" :class="index > 1 ? 'orange' : 'red'"
-					:style="{width:item.sl / list[0].sl * 100  + '%'}" v-else></view>
-				<span>{{item.sl}}</span>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { jqfxCorrelation } from "../../../../api/jqfxApi.js";
-	export default {
-		props: ["list"],
-		watch: {
-			list: {
-				handler(val) {
-					this._getAjlxData()
-				},
-				immediate: true,
-				deep: true
-			}
-		},
-		data() {
-			return {
-				ayList: [],//案由数据
-				totalList:[],//统计数据
-				
-			}
-		},
-		created() {
-			
-		},
-		methods: {
-			/**
-			 * 获取案由
-			 * @param {Object} code 字典代码
-			 */
-			_getAjlxData(code) {
-				jqfxCorrelation('/xtzd/aylx',{}).then(res => {
-					this.ayList = res
-					this.totalList = this.list
-				})
-			},
-			//获取案由名称
-			_getayName(code) {
-				let name = ''
-				let info = this.ayList.find(item => {
-					return code == item.code
-				})
-				if (info) {
-					name = info.name
-					return name
-				}
-				return code
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.box {
-		width: 100%;
-		height: 100%;
-	}
-
-	.total_box {
-		display: flex;
-		width: 100%;
-		margin-bottom: 5vw;
-	}
-
-	.total_name {
-		flex: 1;
-	}
-
-	.total_name>view {
-		color: #999;
-	}
-
-	.total_num {
-		border: 1px solid #264479;
-		border: 1px solid #e0e0e0;
-		flex: 4.5;
-		display: flex;
-		align-items: center;
-		height: 8vw;
-		padding: 1vw;
-		justify-content: space-between;
-	}
-
-	.total_num .percent {
-		width: 92%;
-		height: 5vw;
-	}
-
-	.total_num .red {
-		background-image: linear-gradient(to right, #b6359c, #ef0a6a);
-	}
-
-	.total_num .orange {
-		background-image: linear-gradient(to right, #f28e26, #fd644f);
-	}
-</style>
diff --git a/src/pages/views/jqfx/components/barEcharts.vue b/src/pages/views/jqfx/components/barEcharts.vue
deleted file mode 100644
index f018160..0000000
--- a/src/pages/views/jqfx/components/barEcharts.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-export default {
-  props: ["datas"],
-  watch: {
-    datas: {
-      handler(val) {
-        this.hamdlegfChart();
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
-  data() {
-    return {
-      echid: "",
-    };
-  },
-  created() {
-    this.echid = "ech_" + new Date().getTime();
-  },
-  mounted() {
-    // this.titles = this.titles
-    // this.datas = this.datas
-    this.hamdlegfChart();
-  },
-  methods: {
-    hamdlegfChart() {
-      if (document.getElementById(this.echid)) {
-        let myechart = echarts.init(document.getElementById(this.echid));
-        myechart.setOption({
-          tooltip: {},
-          grid: {
-            left: "5",
-            right: "5",
-            bottom: "0",
-            top: "35",
-            containLabel: true,
-          },
-          legend: {
-            textStyle: {
-              color: "#333",
-            },
-          },
-          dataset: {
-            // dimensions: ['product', '警情', '时长', '里程'],
-            source: this.datas,
-          },
-          xAxis: {
-            type: "category",
-          },
-          yAxis: {
-            type: "value",
-            splitLine: {
-              show: true,
-              lineStyle: {
-                // color: "#224465",
-              },
-            },
-          },
-          series: [
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#ff887c",
-                    },
-                    {
-                      offset: 1,
-                      color: "#b6325f",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#205ddb",
-                    },
-                    {
-                      offset: 1,
-                      color: "#1bdffc",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#98e05f",
-                    },
-                    {
-                      offset: 1,
-                      color: "#0de3ac",
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-.gfChart {
-  margin-top: 1vw;
-  height: 65vw;
-  width: 95vw;
-  margin: 0 auto;
-}
-</style>
diff --git a/src/pages/views/jqfx/components/barEcharts1.vue b/src/pages/views/jqfx/components/barEcharts1.vue
deleted file mode 100644
index 3fcfab6..0000000
--- a/src/pages/views/jqfx/components/barEcharts1.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-export default {
-  props: ["datas"],
-  watch: {
-    datas: {
-      handler(val) {
-        this.hamdlegfChart();
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
-  data() {
-    return {
-      echid: "",
-    };
-  },
-  created() {
-    this.echid = "ech_" + new Date().getTime();
-  },
-  mounted() {
-    // this.titles = this.titles
-    // this.datas = this.datas
-    this.hamdlegfChart();
-  },
-  methods: {
-    hamdlegfChart() {
-      if (document.getElementById(this.echid)) {
-        let myechart = echarts.init(document.getElementById(this.echid));
-        myechart.setOption({
-          tooltip: {},
-          grid: {
-            left: "10",
-            right: "20",
-            bottom: "0",
-            top: "35",
-            containLabel: true,
-          },
-          legend: {
-            textStyle: {
-              color: "#333",
-            },
-          },
-          xAxis: {
-            type: "value",
-            splitLine: {
-              show: true,
-              lineStyle: {
-                // color: "#224465",
-              },
-            },
-          },
-          yAxis: {
-            type: "category",
-            data: this.datas.titles,
-          },
-          series: [
-            {
-              name: "刑事",
-              type: "bar",
-              stack: "total",
-              label: {
-                show: true,
-                color: "#fff",
-                fontSize: 12,
-              },
-              emphasis: {
-                focus: "series",
-              },
-              data: this.datas.xsList,
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#015eea",
-                    },
-                    {
-                      offset: 1,
-                      color: "#00c0fa",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              name: "行政",
-              type: "bar",
-              stack: "total",
-              label: {
-                show: true,
-                color: "#fff",
-              },
-              emphasis: {
-                focus: "series",
-              },
-              data: this.datas.xzList,
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#b6325f",
-                    },
-                    {
-                      offset: 1,
-                      color: "#ff887c",
-                    },
-                  ],
-                },
-              ],
-            },
-            // {
-            // 	name: '总数',
-            // 	type: 'bar',
-            // 	stack: 'total',
-            // 	label: {
-            // 		show: false,
-            // 		color: '#000'
-            // 	},
-            // 	emphasis: {
-            // 		focus: 'series'
-            // 	},
-            // 	data: this.datas.zsList,
-            // 	color: [{
-            // 		type: 'linear',
-            // 		x: 0,
-            // 		y: 0,
-            // 		x2: 0,
-            // 		y2: 1,
-            // 		colorStops: [{
-            // 				offset: 0,
-            // 				color: '#ecc801'
-            // 			},
-            // 			{
-            // 				offset: 1,
-            // 				color: '#feef45'
-            // 			}
-            // 		]
-            // 	}]
-            // },
-          ],
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-.gfChart {
-  margin-top: 1vw;
-  height: 65vw;
-  width: 95vw;
-  margin: 0 auto;
-}
-</style>
diff --git a/src/pages/views/jqfx/components/barEcharts2.vue b/src/pages/views/jqfx/components/barEcharts2.vue
deleted file mode 100644
index 5dfa112..0000000
--- a/src/pages/views/jqfx/components/barEcharts2.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-export default {
-  props: ["datas"],
-  watch: {
-    datas: {
-      handler(val) {
-        this.hamdlegfChart();
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
-  data() {
-    return {
-      echid: "",
-    };
-  },
-  created() {
-    this.echid = "ech_" + new Date().getTime();
-  },
-  mounted() {
-    // this.titles = this.titles
-    // this.datas = this.datas
-    this.hamdlegfChart();
-  },
-  methods: {
-    hamdlegfChart() {
-      if (document.getElementById(this.echid)) {
-        let myechart = echarts.init(document.getElementById(this.echid));
-        myechart.setOption({
-          tooltip: {},
-          grid: {
-            left: "5",
-            right: "5",
-            bottom: "0",
-            top: "35",
-            containLabel: true,
-          },
-          legend: {
-            textStyle: {
-              color: "#333",
-            },
-          },
-          dataset: {
-            // dimensions: ['product', '警情', '时长', '里程'],
-            source: this.datas,
-          },
-          xAxis: {
-            type: "category",
-          },
-          yAxis: {
-            type: "value",
-            splitLine: {
-              show: true,
-              lineStyle: {
-                // color: "#224465",
-              },
-            },
-          },
-          series: [
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#b6325f",
-                    },
-                    {
-                      offset: 1,
-                      color: "#ff887c",
-                    },
-                  ],
-                },
-              ],
-              barGap: "50%",
-            },
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#205ddb",
-                    },
-                    {
-                      offset: 1,
-                      color: "#1bdffc",
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-.gfChart {
-  margin-top: 1vw;
-  height: 65vw;
-  width: 95vw;
-  margin: 0 auto;
-}
-</style>
diff --git a/src/pages/views/jqfx/components/casePerson.vue b/src/pages/views/jqfx/components/casePerson.vue
deleted file mode 100644
index d0de154..0000000
--- a/src/pages/views/jqfx/components/casePerson.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-<template>
-	<div class="cntBox">
-		<div class="box-left">
-			<div class="left-item" v-for="(v,index) in list" :key="index">
-				<div class="title">
-					{{index+1}}.{{v.name}}
-				</div>
-				<div class="number">
-					{{v.todayNum}}
-					<img src="../../../../assets/images/leader/arrow-up@2x.png" v-if="v.todayNum > v.lastNum"/>
-					<img src="../../../../assets/images/leader/arrow-down@2x.png" v-else/>
-				</div>
-			</div>
-		</div>
-		
-		<div class="box-right">
-			<div class="sircle-one">
-				<div class="sircle-one-middle">
-					<div class="sircle-one-small">前科</div>
-					<div class="sircle-two">吸毒</div>
-					<div class="sircle-three">本区</div>
-					<div class="sircle-four">精神病人</div>
-					<div class="sircle-five">外省</div>
-				</div>
-			</div>
-		</div>
-		
-	</div>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				list: [
-					{name:'前科',todayNum:180,lastNum:20},
-					{name:'吸毒',todayNum:180,lastNum:1120},
-					{name:'本区',todayNum:180,lastNum:20},
-					{name:'外省',todayNum:180,lastNum:1120},
-					{name:'精神病人',todayNum:180,lastNum:20}
-				]
-			}
-		},
-		methods: {
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "../../../../assets/styles/mixin.scss";
-	.cntBox{
-		width: 100%;
-		height: 25vh;
-	}
-	.box-left{
-		width: 35%;
-		height: 100%;
-		float: left;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
-	.left-item{
-		flex: 1;
-		
-	}
-	.title{
-		float: left;
-	}
-	.number{
-		float: right;
-	}
-	.box-right{
-		width: 65%;
-		height: 100%;
-		float: right;
-		position: relative;
-		@include font_size($font_medium_s);
-	}
-	.sircle-one{
-		position: absolute;
-		width: 21vw;
-		height: 21vw;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-		margin: auto;
-		border: 1px solid #1565cb;
-		border-radius:50%;
-	}
-	.sircle-one-middle{
-		width: 18vw;
-		height: 18vw;
-		border: 1px solid #1874E7;
-		border-radius:50%;
-		margin: 0 auto;
-		top: 1.25vw;
-		position: relative;
-	}
-	.sircle-one-small{
-		position: absolute;
-		width: 15vw;
-		height: 15vw;
-		border: 1px solid #1874E7;
-		border-radius:50%;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		margin: auto;
-		box-shadow: inset 0 0 10px #1874E7;
-		background: rgba(12,76,180,.3);
-		text-align: center;
-		line-height: 16vw;
-	}
-	.sircle-two{
-		position: absolute;
-		width: 18vw;
-		height: 18vw;
-		left: -17vw;
-		bottom: -1px;
-		border: 1px solid #E5E718;
-		box-shadow: inset 0 0 20px #E5E718;
-		border-radius:50%;
-		text-align: center;
-		line-height: 18vw;
-	}
-	.sircle-three{
-		position: absolute;
-		width: 17vw;
-		height: 17vw;
-		bottom: 16.5vw;
-		border: 1px solid #E78D18;
-		box-shadow: inset 0 0 20px #E78D18;
-		border-radius:50%;
-		text-align: center;
-		line-height: 17vw;
-	}
-	.sircle-four{
-		position: absolute;
-		width: 16vw;
-		height: 16vw;
-		left: 20vw;
-		bottom: 8vw;
-		border: 1px solid #14F5F2;
-		box-shadow: inset 0 0 20px #14F5F2;
-		border-radius:50%;
-		text-align: center;
-		line-height: 16vw;
-	}
-	.sircle-five{
-		position: absolute;
-		width: 15vw;
-		height: 15vw;
-		left: 12vw;
-		bottom: -11vw;
-		border: 1px solid #14A3F5;
-		box-shadow: inset 0 0 20px #14A3F5;
-		border-radius:50%;
-		text-align: center;
-		line-height: 15vw;
-	}
-	img{
-		width: 2vw;
-		margin-left: 2vw;
-	}
-</style>
\ No newline at end of file
diff --git a/src/pages/views/jqfx/components/lineChart.vue b/src/pages/views/jqfx/components/lineChart.vue
deleted file mode 100644
index bad1b52..0000000
--- a/src/pages/views/jqfx/components/lineChart.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-  <div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-export default {
-  props: {
-    data1: Array,
-    data2: Array,
-    data3: Array,
-    timeList: Array,
-    jqType: Number,
-  },
-  data() {
-    return {
-      echid: "",
-    };
-  },
-  created() {
-    this.echid = "ech2_" + new Date().getTime();
-  },
-  watch: {
-    data2: {
-      handler(val) {
-        this.hamdleJqChart();
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
-  mounted() {
-    this.hamdleJqChart();
-  },
-  methods: {
-    hamdleJqChart() {
-      if (document.getElementById(this.echid)) {
-        let myechart = echarts.init(document.getElementById(this.echid));
-        myechart.setOption({
-          color:
-            this.jqType == 1
-              ? ["#268bff", "#FF1A1A", "#FF7B1A"]
-              : ["#FF1A1A", "#268bff"],
-          tooltip: {
-            trigger: "axis",
-            axiosPointer: {
-              type: "cross",
-              crossStyle: {
-                color: "#888",
-              },
-              lineStyle: {
-                type: "dashed",
-              },
-            },
-          },
-          grid: {
-            left: "10",
-            right: "10",
-            bottom: "0",
-            top: "60",
-            containLabel: true,
-          },
-          legend: {
-            data:
-              this.jqType == 1
-                ? ["总警情", "违法犯罪", "街面警情"]
-                : ["刑事", "行政"],
-            orient: "horizontal",
-            show: true,
-            top: 25,
-          },
-          xAxis: {
-            type: "category",
-            data: this.timeList,
-            splitLine: {
-              show: false,
-            },
-            axisTick: {
-              show: false,
-            },
-            axisLine: {
-              show: false,
-            },
-          },
-          yAxis: {
-            type: "value",
-            axisLabel: {
-              color: "#888",
-              textStyle: {
-                fontSize: 12,
-              },
-            },
-            splitLine: {
-              show: true,
-              lineStyle: {
-                // color: "#224465",
-              },
-            },
-            axisTick: {
-              show: false,
-            },
-            axisLine: {
-              show: false,
-            },
-          },
-          series: [
-            {
-              name: this.jqType == 1 ? "总警情" : "刑事",
-              type: "line",
-              smooth: true,
-              data: this.data1,
-            },
-            {
-              name: this.jqType == 1 ? "违法犯罪" : "行政",
-              type: "line",
-              smooth: true,
-              data: this.data2,
-            },
-            {
-              name: "街面警情",
-              type: "line",
-              smooth: true,
-              data: this.data3,
-            },
-          ],
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-.gfChart {
-  margin-top: 1vw;
-  height: 65vw;
-  width: 100vw;
-  margin: 0 auto;
-}
-</style>
diff --git a/src/pages/views/jqfx/dqscFx.vue b/src/pages/views/jqfx/dqscFx.vue
deleted file mode 100644
index db07e22..0000000
--- a/src/pages/views/jqfx/dqscFx.vue
+++ /dev/null
@@ -1,1020 +0,0 @@
-<template>
-  <div class="compare">
-    <div class="title-box">
-      <div class="title">
-        {{ jqTitle
-        }}<img src="../../../assets/images/xiala.png" width class="img" alt="" @click="isShowJqType = true" />
-        <van-action-sheet v-model:show="isShowJqType">
-          <van-picker :columns="jqTypeList" @confirm="groupChange" @cancel="isShowJqType = false" />
-        </van-action-sheet>
-      </div>
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">数据统计</div>
-        <div class="zst-title-right">
-          {{ dataCountDay
-          }}<img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('sjtj')" />
-          <van-action-sheet v-model:show="isShowDataCount1">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount1 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <div class="jrfxBox">
-        <div class="jrfxLi">
-          <div class="numb sum_total">{{ formData.total }}</div>
-          <div class="titles">总数</div>
-        </div>
-        <div class="jrfxLi">
-          <div class="numb xs_total">{{ formData.xs }}</div>
-          <div class="titles">刑事</div>
-        </div>
-        <div class="jrfxLi">
-          <div class="numb xz_total">{{ formData.xz }}</div>
-          <div class="titles">行政</div>
-        </div>
-      </div>
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">发案趋势分析</div>
-        <div class="zst-title-right">
-          {{ qsfxDay }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('qsfx')" />
-          <van-action-sheet v-model:show="isShowDataCount2">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount2 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <lineChart :xline="xline" :xsdata="xsdata" :xzdata="xzdata" :zdata="zdata" />
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box" style="margin-bottom: 2vw">
-        <div class="zst-title-left">派出所发案分析</div>
-        <div class="zst-title-right">
-          {{ pcsDay }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('pcsfafx')" />
-          <van-action-sheet v-model:show="isShowDataCount3">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount3 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <Bar1 :datas="pcsfaList" />
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">发案时段及三车人员预警</div>
-        <div class="zst-title-right">
-          {{ ryyjDay }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('ryyj')" />
-          <van-action-sheet v-model:show="isShowDataCount4">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount4 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <div class="tag_box">
-        <van-tag v-for="(item, index) in tags" @click="changeTime(item)" plain :key="index"
-          :color="isTimeActive == item ? '#3c9cff' : ''" style="margin-right: 1vw">{{ item }}
-        </van-tag>
-      </div>
-      <Bar2 :datas="fasdAndscList" />
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">高发区域TOP5</div>
-        <div class="zst-title-right">
-          {{ gfqyDay }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('gfqy')" />
-          <van-action-sheet v-model:show="isShowDataCount5">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount5 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <div class="fjChart">
-        <TopArea :list="totalList" v-if="totalList.length > 0" />
-        <div v-else style="height: 10vh; text-align: center; line-height: 10vh">
-          没有数据
-        </div>
-      </div>
-      <!-- <div class="but_box">
-        <span>发送指令</span>
-        <span>以地图展示</span>
-      </div> -->
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">三车前科人员活跃TOP5</div>
-        <div class="zst-title-right">
-          {{ ryhdDay }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('qkryhd')" />
-          <van-action-sheet v-model:show="isShowDataCount6">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount6 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <div class="trailList" v-if="ryyjList.length > 0">
-        <!-- <ListData
-          v-for="(item, index) in ryyjList"
-          :key="index"
-          type="ry"
-          :item="item.ryInfo"
-          @onClickItem="onClickItem($event, 'ry')"
-        /> -->
-      </div>
-      <div v-else style="height: 10vh; text-align: center; line-height: 10vh">
-        没有数据
-      </div>
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">车辆预警TOP5</div>
-        <div class="zst-title-right">
-          {{ tpcyjDay }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('tpcyj')" />
-          <van-action-sheet v-model:show="isShowDataCount7">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount7 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <div class="trailList" v-if="clyjList.length > 0">
-        <!-- <ListData
-          v-for="(item, index) in clyjList"
-          :key="index"
-          type="car"
-          :item="item.clInfo"
-          @onClickItem="onClickItem($event, 'cl')"
-        /> -->
-      </div>
-      <div v-else style="height: 10vh; text-align: center; line-height: 10vh">
-        没有数据
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Bar1 from "./components/barEcharts1.vue";
-import Bar2 from "./components/barEcharts2.vue";
-import TopArea from "./components/TopArea.vue";
-import lineChart from "./components/lineChart.vue";
-import router from "../../../router/index.js";
-import {
-  timeValidate,
-  getRecentDay,
-  getnRencebtMonth,
-  setArray,
-  hbArray,
-  dateFormat,
-  getBase64,
-} from "../../../utils/tools.js";
-import { jqfxCorrelation, jqfxCorrelationYjzl } from "../../../api/jqfxApi.js";
-export default {
-  components: {
-    Bar1,
-    Bar2,
-    TopArea,
-    lineChart,
-  },
-  data() {
-    return {
-      daterValidate: [
-        timeValidate(new Date(), "ymd") + " 00:00:00",
-        timeValidate(new Date()),
-      ],
-      submitType: "",
-      isShowDataCount1: false,
-      isShowDataCount2: false,
-      isShowDataCount3: false,
-      isShowDataCount4: false,
-      isShowDataCount5: false,
-      isShowDataCount6: false,
-      isShowDataCount7: false,
-      dataCountDay: "今日",
-      qsfxDay: "今日",
-      pcsDay: "今日",
-      ryyjDay: "今日",
-      gfqyDay: "今日",
-      ryhdDay: "今日",
-      tpcyjDay: "今日",
-      timeList: ["今日", "近7日", "近7周", "近7月"],
-      formData: {
-        total: 0,
-        xs: 0,
-        xz: 0,
-      },
-      xline: [],
-      xsdata: [],
-      xzdata: [],
-      zdata: [],
-      isShowJqType: false,
-      jqTitle: "街面警情",
-      jqTypeList: ["街面警情", "盗抢三车"],
-      tags: ["3时段", "4时段", "6时段", "8时段"],
-      totalList: [], //高发区域
-      //派出所分析数据
-      pcsfaList: {},
-      //三车人员预警
-      fasdAndscList: [],
-      //组织机构数据
-      ssbmList: [],
-      isTimeActive: "6时段", //默认时段
-      pcsfaListCopy: [], //三车预警数据
-      //车预警
-      clyjList: [],
-      //人员预警
-      ryyjList: [],
-      baseUrl: this.baseUrl2,
-    };
-  },
-  mounted() {
-    this.get_data_count();
-    this.get_faqsfx_data();
-    this._getSsbmData();
-    this.get_fasd_scyj_data();
-    this._getgfquData();
-    this._getYjclTOP5();
-    this._getRyyjTOP5();
-  },
-  methods: {
-    //点击人员预警
-    onClickItem(item, type) {
-      //人员跳转
-      if (type == "ry") {
-        let { yj_rysfzh, jd, wd } = item;
-        router.push(
-          `/yjMapPoint?item=${JSON.stringify({
-            yj_rysfzh,
-            jd,
-            wd,
-            time: this.ryhdDay,
-          })}`
-        );
-      } else {
-        //车辆跳转
-        let { yj_clcph } = item;
-        uni.navigateTo({
-          url: `../ryyjTop5AndMap/ryyjTop5AndMap?hphm=${yj_clcph}&clTime=${this.tpcyjDay}`,
-        });
-      }
-    },
-    //获取三车人员预警TOP5
-    _getRyyjTOP5() {
-      this.ryyjList = [];
-      let data = {
-        ssxgajdm: "1",
-      };
-      let url = "";
-      switch (this.ryhdDay) {
-        case "今日":
-          data.kssj = timeValidate(new Date(), "ymd") + " 00:00:00";
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjry/yjrytjsc";
-          break;
-        case "近7日":
-          data.kssj = getRecentDay(-7);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjry/yjrytjsc";
-          break;
-        case "近7周":
-          data.kssj = getRecentDay(-49);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjry/zyjrytjsc";
-          break;
-        default:
-          data.ksny = getnRencebtMonth(6);
-          data.jsny = getnRencebtMonth(0);
-          url = "/yjxx/yjry/yyjrytjsc";
-          break;
-      }
-      jqfxCorrelationYjzl(url, data).then((res) => {
-        let array = res.slice(0, 5);
-        array.forEach(async (item) => {
-          item.ryInfo = await this._getRyInfo(item.yj_rysfzh);
-          item.ryInfo.sl = item.sl;
-          getBase64((_res) => {
-            item.ryInfo.itemUrl = _res;
-            this.ryyjList.push(item);
-            this.ryyjList.sort(function (m, n) {
-              let valueM = m["sl"];
-              let valueN = n["sl"];
-              if (valueM < valueN) return 1;
-              else if (valueM > valueN) return -1;
-              else return 0;
-            });
-          }, item.ryInfo.yj_xtp);
-        });
-      });
-    },
-    //获取 人员详情
-    _getRyInfo(sfzh) {
-      return new Promise((ok) => {
-        jqfxCorrelationYjzl("/yjxx/yjry/queryBySfzh", {
-          sfzh,
-        }).then((res) => {
-          ok(res[0]);
-        });
-      });
-    },
-    //获取预警车辆TOP5
-    _getYjclTOP5() {
-      this.clyjList = [];
-      let data = {
-        ssxgajdm: "1",
-      };
-      let url = "";
-      switch (this.tpcyjDay) {
-        case "今日":
-          data.kssj = timeValidate(new Date(), "ymd") + " 00:00:00";
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjcl/yjcltj";
-          break;
-        case "近7日":
-          data.kssj = getRecentDay(-7);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjcl/yjcltj";
-          break;
-        case "近7周":
-          data.kssj = getRecentDay(-49);
-          data.jssj = timeValidate(new Date());
-          url = "/yjxx/yjcl/zyjcltj";
-          break;
-        default:
-          data.ksny = getnRencebtMonth(6);
-          data.jsny = getnRencebtMonth(0);
-          url = "/yjxx/yjcl/yyjcltj";
-          break;
-      }
-      jqfxCorrelationYjzl(url, data).then((res) => {
-        let array = res.slice(0, 5);
-        array.forEach(async (item) => {
-          item.clInfo = await this._getClInfo(item.yj_clcph);
-          item.clInfo.sl = item.sl;
-          this.clyjList.push(item);
-          this.clyjList.sort(function (m, n) {
-            let valueM = m["sl"];
-            let valueN = n["sl"];
-            if (valueM < valueN) return 1;
-            else if (valueM > valueN) return -1;
-            else return 0;
-          });
-        });
-      });
-    },
-    //获取 车辆详情
-    _getClInfo(hphm) {
-      return new Promise((ok) => {
-        jqfxCorrelationYjzl("/yjxx/yjcl/queryBycCphm", {
-          hphm,
-        }).then((res) => {
-          res[0].yj_xtp = res[0].yj_xtp.replace(
-            "http://80.35.1.132",
-            this.baseUrl
-          );
-          ok(res[0]);
-        });
-      });
-    },
-    //高发区域 TOP5
-    _getgfquData() {
-      let params = {
-        ssxgajdm: "1", //分县局代码
-      };
-      switch (this.gfqyDay) {
-        case "今日":
-          params.ksrq = timeValidate(new Date(), "ymd") + " 00:00:00";
-          params.jsrq = timeValidate(new Date());
-          break;
-        case "近7日":
-          params.ksrq = getRecentDay(-7);
-          params.jsrq = timeValidate(new Date());
-          break;
-        case "近7周":
-          params.ksrq = getRecentDay(-49);
-          params.jsrq = timeValidate(new Date());
-          break;
-        default:
-          params.ksny = getnRencebtMonth(6);
-          params.jsny = getnRencebtMonth(0);
-          break;
-      }
-      this.totalList = [];
-      jqfxCorrelation("/tbJq/queryZtfx", params).then((res) => {
-        if (res && res.length > 0) {
-          res.forEach((item) => {
-            if (!item.error) {
-              item.name = item.address.road || item.display_name.split(",")[0];
-              item.sl = item.jqsl;
-              this.totalList.push(item);
-            }
-          });
-        }
-      });
-    },
-    // 高发时段分析
-    get_fasd_scyj_data() {
-      let params = {
-        ssxgajdm: "1",
-      };
-      switch (this.ryyjDay) {
-        case "今日":
-          params.ksrq = timeValidate(new Date(), "ymd") + " 00:00:00";
-          params.jsrq = timeValidate(new Date());
-          this._getJqData("/ztfx/fascryyj/scryyj", params);
-          break;
-        case "近7日":
-          params.ksrq = getRecentDay(-7);
-          params.jsrq = timeValidate(new Date());
-          this._getJqData("/ztfx/fascryyj/scryyj", params);
-          break;
-        case "近7周":
-          params.ksrq = getRecentDay(-49);
-          params.jsrq = timeValidate(new Date());
-          this._getJqData("/ztfx/fascryyj/zscryyj", params);
-          break;
-        default:
-          params.ksny = getnRencebtMonth(6);
-          params.jsny = getnRencebtMonth(0);
-          this._getJqData("/ztfx/fascryyj/yscryyj", params);
-          break;
-      }
-    },
-    //请求高发地图警情数据
-    _getJqData(url, params) {
-      jqfxCorrelation(url, params).then((res) => {
-        let timeArr = [];
-        for (var i = 0; i < 24; i++) {
-          let obj = {
-            product: i,
-            发案数: 0,
-            前科人员报警数: 0,
-          };
-          for (var j = 0; j < res.length; j++) {
-            let item = res[j];
-            if (i == item.jqfsksxs) {
-              obj["发案数"] = item.sl;
-            }
-          }
-          timeArr.push(obj);
-        }
-        this.pcsfaListCopy = timeArr;
-        this.changeTime("6时段");
-      });
-    },
-    // 高发时段分析时段切换
-    changeTime(value) {
-      this.isTimeActive = value;
-      if (value == "3时段") {
-        this.fasdAndscList = this.getGroup(3);
-      }
-      if (value == "4时段") {
-        this.fasdAndscList = this.getGroup(4);
-      }
-      if (value == "6时段") {
-        this.fasdAndscList = this.getGroup(6);
-      }
-      if (value == "8时段") {
-        this.fasdAndscList = this.getGroup(8);
-      }
-    },
-    // 时间分组
-    getGroup(val) {
-      let arr = [];
-      let num = 24 / val;
-      if (arr.length < num) {
-        for (let j = 1; j <= num; j++) {
-          let obj = {
-            product: "",
-            发案数: 0,
-            前科人员预警数: 0,
-          };
-          for (let t = 0; t < this.pcsfaListCopy.length; t++) {
-            let it = this.pcsfaListCopy[t];
-            if ((j - 1) * val <= t && t < j * val) {
-              let objs = JSON.parse(JSON.stringify(obj));
-              objs.product = (j - 1) * val + "-" + (it.product + 1);
-              this.count = this.count + it["发案数"];
-              if (t % val == val - 1) {
-                objs["发案数"] = this.count;
-                this.count = 0;
-                arr.push(objs);
-                break;
-              }
-            }
-          }
-        }
-      }
-      return arr;
-    },
-    //获取组织机构数据
-    _getSsbmData() {
-      jqfxCorrelation("/xtzd/zzjg").then((res) => {
-        this.ssbmList = res;
-        this._getPcsfaFx();
-      });
-    },
-    // 下拉切换 总警情、违法犯罪警情、街面警情
-    // groupChange(val) {
-    // 	switch (val.value[0]) {
-    // 		case '总警情':
-    // 			this.jqTitle = '总警情'
-    // 			break;
-    // 		case '违法犯罪警情':
-    // 			this.jqTitle = '违法犯罪警情'
-    // 			break;
-    // 		case '街面警情':
-    // 			this.jqTitle = '街面警情'
-    // 			break;
-    // 	}
-    // 	this.isShowJqType = false
-    // },
-    // 选择时间段
-    chooseTime(type) {
-      this.submitType = type; //选择那个模块时间
-      switch (type) {
-        case "sjtj":
-          this.isShowDataCount1 = true;
-          break;
-        case "qsfx":
-          this.isShowDataCount2 = true;
-          break;
-        case "pcsfafx":
-          this.isShowDataCount3 = true;
-          break;
-        case "ryyj":
-          this.isShowDataCount4 = true;
-          break;
-        case "gfqy":
-          this.isShowDataCount5 = true;
-          break;
-        case "qkryhd":
-          this.isShowDataCount6 = true;
-          break;
-        default:
-          this.isShowDataCount7 = true;
-      }
-    },
-    // 专题分析-数据统计 - 时间选择
-    change_data_count(val) {
-      this.selectTime(val);
-      this.isShowDataCount1 = false;
-      this.isShowDataCount2 = false;
-      this.isShowDataCount3 = false;
-      this.isShowDataCount4 = false;
-      this.isShowDataCount5 = false;
-      this.isShowDataCount6 = false;
-      this.isShowDataCount7 = false;
-    },
-    //选择时间
-    selectTime(time) {
-      switch (this.submitType) {
-        case "sjtj":
-          this.dataCountDay = time;
-          this.get_data_count();
-          break;
-        case "qsfx":
-          this.qsfxDay = time;
-          this.get_faqsfx_data();
-          break;
-        case "pcsfafx":
-          this.pcsDay = time;
-          this._getPcsfaFx();
-          break;
-        case "ryyj":
-          this.ryyjDay = time;
-          this.get_fasd_scyj_data();
-          break;
-        case "gfqy":
-          this.gfqyDay = time;
-          this._getgfquData();
-          break;
-        case "tpcyj":
-          this.tpcyjDay = time;
-          this._getYjclTOP5();
-          break;
-        case "qkryhd":
-          this.ryhdDay = time;
-          this._getRyyjTOP5();
-          break;
-      }
-    },
-    //获取派出所发案分析
-    _getPcsfaFx() {
-      // 01刑事  02行政
-      let pcsfaFxList = [];
-      let params = {
-        ssxgajdm: "1", //分县局代码
-      };
-      let url = "/ztfx/pcsfafx/rtj";
-      switch (this.pcsDay) {
-        case "今日":
-          params.ksrq = this.daterValidate[0];
-          params.jsrq = this.daterValidate[1];
-          break;
-        case "近7日":
-          params.ksrq = getRecentDay(-7);
-          params.jsrq = this.daterValidate[1];
-          break;
-        case "近7周":
-          params.ksrq = getRecentDay(-49);
-          params.jsrq = this.daterValidate[1];
-          url = "/ztfx/pcsfafx/ztj";
-          break;
-        case "近7月":
-          params.ksny = getnRencebtMonth(6);
-          params.jsny = getnRencebtMonth(0);
-          url = "/ztfx/pcsfafx/ytj";
-          break;
-      }
-      jqfxCorrelation(url, params).then((res) => {
-        let list = setArray(res);
-        list.forEach((item) => {
-          this.ssbmList.forEach((_item) => {
-            if (item.ssbmdm == _item.id + "") {
-              let obj = {
-                product: "",
-                刑事: 0,
-                行政: 0,
-                总数: 0,
-              };
-              if (item.bjlb == "01000000") {
-                obj["刑事"] = item.sl;
-              } else {
-                obj["行政"] = item.sl;
-              }
-              obj["总数"] = obj["刑事"] + obj["行政"];
-              obj.product = this._getSsbmName(item.ssbmdm).substring(0, 2);
-              pcsfaFxList.push(obj);
-            }
-          });
-        });
-        let arrayList = hbArray(pcsfaFxList, "刑事", "行政", "总数");
-        let arrObj = {
-          titles: [],
-          xsList: [],
-          xzList: [],
-          zsList: [],
-        };
-        arrayList.forEach((item) => {
-          arrObj.titles.push(item.product);
-          arrObj.xsList.push(item["刑事"]);
-          arrObj.xzList.push(item["行政"]);
-          arrObj.zsList.push(item["总数"]);
-        });
-        this.pcsfaList = arrObj;
-      });
-    },
-    //获取组织部门详细信息
-    _getSsbmName(code) {
-      let info = this.ssbmList.find((item) => {
-        return code == item.id;
-      });
-      if (info) {
-        return info.org_short_name;
-      }
-      return;
-    },
-    // 专题分析-数据统计
-    get_data_count() {
-      let params = {
-        ssxgajdm: "1", //分县局代码
-      };
-      let url = "/ztfx/sjtj/ztsjtj";
-      if (this.dataCountDay == "今日") {
-        params.ksrq = this.daterValidate[0];
-        params.jsrq = this.daterValidate[1];
-      }
-      if (this.dataCountDay == "近7日") {
-        params.ksrq = getRecentDay(-7);
-        params.jsrq = this.daterValidate[0];
-      }
-      if (this.dataCountDay == "近7周") {
-        params.ksrq = getRecentDay(-49);
-        params.jsrq = this.daterValidate[0];
-      }
-      if (this.dataCountDay == "近7月") {
-        params.ksny = getnRencebtMonth(6);
-        params.jsny = getnRencebtMonth(0);
-        url = "/ztfx/sjtj/yztsjtj";
-      }
-
-      jqfxCorrelation(url, params).then((res) => {
-        let total = 0;
-        res.forEach((item) => {
-          total = total + item.sl;
-          if (item.bjlb == "01000000") {
-            this.formData.xs = item.sl;
-          }
-          if (item.bjlb == "02000000") {
-            this.formData.xz = item.sl;
-          }
-        });
-        this.formData.total = total;
-      });
-    },
-    // 专题分析-发案趋势分析
-    get_faqsfx_data() {
-      let params = {
-        ssxgajdm: "1", //分县局代码
-      };
-      if (this.qsfxDay == "今日") {
-        params.ksrq = this.daterValidate[0];
-        params.jsrq = this.daterValidate[1];
-        this._getZtfxData("/ztfx/afqsfx/rtj", params);
-      }
-      if (this.qsfxDay == "近7日") {
-        params.ksrq = getRecentDay(-7);
-        params.jsrq = this.daterValidate[0];
-        this._getZtfxData("/ztfx/afqsfx/rtj", params);
-      }
-      if (this.qsfxDay == "近7周") {
-        params.ksrq = getRecentDay(-49);
-        params.jsrq = this.daterValidate[0];
-        this._getZtfxData("/ztfx/afqsfx/ztj", params);
-      }
-      if (this.qsfxDay == "近7月") {
-        params.ksny = getnRencebtMonth(6);
-        params.jsny = getnRencebtMonth(0);
-        this._getZtfxData("/ztfx/afqsfx/ytj", params);
-      }
-    },
-    //获取专题分析数据
-    _getZtfxData(url, params) {
-      jqfxCorrelation(url, params).then((res) => {
-        let xs = [];
-        let xz = [];
-        let total = [];
-        let line = [];
-        if (res.length > 0) {
-          res.forEach((v) => {
-            if (v.bjlb == "01000000") {
-              xs.push(v.sl);
-              let week;
-              if (this.qsfxDay == "近7周") {
-                week = v.jqfskszs + "周";
-              } else if (this.qsfxDay == "近7月") {
-                week = v.jqfsksny;
-              } else {
-                week = timeValidate(v.jqfsksrq, "md");
-              }
-              line.push(week);
-            }
-            if (v.bjlb == "02000000") {
-              xz.push(v.sl);
-            }
-          });
-          xz.forEach((it, index) => {
-            xs.forEach((v, i) => {
-              if (index == i) {
-                total.push(it + v);
-              }
-            });
-          });
-        } else {
-          xs.push(0);
-          xz.push(0);
-          total.push(0);
-          line.push(timeValidate(new Date(), "md"));
-        }
-        this.zdata = total;
-        this.xsdata = xs;
-        this.xzdata = xz;
-        this.xline = line;
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.trailList {
-  padding-bottom: 1vw;
-}
-
-.jrfxBox {
-  margin: 2vw 2vw 0 2vw;
-  display: flex;
-  justify-content: space-around;
-  padding: 2vw 0;
-}
-
-.jrfxBox .jrfxLi .numb {
-  width: 21.06667vw;
-  height: 21.06667vw;
-  background-size: 100% 100%;
-  text-align: center;
-  line-height: 21.06667vw;
-  color: #fff;
-}
-
-.jrfxBox .jrfxLi .titles {
-  text-align: center;
-  font-size: 4vw;
-  padding-top: 2vw;
-}
-
-.sum_total {
-  background: url("../../../assets/images/new/new_yiqing.png") no-repeat;
-}
-
-.xs_total {
-  background: url("../../../assets/images/new/new_dongqing.png") no-repeat;
-}
-
-.xz_total {
-  background: url("../../../assets/images/new/new_dieqing.png") no-repeat;
-}
-
-.compare {}
-
-.title-box {
-  display: flex;
-  justify-content: center;
-}
-
-.title {
-  width: 92vw;
-  height: 4vw;
-  background: url("../../../assets/images/bigTitle@2x.png");
-  background-size: 100% 100%;
-  margin-top: 10px;
-  text-align: center;
-  line-height: 4vw;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-::v-deep .nav-box[data-v-19978886] {
-  border-bottom: 1px solid #203967;
-}
-
-.zst-box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-}
-
-.zst-title-box {
-  margin-top: 20px;
-  display: flex;
-  justify-content: space-between;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium);
-}
-
-.zst-title-left {
-  background: url("../../../assets/images/lanmu-title.png") no-repeat;
-  background-size: 100% 100%;
-  flex: 2;
-  height: 28px;
-  line-height: 28px;
-  padding-left: 10px;
-}
-
-.zst-title-right {
-  flex: 1;
-  text-align: right;
-  height: 28px;
-  line-height: 28px;
-  padding-right: 10px;
-  color: #47b8ff;
-}
-
-.zst-title-right1 {
-  flex: 1;
-  display: flex;
-  justify-content: flex-end;
-  height: 28px;
-  line-height: 28px;
-  padding-right: 10px;
-  /* color: #47B8FF; */
-}
-
-.sendZL {
-  width: 70px;
-  height: 26px;
-  border-radius: 5px;
-  background-image: linear-gradient(#00c0fa, #015eea);
-  text-align: center;
-}
-
-.img {
-  margin-left: 3px;
-}
-
-.fjChart {
-  padding: 3.5vw 3.5vw 0 3.5vw;
-}
-
-.assess-box {
-  padding: 10px;
-  line-height: 18px;
-  font-size: 12px;
-  color: #e3e3e3;
-}
-
-.fjAndCqfj-box {
-  width: 100%;
-  /* height: 40vh; */
-  margin-top: 10px;
-  display: flex;
-  flex-direction: row;
-}
-
-.first-line {
-  width: 11vw;
-  border: 1px solid #178bed;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-  background-color: rgba(51, 157, 255, 0.2);
-}
-
-.first-line :last-child {
-  border-bottom: unset;
-}
-
-.first-line-item {
-  flex: 1;
-  border: 1px solid #18325e;
-  text-align: center;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  padding-left: 1.5vw;
-}
-
-.right-box {
-  display: flex;
-  border-top: 1px solid #178bed;
-  border-bottom: 1px solid #178bed;
-  width: 89vw;
-  overflow: auto;
-}
-
-.right-box-line-item {
-  width: 33vw;
-  border-right: 1px solid #178bed;
-  display: flex;
-  position: relative;
-}
-
-.right-line-box {
-  width: 11vw;
-  height: 40vh;
-  /* border: 0.5px solid #18325E; */
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.first-line-item-right {
-  flex: 1;
-  border-bottom: 0.5px solid #18325e;
-  border-right: 1px solid #18325e;
-  text-align: center;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  padding-left: 1.5vw;
-}
-
-.right-line-box :first-child {
-  border-right: unset;
-}
-
-.right-title-box {
-  position: absolute;
-  top: 0;
-  text-align: center;
-  width: 100%;
-  line-height: 4vh;
-}
-
-/* echarts */
-#gfChart {
-  width: 100%;
-  height: 40vh;
-}
-
-.tag_box {
-  display: flex;
-  padding: 3vw;
-}
-
-.but_box {
-  text-align: center;
-  margin-top: 3vw;
-  color: #fff;
-}
-
-.but_box>span {
-  display: inline-block;
-  padding: 1.5vw 3vw;
-  margin: 0 1.5vw;
-  border-radius: 5px;
-  background-image: linear-gradient(to top, #015eea, #00c0fa);
-}
-</style>
diff --git a/src/pages/views/jqfx/fourTallFx.vue b/src/pages/views/jqfx/fourTallFx.vue
deleted file mode 100644
index d60dbcd..0000000
--- a/src/pages/views/jqfx/fourTallFx.vue
+++ /dev/null
@@ -1,621 +0,0 @@
-<template>
-  <div class="compare">
-    <div class="title-box">
-      <div class="title">
-        {{ jqTitle }}
-        <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="isShowJqType = true" />
-        <van-action-sheet v-model:show="isShowJqType">
-          <van-picker :columns="jqTypeList" @confirm="groupChange" @cancel="isShowJqType = false" />
-        </van-action-sheet>
-      </div>
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">高发时段分析</div>
-        <div class="zst-title-right">
-          {{ gfsdTime }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('gfsd')" />
-          <van-action-sheet v-model:show="isShowDataCount1">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount1 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <div class="tag_box">
-        <van-tag v-for="(item, index) in tags" @click="changeTime(item)" :key="index" plain
-          :color="isTimeActive == item ? '#3c9cff' : ''" style="margin-right: 1vw">{{ item }}
-        </van-tag>
-      </div>
-      <Bar :datas="pcsfaList" />
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">高发区域TOP5</div>
-        <div class="zst-title-right">
-          {{ gfqyTime }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('gfqy')" />
-          <van-action-sheet v-model:show="isShowDataCount2">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount2 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <div class="fjChart">
-        <TopArea :list="gfqyLIst" v-if="gfqyLIst.length > 0" />
-        <div v-else style="height: 10vh; text-align: center; line-height: 10vh">
-          没有数据
-        </div>
-      </div>
-      <!-- <div class="but_box" v-if="gfqyLIst.length > 0">
-        <span>发送指令</span>
-        <span>以地图展示</span>
-      </div> -->
-    </div>
-
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">高发类型TOP5</div>
-        <div class="zst-title-right">
-          {{ gflxTime }}
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" @click="chooseTime('gflx')" />
-          <van-action-sheet v-model:show="isShowDataCount3">
-            <van-picker :columns="timeList" @confirm="change_data_count" @cancel="isShowDataCount3 = false" />
-          </van-action-sheet>
-        </div>
-      </div>
-      <div class="fjChart">
-        <TopArea :list="gflxList" v-if="gflxList.length > 0" />
-        <div v-else style="height: 10vh; text-align: center; line-height: 10vh">
-          没有数据
-        </div>
-      </div>
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">高发对象-作案人员(模拟)</div>
-        <div class="zst-title-right">
-          今日
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" />
-        </div>
-      </div>
-      <div class="fjChart">
-        <CasePerson></CasePerson>
-      </div>
-    </div>
-    <div class="zst-box">
-      <div class="zst-title-box">
-        <div class="zst-title-left">高发对象-受害人(模拟)</div>
-        <div class="zst-title-right">
-          今日
-          <img src="../../../assets/images/xiala.png" width class="img" alt="" />
-        </div>
-      </div>
-      <div class="fjChart">
-        <CasePerson></CasePerson>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Bar from "./components/barEcharts.vue";
-import TopArea from "./components/TopArea.vue";
-import CasePerson from "./components/casePerson.vue";
-import {
-  timeValidate,
-  getRecentDay,
-  getnRencebtMonth,
-} from "../../../utils/tools.js";
-import { jqfxCorrelation } from "../../../api/jqfxApi.js";
-export default {
-  components: {
-    Bar,
-    TopArea,
-    CasePerson,
-  },
-  data() {
-    return {
-      isShowJqType: false,
-      jqTitle: "总警情",
-      jqTypeList: ["总警情", "街面警情", "违法犯罪警情"],
-      //时间段选择数据
-      timeList: ["今日", "近7日", "近7周", "近7月"],
-      count: 0,
-      isTimeActive: "6时段",
-      tags: ["3时段", "4时段", "6时段", "8时段"],
-      pcsfaListCopy: [],
-      pcsfaList: [],
-      gflxList: [], //高发类型数据
-      gfqyLIst: [], //高发区域
-      isShowDataCount1: false, //日期选择
-      isShowDataCount2: false, //日期选择
-      isShowDataCount3: false, //日期选择
-      submitType: "", //选择的模块
-      gfsdTime: "今日",
-      gfqyTime: "今日",
-      gflxTime: "今日",
-      gfdxTime: "今日",
-      gfsdTime: "今日",
-    };
-  },
-  mounted() {
-    this.get_gfsdfx_data();
-    this.get_gflx_zjq_data(); //高发类别TOP5
-    this._getgfquData();
-  },
-  methods: {
-    // 时间选择
-    change_data_count(val) {
-      this._getTimeSelectData(val);
-      this.isShowDataCount1 = false;
-      this.isShowDataCount2 = false;
-      this.isShowDataCount3 = false;
-    },
-    //根据时间查询的数据
-    _getTimeSelectData(time) {
-      switch (this.submitType) {
-        case "gfsd":
-          this.gfsdTime = time;
-          this.get_gfsdfx_data();
-          break;
-        case "gflx":
-          this.gflxTime = time;
-          this.get_gflx_zjq_data();
-          break;
-        case "gfqy":
-          this.gfqyTime = time;
-          this._getgfquData();
-          break;
-      }
-    },
-    // 选择时间段
-    chooseTime(type) {
-      this.submitType = type; //选择那个模块时间
-      switch (type) {
-        case "gfsd":
-          this.isShowDataCount1 = true;
-          break;
-        case "gfqy":
-          this.isShowDataCount2 = true;
-          break;
-        case "gflx":
-          this.isShowDataCount3 = true;
-          break;
-      }
-    },
-    // 下拉切换 总警情、违法犯罪警情、街面警情
-    groupChange(val) {
-      switch (val.value[0]) {
-        case "总警情":
-          this.jqTitle = "总警情";
-          break;
-        case "违法犯罪警情":
-          this.jqTitle = "违法犯罪警情";
-          break;
-        case "街面警情":
-          this.jqTitle = "街面警情";
-          break;
-      }
-      this.isShowJqType = false;
-      this.get_gfsdfx_data(); //高发时段分析
-      this.get_gflx_zjq_data(); //高发类别TOP5
-      this._getgfquData(); //高发区域
-    },
-    // 高发时段分析
-    get_gfsdfx_data() {
-      let params = {
-        ssxgajdm: "1",
-      };
-      switch (this.gfsdTime) {
-        case "今日":
-          params.ksrq = timeValidate(new Date(), "ymd");
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        case "近7日":
-          params.ksrq = getRecentDay(-7);
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        case "近7周":
-          params.ksrq = getRecentDay(-49);
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        default:
-          params.ksny = getnRencebtMonth(6);
-          params.jsny = getnRencebtMonth(0);
-          break;
-      }
-      // 总警情
-      if (this.jqTitle == "总警情") {
-        if (this.gfsdTime == "近7月") {
-          this._getJqData("/sgfx/gfsdfx/yzjq", params);
-        } else {
-          this._getJqData("/sgfx/gfsdfx/zjq", params);
-        }
-      }
-      if (this.jqTitle == "违法犯罪警情") {
-        if (this.gfsdTime == "近7月") {
-          this._getJqData("/sgfx/gfsdfx/ywffzjq", params);
-        } else {
-          this._getJqData("/sgfx/gfsdfx/wffzjq", params);
-        }
-      }
-      // 街面警情
-      if (this.jqTitle == "街面警情") {
-        if (this.gfsdTime == "近7月") {
-          this._getJqData("/sgfx/gfsdfx/yjmjq", params);
-        } else {
-          this._getJqData("/sgfx/gfsdfx/jmjq", params);
-        }
-      }
-    },
-    //请求高发地图警情数据
-    _getJqData(url, params) {
-      jqfxCorrelation(url, params).then((res) => {
-        let timeArr = [];
-        for (var i = 0; i < 24; i++) {
-          let obj = {
-            product: i,
-            警情: 0,
-            时长: 0,
-            里程: 0,
-          };
-          for (var j = 0; j < res.length; j++) {
-            let item = res[j];
-            if (i == item.jqfsksxs) {
-              obj["警情"] = item.sl;
-            }
-          }
-          timeArr.push(obj);
-        }
-        this.pcsfaListCopy = timeArr;
-        this.changeTime("6时段");
-      });
-    },
-    // 高发时段分析时段切换
-    changeTime(value) {
-      this.isTimeActive = value;
-      if (value == "3时段") {
-        this.pcsfaList = this.getGroup(3);
-      }
-      if (value == "4时段") {
-        this.pcsfaList = this.getGroup(4);
-      }
-      if (value == "6时段") {
-        this.pcsfaList = this.getGroup(6);
-      }
-      if (value == "8时段") {
-        this.pcsfaList = this.getGroup(8);
-      }
-    },
-    // 时间分组
-    getGroup(val) {
-      let arr = [];
-      let num = 24 / val;
-      if (arr.length < num) {
-        for (let j = 1; j <= num; j++) {
-          let obj = {
-            product: "",
-            警情: 0,
-            时长: 0,
-            里程: 0,
-          };
-          for (let t = 0; t < this.pcsfaListCopy.length; t++) {
-            let it = this.pcsfaListCopy[t];
-            if ((j - 1) * val <= t && t < j * val) {
-              let objs = JSON.parse(JSON.stringify(obj));
-              objs.product = (j - 1) * val + "-" + (it.product + 1);
-              this.count = this.count + it["警情"];
-              if (t % val == val - 1) {
-                objs["警情"] = this.count;
-                this.count = 0;
-                arr.push(objs);
-                break;
-              }
-            }
-          }
-        }
-      }
-      return arr;
-    },
-    //高发区域 TOP5
-    _getgfquData() {
-      let params = {
-        ssxgajdm: "1", //分县局代码
-      };
-      switch (this.gfqyTime) {
-        case "今日":
-          params.ksrq = timeValidate(new Date(), "ymd");
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        case "近7日":
-          params.ksrq = getRecentDay(-7);
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        case "近7周":
-          params.ksrq = getRecentDay(-49);
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        default:
-          params.ksny = getnRencebtMonth(6);
-          params.jsny = getnRencebtMonth(0);
-          break;
-      }
-      if (this.jqTitle == "总警情") {
-        params.type = 1;
-      }
-      if (this.jqTitle == "违法犯罪警情") {
-        params.type = 3;
-      }
-      if (this.jqTitle == "街面警情") {
-        params.type = 2;
-      }
-      this.gfqyLIst = [];
-      jqfxCorrelation("/tbJq/querySgfx", params).then((res) => {
-        if (res && res.length > 0) {
-          res.forEach((item) => {
-            if (!item.error) {
-              item.name = item.address.road || item.display_name.split(",")[0];
-              item.sl = item.jqsl;
-              this.gfqyLIst.push(item);
-            }
-          });
-        }
-      });
-    },
-    // 高发类型TOP5
-    get_gflx_zjq_data() {
-      let params = {
-        ssxgajdm: "1", //分县局代码
-      };
-      switch (this.gflxTime) {
-        case "今日":
-          params.ksrq = timeValidate(new Date(), "ymd");
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        case "近7日":
-          params.ksrq = getRecentDay(-7);
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        case "近7周":
-          params.ksrq = getRecentDay(-49);
-          params.jsrq = timeValidate(new Date(), "ymd");
-          break;
-        default:
-          params.ksny = getnRencebtMonth(6);
-          params.jsny = getnRencebtMonth(0);
-          break;
-      }
-      // 总警情
-      if (this.jqTitle == "总警情") {
-        if (this.gflxTime == "近7月") {
-          this._getGflxData("/sgfx/gflx/yzjq", params);
-        } else {
-          this._getGflxData("/sgfx/gflx/zjq", params);
-        }
-      }
-      // 违法犯罪警情
-      if (this.jqTitle == "违法犯罪警情") {
-        if (this.gflxTime == "近7月") {
-          this._getGflxData("/sgfx/gflx/yzwffzjq", params);
-        } else {
-          this._getGflxData("/sgfx/gflx/wffzjq", params);
-        }
-      }
-      // 街面警情
-      if (this.jqTitle == "街面警情") {
-        if (this.gflxTime == "近7月") {
-          this._getGflxData("/sgfx/gflx/yjmjq", params);
-        } else {
-          this._getGflxData("/sgfx/gflx/jmjq", params);
-        }
-      }
-    },
-    //获取高发类型数据
-    _getGflxData(url, params) {
-      jqfxCorrelation(url, params).then((res) => {
-        if (res && res.length > 0) {
-          this.gflxList = res.slice(0, 5);
-        }
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.compare {
-  padding-bottom: 3vw;
-}
-
-.title-box {
-  display: flex;
-  justify-content: center;
-}
-
-.title {
-  width: 92vw;
-  height: 4vw;
-  background: url("../../../assets/images/bigTitle@2x.png");
-  background-size: 100% 100%;
-  margin-top: 10px;
-  text-align: center;
-  line-height: 4vw;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-::v-deep .nav-box[data-v-19978886] {
-  border-bottom: 1px solid #203967;
-}
-
-.zst-box {
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-.zst-title-box {
-  margin-top: 20px;
-  display: flex;
-  justify-content: space-between;
-  @include font_color($font-color-theme);
-}
-
-.zst-title-left {
-  background: url("../../../assets/images/lanmu-title.png") no-repeat;
-  background-size: 100% 100%;
-  flex: 2;
-  height: 28px;
-  line-height: 28px;
-  padding-left: 10px;
-  @include font_size($font_medium);
-}
-
-.zst-title-right {
-  flex: 1;
-  text-align: right;
-  height: 28px;
-  line-height: 28px;
-  padding-right: 10px;
-  color: #47b8ff;
-}
-
-.zst-title-right1 {
-  flex: 1;
-  display: flex;
-  justify-content: flex-end;
-  height: 28px;
-  line-height: 28px;
-  padding-right: 10px;
-  /* color: #47B8FF; */
-}
-
-.sendZL {
-  width: 70px;
-  height: 26px;
-  border-radius: 5px;
-  background-image: linear-gradient(#00c0fa, #015eea);
-  text-align: center;
-}
-
-.img {
-  margin-left: 3px;
-}
-
-.fjChart {
-  /* width: 80vw; */
-  padding: 3.5vw 3.5vw 0 3.5vw;
-  /* height: 30vh; */
-}
-
-.assess-box {
-  padding: 10px;
-  line-height: 18px;
-  font-size: 12px;
-  color: #e3e3e3;
-}
-
-.fjAndCqfj-box {
-  width: 100%;
-  /* height: 40vh; */
-  margin-top: 10px;
-  display: flex;
-  flex-direction: row;
-}
-
-.first-line {
-  width: 11vw;
-  border: 1px solid #178bed;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-  background-color: rgb(51, 157, 255, 0.2);
-}
-
-.first-line :last-child {
-  border-bottom: unset;
-}
-
-.first-line-item {
-  flex: 1;
-  border: 1px solid #18325e;
-  text-align: center;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  padding-left: 1.5vw;
-}
-
-.right-box {
-  display: flex;
-  border-top: 1px solid #178bed;
-  border-bottom: 1px solid #178bed;
-  width: 89vw;
-  overflow: auto;
-}
-
-.right-box-line-item {
-  width: 33vw;
-  border-right: 1px solid #178bed;
-  display: flex;
-  position: relative;
-}
-
-.right-line-box {
-  width: 11vw;
-  height: 40vh;
-  /* border: 0.5px solid #18325E; */
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.first-line-item-right {
-  flex: 1;
-  border-bottom: 0.5px solid #18325e;
-  border-right: 1px solid #18325e;
-  text-align: center;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  padding-left: 1.5vw;
-}
-
-.right-line-box :first-child {
-  border-right: unset;
-}
-
-.right-title-box {
-  position: absolute;
-  top: 0;
-  text-align: center;
-  width: 100%;
-  line-height: 4vh;
-}
-
-/* echarts */
-#gfChart {
-  width: 100%;
-  height: 40vh;
-}
-
-.tag_box {
-  display: flex;
-  padding: 3vw;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium);
-}
-
-.but_box {
-  text-align: center;
-}
-
-.but_box>span {
-  display: inline-block;
-  padding: 1.5vw 3vw;
-  margin: 0 1.5vw;
-  border-radius: 5px;
-  background-image: linear-gradient(to top, #015eea, #00c0fa);
-}
-</style>
diff --git a/src/pages/views/jqfx/jqAnsisy.vue b/src/pages/views/jqfx/jqAnsisy.vue
deleted file mode 100644
index 3799605..0000000
--- a/src/pages/views/jqfx/jqAnsisy.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <div style="padding-top: 14vw">
-    <TopNav navTitle="警情分析" />
-    <TopSelectTime @chenge:time="onSelectTime" />
-    <div class="jqfx_box">
-      <compareFx :timeActive="timeActive" :keyIndex="keyIndex" />
-      <!-- <van-tabs
-        v-model:active="active"
-        @click-tab="getNav"
-        title-active-color="rgb(60, 156, 255)"
-        color="rgb(60, 156, 255)"
-        :background="backgroundColor"
-        :title-inactive-color="inactive"
-      >
-        <van-tab title="对比分析">
-          <compareFx :timeActive="timeActive" :keyIndex="keyIndex" />
-        </van-tab>
-        <van-tab title="四高分析">
-          <fourTallFx :timeActive="timeActive" :keyIndex="keyIndex" />
-        </van-tab>
-        <van-tab title="专题分析">
-          <dqscFx :timeActive="timeActive" :keyIndex="keyIndex" />
-        </van-tab>
-      </van-tabs> -->
-      <!-- <u-tabs :list="navList" @click="getNav" :activeStyle="{color: '#fff'}"
-					:inactiveStyle="{color:'#7188AF'}"
-					itemStyle="display:flex;justify-content: space-around;padding-left:15px;padding-right:15px; height:42.5px;">
-				</u-tabs> -->
-      <!-- </van-sticky> -->
-    </div>
-  </div>
-</template>
-
-<script setup>
-import dqscFx from "./dqscFx.vue";
-import compareFx from "./compareFx.vue";
-import fourTallFx from "./fourTallFx.vue";
-import TopNav from "../../../components/topNav.vue";
-import TopSelectTime from "../../../components/topSelectTime.vue";
-import { onMounted, ref } from "vue";
-import { useRoute } from "vue-router";
-const keyIndex = ref(1);
-const active = ref(0);
-const backgroundColor = ref("#fff");
-const inactive = ref("#333");
-const timeActive = ref(0);
-// onActivated(() => {
-//   const route = useRoute();
-//   try {
-//     if (route.query.jqlx == "jmjq") {
-//       keyIndex.value++;
-//     }
-//   } catch (error) {}
-// });
-onMounted(() => {
-  if (getStorage("themeSetting") == "light") {
-    backgroundColor.value = "#fff";
-    inactive.value = "#333";
-  } else {
-    backgroundColor.value = "#041634";
-    inactive.value = "#fff";
-  }
-});
-function getNav(item) {
-  active.value = item.name;
-}
-function onSelectTime(val) {
-  timeActive.value = val;
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.jqfx_box {
-  padding-bottom: 2vw;
-}
-::v-deep .van-tabs__nav {
-  @include bg_color($background-color-theme);
-}
-::v-deep .van-tabs__nav--card {
-  margin: 0 1vw;
-}
-</style>
diff --git a/src/pages/views/jqfx/percent.vue b/src/pages/views/jqfx/percent.vue
deleted file mode 100644
index 380451a..0000000
--- a/src/pages/views/jqfx/percent.vue
+++ /dev/null
@@ -1,165 +0,0 @@
-<template>
-  <div class="container">
-    <div class="title-box">
-      <div class="one-box">
-        <div class="react-box onebg"></div>
-        <span>{{ day }}</span>
-      </div>
-      <div class="one-box">
-        <div class="react-box twobg"></div>
-        <span>{{ yesterday }}</span>
-      </div>
-    </div>
-    <div class="content-box" v-for="(item, index) in dataList" :key="index">
-      <div class="front-box">
-        <div class="top-span">{{ item.orgname }}</div>
-        <div class="bottom-tex" :style="{ color: item.hb <= 0 ? 'green' : 'red' }">
-          环比:{{ item.hb }}
-        </div>
-      </div>
-      <div class="center-box">
-        <div class="center-x">
-          <div class="line-box onebg" :style="'width:' +
-            (
-              item.count /
-              (item.count + item.count1 == 0 ? 1 : item.count + item.count1)
-            ).toFixed(2) *
-            100 +
-            '%;'
-            "></div>
-          <span>{{ item.count }}</span>
-        </div>
-        <div class="center-x">
-          <div class="line-box twobg" :style="'width:' +
-            (
-              item.count1 /
-              (item.count + item.count1 == 0 ? 1 : item.count + item.count1)
-            ).toFixed(2) *
-            100 +
-            '%;'
-            "></div>
-          <span>{{ item.count1 }}</span>
-        </div>
-      </div>
-      <div class="right-box">
-        <div>占比</div>
-        <span class="span-zhanb">{{ item.zb }}</span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { compare } from "../../../utils/tools.js";
-export default {
-  props: {
-    list: Array,
-    day: String,
-    yesterday: String,
-  },
-  watch: {
-    list: {
-      handler(val) {
-        for (let i = 0; i < val.length; i++) {
-          let item = val[i];
-          item.zb = (
-            (item.count / (item.count2 == 0 ? 1 : item.count2)) *
-            100
-          ).toFixed(2);
-          item.hb = item.count - item.count1;
-        }
-        this.dataList = val.sort(compare("zb", true));
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
-  data() {
-    return {
-      dataList: [],
-    };
-  },
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.title-box {
-  margin: 3vh 0;
-  width: 100vw;
-  display: flex;
-  justify-content: center;
-  @include font_color($font-color-theme);
-}
-
-.one-box {
-  display: flex;
-  margin-right: 2vw;
-  height: 4vw;
-  line-height: 4vw;
-}
-
-.react-box {
-  width: 8vw;
-  height: 4vw;
-  border-radius: 1vw;
-  margin-right: 1vw;
-}
-
-.onebg {
-  background: linear-gradient(#0bbafb, #4285ec);
-}
-
-.twobg {
-  background: linear-gradient(#98e05f, #0de3ac);
-}
-
-.content-box {
-  font-size: 11px;
-  margin: 3vw;
-  border-bottom: 1px dashed #224465;
-  display: flex;
-  padding-bottom: 2vw;
-  @include font_color($font-color-theme);
-}
-
-.center-x {
-  display: flex;
-  align-items: center;
-}
-
-.line-box {
-  /* width: 10vw; */
-  height: 2vw;
-  border-radius: 1vw;
-  margin-right: 1vw;
-}
-
-.front-box {
-  flex: 1;
-}
-
-.center-box {
-  flex: 3;
-}
-
-.right-box {
-  flex: 1;
-  margin-left: 2vw;
-  text-align: right;
-}
-
-.span-zhanb {
-  color: #ff7327;
-  font-size: 18px;
-  span-align: center;
-  line-height: 6vw;
-}
-
-.bottom-tex {
-  color: #e82929;
-  font-size: 11px;
-}
-</style>
diff --git a/src/pages/views/report/components/normalReport.vue b/src/pages/views/report/components/normalReport.vue
deleted file mode 100644
index 0cab1d2..0000000
--- a/src/pages/views/report/components/normalReport.vue
+++ /dev/null
@@ -1,1350 +0,0 @@
-<template>
-  <div class="container">
-    <van-config-provider :theme-vars="themeVars">
-      <van-form @submit="onSubmit">
-        <div class="title_tab">班次岗位</div>
-        <van-field v-model="normalForm.bcmc" required name="班次" is-link readonly label="班次" placeholder="请选择班次"
-          input-align="right" :rules="[{ required: true, message: '请选择班次' }]" @click="showbcPicker = true" />
-
-        <van-field readonly v-if="qzsj" v-model="qzsj" input-align="right" label="班次时段" />
-
-        <van-field v-if="normalForm.xffwlx === '2'" v-model="normalForm.kfdMc" name="picker" label="执勤岗"
-          input-align="right" is-link readonly placeholder="请选择执勤岗" @click="showkfdPicker = true"
-          :rules="[{ required: true, message: '请选择执勤岗' }]" />
-
-        <div class="title_tab">人员车辆</div>
-        <van-field v-model="normalForm.jzMc" name="选择警组" input-align="right" label="选择警组" is-link readonly
-          placeholder="请选择警组" :rules="[{ required: true, message: '请选择警组' }]" @click="showjzPicker = true" />
-
-        <van-field v-model="normalForm.fzrXm" required readonly input-align="right" name="picker" label="负责人"
-          placeholder="请选择负责人" @click="showfzrPicker = true" :rules="[{ required: true, message: '请选择负责人' }]" is-link />
-
-        <van-cell class="mulSelect" title="民警" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('mj')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.mj" :key="index">
-                <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'mj')" plain>{{ item.text
-                  }}</van-tag>
-                <!-- <van-badge>
-                  <van-tag color="#7232dd" plain>{{ item.text }}</van-tag>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'mj')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <van-cell class="mulSelect" title="辅警" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('fj')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.fj" :key="index">
-                <van-tag closeable @close="deleteCheckTag(item, index, 'fj')" color="#7232dd" plain>{{ item.text
-                  }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'fj')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <div class="title_tab">装备</div>
-        <van-cell class="mulSelect" title="智能装备" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('zn')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.zn" :key="index">
-                <van-tag closeable @close="deleteCheckTag(item, index, 'zn')" color="#7232dd" plain>{{ item.text ||
-                  item.sbmc }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'zn')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <van-cell class="mulSelect" title="警用器械" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('jy')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.jy" :key="index">
-                <van-tag closeable @close="deleteCheckTag(item, index, 'jy')" color="#7232dd" plain>{{ item.text ||
-                  item.qxmc }} * {{ item.qxsl }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'jy')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <div class="title_tab">巡逻</div>
-        <van-cell class="mulSelect" title="巡防车辆" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('cl')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.cl" :key="index">
-                <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'cl')" plain>{{ item.text ||
-                  item.jdchphm }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'cl')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <van-field class="change" name="radio" label="巡逻方式">
-          <template #input>
-            <van-radio-group v-model="normalForm.xlfs" direction="horizontal" :disabled="disable">
-              <van-radio shape="square" checked-color="#3e6ee8" name="1">步巡</van-radio>
-              <van-radio shape="square" checked-color="#3e6ee8" name="0">车巡</van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-field class="change" name="radio" label="着装类型">
-          <template #input>
-            <van-radio-group v-model="normalForm.zzlx" direction="horizontal" :disabled="disable">
-              <van-radio shape="square" checked-color="#3e6ee8" name="0">制服</van-radio>
-              <van-radio shape="square" checked-color="#3e6ee8" name="1">便衣</van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-field class="change" name="radio" label="武装类型">
-          <template #input>
-            <van-radio-group v-model="normalForm.wzlx" direction="horizontal" :disabled="disable">
-              <van-radio shape="square" checked-color="#3e6ee8" name="0">武装</van-radio>
-              <van-radio shape="square" checked-color="#3e6ee8" name="1">非武装</van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-row>
-          <van-col span="24">
-            <van-field rows="3" type="textarea" v-model="normalForm.bz" name="备注" placeholder="备注信息" />
-          </van-col>
-        </van-row>
-        <div v-if="route.query.zt == 0" style="margin: 16px 0; padding: 0 5vw">
-          <van-button :loading="loading" round @click="submit" block type="primary">
-            开始报备
-          </van-button>
-        </div>
-        <div style="padding: 0 5vw" v-else>
-          <van-button style="margin: 16px 0" :loading="loading" round @click="editFn(1)" block type="primary">
-            修改
-          </van-button>
-          <van-button style="margin: 16px 0" :loading="loading" round @click="editFn(0)" block type="success">
-            结束报备
-          </van-button>
-        </div>
-      </van-form>
-    </van-config-provider>
-    <!-- 班次 -->
-    <van-popup v-model:show="showbcPicker" position="bottom">
-      <van-picker :columns="bcList" @confirm="onbcConfirm" @cancel="showbcPicker = false" />
-    </van-popup>
-    <van-popup v-model:show="showksPicker" position="bottom">
-      <van-datetime-picker v-model="normalForm.ksTime" type="time" title="选择时间" :min-hour="0" :max-hour="23"
-        @confirm="onksConfirm" @change="ksChange" @cancel="showksPicker = false" />
-    </van-popup>
-    <van-popup v-model:show="showjsPicker" position="bottom">
-      <van-datetime-picker v-model="normalForm.jsTime" type="time" title="选择时间" :min-hour="0" :max-hour="23"
-        @confirm="onjsConfirm" @change="jsChange" @cancel="showjsPicker = false" />
-    </van-popup>
-    <van-popup v-model:show="showxfqPicker" position="bottom">
-      <van-picker :columns="list.xfqList" :columns-field-names="filedxfqNames" @confirm="onxfqConfirm"
-        @cancel="showxfqPicker = false" />
-    </van-popup>
-    <van-popup v-model:show="showkfdPicker" position="bottom">
-      <van-picker :columns="list.kfdList" :columns-field-names="filedkfdNames" @confirm="onkfdConfirm"
-        @cancel="showkfdPicker = false" />
-    </van-popup>
-    <!-- 警组 -->
-    <van-popup v-model:show="showjzPicker" position="bottom">
-      <van-picker :columns="list.jzList" :columns-field-names="customJzFieldName" @confirm="onjzConfirm"
-        @cancel="showjzPicker = false" />
-    </van-popup>
-    <!-- 负责人 -->
-    <van-popup v-model:show="showfzrPicker" position="bottom">
-      <van-search v-model="list.phone" placeholder="请输入负责人电话号码" @update:model-value="getMJList()" />
-      <van-picker :columns="list.fzrList" @confirm="onfzrConfirm" @cancel="showfzrPicker = false"
-        :columns-field-names="customfzrFieldNamed" />
-    </van-popup>
-    <van-popup v-model:show="selfDefinedPopup" :style="{ width: '80%' }">
-      <div class="popupTitle">{{ popupTitle }}</div>
-      <van-search v-model="list.text" :placeholder="`请输入`" @update:model-value="getJYList(popupTitle)" />
-      <div class="check-data-box">
-        <van-checkbox-group v-model="checkedList">
-          <van-cell-group inset>
-            <van-cell v-for="(item, index) in list.mulChooseList" clickable :key="item" :title="`${item.text}`">
-              <template #right-icon>
-                <van-checkbox :name="item.text" :ref="(el) => (checkboxRefs[index] = el)"
-                  @click="toggle(item, index)" />
-              </template>
-              <template #label v-if="popupTitle === '选择警用器械'">
-                数量：
-                <van-stepper @change="changeTo(item, index)" v-model="item.sl" integer />
-              </template>
-            </van-cell>
-          </van-cell-group>
-        </van-checkbox-group>
-      </div>
-      <div class="popbtn-box">
-        <van-button style="flex: 1" type="default" size="small" @click="selfDefinedPopup = false">取消
-        </van-button>
-        <van-button style="flex: 1" type="primary" size="small" @click="popSure">确定</van-button>
-      </div>
-    </van-popup>
-    <van-popup v-model:show="showtsfaPicker" position="bottom">
-      <van-search v-model="list.famc" placeholder="请输入申请人" @update:model-value="getPoliceList" />
-      <van-picker :columns="list.tsfaList" :columns-field-names="customFieldtsfaName" @confirm="ontsfaConfirm"
-        @cancel="showtsfaPicker = false" />
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import { getItem } from "../../../../utils/storage";
-import {
-  selectDeckList,
-  addXFBB,
-  editXFBB,
-  queryJzList,
-  tbJcglXfll,
-  getQwdj,
-  getQwbc,
-  getXfq,
-  getPbinfo,
-  getBbinfo,
-  getKfdInfo,
-} from "../../../../api/report.js";
-import {
-  selectNextPage,
-  sysUser,
-  getZnzb,
-  selectJyqx,
-  getXfclList,
-  selectKfdList,
-} from "../../../../api/patrolBasicInfo";
-import {
-  getBxdList,
-  getMybbToday,
-  getMybbTodayNew,
-  getMyXfpbToday,
-  getBcxx,
-  getKfd,
-  getXfqs,
-  getXlfa,
-  finishReport,
-} from "../../../../api/common";
-import { timeFormat } from "../../../../utils/index";
-import { computed, ref, reactive, onMounted, watch } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { hintToast } from "../../../../utils/tools.js";
-//主题色
-const themeType = ref(getStorage("themeSetting"));
-const themeVars = ref({
-  cellBackgroundColor: themeType.value == "light" ? "#fff" : "#041634",
-  fieldInputTextColor: themeType.value == "light" ? "#333" : "#fff",
-  fieldLabelColor: themeType.value == "light" ? "#333" : "#fff",
-  cellTextColor: themeType.value == "light" ? "#333" : "#fff",
-  radioLabelColor: themeType.value == "light" ? "#333" : "#fff",
-  cellBorderColor: themeType.value == "light" ? "#dbdbdb" : "#001e6b",
-});
-const router = useRouter();
-const route = useRoute();
-const userInfo = getItem("userInfo");
-const qzsj = ref("");
-const normalForm = reactive({
-  bbzt: "0",
-  xfrq: timeFormat(new Date()),
-  xlfs: "1",
-  zzlx: "1",
-  wzlx: "2",
-  qwdjLabel: "",
-  qwdj: "",
-  startEndDate: "",
-  ksDate: "",
-  jsDate: "",
-  ksTime: "",
-  jsTime: "",
-  kssj: "",
-  jssj: "",
-  jzLabel: "",
-  jzMc: "",
-  jzId: "",
-  xfbmLabel: "",
-  xfbm: "",
-  xfbmdm: "",
-  ssbm: userInfo.deptName,
-  ssbmdm: userInfo.deptList[0].deptCode,
-  fzrXm: "",
-  fzrSfzh: "",
-  fzrLxdh: "",
-  fzrId: "",
-  znzbList: [],
-  jyqxList: [],
-  clList: [],
-  jlList: [],
-  bz: "",
-  jgts: 0,
-  bcmc: "",
-  xfbm: "",
-  xfbmdm: "",
-  xffwid: "",
-  xffwlx: "",
-  xlfaLx: "01", //巡逻方案xlfaLx
-  xfqMc: "",
-  kfdMc: "",
-  xlfaMc: "",
-  xlfaId: "",
-  famc: "",
-  bbzt: "",
-});
-const list = reactive({
-  columns: [],
-  jzList: [],
-  ssbmList: [],
-  fzrList: [],
-  phone: "",
-  fzrTotal: 0,
-  mjList: [],
-  fjList: [],
-  fjXm: "",
-  mjXm: "",
-  zbList: [],
-  jyqxList: [],
-  clList: [],
-  cph: "",
-  sbmc: "",
-  qxMc: "",
-  text: "",
-  mulChooseList: [],
-  mj: [],
-  fj: [],
-  zn: [],
-  jy: [],
-  cl: [],
-  scoutsRangeList: [
-    {
-      text: "巡防区",
-      value: "巡防区",
-      children: [],
-    },
-    {
-      text: "执勤岗",
-      value: "执勤岗",
-      children: [],
-    },
-  ],
-  xfqList: [],
-  kfdList: [],
-  rcfaList: [],
-  tsfaList: [],
-  bxdMc: "",
-  famc: "",
-});
-function getPbxx() {
-  const id = route.query.bbid;
-  if (route.query.zt == 1) {
-    getBbinfo(id).then((res) => {
-      qzsj.value = res.kssj + "-" + res.jssj;
-      const data = res;
-      getBcxxList(data.qwbcId);
-      normalForm.qwbcId = data.qwbcId;
-      normalForm.kssj = data.kssj;
-      normalForm.jssj = data.jssj;
-      normalForm.jzMc = data.jzMc;
-      normalForm.jzId = data.jzId;
-      normalForm.id = data.id;
-      normalForm.jh = data.jh;
-      normalForm.fzrXm = data.fzrXm;
-      normalForm.fzrSfzh = data.fzrSfzh;
-      normalForm.fzrLxdh = data.fzrLxdh;
-      normalForm.fzrId = data.fzrId;
-      normalForm.bblx = data.bblx;
-      normalForm.xlfs = data.xlfs;
-      normalForm.zzlx = data.zzlx;
-      normalForm.wzlx = data.wzlx;
-      // normalForm.xlfaLx=data.xlfaLx
-      list.mj = data.jlList
-        .filter((item) => item.jllx == "01")
-        .map((item) => {
-          return { ...item, text: item.jlxm };
-        });
-      list.fj = data.jlList
-        .filter((item) => item.jllx == "02")
-        .map((item) => {
-          return { ...item, text: item.jlxm };
-        });
-      list.zn = data.znzbList;
-      list.jy = data.jyqxList;
-      list.cl = data.clList;
-      normalForm.xffwid = data.xffwid;
-      normalForm.xffwlx = "2";
-      // 查询快返点的详细信息
-      getKfdInfo({ id: data.xffwid }).then((res) => {
-        normalForm.kfdMc = res.kfdMc;
-      });
-    });
-  } else {
-    getPbinfo(route.query.pbid).then((res) => {
-      qzsj.value = res.kssj + "-" + res.jssj;
-      const data = res;
-      getBcxxList(data.qwbcId);
-      normalForm.qwbcId = data.qwbcId;
-      normalForm.id = data.id;
-      normalForm.kssj = data.kssj;
-      normalForm.jssj = data.jssj;
-      normalForm.jzMc = data.jzMc;
-      normalForm.jzId = data.jzId;
-      normalForm.jh = data.jh;
-      normalForm.fzrXm = data.fzrXm;
-      normalForm.fzrSfzh = data.fzrSfzh;
-      normalForm.fzrLxdh = data.fzrLxdh;
-      normalForm.fzrId = data.fzrId;
-      normalForm.bblx = data.bblx;
-      normalForm.xlfs = data.xlfs;
-      normalForm.zzlx = data.zzlx;
-      normalForm.wzlx = data.wzlx;
-      // normalForm.xlfaLx=data.xlfaLx
-      list.mj = data.jlList
-        .filter((item) => item.jllx == "01")
-        .map((item) => {
-          return { ...item, text: item.jlxm };
-        });
-      list.fj = data.jlList
-        .filter((item) => item.jllx == "02")
-        .map((item) => {
-          return { ...item, text: item.jlxm };
-        });
-      list.zn = data.znzbList;
-      list.jy = data.jyqxList;
-      list.cl = data.clList;
-      normalForm.xffwid = data.xffwid;
-      normalForm.xffwlx = "2";
-      // 查询快返点的详细信息
-      getKfdInfo({ id: data.xffwid }).then((res) => {
-        normalForm.kfdMc = res.kfdMc;
-      });
-    });
-  }
-}
-onMounted(() => {
-  // getIsReport();
-  getXUJZList();
-  getDepts();
-  getMJList();
-  getFj();
-  getMJ();
-  getznzbs();
-  getJyqx();
-  getCl();
-  getQwLevel();
-  getQwbcList();
-  getSourtRange();
-  getFaList();
-  getPbxx();
-});
-// 判断已报备还是未报备
-function getIsReport() {
-  let flag = route.query.reportTitle;
-  if (route.query.reportType === "01") {
-    if (flag === "报备") {
-      getMyXfpbToday().then((res1) => {
-        normalForm.bbzt = "0";
-        normalForm.ksTime = res1.kssj;
-        normalForm.jsTime = res1.jssj;
-        normalForm.fzrXm = res1.fzrXm;
-        normalForm.fzrId = res1.fzrId;
-        normalForm.jzMc = res1.jzMc;
-        normalForm.wzlx = res1.wzlx;
-        normalForm.xffwlx = res1.xffwlx;
-        normalForm.jzId = res1.jzId;
-        normalForm.qwbcId = res1.pbId;
-        normalForm.xffwid = res1.xffwid;
-        normalForm.zqsc = res1.zqsc;
-        normalForm.xfrq = timeFormat(new Date());
-        getXffwList(res1.xffwid);
-        normalForm.xlfs = res1.xlfs;
-        normalForm.fzrLxdh = res1.fzrLxdh;
-        normalForm.fzrSfzh = res1.fzrSfzh;
-        normalForm.bz = res1.bz;
-        normalForm.kssj = res1.kssj;
-        normalForm.jssj = res1.jssj;
-        normalForm.jd = "104.13407";
-        normalForm.wd = "29.99572";
-        // normalForm.xlfaMc = res1.xlfaMc
-        normalForm.famc = res1.xlfaMc;
-        normalForm.xlfaLx = res1.xlfaLx ? res1.xlfaLx : "01";
-        normalForm.xlfaId = res1.xlfaId;
-        if (normalForm.xlfaLx === "02") {
-          normalForm.xlfaMc = res1.xlfaMc;
-        }
-        getBcxxList(res1.qwbcId);
-        list.cl = JSON.parse(res1.pbcl);
-        if (list.cl.length > 0) {
-          normalForm.xlfs = "0";
-        }
-        list.cl.forEach((ele) => {
-          ele.text = ele.jdchphm;
-        });
-        list.fj = JSON.parse(res1.pbfj);
-        list.fj.forEach((f) => {
-          f.text = f.jlxm;
-        });
-        list.mj = JSON.parse(res1.pbmj);
-        list.mj.forEach((m) => {
-          m.text = m.jlxm;
-        });
-        list.zn = JSON.parse(res1.txzb);
-        list.zn.forEach((m) => {
-          m.text = m.sbmc;
-        });
-        list.jy = JSON.parse(res1.jyqx);
-        list.jy.forEach((m) => {
-          m.text = m.qxmc;
-          m.qxsl = m.sl;
-        });
-      });
-    } else if (flag === "已报备") {
-      getMybbTodayNew().then((res2) => {
-        getBcxxList(res2.qwbcId);
-        normalForm.xffwlx = res2.xffwlx;
-        normalForm.xffwid = res2.xffwid;
-        getXffwList(res2.xffwid);
-        normalForm.id = res2.id;
-        normalForm.ksTime = res2.bbkssj ? res2.bbkssj.split(" ")[1] : "";
-        normalForm.jsTime = res2.bbjssj ? res2.bbjssj.split(" ")[1] : "";
-        normalForm.fzrXm = res2.fzrXm;
-        normalForm.fzrId = res2.fzrId;
-        normalForm.jzMc = res2.jzMc;
-        normalForm.bz = res2.bz;
-        normalForm.famc = res2.xlfaMc;
-        normalForm.xlfaLx = res2.xlfaLx ? res2.xlfaLx : "01";
-        normalForm.xlfaId = res2.xlfaId;
-        normalForm.kssj = res2.kssj;
-        normalForm.jssj = res2.jssj;
-        normalForm.jzId = res2.jzId;
-        normalForm.xfpbId = res2.qwbcId;
-        normalForm.zqsc = res2.zqsc;
-        normalForm.jd = "104.13407";
-        normalForm.wd = "29.99572";
-        normalForm.xfrq = timeFormat(new Date());
-        // normalForm.xlfaMc = res2.xlfaMc
-        if (res2.xlfaLx === "02") {
-          normalForm.xlfaMc = res2.xlfaMc;
-        }
-        list.cl = JSON.parse(res2.pbcl);
-        if (list.cl.length > 0) {
-          normalForm.xlfs = "0";
-        }
-        list.cl.forEach((ele) => {
-          ele.text = ele.jdchphm;
-        });
-        list.fj = JSON.parse(res2.pbfj);
-        list.fj.forEach((f) => {
-          f.text = f.jlxm;
-        });
-        list.mj = JSON.parse(res2.pbmj);
-        list.mj.forEach((m) => {
-          m.text = m.jlxm;
-        });
-        list.zn = JSON.parse(res2.txzb);
-        list.zn.forEach((m) => {
-          m.text = m.sbmc;
-        });
-        list.jy = JSON.parse(res2.jyqx);
-        list.jy.forEach((m) => {
-          m.text = m.qxmc;
-          m.qxsl = m.qxsl;
-        });
-        normalForm.wzlx = res2.wzlx;
-        normalForm.xffwlx = res2.xffwlx;
-        normalForm.xlfs = res2.xlfs;
-        normalForm.xffwid = res2.xffwid;
-      });
-    }
-  }
-}
-watch(normalForm.xlfaLx, (newVal) => {
-  if (newVal === "01") {
-    normalForm.xlfaMc = normalForm.xfqMc;
-  }
-});
-// 查询班次信息
-function getBcxxList(val) {
-  getBcxx(val).then((res) => {
-    normalForm.bcmc = res.bcmc ? res.bcmc : "";
-  });
-}
-// 查询巡防范围通过id查询
-function getXffwList(val) {
-  if (normalForm.xffwlx === "1") {
-    getXfqs({
-      id: val,
-    }).then((res) => {
-      normalForm.xfqMc = res.xfqMc;
-      if (normalForm.xlfaLx === "01") {
-        normalForm.xlfaMc = normalForm.xfqMc;
-      }
-    });
-  } else if (normalForm.xffwlx === "2") {
-    getKfd({
-      id: val,
-    }).then((res) => {
-      normalForm.kfdMc = res.kfdMc;
-    });
-  }
-}
-// 勤务等级
-const showqwPicker = ref(false);
-
-function getQwLevel() {
-  getQwdj({
-    pageSize: 200,
-    pageCurrent: 1,
-    fbzt: 1,
-  }).then((res) => {
-    qwdjList.value = res.records;
-    qwdjList.value.forEach((item) => {
-      if (item.qwdj === "01") {
-        item.text = "一级勤务";
-      } else if (item.qwdj === "02") {
-        item.text = "二级勤务";
-      } else if (item.qwdj === "03") {
-        item.text = "三级勤务";
-      } else if (item.qwdj === "04") {
-        item.text = "日常勤务";
-      }
-    });
-  });
-}
-const qwdjList = ref([]);
-
-function onqwConfirm(value) {
-  normalForm.qwdjLabel = value.text;
-  normalForm.qwdj = value.value;
-  showqwPicker.value = false;
-}
-// 选择勤务班次
-const showbcPicker = ref(false);
-
-function onbcConfirm(val) {
-  qzsj.value = val.kssj + "-" + val.jssj;
-  normalForm.bcmc = val.bcmc;
-  normalForm.qwbcId = val.id;
-  normalForm.zqsc = val.zqsc;
-  normalForm.ksTime = val.kssj;
-  normalForm.kssj = val.kssj;
-  normalForm.jssj = val.jssj;
-  normalForm.jsTime = val.jssj;
-  showbcPicker.value = false;
-}
-const bcList = ref([]);
-
-function getQwbcList() {
-  getQwbc({
-    pageSize: 200,
-    pageCurrent: 1,
-    bcmc: "",
-    bclx: "02",
-  }).then((res) => {
-    bcList.value = res.records;
-    bcList.value.forEach((item) => {
-      item.text = item.bcmc;
-    });
-  });
-}
-// 开始结束日期
-const calendarShow = ref(false);
-
-function onCalendarConfirm(values) {
-  // normalForm.startEndDate = timeFormat(values[0]) + '至' + timeFormat(values[1])
-  // normalForm.ksDate = timeFormat(values[0])
-  // normalForm.jsDate = timeFormat(values[1])
-  normalForm.xfrq = timeFormat(values) + " " + "00:00:00";
-  calendarShow.value = false;
-}
-// 开始时间
-const showksPicker = ref(false);
-
-function onksConfirm(val) {
-  normalForm.kssj = val + ":" + "00";
-  // normalForm.kssj = normalForm.ksDate + ' ' + normalForm.ksTime
-  showksPicker.value = false;
-}
-
-function ksChange(val) {
-  normalForm.kssj = val + ":" + "00";
-}
-// 结束时间
-const showjsPicker = ref(false);
-
-function onjsConfirm(val) {
-  normalForm.jssj = val + ":" + "00";
-  // normalForm.jssj = normalForm.jsDate + ' ' + normalForm.jsTime
-  showjsPicker.value = false;
-}
-
-function jsChange(val) {
-  normalForm.jssj = val + ":" + "00";
-}
-// 巡防范围
-const showsrPicker = ref(false);
-
-function onsrChange(value) {
-  normalForm.xffwid =
-    value.selectedOptions[value.selectedOptions.length - 1].id;
-  normalForm.xffwlx = value.selectedOptions[0].text;
-}
-// 选择警组
-const showjzPicker = ref(false);
-
-function onjzConfirm(val) {
-  list.mj = [];
-  list.fj = [];
-  list.cl = [];
-  list.zn = [];
-  list.jy = [];
-  normalForm.jzMc = val.jzMc;
-  normalForm.jzId = val.id;
-  normalForm.fzrXm = val.ddMjxm;
-  normalForm.fzrLxdh = val.ddDh;
-  normalForm.fzrSfzh = val.ddMjsfzh;
-  normalForm.fzrId = val.ddMjid;
-  // normalForm.xbdm = val.
-  normalForm.jh = val.ddMjjh;
-  normalForm.ssbm = val.ssbm;
-  normalForm.ssbmdm = val.ssbmdm;
-  // 民警辅警已有赋值
-  val.jzryList.forEach((m) => {
-    if (m.jllx === "01") {
-      list.mj.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xbdm: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-    if (m.jllx === "02") {
-      list.fj.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xbdm: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-  });
-  // 车辆
-  if (val.clList.length > 0) {
-    normalForm.xlfs = "0";
-    val.clList.forEach((c) => {
-      list.cl.push({
-        clId: c.clId,
-        jdchphm: c.jdchphm,
-        text: c.jdchphm,
-        jdchpzldm: c.jdchpzldm,
-        qwjzId: c.qwjzId,
-      });
-    });
-  }
-
-  // 警用器械
-  val.jyqxList.forEach((j) => {
-    list.jy.push({
-      qxid: j.qxid,
-      qxmc: j.qxmc,
-      text: j.qxmc,
-      qxsl: j.sl ? j.sl : 1,
-      qxlx: j.qxlx,
-      qwjzId: j.qwjzId,
-    });
-  });
-  // 智能装备
-  val.txzbList.forEach((z) => {
-    list.zn.push({
-      sbmc: z.sbmc,
-      text: z.sbmc,
-      txzblx: z.txzblx,
-      txzbId: z.zbId,
-      qwjzId: z.qwjzId,
-      hh: z.hh,
-    });
-  });
-  showjzPicker.value = false;
-}
-const customJzFieldName = {
-  text: "jzMc",
-};
-// 查询警组
-function getXUJZList() {
-  queryJzList({
-    pageSize: 20,
-    pageCurrent: 1,
-  }).then((res) => {
-    list.jzList = res.records;
-  });
-}
-// 巡防部门
-const showxfPicker = ref(false);
-
-function onxfConfirm(val) {
-  showxfPicker.value = false;
-}
-const customFieldNamed = {
-  text: "orgName",
-  value: "orgName",
-  children: "childDeptList",
-};
-const showbmPicker = ref(false);
-
-function onChange(value, selectedOptions) {
-  normalForm.ssbmdm =
-    value.selectedOptions[value.selectedOptions.length - 1].id;
-}
-// 查询部门
-function getDepts() {
-  selectNextPage({}).then((res) => {
-    list.ssbmList = [res.records[0]];
-  });
-}
-// 选择负责人
-const showfzrPicker = ref(false);
-
-function onfzrConfirm(val) {
-  normalForm.fzrXm = val.loginName;
-  normalForm.fzrSfzh = val.idEntityCard;
-  normalForm.fzrLxdh = val.mobile;
-  normalForm.fzrId = val.id;
-  normalForm.xbdm = val.sex;
-  showfzrPicker.value = false;
-}
-const customfzrFieldNamed = {
-  text: "loginName",
-};
-// 查询负责人
-function getMJList() {
-  sysUser({
-    current: 1,
-    size: 50,
-    phone: list.phone,
-  }).then((res) => {
-    list.fzrList = res.records;
-    list.fzrTotal = res.total;
-  });
-}
-
-// 查询民警辅警 智能装备 警用器械 巡防车辆
-function getJYList(val) {
-  switch (val) {
-    case "选择民警":
-      list.mjXm = list.text;
-      getMJ();
-      list.mulChooseList = list.mjList;
-      break;
-    case "选择辅警":
-      list.fjXm = list.text;
-      getFj();
-      list.mulChooseList = list.fjList;
-      break;
-    case "选择智能装备":
-      list.sbmc = list.text;
-      getznzbs();
-      list.mulChooseList = list.zbList;
-      break;
-    case "选择警用器械":
-      list.qxMc = list.text;
-      getJyqx();
-      list.mulChooseList = list.jyqxList;
-      break;
-    case "选择巡防车辆":
-      list.cph = list.text;
-      getCl();
-      list.mulChooseList = list.clList;
-      break;
-  }
-}
-// 民警
-function getMJ() {
-  tbJcglXfll({
-    pageCurrent: 1,
-    pageSize: 50,
-    fl: "01", // 民警
-    xm: list.mjXm,
-  }).then((res) => {
-    list.mjList = res.records;
-    list.mjList.forEach((item) => {
-      item.text = item.xm;
-    });
-  });
-}
-// 辅警
-function getFj() {
-  tbJcglXfll({
-    pageCurrent: 1,
-    pageSize: 50,
-    fl: "02", // 辅警
-    xm: list.fjXm,
-  }).then((res) => {
-    list.fjList = res.records;
-    list.fjList.forEach((item) => {
-      item.text = item.xm;
-    });
-  });
-}
-// 智能装备
-function getznzbs() {
-  // 智能装备
-  getZnzb({
-    pageNo: 1,
-    pageSize: 50,
-    sbmc: list.sbmc,
-  }).then((res) => {
-    list.zbList = res.records;
-    list.zbList.forEach((item) => {
-      item.text = item.sbmc;
-    });
-  });
-}
-
-function getJyqx() {
-  // 警用器械
-  selectJyqx({
-    pageNo: 1,
-    pageSize: 50,
-    qxMc: list.qxMc,
-  }).then((res) => {
-    list.jyqxList = res.records;
-    list.jyqxList.forEach((item) => {
-      item.text = item.qxMc;
-      item.jysl = 1;
-    });
-  });
-}
-
-function getCl() {
-  // 巡防车辆
-  getXfclList({
-    pageCurrent: 1,
-    pageSize: 50,
-    cph: list.cph,
-  }).then((res) => {
-    list.clList = res.records;
-    list.clList.forEach((item) => {
-      item.text = item.cph;
-    });
-  });
-}
-// 弹框标题
-const checkList = reactive({});
-const checkedList = ref([]);
-const checkboxRefs = ref([]);
-const popupTitle = ref("");
-const selfDefinedPopup = ref(false);
-
-function showDialogfn(val) {
-  list.text = "";
-  switch (val) {
-    case "mj":
-      popupTitle.value = "选择民警";
-      checkedList.value = list.mj.map((el) => el.text);
-      list.mulChooseList = list.mjList;
-      break;
-    case "fj":
-      popupTitle.value = "选择辅警";
-      checkedList.value = list.fj.map((el) => el.text);
-      list.mulChooseList = list.fjList;
-      break;
-    case "zn":
-      popupTitle.value = "选择智能装备";
-      checkedList.value = list.zn.map((el) => el.text);
-      list.mulChooseList = list.zbList;
-      break;
-    case "jy":
-      popupTitle.value = "选择警用器械";
-      // if (list.jy && list.jy.length > 0) {
-      checkedList.value = list.jy.map((el) => el.text);
-      list.mulChooseList = list.jyqxList;
-      // }
-      break;
-    case "cl":
-      popupTitle.value = "选择巡防车辆";
-      checkedList.value = list.cl.map((el) => el.text);
-      list.mulChooseList = list.clList;
-      break;
-  }
-  selfDefinedPopup.value = true;
-}
-
-function popSure() {
-  selfDefinedPopup.value = false;
-}
-function changeTo(item, index) {
-  list.jy[list.jy.map((e) => e.text).indexOf(item.text)].qxsl = item.sl;
-}
-const toggle = (item, index) => {
-  switch (popupTitle.value) {
-    case "选择民警":
-      if (!list.mj.map((m) => m.jlId).includes(item.ryid)) {
-        list.mj.push({
-          jh: item.jh,
-          jllx: item.fl,
-          jlxm: item.xm,
-          sfzh: item.sfzh,
-          xm: item.xm,
-          lxdh: item.lxdh,
-          xbdm: item.xbdm,
-          jlzt: "1",
-          id: item.ryid,
-          text: item.xm,
-          nl: 0,
-          qwjzId: "",
-          jlId: item.ryid,
-        });
-      } else {
-        list.mj.splice(list.mj.map((m1) => m1.jlxm).indexOf(item.jlxm), 1);
-      }
-      break;
-    case "选择辅警":
-      if (!list.fj.map((f) => f.jlId).includes(item.ryid)) {
-        list.fj.push({
-          jh: item.jh,
-          jllx: item.fl,
-          jlxm: item.xm,
-          text: item.xm,
-          id: item.id,
-          sfzh: item.sfzh,
-          xm: item.xm,
-          jlzt: "1",
-          lxdh: item.lxdh,
-          xbdm: item.xbdm,
-          nl: 0,
-          qwjzId: "",
-          jlId: item.id,
-        });
-      } else {
-        list.fj.splice(list.fj.map((f1) => f1.jlxm).indexOf(item.jlxm), 1);
-      }
-      break;
-    case "选择智能装备":
-      if (!list.zn.map((z) => z.text).includes(item.text)) {
-        list.zn.push({
-          sbmc: item.sbmc,
-          text: item.sbmc,
-          txzblx: item.scode,
-          txzbId: item.id,
-          hh: item.sbbh,
-        });
-      } else {
-        list.zn.splice(list.zn.map((f1) => f1.text).indexOf(item.text), 1);
-      }
-      break;
-    case "选择警用器械":
-      if (!list.jy.map((j) => j.text).includes(item.text)) {
-        list.jy.push({
-          qxid: item.id,
-          qxmc: item.qxMc,
-          text: item.qxMc,
-          qxsl: item.sl ? item.sl : 1,
-          qxlx: item.scode,
-        });
-      } else {
-        list.jy.splice(list.jy.map((f1) => f1.text).indexOf(item.text), 1);
-      }
-      if (item.scode === "01") {
-        normalForm.wzlx = "1";
-      }
-      break;
-    case "选择巡防车辆":
-      if (!list.cl.map((c) => c.clId).includes(item.cid)) {
-        list.cl.push({
-          clId: item.cid,
-          jdchphm: item.cph,
-          text: item.cph,
-          jdchpzldm: item.cllx,
-        });
-        normalForm.xlfs = "0";
-      } else {
-        list.cl.splice(list.cl.map((f1) => f1.text).indexOf(item.text), 1);
-      }
-      break;
-  }
-};
-
-function deleteCheckTag(item, index, val) {
-  switch (val) {
-    case "mj":
-      list.mj.splice(index, 1);
-      break;
-    case "fj":
-      list.fj.splice(index, 1);
-      break;
-    case "zn":
-      list.zn.splice(index, 1);
-      break;
-    case "jy":
-      list.jy.splice(index, 1);
-      list.jyqxList.forEach((el) => {
-        if (el.id === item.qxid) {
-          el.qxsl = 1;
-        }
-      });
-      if (!list.jy.map((j) => j.scode).includes("01")) {
-        normalForm.wzlx = "2";
-      }
-      break;
-    case "cl":
-      list.cl.splice(index, 1);
-      if (list.cl == false) {
-        normalForm.xlfs = "1";
-      }
-      break;
-  }
-}
-// 查询巡防范围
-function getSourtRange() {
-}
-
-// 日常方案
-const customFieldqjxmName = {
-  text: "bxdMc",
-};
-const showrcfaPicker = ref(false);
-
-function onrcfaConfirm(val) {
-  normalForm.xlfaMc = val.bxdMc;
-  normalForm.xlfaId = val.id;
-  showrcfaPicker.value = false;
-}
-
-function getFaList() {
-  getBxdList({
-    pageSize: 50,
-    pageCurrent: 1,
-    bxdMc: list.bxdMc,
-  }).then((res) => {
-    list.rcfaList = res.records;
-  });
-  getXlfa({
-    pageSize: 50,
-    pageCurrent: 1,
-    famc: list.famc,
-  }).then((res) => {
-    list.tsfaList = res.records;
-  });
-}
-// 特殊方案
-const showtsfaPicker = ref(false);
-const customFieldtsfaName = {
-  text: "famc",
-};
-
-function ontsfaConfirm(val) {
-  normalForm.xlfaMc = val.famc;
-  normalForm.xlfaId = val.id;
-  showtsfaPicker.value = false;
-}
-// 巡防区
-const filedxfqNames = {
-  text: "xfqMc",
-};
-const showxfqPicker = ref(false);
-
-function onxfqConfirm(val) {
-  normalForm.xfqMc = val.xfqMc;
-  normalForm.xffwid = val.id;
-  normalForm.xlfaMc = val.xfqMc;
-  showxfqPicker.value = false;
-}
-// 执勤岗
-const filedkfdNames = {
-  text: "",
-};
-const showkfdPicker = ref(false);
-
-function onkfdConfirm(val) {
-  normalForm.kfdMc = val.kfdMc;
-  normalForm.xffwid = val.id;
-  showkfdPicker.value = false;
-}
-
-// 新增报备接口
-function submit() {
-  // if (route.query.reportTitle === "报备") {
-  if (route.query.zt == 0) {
-    normalForm.jlList = [...list.mj, ...list.fj];
-    normalForm.clList = list.cl;
-    normalForm.jyqxList = list.jy;
-    normalForm.znzbList = list.zn;
-    normalForm.bblx = "01";
-    addXFBB(normalForm).then((res) => {
-      finishReport({
-        bbzt: "0",
-        id: res,
-      }).then((res) => { });
-      router.go(-1);
-    });
-    // } else if (route.query.reportTitle === "已报备") {
-  } else if (route.query.zt == 0) {
-    finishReport({
-      bbzt: "1",
-      id: normalForm.id,
-    }).then((res) => {
-      router.go(-1);
-      // router.push("/home");
-    });
-  }
-}
-function editFn(e) {
-  if (e == 1) {
-    normalForm.jlList = [...list.mj, ...list.fj];
-    normalForm.clList = list.cl;
-    normalForm.jyqxList = list.jy;
-    normalForm.znzbList = list.zn;
-    normalForm.bblx = "01";
-    editXFBB(normalForm).then((res) => {
-      hintToast("报备修改成功")
-      router.go(-1);
-    });
-  } else {
-    finishReport({
-      bbzt: "1",
-      id: normalForm.id,
-    }).then((res) => {
-      hintToast("报备结束成功")
-      router.go(-1);
-    });
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-
-.title_tab {
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-
-.van-cell:after {
-  display: none;
-}
-
-.van-cell {
-  background: #e4e9f6;
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-
-.popupTitle {
-  color: #fff;
-}
-</style>
diff --git a/src/pages/views/report/components/specialReport.vue b/src/pages/views/report/components/specialReport.vue
deleted file mode 100644
index 5703308..0000000
--- a/src/pages/views/report/components/specialReport.vue
+++ /dev/null
@@ -1,1370 +0,0 @@
-<template>
-  <div class="container">
-    <van-config-provider :theme-vars="themeVars">
-      <van-form @submit="onSubmit">
-        <van-field
-          v-model="specialForm.xfrq"
-          name="巡防日期"
-          label="巡防日期"
-          placeholder="请选择巡防日期"
-          :rules="[{ required: true, message: '请选择巡防日期' }]"
-          right-icon="calendar-o"
-          input-align="right"
-          @click="showXfrq = true"
-        />
-        <div class="title_tab">人员车辆</div>
-        <van-field
-          v-model="specialForm.fzrXm"
-          readonly
-          name="picker"
-          input-align="right"
-          is-link
-          label="负责人"
-          placeholder="请选择负责人"
-          @click="showfzrPicker = true"
-        />
-
-        <van-cell class="mulSelect" title="民警" color="#1989fa">
-          <template #right-icon>
-            <van-icon
-              @click.stop="showDialogfn('mj')"
-              name="add-o"
-              color="#1989fa"
-              size="22"
-            />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div
-                class="check-item-tag"
-                v-for="(item, index) in list.mj"
-                :key="index"
-              >
-                <van-tag closeable @close="deleteCheckTag(item, index, 'mj')" color="#7232dd" plain>{{ item.text }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'mj')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <van-cell class="mulSelect" title="辅警" color="#1989fa">
-          <template #right-icon>
-            <van-icon
-              @click.stop="showDialogfn('fj')"
-              name="add-o"
-              color="#1989fa"
-              size="22"
-            />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div
-                class="check-item-tag"
-                v-for="(item, index) in list.fj"
-                :key="index"
-              >
-                <van-tag
-                  closeable
-                  @close="deleteCheckTag(item, index, 'fj')"
-                  color="#7232dd"
-                  plain
-                  >{{ item.text }}</van-tag
-                >
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'fj')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <div class="title_tab">装备</div>
-        <van-cell class="mulSelect" title="智能装备" color="#1989fa">
-          <template #right-icon>
-            <van-icon
-              @click.stop="showDialogfn('zn')"
-              name="add-o"
-              color="#1989fa"
-              size="22"
-            />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div
-                class="check-item-tag"
-                v-for="(item, index) in list.zn"
-                :key="index"
-              >
-                <van-tag
-                  closeable
-                  @close="deleteCheckTag(item, index, 'zn')"
-                  color="#7232dd"
-                  plain
-                  >{{ item.text }}</van-tag
-                >
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'zn')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <van-cell class="mulSelect" title="警用器械" color="#1989fa">
-          <template #right-icon>
-            <van-icon
-              @click.stop="showDialogfn('jy')"
-              name="add-o"
-              color="#1989fa"
-              size="22"
-            />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div
-                class="check-item-tag"
-                v-for="(item, index) in list.jy"
-                :key="index"
-              >
-                <van-tag
-                  closeable
-                  @close="deleteCheckTag(item, index, 'jy')"
-                  color="#7232dd"
-                  plain
-                  >{{ item.text }}</van-tag
-                >
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'jy')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <div class="title_tab">巡逻</div>
-        <van-cell class="mulSelect" title="巡防车辆" color="#1989fa">
-          <template #right-icon>
-            <van-icon
-              @click.stop="showDialogfn('cl')"
-              name="add-o"
-              color="#1989fa"
-              size="22"
-            />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div
-                class="check-item-tag"
-                v-for="(item, index) in list.cl"
-                :key="index"
-              >
-                <van-tag
-                  closeable
-                  @close="deleteCheckTag(item, index, 'cl')"
-                  color="#7232dd"
-                  plain
-                  >{{ item.text }}</van-tag
-                >
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'cl')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-
-        <!-- <div class="titlebbSjy">武器装备</div> -->
-        <van-field class="change" name="radio" label="巡逻方式">
-          <template #input>
-            <van-radio-group
-              v-model="specialForm.xlfs"
-              direction="horizontal"
-              :disabled="disable"
-            >
-              <van-radio shape="square" checked-color="#3e6ee8" name="1"
-                >步巡</van-radio
-              >
-              <van-radio shape="square" checked-color="#3e6ee8" name="0"
-                >车巡</van-radio
-              >
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-field class="change" name="radio" label="着装类型">
-          <template #input>
-            <van-radio-group
-              v-model="specialForm.zzlx"
-              direction="horizontal"
-              :disabled="disable"
-            >
-              <van-radio shape="square" checked-color="#3e6ee8" name="0"
-                >制服</van-radio
-              >
-              <van-radio shape="square" checked-color="#3e6ee8" name="1"
-                >便衣</van-radio
-              >
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-field class="change" name="radio" label="武装类型">
-          <template #input>
-            <van-radio-group
-              v-model="specialForm.wzlx"
-              direction="horizontal"
-              :disabled="disable"
-            >
-              <van-radio shape="square" checked-color="#3e6ee8" name="0"
-                >武装</van-radio
-              >
-              <van-radio shape="square" checked-color="#3e6ee8" name="1"
-                >非武装</van-radio
-              >
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-row>
-          <van-col span="24" v-for="(item, index) in list.jy" :key="index">
-            <van-field
-              class="change"
-              name="radio"
-              label-width="50%"
-              :label="item.qxmc"
-              input-align="right"
-            >
-              <template #input>
-                <van-stepper v-model="item.qxsl" step="1" />
-              </template>
-            </van-field>
-          </van-col>
-        </van-row>
-        <van-row>
-          <van-col span="24">
-            <van-field
-              rows="3"
-              type="textarea"
-              v-model="specialForm.bz"
-              name="备注"
-              placeholder="备注信息"
-            />
-          </van-col>
-        </van-row>
-        <div style="margin: 16px 0">
-          <van-button
-            :loading="loading"
-            round
-            @click="submit"
-            block
-            type="primary"
-          >
-            {{ route.query.reportTitle === "报备" ? "提交" : "结束报备" }}
-          </van-button>
-        </div>
-      </van-form>
-    </van-config-provider>
-
-    <van-popup v-model:show="showXfrq" position="bottom">
-      <van-datetime-picker
-        v-model="specialForm.xfrq"
-        type="month-day"
-        title="选择巡防日期"
-        :min-date="minDate"
-        :max-date="maxDate"
-        :formatter="formatter"
-        @confirm="onXfrqConfirm"
-        @change="xfChange"
-        @cancel="showXfrq = false"
-      />
-    </van-popup>
-    <van-popup v-model:show="showjzPicker" position="bottom">
-      <van-picker
-        :columns="list.jzList"
-        :columns-field-names="customJzFieldName"
-        @confirm="onjzConfirm"
-        @cancel="showjzPicker = false"
-      />
-    </van-popup>
-    <van-popup v-model:show="showfzrPicker" position="bottom">
-      <van-search
-        v-model="list.phone"
-        placeholder="请输入负责人电话号码"
-        @update:model-value="getMJList()"
-      />
-      <van-picker
-        :columns="list.fzrList"
-        @confirm="onfzrConfirm"
-        @cancel="showfzrPicker = false"
-        :columns-field-names="customfzrFieldNamed"
-      />
-    </van-popup>
-    <van-popup v-model:show="selfDefinedPopup" :style="{ width: '80%' }">
-      <div class="popupTitle">{{ popupTitle }}</div>
-      <van-search
-        v-model="list.text"
-        :placeholder="`请输入`"
-        @update:model-value="getJYList(popupTitle)"
-      />
-      <div class="check-data-box">
-        <van-checkbox-group v-model="checkedList">
-          <van-cell-group inset>
-            <van-cell
-              v-for="(item, index) in list.mulChooseList"
-              clickable
-              :key="item"
-              :title="`${item.text}`"
-            >
-              <template #right-icon>
-                <van-checkbox
-                  :name="item.text"
-                  :ref="(el) => (checkboxRefs[index] = el)"
-                  @click="toggle(item, index)"
-                />
-              </template>
-            </van-cell>
-          </van-cell-group>
-        </van-checkbox-group>
-      </div>
-      <div class="popbtn-box">
-        <van-button
-          style="flex: 1"
-          type="default"
-          size="small"
-          @click="selfDefinedPopup = false"
-          >取消
-        </van-button>
-        <van-button style="flex: 1" type="primary" size="small" @click="popSure"
-          >确定</van-button
-        >
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import {
-  selectDeckList,
-  addXFBB,
-  queryJzList,
-  tbJcglXfll,
-  getQwdj,
-  getQwbc,
-  getXfq,
-} from "../../../../api/report.js";
-import {
-  selectNextPage,
-  sysUser,
-  getZnzb,
-  selectJyqx,
-  getXfclList,
-  selectKfdList,
-} from "../../../../api/patrolBasicInfo";
-import {
-  getBxdList,
-  finishReport,
-  getMybbTodayNew,
-  getMyXfpbToday,
-  getBcxx,
-  getKfd,
-  getXfqs,
-} from "../../../../api/common";
-import { timeFormat } from "../../../../utils/index";
-import { computed, ref, reactive, onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
-const router = useRouter();
-const route = useRoute();
-//主题色
-const themeType = ref(getStorage("themeSetting"));
-const themeVars = ref({
-  cellBackgroundColor: themeType.value == "light" ? "#fff" : "#041634",
-  fieldInputTextColor: themeType.value == "light" ? "#333" : "#fff",
-  fieldLabelColor: themeType.value == "light" ? "#333" : "#fff",
-  cellTextColor: themeType.value == "light" ? "#333" : "#fff",
-  radioLabelColor: themeType.value == "light" ? "#333" : "#fff",
-  cellBorderColor: themeType.value == "light" ? "#dbdbdb" : "#001e6b",
-});
-const specialForm = reactive({
-  xlfs: "1",
-  zzlx: "1",
-  wzlx: "1",
-  qwdjLabel: "",
-  qwdj: "",
-  startEndDate: "",
-  ksDate: "",
-  jsDate: "",
-  ksTime: "",
-  jsTime: "",
-  kssj: "",
-  jssj: "",
-  jzLabel: "",
-  jzMc: "",
-  jzId: "",
-  xfbmLabel: "",
-  xfbm: "",
-  xfbmdm: "",
-  ssbm: "",
-  ssbmdm: "",
-  fzrXm: "",
-  fzrSfzh: "",
-  fzrLxdh: "",
-  fzrId: "",
-  znzbList: [],
-  jyqxList: [],
-  clList: [],
-  jlList: [],
-  bz: "",
-  xfrq: timeFormat(new Date()),
-  jgts: 0,
-  bcmc: "",
-  xfbm: "",
-  xfbmdm: "",
-  xffwid: "",
-  xffwlx: "",
-  xlfa: "1", //巡逻方案
-});
-const list = reactive({
-  columns: [],
-  jzList: [],
-  ssbmList: [],
-  fzrList: [],
-  phone: "",
-  fzrTotal: 0,
-  mjList: [],
-  fjList: [],
-  fjXm: "",
-  mjXm: "",
-  zbList: [],
-  jyqxList: [],
-  clList: [],
-  cph: "",
-  sbmc: "",
-  qxMc: "",
-  text: "",
-  mulChooseList: [],
-  mj: [],
-  fj: [],
-  zn: [],
-  jy: [],
-  cl: [],
-  scoutsRangeList: [
-    {
-      text: "巡防区",
-      value: "巡防区",
-      children: [],
-    },
-    {
-      text: "快反点",
-      value: "快反点",
-      children: [],
-    },
-  ],
-  xfqList: [],
-  kfdList: [],
-  rcfaList: [],
-  tsfaList: [],
-  bxdMc: "",
-});
-onMounted(() => {
-  getIsReport();
-  getXUJZList();
-  getDepts();
-  getMJList();
-  getFj();
-  getMJ();
-  getznzbs();
-  getJyqx();
-  getCl();
-  getQwLevel();
-  getQwbcList();
-  getSourtRange();
-});
-// 判断已报备还是未报备
-function getIsReport() {
-  let flag = route.query.reportTitle;
-  if (route.query.reportType === "02") {
-    if (flag === "报备") {
-      getMyXfpbToday().then((res1) => {
-        specialForm.bbzt = "0";
-        specialForm.ksTime = res1.kssj;
-        specialForm.jsTime = res1.jssj;
-        specialForm.fzrXm = res1.fzrXm;
-        specialForm.fzrId = res1.fzrId;
-        specialForm.jzMc = res1.jzMc;
-        specialForm.wzlx = res1.wzlx;
-        specialForm.xffwlx = res1.xffwlx;
-        specialForm.jzId = res1.jzId;
-        specialForm.qwbcId = res1.pbId;
-        specialForm.xffwid = res1.xffwid;
-        specialForm.zqsc = res1.zqsc;
-        specialForm.xfrq = timeFormat(new Date());
-        getXffwList(res1.xffwid);
-        specialForm.xlfs = res1.xlfs;
-        specialForm.fzrLxdh = res1.fzrLxdh;
-        specialForm.fzrSfzh = res1.fzrSfzh;
-        specialForm.bz = res1.bz;
-        specialForm.kssj = res1.kssj;
-        specialForm.jssj = res1.jssj;
-        specialForm.jd = "104.13407";
-        specialForm.wd = "29.99572";
-        // specialForm.xlfaMc = res1.xlfaMc
-        specialForm.famc = res1.xlfaMc;
-        specialForm.xlfaLx = res1.xlfaLx ? res1.xlfaLx : "01";
-        specialForm.xlfaId = res1.xlfaId;
-        if (specialForm.xlfaLx === "02") {
-          specialForm.xlfaMc = res1.xlfaMc;
-        }
-        getBcxxList(res1.qwbcId);
-        list.cl = JSON.parse(res1.pbcl);
-        if (list.cl.length > 0) {
-          specialForm.xlfs = "0";
-        }
-        list.cl.forEach((ele) => {
-          ele.text = ele.jdchphm;
-        });
-        list.fj = JSON.parse(res1.pbfj);
-        list.fj.forEach((f) => {
-          f.text = f.jlxm;
-        });
-        list.mj = JSON.parse(res1.pbmj);
-        list.mj.forEach((m) => {
-          m.text = m.jlxm;
-        });
-        list.zn = JSON.parse(res1.txzb);
-        list.zn.forEach((m) => {
-          m.text = m.sbmc;
-        });
-        list.jy = JSON.parse(res1.jyqx);
-        list.jy.forEach((m) => {
-          m.text = m.qxmc;
-          m.qxsl = m.sl;
-        });
-      });
-    } else if (flag === "已报备") {
-      getMybbTodayNew().then((res2) => {
-        getBcxxList(res2.qwbcId);
-        specialForm.xffwlx = res2.xffwlx;
-        specialForm.xffwid = res2.xffwid;
-        getXffwList(res2.xffwid);
-        specialForm.id = res2.id;
-        specialForm.ksTime = res2.bbkssj ? res2.bbkssj.split(" ")[1] : "";
-        specialForm.jsTime = res2.bbjssj ? res2.bbjssj.split(" ")[1] : "";
-        specialForm.fzrXm = res2.fzrXm;
-        specialForm.fzrId = res2.fzrId;
-        specialForm.jzMc = res2.jzMc;
-        specialForm.bz = res2.bz;
-        specialForm.famc = res2.xlfaMc;
-        specialForm.xlfaLx = res2.xlfaLx ? res2.xlfaLx : "01";
-        specialForm.xlfaId = res2.xlfaId;
-        specialForm.kssj = res2.kssj;
-        specialForm.jssj = res2.jssj;
-        specialForm.jzId = res2.jzId;
-        specialForm.xfpbId = res2.qwbcId;
-        specialForm.zqsc = res2.zqsc;
-        specialForm.jd = "104.13407";
-        specialForm.wd = "29.99572";
-        specialForm.xfrq = timeFormat(new Date());
-        // specialForm.xlfaMc = res2.xlfaMc
-        if (res2.xlfaLx === "02") {
-          specialForm.xlfaMc = res2.xlfaMc;
-        }
-        list.cl = JSON.parse(res2.pbcl);
-        if (list.cl.length > 0) {
-          specialForm.xlfs = "0";
-        }
-        list.cl.forEach((ele) => {
-          ele.text = ele.jdchphm;
-        });
-        list.fj = JSON.parse(res2.pbfj);
-        list.fj.forEach((f) => {
-          f.text = f.jlxm;
-        });
-        list.mj = JSON.parse(res2.pbmj);
-        list.mj.forEach((m) => {
-          m.text = m.jlxm;
-        });
-        list.zn = JSON.parse(res2.txzb);
-        list.zn.forEach((m) => {
-          m.text = m.sbmc;
-        });
-        list.jy = JSON.parse(res2.jyqx);
-        list.jy.forEach((m) => {
-          m.text = m.qxmc;
-          m.qxsl = m.qxsl;
-        });
-        specialForm.wzlx = res2.wzlx;
-        specialForm.xffwlx = res2.xffwlx;
-        specialForm.xlfs = res2.xlfs;
-        specialForm.xffwid = res2.xffwid;
-      });
-    }
-  }
-}
-// 查询班次信息
-function getBcxxList(val) {
-  getBcxx(val).then((res) => {
-    specialForm.bcmc = res.bcmc ? res.bcmc : "";
-  });
-}
-// 查询巡防范围通过id查询
-function getXffwList(val) {
-  if (specialForm.xffwlx === "1") {
-    getXfqs({
-      id: val,
-    }).then((res) => {
-      specialForm.xfqMc = res.xfqMc;
-    });
-  } else if (specialForm.xffwlx === "2") {
-    getKfd({
-      id: val,
-    }).then((res) => {
-      specialForm.kfdMc = res.kfdMc;
-    });
-  }
-}
-// 勤务等级
-const showqwPicker = ref(false);
-
-function getQwLevel() {
-  getQwdj({
-    pageSize: 200,
-    pageCurrent: 1,
-    fbzt: 1,
-  }).then((res) => {
-    qwdjList.value = res.records;
-    qwdjList.value.forEach((item) => {
-      if (item.qwdj === "01") {
-        item.text = "一级勤务";
-      } else if (item.qwdj === "02") {
-        item.text = "二级勤务";
-      } else if (item.qwdj === "03") {
-        item.text = "三级勤务";
-      } else if (item.qwdj === "04") {
-        item.text = "日常勤务";
-      }
-    });
-  });
-}
-const qwdjList = ref([]);
-
-function onqwConfirm(value) {
-  specialForm.qwdjLabel = value.text;
-  specialForm.qwdj = value.value;
-  showqwPicker.value = false;
-}
-// 选择勤务班次
-const showbcPicker = ref(false);
-
-function onbcConfirm(val) {
-  specialForm.bcmc = val.bcmc;
-  specialForm.ksTime = val.kssj;
-  specialForm.jsTime = val.jssj;
-  specialForm.qwbcId = val.id;
-  specialForm.zqsc = val.zqsc;
-  showbcPicker.value = false;
-}
-const bcList = ref([]);
-
-function getQwbcList() {
-  getQwbc({
-    pageSize: 200,
-    pageCurrent: 1,
-    bcmc: "",
-    bclx: "02",
-  }).then((res) => {
-    bcList.value = res.records;
-    bcList.value.forEach((item) => {
-      item.text = item.bcmc;
-    });
-  });
-}
-// 开始结束日期
-const calendarShow = ref(false);
-
-function onCalendarConfirm(values) {
-  // specialForm.startEndDate = timeFormat(values[0]) + '至' + timeFormat(values[1])
-  // specialForm.ksDate = timeFormat(values[0])
-  // specialForm.jsDate = timeFormat(values[1])
-  specialForm.xfrq = timeFormat(values) + " " + "00:00:00";
-  calendarShow.value = false;
-}
-// 开始时间
-const showksPicker = ref(false);
-
-function onksConfirm(val) {
-  specialForm.kssj = val + ":" + "00";
-  // specialForm.kssj = specialForm.ksDate + ' ' + specialForm.ksTime
-  showksPicker.value = false;
-}
-
-function ksChange(val) {
-  specialForm.kssj = val + ":" + "00";
-}
-// 结束时间
-const showjsPicker = ref(false);
-
-function onjsConfirm(val) {
-  specialForm.jssj = val + ":" + "00";
-  // specialForm.jssj = specialForm.jsDate + ' ' + specialForm.jsTime
-  showjsPicker.value = false;
-}
-const showXfrq = ref(false);
-const currentDate = ref(new Date());
-const minDate = new Date();
-const maxDate = new Date(2050, 10, 1);
-const formatter = (type, val) => {
-  if (type === "month") {
-    return `${val}月`;
-  }
-  if (type === "day") {
-    return `${val}日`;
-  }
-  return val;
-};
-//巡防日期
-function onXfrqConfirm(val) {
-  let time = new Date(val);
-  let year = time.getFullYear();
-  let month = time.getMonth() + 1;
-  let day = time.getDate();
-  specialForm.xfrq = year + "-" + month + "-" + day;
-  showXfrq.value = false;
-}
-
-function jsChange(val) {
-  specialForm.jssj = val + ":" + "00";
-}
-
-function xfChange(val) {
-  let time = new Date(val);
-  let year = time.getFullYear();
-  let month = time.getMonth() + 1;
-  let day = time.getDate();
-  specialForm.xfrq = year + "-" + month + "-" + day;
-}
-// 巡防范围
-const showsrPicker = ref(false);
-
-function onsrChange(value) {
-  specialForm.xffwid =
-    value.selectedOptions[value.selectedOptions.length - 1].id;
-  specialForm.xffwlx = value.selectedOptions[0].text;
-}
-// 选择警组
-const showjzPicker = ref(false);
-
-function onjzConfirm(val) {
-  list.mj = [];
-  list.fj = [];
-  list.cl = [];
-  list.zn = [];
-  list.jy = [];
-  specialForm.jzMc = val.jzMc;
-  specialForm.fzrXm = val.ddMjxm;
-  specialForm.fzrLxdh = val.ddDh;
-  specialForm.fzrId = val.ddMjid;
-  specialForm.fzrSfzh = val.ddMjsfzh;
-  specialForm.jh = val.ddMjjh;
-  specialForm.jzId = val.id;
-  specialForm.ssbm = val.ssbm;
-  specialForm.ssbmdm = val.ssbmdm;
-  // 民警辅警已有赋值
-  val.jzryList.forEach((m) => {
-    if (m.jllx === "01") {
-      list.mj.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xbdm: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-    if (m.jllx === "02") {
-      list.fj.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xbdm: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-  });
-  // 车辆
-  val.clList.forEach((c) => {
-    list.cl.push({
-      clId: c.clId,
-      jdchphm: c.jdchphm,
-      text: c.jdchphm,
-      jdchpzldm: c.jdchpzldm,
-      qwjzId: c.qwjzId,
-    });
-  });
-  // 警用器械
-  val.jyqxList.forEach((j) => {
-    list.jy.push({
-      qxid: j.qxId,
-      qxmc: j.qxmc,
-      text: j.qxmc,
-      qxsl: j.sl ? j.sl : 1,
-      qxlx: j.qxlx,
-      qwjzId: j.qwjzId,
-    });
-  });
-  // 智能装备
-  val.txzbList.forEach((z) => {
-    list.zn.push({
-      sbmc: z.sbmc,
-      text: z.sbmc,
-      txzblx: z.txzblx,
-      txzbId: z.zbId,
-      qwjzId: z.qwjzId,
-      hh: z.hh,
-    });
-  });
-  showjzPicker.value = false;
-}
-const customJzFieldName = {
-  text: "jzMc",
-};
-// 查询警组
-function getXUJZList() {
-  queryJzList({
-    pageSize: 20,
-    pageCurrent: 1,
-  }).then((res) => {
-    list.jzList = res.records;
-  });
-}
-// 巡防部门
-const showxfPicker = ref(false);
-
-function onxfConfirm(val) {
-  showxfPicker.value = false;
-}
-const customFieldNamed = {
-  text: "orgName",
-  value: "orgName",
-  children: "childDeptList",
-};
-const showbmPicker = ref(false);
-
-function onChange(value, selectedOptions) {
-  specialForm.ssbmdm =
-    value.selectedOptions[value.selectedOptions.length - 1].id;
-}
-// 查询部门
-function getDepts() {
-  selectNextPage({}).then((res) => {
-    list.ssbmList = [res.records[0]];
-  });
-}
-// 选择负责人
-const showfzrPicker = ref(false);
-
-function onfzrConfirm(val) {
-  specialForm.fzrXm = val.userName;
-  specialForm.jzMc = val.userName + "-" + "警组";
-  specialForm.fzrSfzhL = val.idEntityCard;
-  specialForm.fzrLxdh = val.telePhone;
-  specialForm.fzrId = val.id;
-  showfzrPicker.value = false;
-}
-const customfzrFieldNamed = {
-  text: "userName",
-};
-// 查询负责人
-function getMJList() {
-  sysUser({
-    current: 1,
-    size: 50,
-    phone: list.phone,
-  }).then((res) => {
-    list.fzrList = res.records;
-    list.fzrTotal = res.total;
-  });
-}
-
-// 查询民警辅警 智能装备 警用器械 巡防车辆
-function getJYList(val) {
-  switch (val) {
-    case "选择民警":
-      list.mjXm = list.text;
-      getMJ();
-      list.mulChooseList = list.mjList;
-      break;
-    case "选择辅警":
-      list.fjXm = list.text;
-      getFj();
-      list.mulChooseList = list.fjList;
-      break;
-    case "选择智能装备":
-      list.sbmc = list.text;
-      getznzbs();
-      list.mulChooseList = list.zbList;
-      break;
-    case "选择警用器械":
-      list.qxMc = list.text;
-      getJyqx();
-      list.mulChooseList = list.jyqxList;
-      break;
-    case "选择巡防车辆":
-      list.cph = list.text;
-      getCl();
-      list.mulChooseList = list.clList;
-      break;
-  }
-}
-// 民警
-function getMJ() {
-  tbJcglXfll({
-    pageCurrent: 1,
-    pageSize: 50,
-    fl: "01", // 民警
-    xm: list.mjXm,
-  }).then((res) => {
-    list.mjList = res.records;
-    list.mjList.forEach((item) => {
-      item.text = item.xm;
-    });
-  });
-}
-// 辅警
-function getFj() {
-  tbJcglXfll({
-    pageCurrent: 1,
-    pageSize: 50,
-    fl: "02", // 辅警
-    xm: list.fjXm,
-  }).then((res) => {
-    list.fjList = res.records;
-    list.fjList.forEach((item) => {
-      item.text = item.xm;
-    });
-  });
-}
-// 智能装备
-function getznzbs() {
-  // 智能装备
-  getZnzb({
-    pageNo: 1,
-    pageSize: 50,
-    sbmc: list.sbmc,
-  }).then((res) => {
-    list.zbList = res.records;
-    list.zbList.forEach((item) => {
-      item.text = item.sbmc;
-    });
-  });
-}
-
-function getJyqx() {
-  // 警用器械
-  selectJyqx({
-    pageNo: 1,
-    pageSize: 50,
-    qxMc: list.qxMc,
-  }).then((res) => {
-    list.jyqxList = res.records;
-    list.jyqxList.forEach((item) => {
-      item.text = item.qxMc;
-    });
-  });
-}
-
-function getCl() {
-  // 巡防车辆
-  getXfclList({
-    pageCurrent: 1,
-    pageSize: 50,
-    cph: list.cph,
-  }).then((res) => {
-    list.clList = res.records;
-    list.clList.forEach((item) => {
-      item.text = item.cph;
-    });
-  });
-}
-// 弹框标题
-const checkList = reactive({});
-const checkedList = ref([]);
-const checkboxRefs = ref([]);
-const popupTitle = ref("");
-const selfDefinedPopup = ref(false);
-
-function showDialogfn(val) {
-  list.text = "";
-  switch (val) {
-    case "mj":
-      popupTitle.value = "选择民警";
-      checkedList.value = list.mj.map((el) => el.text);
-      list.mulChooseList = list.mjList;
-      break;
-    case "fj":
-      popupTitle.value = "选择辅警";
-      checkedList.value = list.fj.map((el) => el.text);
-      list.mulChooseList = list.fjList;
-      break;
-    case "zn":
-      popupTitle.value = "选择智能装备";
-      checkedList.value = list.zn.map((el) => el.text);
-      list.mulChooseList = list.zbList;
-      break;
-    case "jy":
-      popupTitle.value = "选择警用器械";
-      checkedList.value = list.jy.map((el) => el.text);
-      list.mulChooseList = list.jyqxList;
-      break;
-    case "cl":
-      popupTitle.value = "选择巡防车辆";
-      checkedList.value = list.cl.map((el) => el.text);
-      list.mulChooseList = list.clList;
-      break;
-  }
-  selfDefinedPopup.value = true;
-}
-
-function popSure() {
-  selfDefinedPopup.value = false;
-}
-const toggle = (item, index) => {
-  switch (popupTitle.value) {
-    case "选择民警":
-      if (!list.mj.map((m) => m.text).includes(item.text)) {
-        list.mj.push({
-          jh: item.jh,
-          jllx: item.fl,
-          jlxm: item.xm,
-          text: item.xm,
-          nl: 0,
-          qwjzId: "",
-          jlId: item.ryid,
-          sfzh: item.sfzh,
-          xbdm: item.xbdm,
-          xm: item.jlxm,
-          jh: item.jh,
-          lxdh: item.lxdh,
-          id: item.ryid,
-        });
-      }else{
-       list.mj.splice(list.mj.map(m1=>m1.jlxm).indexOf(item.xm),1) 
-      }
-      break;
-    case "选择辅警":
-      if (!list.fj.map((f) => f.text).includes(item.text)) {
-        list.fj.push({
-          jh: item.jh,
-          jllx: item.fl,
-          jlxm: item.xm,
-          text: item.xm,
-          nl: 0,
-          qwjzId: "",
-          jlId: item.id,
-          sfzh: item.sfzh,
-          xbdm: item.xbdm,
-          xm: item.jlxm,
-          jh: item.jh,
-          lxdh: item.lxdh,
-          id: item.id,
-        });
-      }else{
-       list.fj.splice(list.fj.map(f1=>f1.jlxm).indexOf(item.jlxm),1) 
-      }
-      break;
-    case "选择智能装备":
-      if (!list.zn.map((z) => z.text).includes(item.text)) {
-        list.zn.push({
-          sbmc: item.sbmc,
-          text: item.sbmc,
-          txzblx: item.scode,
-          txzbId: item.id,
-          hh: item.sbbh,
-        });
-      }else{
-        list.zn.splice(list.zn.map(f1=>f1.text).indexOf(item.text),1) 
-      }
-      break;
-    case "选择警用器械":
-      if (!list.jy.map((j) => j.qxid).includes(item.id)) {
-        list.jy.push({
-          qxid: item.id,
-          qxmc: item.qxMc,
-          text: item.qxMc,
-          qxsl: item.sl,
-          qxlx: item.scode,
-        });
-      }else{
-        list.jy.splice(list.jy.map(f1=>f1.text).indexOf(item.text),1) 
-      }
-      if (item.scode === "01") {
-        specialForm.wzlx = "1";
-      }
-      break;
-    case "选择巡防车辆":
-      if (!list.cl.map((c) => c.clId).includes(item.cid)) {
-        specialForm.xlfs = "0";
-        list.cl.push({
-          clId: item.cid,
-          jdchphm: item.cph,
-          text: item.cph,
-          jdchpzldm: item.cllx,
-        });
-      }else{
-        list.cl.splice(list.cl.map(f1=>f1.text).indexOf(item.text),1) 
-      }
-      break;
-  }
-};
-
-function deleteCheckTag(item, index, val) {
-  switch (val) {
-    case "mj":
-      list.mj.splice(index, 1);
-      break;
-    case "fj":
-      list.fj.splice(index, 1);
-      break;
-    case "zn":
-      list.zn.splice(index, 1);
-      break;
-    case "jy":
-      list.jy.splice(index, 1);
-      if (!list.jy.map((j) => j.scode).includes("01")) {
-        specialForm.wzlx = "0";
-      }
-      break;
-    case "cl":
-      list.cl.splice(index, 1);
-      if (list.cl == false) {
-        specialForm.xlfs = "1";
-      }
-      break;
-  }
-}
-// 查询巡防范围
-function getSourtRange() {
-  getXfq({
-    pageCurrent: 1,
-    pageSize: 200,
-  }).then((res) => {
-    let xfq = res.records;
-    list.xfqList = res.records;
-    list.scoutsRangeList[0].children = xfq;
-  });
-  selectKfdList({
-    pageNum: 1,
-    pageSize: 200,
-  }).then((res) => {
-    let kfd = res.records;
-    list.kfdList = res.records;
-    list.scoutsRangeList[1].children = kfd;
-  });
-}
-
-// 日常方案
-const showrcfaPicker = ref(false);
-
-function onrcfaConfirm() {
-  showrcfaPicker.value = false;
-}
-
-function getFaList() {
-  getBxdList({
-    pageSize: 50,
-    pageCurrent: 1,
-    bxdMc: list.bxdMc,
-  }).then((res) => {
-    list.records = res.records;
-  });
-}
-// 特殊方案
-const showtsfaPicker = ref(false);
-
-function ontsfaConfirm() {
-  showtsfaPicker.value = false;
-}
-// 巡防区
-const filedxfqNames = {
-  text: "xfqMc",
-};
-const showxfqPicker = ref(false);
-
-function onxfqConfirm(val) {
-  specialForm.xffwid = val.id;
-  specialForm.xfqMc = val.xfqMc;
-  specialForm.xffwmc = val.xfqMc;
-  showxfqPicker.value = false;
-}
-// 快反点
-const filedkfdNames = {
-  text: "kfdMc",
-};
-const showkfdPicker = ref(false);
-
-function onkfdConfirm(val) {
-  specialForm.xffwid = val.kfdId;
-  specialForm.kfdMc = val.kfdMc;
-  specialForm.xffwmc = val.kfdMc;
-  showkfdPicker.value = false;
-}
-
-// 新增报备接口
-function submit() {
-  specialForm.jlList = [...list.mj, ...list.fj];
-  specialForm.clList = list.cl;
-  specialForm.jyqxList = list.jy;
-  specialForm.znzbList = list.zn;
-  const params = {
-    xlfs: specialForm.xlfs,
-    wzlx: specialForm.wzlx,
-    zzlx: specialForm.zzlx,
-    ssbmdm: specialForm.ssbmdm,
-    ssbm: specialForm.ssbm,
-    xfrq: specialForm.xfrq,
-    xffwlx: specialForm.xffwlx,
-    xffwid: specialForm.xffwid,
-    qwbcId: specialForm.qwbcId,
-    kssj: specialForm.ksTime,
-    jssj: specialForm.jsTime,
-    zqsc: specialForm.zqsc,
-    jzId: specialForm.jzId,
-    fzrXm: specialForm.fzrXm,
-    fzrId: specialForm.fzrId,
-    jzMc: specialForm.jzMc,
-    fzrSfzh: specialForm.fzrSfzh,
-    fzrLxdh: specialForm.fzrLxdh,
-    bz: specialForm.bz,
-    jlList: specialForm.jlList,
-    znzbList: specialForm.znzbList,
-    jyqxList: specialForm.jyqxList,
-    clList: specialForm.clList,
-    bblx: "02",
-  };
-  if (route.query.reportTitle === "报备") {
-    addXFBB(params).then((res) => {
-      finishReport({
-        bbzt: "0",
-        id: res,
-      }).then((res) => {});
-      router.push("/home");
-    });
-  } else if (route.query.reportTitle === "已报备") {
-    finishReport({
-      bbzt: "1",
-      id: specialForm.id,
-    }).then((res) => {
-      router.push("/home");
-    });
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-.title_tab {
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-.van-cell:after {
-  display: none;
-}
-.van-cell {
-  background: #e4e9f6;
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-.popupTitle {
-  color: #fff;
-}
-</style>
diff --git a/src/pages/views/report/index.vue b/src/pages/views/report/index.vue
deleted file mode 100644
index dc5b2b7..0000000
--- a/src/pages/views/report/index.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="route.query.zt==0?'报备':'报备信息'" />
-    <div class="nav_tab">
-        <span @click="active='a'" :class="active==='a'?'tab active':'tab'">正常报备</span>
-        <span @click="active='b'" :class="active==='b'?'tab active':'tab'">特殊勤务报备</span>
-    </div>
-    <normalReport v-if="active==='a'" />
-    <specialReport v-else/>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import normalReport from "./components/normalReport";
-import specialReport from "./components/specialReport";
-import { computed, ref, reactive, watch, onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { Toast } from "vant";
-
-const router = useRouter();
-const route = useRoute();
-
-const active = ref('a')
-
-</script>
-
-<style lang="scss" scoped>
-.container {
-  margin-top: 2vw;
-}
-.nav_tab{
-    padding: 2vw;
-    display: flex;
-    justify-content: space-around;
-    .tab{
-        background: #a4aec8;
-        color: #fff;
-        height: 32px;
-        line-height: 32px;
-        width: 40vw;
-        text-align: center;
-        border-radius: 16px 16px 16px 0;
-    }
-    .tab.active{
-        background: #517cea;
-    }
-}
-</style>
diff --git a/src/pages/xlmjHome/components/filing.vue b/src/pages/xlmjHome/components/filing.vue
deleted file mode 100644
index 7f4151f..0000000
--- a/src/pages/xlmjHome/components/filing.vue
+++ /dev/null
@@ -1,509 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav navTitle="报备" />
-    <van-form @submit="onSubmit">
-      <van-field
-        :rules="[{ required: true, message: '请输入勤务名称' }]"
-        required
-        v-model="normalForm.qwmc"
-        label="勤务名称"
-      >
-      </van-field>
-      <div class="title_tab">勤务时间</div>
-      <van-cell title="勤务日期" @click="calShow = true">
-        <template #value>
-          <span>{{ normalForm.qwrq }}</span>
-        </template>
-      </van-cell>
-      <van-calendar
-        v-model:show="calShow"
-        @confirm="onConfirmTime"
-        :min-date="minDate"
-        :max-date="maxDate"
-        color="#3e6ee8"
-      ></van-calendar>
-      <van-field
-        readonly
-        :rules="[{ required: true, message: '请选择开始时间' }]"
-        required
-        v-model="normalForm.kssj"
-        placeholder="请选择开始时间"
-        input-align="right"
-        is-link
-        label="开始时间"
-        @click="showkssjPicker = true"
-      />
-      <van-popup v-model:show="showkssjPicker" position="bottom">
-        <van-datetime-picker
-          v-model="startTime"
-          type="datatime"
-          title="选择时间"
-          :min-date="minDate"
-          :max-date="maxDate"
-          @cancel="showkssjPicker = false"
-          @confirm="ksConfirm"
-        />
-      </van-popup>
-
-      <van-field
-        readonly
-        :rules="[{ required: true, message: '请选择结束时间' }]"
-        required
-        placeholder="请选择结束时间"
-        v-model="normalForm.jssj"
-        input-align="right"
-        is-link
-        label="结束时间"
-        @click="showjssjPicker = true"
-      />
-      <van-popup v-model:show="showjssjPicker" position="bottom">
-        <van-datetime-picker
-          v-model="endTime"
-          type="datatime"
-          title="选择时间"
-          @cancel="showjssjPicker = false"
-          @confirm="jsConfirm"
-        />
-      </van-popup>
-
-      <div class="title_tab">勤务警力</div>
-      <van-field
-        v-model="normalForm.xm"
-        readonly
-        input-align="right"
-        label="姓名"
-        is-link
-        @click="showDialogfn('ry')"
-      />
-      <div
-        class="listBox"
-        v-for="(item, index) in normalForm.qwjlLists"
-        :key="index"
-      >
-        <div class="left">
-          <div>{{ item.xm }} ({{ item.sfzh }})</div>
-          <div class="adress">{{ item.dwmc }}</div>
-        </div>
-        <div class="right" @click="deleteRy(index)">-</div>
-      </div>
-      <van-field v-model="normalForm.clxx" label="车辆信息"> </van-field>
-      <van-field
-        v-model="normalForm.sbmc"
-        readonly
-        input-align="right"
-        label="选择设备信息"
-        is-link
-        placeholder="请选择设备信息"
-        @click="popupShowCar = true"
-      />
-
-      <div class="title_tab">装备信息</div>
-      <div class="zbBox">
-        <span class="zbBox-item" v-for="(item,i) in normalForm.qwzbLists" :key="i">
-          <span class="bt">{{item.zbmc}}</span>
-          <van-stepper :min="0" :max="1000" v-model="item.zbsl" />
-        </span>
-      </div>
-      <div style="padding: 0 5vw" v-if="obj.bbInfo">
-        <van-button
-          style="margin: 16px 0"
-          :loading="loading"
-          round
-          @click="editFn(0)"
-          block
-          type="success"
-        >
-          结束报备
-        </van-button>
-      </div>
-      <div style="margin: 16px 0; padding: 0 5vw" v-else>
-        <van-button
-          :loading="loading"
-          round
-          native-type="submit"
-          block
-          type="primary"
-        >
-          开始报备
-        </van-button>
-      </div>
-    </van-form>
-    <!-- 负责人 -->
-    <SelectPeo
-      :isRadio="isRadio"
-      :selectType="selectType"
-      :show="showSelect"
-      :checkedList="normalForm.qwjlLists"
-      @update:cancel="showSelect = false"
-      @update:confirm="onComfirm"
-      :key="selectIndex"
-    />
-
-    <!-- 弹出层 -->
-    <van-popup v-model:show="popupShowCar" round position="bottom">
-      <van-picker
-        :columns="sblist.list"
-        :columns-field-names="customFieldName"
-        @cancel="popupShowCar = false"
-        @confirm="submitPoup"
-      />
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import { getZBList, qwbbAdd, getSBList } from "@/api/checkponit.js";
-import { getItem } from "../../../utils/storage";
-import TopNav from "../../../components/topNav";
-import SelectPeo from "./selectPeo.vue";
-import { Dialog, Toast } from "vant";
-import { dateFormat, hintToast } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { computed, ref, reactive, onMounted, watch } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { get } from "vant/lib/utils";
-Toast.allowMultiple();
-const { D_BZ_HPZL } = getDictList("D_BZ_HPZL");
-const router = useRouter();
-const route = useRoute();
-const minDate = new Date(2022, 0, 1);
-const maxDate = new Date(2050, 0, 1);
-const userInfo = getItem("userInfo");
-const popupShowCar = ref(false); //选择车辆弹窗
-const selectType = ref(""); //选择的类型
-const isRadio = ref(false); //单选框默认选中
-const showSelect = ref(false); //人员弹窗
-const selectIndex = ref(1); //选择器组件KEY
-const calShow = ref(false); //是否显示巡防日期选择器
-const showkssjPicker = ref(false); // 开始时间结束时间
-const showjssjPicker = ref(false); // 结束时间结束时间
-const startTime = new Date()
-const endTime = new Date()
-
-const normalForm = reactive({
-  qwmc: "",
-  qwrq: dateFormat("", new Date()),
-  ssbm: userInfo.deptName,
-  ssbmdm: userInfo.deptList[0].deptCode,
-  sbbh: "",
-  sbmc: "",
-  qwjlLists: [],
-  qwzbLists: [
-    {
-      zbmc: "枪支",
-      zbsl: 0,
-      entryCode: "qz",
-    },
-    {
-      zbmc: "弹药",
-      zbsl: 0,
-      entryCode: "dy",
-    },
-    {
-      zbmc: "手铐",
-      zbsl: 1,
-      entryCode: "sk",
-    },
-    {
-      zbmc: "执法仪",
-      zbsl: 0,
-      entryCode: "zfy",
-    },
-    {
-      zbmc: "警棍",
-      zbsl: 0,
-      entryCode: "jg",
-    },
-    {
-      zbmc: " 盾牌",
-      zbsl: 0,
-      entryCode: "dp",
-    },
-    {
-      zbmc: "手电",
-      zbsl: 1,
-      entryCode: "sd",
-    },
-    {
-      zbmc: " 急救包",
-      zbsl: 0,
-      entryCode: "jjb",
-    },
-    {
-      zbmc: "防暴叉",
-      zbsl: 0,
-      entryCode: "fbc",
-    },
-    {
-      zbmc: "防暴头盔",
-      zbsl: 0,
-      entryCode: "fbtk",
-    },
-    {
-      zbmc: "手持对讲机",
-      zbsl: 0,
-      entryCode: "sjdjj",
-    },
-    {
-      zbmc: "移动警务终端",
-      zbsl: 0,
-      entryCode: "ydjwzd",
-    },
-  ]
-}); //表单数据
-// 巡防日期
-
-const obj = ref({
-  bbInfo: null,
-});
-const sblist = {
-  list: [],
-}; //设备数据
-const customFieldName = {
-  text: "baseName",
-};
-
-onMounted(() => {
-  getZbList();
-  getsBList();
-});
-// 装备数据
-function getZbList() {
-  getZBList({ scSysDictionaryCatalogId: 20 }).then((res) => {
-    let arr = [];
-    normalForm.qwzbLists = res.scSysDictionaryEntrys.map((item) => {
-      return {
-        zbmc: item.entryName,
-        zbsl: 0,
-        entryCode: item.entryCode,
-      };
-    });
-  });
-}
-// 设备数据
-function getsBList() {
-  getSBList({ typeDevicesCode: 8 }).then((res) => {
-    sblist.list = res;
-  });
-}
-// 选择开始时间
-function ksConfirm(val) {
-  normalForm.kssj = dateFormat("all", val);
-  showkssjPicker.value = false;
-}
-// 选择结束时间
-function jsConfirm(val) {
-  normalForm.jssj = dateFormat("all", val);
-  showjssjPicker.value = false;
-}
-//打开勤务警力选择框
-function showDialogfn(val) {
-  selectType.value = val;
-  showSelect.value = true;
-  selectIndex.value++;
-}
-//选中勤务时间
-function onConfirmTime(val) {
-  calShow.value = false;
-  normalForm.qwrq = dateFormat("", val);
-}
-//选中人员确认按钮
-function onComfirm(val) {
-  let arr = [];
-  val.forEach((item) => {
-    let obj = {
-      id: item.id,
-      sfzh: item.sfzh,
-      dwdm: item.ssbmdm,
-      dwmc: item.ssbm,
-      jylx: item.jylx,
-      xm: item.xm,
-      sjhm: item.lxdh,
-    };
-    arr.push(obj);
-  });
-  normalForm.qwjlLists = arr;
-}
-
-// 删除人员
-function deleteRy(index) {
-  normalForm.qwjlLists.splice(index, 1);
-}
-
-// 新增报备接口
-function onSubmit() {
-  normalForm.qwjlLists.forEach(item=>{
-     item.jylx = item.jylx == '01'?1:2
-    delete item.id
-  })
-  normalForm.kkbh = route.query.kkid;
-  normalForm.kkmc = route.query.kkmc;
-  qwbbAdd(normalForm).then((res) => {
-    hintToast("保存成功");
-    router.go(-1)
-  });
-}
-
-function submitPoup(val) {
-  normalForm.sbbh = val.scDevicesInfoId;
-  normalForm.sbmc = val.baseName;
-  popupShowCar.value = false;
-}
-//结束报备
-function editFn(e) {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认结束报备!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {});
-}
-
-// 获取装备数据
-function getZbData() {}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-.title_tab {
-  @include font_color($font-color-theme);
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-.van-cell:after {
-  display: none;
-}
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-.zbBox {
-  display: flex;
-  font-size: 12px;
-  color: rgb(150, 146, 146);
-  padding: 0 5vw;
-  box-sizing: border-box;
-  justify-content: space-between;
-  align-items: center;
-  flex-wrap: wrap;
-  .zbBox-item {
-    width: 48%;
-    margin: 2vw 0;
-    .bt {
-      display: inline-block;
-      width: 60px;
-      text-align: center;
-    }
-    .zbBox-item:nth-child(2n) {
-      margin-left: 4vw;
-    }
-  }
-}
-.popupTitle {
-  color: #fff;
-}
-.listBox {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin: 4vw 5vw;
-  border-radius: 2vw;
-  padding: 0.5vw 2vw;
-  box-sizing: border-box;
-  font-size: 13px;
-  background-color: #e8eeff;
-  .left {
-    flex: 1;
-    > div {
-      max-width: 280px;
-      line-height: 20px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    .adress {
-      color: #727171;
-    }
-  }
-  .right {
-    width: 20px;
-    height: 20px;
-    margin-left: 4vw;
-    line-height: 16px;
-    text-align: center;
-    background: red;
-    border-radius: 50%;
-    color: #fff;
-    font-size: 20px;
-    font-weight: 800;
-  }
-}
-::v-deep .van-field__label {
-  margin-right: 0px;
-}
-::v-deep .van-radio-group--horizontal,
-.van-checkbox-group--horizontal {
-  flex-wrap: nowrap;
-  @include font_size($font_medium_s);
-}
-::v-deep .van-field__control--custom {
-  justify-content: flex-end;
-}
-::v-deep .van-field__control {
-  text-align: right;
-}
-</style>
diff --git a/src/pages/xlmjHome/components/fjFunction.vue b/src/pages/xlmjHome/components/fjFunction.vue
deleted file mode 100644
index 96b9ff9..0000000
--- a/src/pages/xlmjHome/components/fjFunction.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
-  <van-popup v-model:show="props.show" round style="width: 95%" @click-overlay="onClickOverlay">
-    <div style="padding: 3vw">
-      <div class="other_type_title">附近力量</div>
-      <div class="function_box">
-        <div @click="onClickFjll(item)" v-for="item in points.fjllList" :key="item" class="function_item">
-          <img :src="item.imgUrl" alt="" :class="{ imgBack: item.checked }" />
-          <div class="function_title">{{ item.title }}</div>
-        </div>
-      </div>
-      <div class="other_type_title">附近资源</div>
-      <div class="function_box">
-        <div @click="onClickFjzy(item)" v-for="item in points.fjzyList" :key="item" class="function_item">
-          <img :src="item.imgUrl" alt="" :class="{ imgBack: item.checked }" />
-          <div class="function_title">{{ item.title }}</div>
-        </div>
-      </div>
-      <div class="other_type_title">附近场所</div>
-      <div class="function_box">
-        <div @click="onClickFjcs(item)" v-for="item in points.fjcsList" :key="item" class="function_item">
-          <img :src="item.imgUrl" alt="" :class="{ imgBack: item.checked }" />
-          <div class="function_title">{{ item.title }}</div>
-        </div>
-      </div>
-    </div>
-  </van-popup>
-</template>
-<script setup>
-import { timeValidate} from "@/utils/tools.js";
-import emitter from "@/utils/eventBus.js";
-import { serviceHttp } from '@/api/serviceHttp.js'
-import { getDictList, setDict } from "@/utils/dict";
-import { defineProps, ref, reactive, defineEmits } from "vue";
-const { JQLB_DP , D_BZ_BMYWLX} = getDictList( "JQLB_DP" ,"D_BZ_BMYWLX");
-const props = defineProps({
-  show:{
-    type:Boolean,
-    default:false
-  }
-})
-const emits = defineEmits(["update:close"]);
-//点位功能
-const points = reactive({
-  //附近力量
-  fjllList: [
-    {
-      imgUrl: require("../../../assets/lz/xz.png"),
-      title: "巡组",
-      checked: false,
-    },
-    {
-      imgUrl: require("../../../assets/lz/jwz.png"),
-      title: "警务站",
-      checked: false,
-    },
-    {
-      imgUrl: require("../../../assets/lz/kfd.png"),
-      title: "快反点",
-      checked: false,
-    },
-  ],
-  //附近资源
-  fjzyList: [
-    {
-      imgUrl: require("../../../assets/lz/sp.png"),
-      title: "视频",
-      checked: false,
-    },
-    {
-      imgUrl: require("../../../assets/lz/jtkk.png"),
-      title: "交通卡口",
-      checked: false,
-    },
-    {
-      imgUrl: require("../../../assets/lz/zl.png"),
-      title: "指令",
-      checked: false,
-    },
-    {
-      imgUrl: require("../../../assets/lz/jq.png"),
-      title: "警情",
-      checked: false,
-    },
-    {
-      imgUrl: require("../../../assets/lz/jq.png"),
-      title: "战果",
-      checked: false,
-    },
-  ],
-  //附近场所
-  fjcsList: [
-    {
-      imgUrl: require("../../../assets/lz/ld.png"),
-      title: "旅店",
-      checked: false,
-    },
-    {
-      imgUrl: require("../../../assets/lz/wb.png"),
-      title: "网吧",
-      checked: false,
-    },
-    {
-      imgUrl: require("../../../assets/lz/dzjg.png"),
-      title: "党政机关",
-      checked: false,
-    },
-  ],
-});
-//点击遮罩层
-function onClickOverlay() {
-  emits("update:close", false);
-}
-//点击附近力量
-function onClickFjll(item) {
-  item.checked = !item.checked;
-  points.fjllList.forEach(item=>{
-    if(item.checked && item.title == '巡组') handleGroup();
-    if(!item.checked && item.title == '巡组') emitter.emit("deletePointZBAll"); 
-    if(item.checked && item.title == '警务站') getPoints('jwz');
-    if(!item.checked && item.title == '警务站') emitter.emit("deletePoint", "jwz");
-    if(item.checked && item.title == '快反点') getPoints('kfd');
-    if(!item.checked && item.title == '快反点') emitter.emit("deletePoint", "kfd");
-  })
-}
-
-// 获取巡组信息
-const handleGroup = () => {
-  let pramas = { xfzt:' 0,1,2', qwlx: '01,02,03', pageSize: 500, pageCurrent: 1 }
-  serviceHttp.get(pramas,'/mosty-qwzx/tbQwXfbb/selectDeckList').then(res=>{
-    let arr = res.records ? res.records : [];
-    let brrSd = arr.filter((v) => { return v.jd && v.wd; });
-    let pramas = { coords: brrSd,undel:true, icon: '', flag: "rx" }
-    emitter.emit("addPointTakeTittle", pramas);
-  })
-}
-
-// 处理警务站 - 快返回点
-const getPoints = (type) =>{
-  let data = {ysdl: "001", yszl: "001001"}
-  let icon = ''
-  switch(type){
-    case 'jwz':
-      data.ysxl = "001001007";
-      icon = require("@/assets/pointIcon/jwz.png");
-      break;
-    case 'kfd':
-      data.ysxl = "001001008";
-      icon = require("@/assets/pointIcon/f.png");
-      break;
-  }
-  serviceHttp.post(data,'/mosty-yszx/tbYsGajg/getList').then(res=>{
-    let arr = res.records ? res.records : [];
-    handlePoint(arr, icon, type);
-  })
-}
-
-// 处理撒点
-const handlePoint = (arr,icon,flag,scale) =>{
-  let list = arr.filter((item) => { return item.jd && item.wd;  });
-  emitter.emit("addPoint", { coords: list, icon: icon, flag: flag ,scale });
-}
-//点击附近资源
-const onClickFjzy = (item) => {
-  item.checked = !item.checked;
-  points.fjzyList.forEach(item=>{
-    if(item.checked && item.title == '指令') handleZl();
-    if(!item.checked && item.title == '指令') emitter.emit("deletePoint", "yjMap");
-    if(item.checked && item.title == '警情') handleJQ();
-    if(!item.checked && item.title == '警情') emitter.emit("deletePoint", "jqMap");
-  })
-}
-
-// 处理指令
-const handleZl = () =>{
-  let params = { startTime: timeValidate(new Date(), "ymd"),  endTime: timeValidate(new Date(), "ymd")};
-  serviceHttp.get(params,'/mosty-yjzl/tbYjxx/getList').then(res=>{
-    let arr = res ? res : [];
-    let icon = require("@/assets/pointIcon/icon-zl.png")
-    handlePoint(arr, icon, 'yjMap',1.2);
-  })
-}
-
-// 处理警情
-const handleJQ = () =>{
-  let jqlb = JQLB_DP.value.map(item => {return item.value})
-  let params = { 
-    startTime: timeValidate(new Date(), "ymd"),  
-    endTime: timeValidate(new Date(), "ymd"),
-    bjlbs:jqlb.join(','),
-    mylb:'1,2'
-  };
-  serviceHttp.get(params,'/mosty-sjzx/tbJq/getList').then(res=>{
-    let arr = res ? res : [];
-    let icon = require("@/assets/pointIcon/jqIcon.png")
-    handlePoint(arr, icon, 'jqMap',1.2);
-  })
-}
-
-//点击附近场所
-function onClickFjcs(item) {
-  item.checked = !item.checked;
-}
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.function_box {
-  @include font_size($font_medium_s);
-  display: flex;
-  flex-wrap: wrap;
-  .function_item {
-    text-align: center;
-    width: 25%;
-    padding: 3vw 0;
-    .function_title {
-      margin-top: 1vw;
-    }
-    > img {
-      background: #3e6ee8;
-      width: 25px;
-      height: 25px;
-      border-radius: 50%;
-      padding: 2.5vw;
-    }
-    .imgBack {
-      background: orange;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/xlmjHome/components/selectPeo.vue b/src/pages/xlmjHome/components/selectPeo.vue
deleted file mode 100644
index f5b59f0..0000000
--- a/src/pages/xlmjHome/components/selectPeo.vue
+++ /dev/null
@@ -1,250 +0,0 @@
-<template>
-  <van-popup v-model:show="props.show" style="width: 90%">
-    <div class="popupTitle">{{ popupTitle }}</div>
-    <van-tabs v-model:active="active" color="#3e6ee8" @change="onActive">
-      <van-tab title="民警" name="01"> </van-tab>
-      <van-tab title="辅警" name="02"> </van-tab>
-    </van-tabs>
-    <van-search
-      v-model="searchVal"
-      :placeholder="placeholder"
-      @search="onUpdate"
-      @clear="onClear"
-    />
-    <div class="check-data-box">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text=""
-        @load="onLoad"
-        offset="1"
-        :immediate-check="false"
-      >
-        <!-- 单选 -->
-        <van-radio-group v-model="radioChecked" v-if="props.isRadio">
-          <van-cell-group>
-            <van-cell
-              v-for="item in list.mulChooseList"
-              clickable
-              :key="item"
-              :title="`${item.xm} (${item.lxdh})`"
-              :border="false"
-            >
-              <template #right-icon>
-                <van-radio :name="item.id" />
-              </template>
-              <template #label>
-                <div>
-                  <span :class="active == '02'?'bqBox':'bqBox1'">{{active == '02'?'辅警':'民警'}}</span> {{ item.ssbm }}
-                </div>
-              </template>
-            </van-cell>
-          </van-cell-group>
-        </van-radio-group>
-
-        <!-- 多选 -->
-        <van-checkbox-group
-          v-else
-          v-model="checkedLists"
-          @change="hoooo"
-        >
-          <van-cell-group  v-if="list.mulChooseList.length > 0">
-            <van-cell
-              v-for="item in list.mulChooseList"
-              clickable
-              :key="item"
-              :title="item.xm +(item.lxdh)"
-            >
-              <template #right-icon>
-                <van-checkbox shape="square" :name="item.id" />
-              </template>
-              <template #label>
-                <span :class="active == '02'?'bqBox':'bqBox1'">{{active == '02'?'辅警':'民警'}}</span> 
-                <div>{{ item.ssbm }}</div>
-              </template>
-            </van-cell>
-          </van-cell-group>
-        </van-checkbox-group>
-        <van-empty
-          description="没有数据"
-          image="default"
-          v-if="list.mulChooseList.length <= 0 && loading == false"
-        />
-      </van-list>
-    </div>
-    <div class="popbtn-box">
-      <van-button style="flex: 1" type="default" @click="onCancel"
-        >取消
-      </van-button>
-      <van-button style="flex: 1" type="primary" @click="onConfirm"
-        >确定</van-button
-      >
-    </div>
-  </van-popup>
-</template>
-
-<script setup>
-import { getBBData ,getXfllRyData} from "@/api/xfbbAndZbbb.js";
-import { defineProps, ref, defineEmits, watch, reactive, onMounted } from "vue";
-import { dateFormat, hintToast } from "@/utils/tools";
-const props = defineProps({
-  selectType: String, //查询的类型  详情见watch 监听
-  show: Boolean, //是否显示
-  checkedList: Array, //默认选中 多选
-  isRadio: String, //单选
-});
-const emits = defineEmits([
-  "update:cancel",
-  "update:confirm",
-  "update:tabs",
-  "update:tag",
-]);
-const popupTitle = ref("人员"); //标题
-const active = ref('01'); //默认的TBS 选择
-const loading = ref(false); //列表加载
-const finished = ref(false);
-const checkedLists = ref([]); //选中的数据
-const page = ref(1);
-const total = ref(0);
-const radioChecked = ref("");
-const placeholder = ref(""); //占位字符
-const list = reactive({
-  mulChooseList: [],
-}); //列表数据
-const sowMuList = ref([]) //展示民警辅警的数据
-
-watch(
-  () => props.checkedList,
-  (newValue) => {
-    if (props.isRadio && newValue.length>0) {
-      radioChecked.value = newValue[0].id;
-    } else {
-      checkedLists.value = newValue.map((item) => {
-        return item.id;
-      });
-    }
-  },
-  { immediate: true, deep: true }
-);
-onMounted(()=>{
-  getList('01') //获取民警人员列表
-})
-//tabs切换
-function onActive(val) {
-  page.value = 1
-  list.mulChooseList = []
-  getList(val)
-}
-const searchVal = ref(""); //选择器关键字
-//搜索关键词
-function onUpdate() {
-  page.value = 1
-  getList(active.value)
-}
-//清空关键字
-function onClear() {
-  page.value = 1
-  getList(active.value)
-}
-//触底加载
-function onLoad() {
-  if (page.value >= total.value) {
-    finished.value = true;
-    return;
-  }
-  page.value++;
-  getList(active.value)
-}
-
-function hoooo(){
-}
-
-// 获取民警、辅警数据列表
-function getList(jllx){
-  loading.value = true
-  let params = {
-    pageCurrent: page.value,
-    pageSize: 10,
-    keyword: searchVal.value,
-    jllx
-  }
-  getXfllRyData(params).then(res=>{
-    if(page.value == 1){
-      list.mulChooseList = res.records
-    }else{
-      list.mulChooseList = list.mulChooseList.concat(res.records)
-    }
-    sowMuList.value = sowMuList.value.concat(res.records)
-    let newObj = {}
-    sowMuList.value = sowMuList.value.reduce((preval,curval)=>{
-      newObj[curval.id]?'':newObj[curval.id] = preval.push(curval)
-      return preval
-    },[])
-    total.value = res.total
-    loading.value = false
-  })
-
-}
-
-//关闭弹窗
-function onCancel() {
-  emits("update:cancel", false);
-}
-
-//确认选择
-function onConfirm() {
-  if (radioChecked.value == "" && checkedLists.value.length <= 0) {
-    hintToast("请选择人员");
-  } else {
-    let arr = props.isRadio ? [radioChecked.value] : checkedLists.value;
-    let brr = []
-    sowMuList.value.forEach(v=>{
-      v.jylx = active.value
-      arr.forEach(t=>{if(v.id == t) brr.push(v)})
-    })
-    emits("update:confirm", brr);
-    emits("update:cancel", false);
-  }
-}
-</script>
-<style lang="scss" scoped>
-@import "@/assets/styles/mixin.scss";
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-  color: #fff;
-}
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  padding-top: 2vw;
-}
-
-.check-data-box {
-  height: 100vw;
-  overflow: auto;
-}
-::v-deep .van-stepper__input {
-  width: 100px;
-}
-.zn_tag_select {
-  padding: 2vw 3.5vw;
-}
-.bqBox{
-  padding: 0.5vw 2vw;
-  border-radius: 1vw;
-  background: rgb(42, 209, 167);
-  color: #fff;
-  font-size: 12px;
-}
-.bqBox1{
-  padding: 0.5vw 2vw;
-  border-radius: 1vw;
-  background: rgb(21, 178, 240);
-  color: #fff;
-  font-size: 12px;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/xlmjHome/index.vue b/src/pages/xlmjHome/index.vue
deleted file mode 100644
index 0d06b22..0000000
--- a/src/pages/xlmjHome/index.vue
+++ /dev/null
@@ -1,703 +0,0 @@
-<template>
-  <div style="height:100vh">
-    <GdMap />
-    <div class="point-pop-alert">
-      <img :src="require('../../assets/images/p1.png')" @click="onClickYjbj" alt />
-      <img :src="require('../../assets/images/p2.png')" @click="functionShow = true" alt />
-    </div>
-    <div class="hsf">
-      <van-popover v-model:show="showThemeSetting" :actions="actions" :theme="defaultThemeQp" :offset="[16, 0]"
-        placement="bottom-end" @select="onSelectSeting" :teleport="isbody">
-        <template #reference>
-          <van-icon name="weapp-nav" color="#fff" size="22px" @click.stop="showThemeSetting = true" />
-        </template>
-      </van-popover>
-    </div>
-    <FjFunction :show="functionShow" @update:close="functionShow = false" />
-    <div class="homeTotal_box">
-      <TopTabs :list="zdModule" :kkid="route.query.kkid" :kkmc="route.query.kkmc" @onPcTypeShow="onPcTypeShow"
-        :xzList="xzList" />
-      <div class="home_box">
-        <!-- 检查站 -->
-        <ul class="count-box count-box-jcz" v-if="isShowModel">
-          <li class="count-item-jcz">
-            <div class="count-item-jcz-name">执勤时长</div>
-          </li>
-          <li class="count-item-jcz" v-for="(item, index) in countJczList" :key="index">
-            <div class="count-item-jcz-num">
-              <div class="count-item-jcz-num-left">
-                <span class="num-red">{{ item.total1 }}</span> <br />
-                <span class="text">{{ item.text1 }}</span>
-              </div>
-              <div class="count-item-jcz-num-right">
-                <span class="num">{{ item.total2 }}</span> <br />
-                <span class="text">{{ item.text2 }}</span>
-              </div>
-            </div>
-            <div class="count-item-jcz-name">{{ item.title }}</div>
-          </li>
-        </ul>
-        <!-- 巡防 -->
-        <div class="count-box" v-else>
-          <div class="count-item" v-for="(item, index) in countList" :key="index">
-            <div class="bottom-box">
-              <div class="inner-box">{{ item.title }}</div>
-            </div>
-            <div class="left" @click="uploadSsxz(item, 'L')">
-              <div class="num1">{{ item.total1 }}</div>
-              <div class="text-box">{{ item.text1 }}</div>
-            </div>
-            <div class="right" @click="uploadSsxz(item, 'R')">
-              <div :class="item.title === '实时巡组'
-                ? 'num1'
-                : item.title === '指令信息'
-                  ? 'num2'
-                  : 'num3'
-                ">
-                {{ item.total2 }}
-              </div>
-              <div class="text-box">{{ item.text2 }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <van-dialog :show="showUserChangePicker" title="选择角色" show-cancel-button @confirm="onConfirm"
-      @cancel="showUserChangePicker = false" confirmButtonColor="#3e6ee8">
-      <van-radio-group v-model="isActive">
-        <van-radio v-for="item in radioList" :key="item.id" :name="item.id">{{
-          item.homename
-        }}</van-radio>
-      </van-radio-group>
-    </van-dialog>
-    <BottomTabs type="sy" />
-    <!-- 盘人 街面巡防 -->
-    <checkedPeople ref="pr" :key="pcKey + 'pr'" />
-    <!-- 盘车 -->
-    <checkedCar ref="pc" :key="pcKey + 'pc'" />
-  </div>
-</template>
-
-<script setup>
-import Axios from "axios";
-import { getyjzlCount } from "../../api/checkponit.js";
-import checkedCar from "../spsHome/components/checkCar.vue";
-import { qcckGet } from "@/api/qcckApi.js";
-import checkedPeople from "../spsHome/components/checkPeople.vue";
-import {
-  dateFormat,
-  setUserHome,
-  hintToast,
-  timeValidate,
-} from "../../utils/tools.js";
-import TopTabs from "../../components/topTabs.vue";
-import GdMap from "../../components/GdMap/index.vue";
-import BottomTabs from "../../components/bottomTabs.vue";
-import FjFunction from "./components/fjFunction.vue";
-import { setUserDefaultModleData, getUserLzLocation } from "../../api/user.js";
-import {
-  getRypcList,
-  getRypcCount,
-  getClpcCount,
-  getClpcPcList,
-  getNearXz,
-  queryListfzyc,
-} from "../../api/common.js";
-import {
-  getUserSelectPage,
-  selectDeck1,
-  getZlsl,
-  selectDeck3,
-  addYjbj,
-} from "../../api/gxHomeApi.js";
-import emitter from "../../utils/eventBus.js";
-import {
-  ref,
-  onMounted,
-  onUnmounted,
-  reactive,
-  nextTick,
-  onBeforeUnmount,
-} from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { Dialog } from "vant";
-const route = useRoute();
-const timeHour = ref(0); //小时
-const timeMine = ref(0); //分钟
-const timeSec = ref(0); //秒
-const Loadtion = ref({
-  address: "暂无地址信息",
-  lng: "暂无",
-  lat: "暂无",
-  ly: "暂无",
-});
-const isShowModel = ref(false); //展示底部模块
-//统计数据
-const countJczList = ref([
-  {
-    text1: "执勤",
-    text2: "接收",
-    title: "预警指令",
-    total1: 0,
-    total2: 0,
-  },
-  {
-    text1: "盘查",
-    text2: "移交",
-    title: "盘查人员",
-    total1: 0,
-    total2: 0,
-  },
-  {
-    text1: "盘查",
-    text2: "移交",
-    title: "盘查车辆",
-    total1: 0,
-    total2: 0,
-  },
-]);
-
-//统计数据
-const countList = ref([
-  {
-    text1: "巡组",
-    text2: "警力",
-    title: "实时巡组",
-    total1: 0,
-    total2: 0,
-  },
-  {
-    text1: "完成",
-    text2: "执行中",
-    title: "预警指令",
-    total1: 0,
-    total2: 0,
-  },
-  {
-    text1: "总数",
-    text2: "移交",
-    title: "盘查人员",
-    total1: 0,
-    total2: 0,
-  },
-  {
-    text1: "总数",
-    text2: "移交",
-    title: "盘查车辆",
-    total1: 0,
-    total2: 0,
-  },
-]);
-
-function uploadSsxz(row, type) {
-  switch (row.title) {
-    case "实时巡组":
-      router.push("/qwCenter");
-      break;
-    case "预警指令":
-      router.push("/yyzx/zlzx/zlzxIndex");
-      break;
-    case "盘查人员":
-      router.push("/yyzx/views/pcry");
-      break;
-    case "盘查车辆":
-      router.push("/yyzx/views/clpc");
-      break;
-  }
-}
-let timer;
-onMounted(() => {
-  localStorage.removeItem('NFC')
-  localStorage.removeItem('OCR')
-  _getUserLocation(true); //获取当前位置
-  setInterval(() => {
-    _getUserLocation(false); //获取当前位置
-  }, 5000);
-
-  if (route.query.kkid) {
-    isShowModel.value = true; //展示检查站
-    getCountJcz(); //获取检查站预警指令统计
-    getPcCountJcz(); //获取盘查统计接口
-    setInterval(() => { getTimer(); }, 1000);
-  } else {
-    isShowModel.value = false; //展示街面巡防
-    onShowFZYC(); //显示犯罪区域
-    _getUserSelectPage();
-    getTjdata();
-    timer = setInterval(() => {
-      getJmxzList();
-    }, 5e3);
-  }
-});
-
-
-
-//获取当前位置信息
-function _getUserLocation(sfdw) {
-  let { lng, lat, zbly } = getLocation();
-  if (lng && lat) {
-    // qcckGet({ longitude: lng, latitude: lat }, "/mosty-wzzx/gxga/locationInfo/wgs842Mercator").then(res => {
-    //   emitter.emit("deletePointArea", "dw");
-    //   emitter.emit("addPointArea", {
-    //     coords: [{ jd: res.longitude, wd: res.latitude }],
-    //     icon: require("../../assets/lz/dw.png"),
-    //     flag: "dw",
-    //     sfdw: sfdw,
-    //     sizeX: 30,
-    //     sizeY: 35
-    //   });
-    // })
-    Loadtion.value.lng = lng;
-    Loadtion.value.lat = lat;
-    Loadtion.value.ly = zbly == 1 ? "GPS" : "融合";
-    emitter.emit("deletePointArea", "dw");
-    //地图撒点然后移动
-    emitter.emit("addPointArea", {
-      coords: [{ jd: lng, wd: lat }],
-      icon: require("../../assets/lz/dw.png"),
-      flag: "dw",
-      sfdw: sfdw,
-      sizeX: 30,
-      sizeY: 35
-    });
-  } else {
-    hintToast("暂无坐标信息");
-  }
-}
-
-// 获取计数器
-function getTimer() {
-  timeSec.value++;
-  if (timeSec.value >= 60) {
-    timeSec.value = 1;
-    timeMine.value++;
-  }
-  if (timeMine.value >= 60) {
-    timeMine.value = 1;
-    timeHour.value++;
-  }
-}
-
-onUnmounted(() => {
-  clearInterval(timer);
-});
-
-// 获取检查站-预警指令统计数据
-function getCountJcz() {
-  let params = {
-    beginDate: dateFormat() + " 00:00:00",
-    checkpointCode: route.query.kkid,
-  };
-  getyjzlCount(params).then((res) => {
-    countJczList.value[0].total1 = res.completed; //执勤
-    countJczList.value[0].total2 = res.received; //接收
-  });
-}
-// 获取检查站 - 盘查 人-车-统计数据
-function getPcCountJcz() {
-  // 盘查人员 移交
-  getRypcList({
-    pageCurrent: 1,
-    pageSize: 10,
-    pcclJg: 2,
-    kkid: route.query.kkid,
-  }).then((res) => {
-    countJczList.value[1].total2 = res.total;
-  });
-  // 盘查人员 盘查
-  getRypcList({
-    pageCurrent: 1,
-    pageSize: 10,
-    pcclJg: 9,
-    kkid: route.query.kkid,
-  }).then((res) => {
-    countJczList.value[1].total1 = res.total;
-  });
-  // 盘查车辆 移交
-  getClpcPcList({
-    pageCurrent: 1,
-    pageSize: 10,
-    pcclJg: 2,
-    kkid: route.query.kkid,
-  }).then((res) => {
-    countJczList.value[2].total2 = res.total;
-  });
-  // 盘查车辆  盘查
-  getClpcPcList({
-    pageCurrent: 1,
-    pageSize: 10,
-    pcclJg: 9,
-    kkid: route.query.kkid,
-  }).then((res) => {
-    countJczList.value[2].total1 = res.total;
-  });
-}
-
-// 盘查数据tab
-function onPcTypeShow(type) {
-  pcKey.value++;
-  switch (type) {
-    case "pr":
-      nextTick(() => {
-        pr.value.handleOpen();
-      });
-      break;
-    case "pc":
-      nextTick(() => {
-        pc.value.handleOpen();
-      });
-      break;
-  }
-}
-
-// *******************************************************
-const userInfo = getStorage("userInfo");
-const pcKey = ref(1);
-const pr = ref(null);
-const pc = ref(null);
-const router = useRouter();
-const isActive = ref(7); //用户选中的身份
-const radioList = ref([]); //用户身份数据
-const showUserChangePicker = ref(false); //用户换身份弹窗
-const showThemeSetting = ref(false); //是否显示设置主题模板
-const defaultThemeQp = ref("light"); //默认的右侧气泡框主题
-const isbody = ref("body");
-const xzList = ref([]); //巡组数据
-const actions = [
-  {
-    text: "切换身份",
-    icon: "exchange",
-  },
-];
-
-const functionShow = ref(false); //是否显示点位功能区
-const zdModule = ref([
-  {
-    bkmc: "报备",
-  },
-  {
-    bkmc: "特殊报备",
-  },
-  {
-    bkmc: "盘人",
-  },
-  {
-    bkmc: "盘车",
-  },
-  {
-    bkmc: "指令",
-  },
-]);
-
-// 查询巡组并撒点
-function getJmxzList(xfzt) {
-  let data = {
-    bbrq: timeValidate(new Date(), "ymd"),
-    xfzt: "0,1,2",
-    pageSize: 500,
-    pageCurrent: 1,
-  };
-}
-//点击一键报警
-function onClickYjbj() {
-  let { lng, lat, zbly } = getLocation();
-  if (lng && lat) {
-    Loadtion.value.lng = lng;
-    Loadtion.value.lat = lat;
-    getUserLzLocation({ lng, lat }).then((res) => {
-      if (res) {
-        Loadtion.value.address = res.city + res.suburb + res.town + res.village;
-      }
-    });
-  } else {
-    Loadtion.value.lng = jd;
-    Loadtion.value.lat = wd;
-    Loadtion.value.address = address;
-  }
-
-  Dialog.confirm({
-    title: "提示",
-    message: "是否一键报警?",
-  })
-    .then((res) => {
-      addYjbj({
-        jd: Loadtion.value.lng,
-        wd: Loadtion.value.lat,
-        sfdz: Loadtion.value.address,
-      }).then((res) => { });
-      hintToast("您选择了一键报警！");
-    })
-    .catch((err) => {
-      hintToast("您取消了一键报警！");
-    });
-}
-//获取用户首页模板
-function _getUserSelectPage() {
-  getUserSelectPage({
-    size: 20,
-    current: 1,
-  }).then((res) => {
-    res.records.forEach((item) => {
-      radioList.value.push(item);
-    });
-  });
-}
-//选中的设置信息
-function onSelectSeting(e) {
-  switch (e.text) {
-    case "切换身份":
-      showUserChangePicker.value = true;
-      break;
-  }
-}
-//获取统计数据
-function getTjdata() {
-  selectDeck1({}).then((res) => {
-    countList.value[0].total2 = res.jmfjsl + res.jmmjsl;
-    countList.value[0].total1 = res.sjsl;
-  });
-  // 模块二
-  getZlsl({}).then((res) => {
-    if (res) {
-      countList.value[1].total2 = res.all - res.wwc;
-      countList.value[1].total1 = res.all;
-    }
-  });
-
-  // 模块三 盘查人员
-  // 移交
-  // getRypcList({ pageCurrent: 1, pageSize: 10, pcclJg: 2 }).then((res) => {
-  //   countList.value[2].total1 = res.total;
-  // });
-  // // 盘查
-  // getRypcList({
-  //   pageCurrent: 1,
-  //   pageSize: 10,
-  //   pcclJg: 9,
-  // }).then((res) => {
-  //   countList.value[2].total2 = res.total;
-  // });
-
-  getRypcCount({}).then((res) => {
-    countList.value[2].total1 = res.All;
-    countList.value[2].total2 = res.yj;
-  });
-  // 模块四 盘查车辆
-  // 移交
-  // getClpcPcList({
-  //   pageCurrent: 1,
-  //   pageSize: 10,
-  //   pcclJg: 2,
-  // }).then((res) => {
-  //   countList.value[3].total1 = res.total;
-  // });
-  // // 盘查
-  // getClpcPcList({
-  //   pageCurrent: 1,
-  //   pageSize: 10,
-  //   pcclJg: 9,
-  // }).then((res) => {
-  //   countList.value[3].total2 = res.total;
-  // });
-  getClpcCount({}).then((res) => {
-    countList.value[3].total1 = res.All;
-    countList.value[3].total2 = res.yj;
-  });
-}
-//用户选中身份
-function onConfirm() {
-  showUserChangePicker.value = false;
-  setUserHome(isActive.value);
-}
-//犯罪区域撒点
-function onShowFZYC() {
-  emitter.emit("deletePointArea", 'fzyc')
-  queryListfzyc().then((res) => {
-    if (res.length == 0) return false;
-    res.forEach((item, index) => {
-      emitter.emit("setFzyc", { data: item, index: index, });
-    });
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../assets/styles/mixin.scss";
-
-::v-deep .van-radio-group {
-  padding: 5vw;
-}
-
-::v-deep .van-radio {
-  padding: 2vw 0;
-}
-
-.homeTotal_box {
-  position: absolute;
-  bottom: 13.5vw;
-  z-index: 20;
-  background: #fff;
-  width: 100%;
-  border-top-left-radius: 2vw;
-  border-top-right-radius: 2vw;
-}
-
-.home_box {
-  padding: 1vw 3vw 3vw 3vw;
-}
-
-.point-pop-alert {
-  position: absolute;
-  display: flex;
-  flex-direction: column;
-  top: 80px;
-  right: 10px;
-
-  >img {
-    width: 45px;
-    height: 45px;
-    margin: 2vw 0;
-  }
-}
-
-.count-box {
-  display: flex;
-  flex-wrap: wrap;
-  line-height: 3.5vh;
-  justify-content: space-around;
-  @include font_size($font_medium_s);
-
-  .count-item {
-    margin-top: 1vh;
-    width: 47%;
-    display: flex;
-    margin-top: 3%;
-    align-items: center;
-    background-color: rgba(140, 175, 206, 0.1);
-    border-radius: 1.5vw;
-
-    .bottom-box {
-      flex: 1;
-      box-sizing: border-box;
-      padding: 10px;
-      border-right: 1px dashed rgb(172, 171, 171);
-      width: 100%;
-      height: 100%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      line-height: 2.5vh;
-
-      .inner-box {
-        width: 70%;
-        text-align: center;
-      }
-    }
-
-    .text-box {
-      color: rgb(179, 179, 179);
-    }
-
-    .left {
-      flex: 1;
-      text-align: center;
-      // margin-right: 4vw;
-    }
-
-    .right {
-      flex: 1;
-      text-align: center;
-      // margin-left: 4vw;
-    }
-
-    .num1 {
-      color: rgb(16, 16, 16);
-      font-weight: bold;
-    }
-
-    .num2 {
-      color: rgb(5, 167, 24);
-      font-weight: bold;
-    }
-
-    .num3 {
-      color: rgb(241, 8, 8);
-      font-weight: bold;
-    }
-
-    .top {
-      display: flex;
-    }
-  }
-
-  // 检查站
-  .count-item-jcz {
-    width: calc(50% - 1px);
-    text-align: center;
-    color: #999;
-    border-top: 1px solid #e9e9e9;
-
-    .count-time-jcz {
-      font-size: 1rem;
-      color: #222;
-      line-height: 12vw;
-    }
-
-    .count-item-jcz-num {
-      display: flex;
-      @include font_size($font_medium_s);
-
-      .count-item-jcz-num-left {
-        position: relative;
-        width: 50%;
-        text-align: right;
-        padding: 0 3vw;
-        box-sizing: border-box;
-      }
-
-      .count-item-jcz-num-right {
-        width: 50%;
-        text-align: left;
-        padding: 0 3vw;
-        box-sizing: border-box;
-      }
-
-      .count-item-jcz-num-left::after {
-        content: "";
-        position: absolute;
-        right: 0;
-        top: 10px;
-        bottom: 10px;
-        width: 1px;
-        background: #e9e9e9;
-        border-radius: 1px;
-      }
-
-      .num-red {
-        color: #f00;
-        font-size: 14px;
-      }
-
-      .num {
-        color: #000;
-        font-size: 14px;
-      }
-    }
-  }
-
-  .count-item-jcz:nth-child(2n + 1) {
-    border-right: 1px solid #e9e9e9;
-  }
-}
-
-.count-box-jcz {
-  padding-top: 1vh;
-  box-sizing: border-box;
-}
-
-.hsf {
-  position: absolute;
-  top: 20px;
-  right: 18px;
-}
-</style>
diff --git a/src/pages/yyzx/cjbsPage/cjbsList.vue b/src/pages/yyzx/cjbsPage/cjbsList.vue
deleted file mode 100644
index 4eab888..0000000
--- a/src/pages/yyzx/cjbsPage/cjbsList.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="处警记录" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Search placeholder="请输入上报人员姓名" v-model="kwd" :isSx="true" @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"></Search>
-      </div>
-    </van-sticky>
-    <SxPopup :showPopup="showPopup" :list="cjxx.sxList" :showTime='false' :p_top="110" @update:close="showPopup = false"
-      @update:onConfirm="onConfirm" />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list v-model:loading="loading" :finished="finished" finished-text=" " @load="onLoad" offset="1"
-        :immediate-check="false">
-        <List v-for="(item, index) in cjxx.list" :key="index" :item="item" :dict="{ D_QW_CJSBLX }" />
-        <van-empty description="暂无信息" image="default" v-if="cjxx.list.length <= 0 && showEmpty" />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-
-<script setup>
-import { getRypcList, getRypcCount } from "../../../api/common.js";
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/cjbsList.vue";
-import { setTimeQuantum } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted, watch } from "vue";
-import { qcckGet, qcckPost } from "@/api/qcckApi.js";
-const showEmpty = ref(false);
-const { D_QW_CJSBLX } = getDictList(
-  "D_QW_CJSBLX"
-); //字典信息
-watch(D_QW_CJSBLX, (newValue) => {
-  for (let i = 0; i < newValue.length; i++) {
-    newValue[i].name = newValue[i].text;
-    newValue[i].key = newValue[i].dm;
-    newValue[i].isCheck = false;
-  }
-  cjxx.sxList = [
-    {
-      title: "警情类型",
-      isCheckBox: true,
-      array: newValue,
-    },
-  ];
-  //时间段选项
-  // cjxx.sxList[1] = setTimeQuantum();
-});
-const tabsIndex = ref(1);
-const total = ref(0);
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    pclx: "",
-  },
-  {
-    name: "盘查",
-    count: 0,
-    pclx: "9",
-  },
-  {
-    name: "移交",
-    count: 0,
-    pclx: "2",
-  },
-  {
-    name: "放行",
-    count: 0,
-    pclx: "1",
-  },
-]);
-const cjxx = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  yjJb: "",
-  yjLx: "",
-  startTime: "",
-  endTime: "",
-  yjLx: "",
-  sxList: [], //筛选条件数据
-  list: [], //预警列表数据
-});
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const loadingPull = ref(false);
-const showPopup = ref(false); //筛选弹窗
-
-onMounted(() => {
-  getList();
-});
-//下拉刷新
-function onRefresh() {
-  cjxx.list = [];
-  cjxx.pageNum = 1;
-  kwd.value = "";
-  tabsIndex.value++;
-  getList();
-}
-// 获取警情信息
-function getList() {
-  loading.value = true;
-  qcckGet({
-    pageCurrent: cjxx.pageNum,
-    pageSize: cjxx.pageSize,
-    cjsbRyXm: kwd.value,
-    cjsbLx: cjxx.cjsbLx
-  }, "/mosty-qwzx/tbQwCjbs/selectPage")
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (!res.records || res.records.length <= 0) showEmpty.value = true;
-      if (cjxx.pageNum == 1) {
-        cjxx.list = res.records;
-      } else {
-        res.records.forEach((item) => {
-          cjxx.list.push(item);
-        });
-      }
-      total.value = res.pages;
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  cjxx.pageNum = 1;
-  getList();
-}
-// 弹框盒子
-function onConfirm(val) {
-  cjxx.startTime = val.startTime;
-  cjxx.endTime = val.endTime;
-  let arr = [];
-  if (val.list) {
-    val.list[0].array.forEach((item) => {
-      if (item.isCheck) {
-        arr.push(item.value);
-      }
-    });
-    cjxx.cjsbLx = arr.join(",");
-  }
-
-  cjxx.pageNum = 1;
-  getList();
-  showPopup.value = false;
-}
-function onLoad() {
-  if (cjxx.pageNum >= total.value) {
-    finished.value = true;
-    return;
-  }
-  cjxx.pageNum += 1;
-  getList();
-}
-</script>
-
-<style lang="scss" scoped>
-.sticky_box {
-  margin-top: 13vw;
-}
-</style>
diff --git a/src/pages/yyzx/cjbsPage/index.vue b/src/pages/yyzx/cjbsPage/index.vue
deleted file mode 100644
index 73ba837..0000000
--- a/src/pages/yyzx/cjbsPage/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="处警报送" :showRight="isSeeInfo ? true : false" :showLeft="true" @clickRight="onClickRight" />
-    <div class="main_box">
-      <van-form @submit="onSubmit" class="form" :disabled="isSeeInfo ? false : true">
-        <van-field name="radio" label="警情类型">
-          <template #input>
-            <van-radio-group v-model="params.cjsbLx" direction="horizontal" :disabled="isSeeInfo ? false : true">
-              <van-radio :name="item.dm" v-for="item in D_QW_CJSBLX" :key="item">{{ item.zdmc }}</van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-field v-model="params.cjsbQk" name="cjsbQk" type="textarea" label="处警情况" placeholder="请输入处警情况"
-          :rules="[{ required: true, message: '请输入处警情况' }]" />
-        <van-field name="uploader" label="图片">
-          <template #input>
-            <van-uploader :disabled="isSeeInfo ? false : true" v-model="wpTpIdList" multiple :after-read="upLoadImg" />
-          </template>
-        </van-field>
-        <div style="margin: 16px" v-show="isSeeInfo">
-          <van-button round block type="primary" native-type="submit" :loading="isLoading" loading-type="spinner"
-            loading-text="提交中...">提交</van-button>
-        </div>
-      </van-form>
-    </div>
-  </div>
-</template>
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { qcckGet, qcckPost } from "../../../api/qcckApi.js";
-import ImageCompressor from "image-compressor.js";
-import {
-  timeValidate
-} from "../../../utils/tools.js";
-import { ImagePreview } from "vant";
-import { getMybbTodayNew } from "../../../api/common";
-import { useRoute } from "vue-router";
-import { onMounted, ref } from 'vue';
-import { upImage } from "@/api/common";
-import { hintToast } from "@/utils/tools";
-import router from "@/router";
-import { getDictList, setDict } from "../../../utils/dict";
-const { D_QW_CJSBLX } = getDictList(
-  "D_QW_CJSBLX"
-);
-const route = useRoute();
-const wpTpIdList = ref([]);
-const isSeeInfo = ref(true);
-const fileList = ref([])
-const params = ref({
-  cjsbTpid: '',//图片
-})
-const baseUrl = ref("");
-const workTips = ref();
-// 上传图片
-async function upLoadImg(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  upImage(data).then((res) => {
-    console.log(res, 'res');
-    file.status = "done";
-    file.message = "上传成功";
-    if (!fileList.value.includes(res)) fileList.value.push(res);
-  });
-}
-
-//压缩图片
-const _compressImage = (file) => {
-  return new Promise((resolve, reject) => {
-    new ImageCompressor(file, {
-      quality: 0.6, //压缩质量
-      success(res) {
-        resolve(res);
-      },
-      error(e) {
-        reject(e);
-      },
-    });
-  });
-};
-const onSubmit = () => {
-  if (fileList.value.length > 0) params.value.cjsbTpid = fileList.value.join(',');
-  qcckPost(params.value, "/mosty-qwzx/tbQwCjbs/save").then(res => {
-    hintToast('添加成功')
-    router.back()
-  })
-}
-const onClickRight = () => {
-  router.push('/cjbsList')
-}
-const getImageUrl = (item) => {
-  return new Promise((ok) => {
-    qcckGet({}, `/mosty-base/minio/file/download/${item}`).then(res => {
-      ok(res.url);
-    })
-  });
-}
-onMounted(async () => {
-  if (route.query.item) {
-    isSeeInfo.value = false;
-    params.value = JSON.parse(route.query.item);
-    let imgId = params.value.cjsbTpid.split(',');
-    for (let i = 0; i < imgId.length; i++) {
-      const el = imgId[i];
-      wpTpIdList.value.push({ url: await getImageUrl(el) });
-      console.log(wpTpIdList.value, 'wpTpIdList.value');
-
-    }
-  }
-
-})
-</script>
-<style lang="scss" scoped>
-.main_box {
-  padding: 10px;
-  box-sizing: border-box;
-}
-
-::v-deep .van-radio {
-  margin-bottom: 4px;
-}
-::v-deep .van-radio__label--disabled{
-  color: #000!important;
-}
-::v-deep .van-field__label{
-  color: #000!important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/clock/clockList.vue b/src/pages/yyzx/clock/clockList.vue
deleted file mode 100644
index e02bc57..0000000
--- a/src/pages/yyzx/clock/clockList.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="打卡记录" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Search placeholder="请输入人员姓名" v-model="kwd" :isSx="false" @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"></Search>
-      </div>
-    </van-sticky>
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list v-model:loading="loading" :finished="finished" finished-text=" " @load="onLoad" offset="1"
-        :immediate-check="false">
-        <List v-for="(item, index) in yjxx.list" :key="index" :item="item" />
-        <van-empty description="暂无信息" image="default" v-if="yjxx.list.length <= 0 && showEmpty" />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-
-<script setup>
-import { getRypcList, getRypcCount } from "../../../api/common.js";
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/clockList.vue";
-import { setTimeQuantum } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted, watch } from "vue";
-import { qcckGet, qcckPost } from "@/api/qcckApi.js";
-const showEmpty = ref(false);
-const tabsIndex = ref(1);
-const total = ref(0);
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    pclx: "",
-  },
-  {
-    name: "盘查",
-    count: 0,
-    pclx: "9",
-  },
-  {
-    name: "移交",
-    count: 0,
-    pclx: "2",
-  },
-  {
-    name: "放行",
-    count: 0,
-    pclx: "1",
-  },
-]);
-const yjxx = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  yjJb: "",
-  yjLx: "",
-  startTime: "",
-  endTime: "",
-  yjLx: "",
-  sxList: [], //筛选条件数据
-  list: [], //预警列表数据
-});
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const loadingPull = ref(false);
-const showPopup = ref(false); //筛选弹窗
-
-onMounted(() => {
-  getList();
-});
-//下拉刷新
-function onRefresh() {
-  yjxx.list = [];
-  yjxx.pageNum = 1;
-  kwd.value = "";
-  tabsIndex.value++;
-  getList();
-}
-// 获取警情信息
-function getList() {
-  loading.value = true;
-  qcckPost({
-    pageCurrent: yjxx.pageNum,
-    pageSize: yjxx.pageSize,
-    dkrxm: kwd.value,
-  }, "/mosty-qwzx/tbQwXfbb/selectXfbbDkPage")
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (!res.records || res.records.length <= 0) showEmpty.value = true;
-      if (yjxx.pageNum == 1) {
-        yjxx.list = res.records;
-      } else {
-        res.records.forEach((item) => {
-          yjxx.list.push(item);
-        });
-      }
-      total.value = res.pages;
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.pageNum = 1;
-  getList();
-}
-function onLoad() {
-  if (yjxx.pageNum >= total.value) {
-    finished.value = true;
-    return;
-  }
-  yjxx.pageNum += 1;
-  getList();
-}
-</script>
-
-<style lang="scss" scoped>
-.sticky_box {
-  margin-top: 13vw;
-}
-</style>
diff --git a/src/pages/yyzx/clock/index.vue b/src/pages/yyzx/clock/index.vue
deleted file mode 100644
index 9e7fd80..0000000
--- a/src/pages/yyzx/clock/index.vue
+++ /dev/null
@@ -1,325 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="打卡" :showRight="true" :showLeft="true" @clickRight="onClickRight" />
-    <div class="main_box">
-      <!-- <div class="top_box">
-        <div class="left_top">
-          <div class="top_text">上班：09:00:00</div>
-          <div class="tip_text">未打卡</div>
-        </div>
-        <div class="left_top">
-          <div class="top_text">下班：09:00:00</div>
-          <div class="tip_text">未打卡</div>
-        </div>
-      </div> -->
-      <div class="upload_box">
-        <div class="image_box" v-if="baseUrl">
-          <van-icon name="close" class="close_icon" @click="clearImage" color="#000" size="24px" />
-          <van-image :src="baseUrl" @click="onClickImg(baseUrl)" style="flex: 1">
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-          </van-image>
-        </div>
-        <div class="upload_icon_box" v-else>
-          <van-icon @click="photoFn" name="plus" />
-        </div>
-        <!-- <van-uploader v-model="clockList" :max-count="1" :after-read="afterRead" capture="camera"
-          :before-read="beforeRead" accept="image/*" /> -->
-        <div class="upload_tip"><span style="color: red;">*</span>须拍摄实景图才可进行打卡</div>
-      </div>
-      <div class="dk_box">
-        <div class="circle_box" @click="workFn">
-          {{ workTips ? workTips : '打卡' }}
-        </div>
-        <!-- <div class="dk_tip" v-show="rangeShow"><van-icon name="checked" color="#08B353" />已进入考勤范围：德阳市某某某</div>
-        <div class="dk_tip" v-show="!rangeShow"><van-icon name="clear" color="red" />未进入考勤范围：德阳市某某某</div> -->
-      </div>
-      <!-- <div class="bzt_box">
-        <div style="color: #75787F;">时间轴</div>
-        <van-steps direction="vertical" :active="-1" active-color="#1DB1FF">
-          <van-step>
-            <div style="color:#000">上班打卡</div>
-            <img src="@/assets/images/menu-dk.png" alt="">
-          </van-step>
-          <van-step style="color:#000">
-            <div>下班打卡</div>
-            <img src="@/assets/images/menu-dk.png" alt="">
-          </van-step>
-        </van-steps>
-      </div> -->
-      <div class="choose_dw">
-        <van-button type="primary" block @click="chooseDwFn">{{ workTips ? workTips : '点位选择' }}</van-button>
-        <van-popup v-model:show="showPicker" position="bottom">
-          <van-picker :columns="columns" @confirm="onConfirm" @cancel="showPicker = false" />
-        </van-popup>
-      </div>
-    </div>
-  </div>
-</template>
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { qcckGet, qcckPost } from "../../../api/qcckApi.js";
-import ImageCompressor from "image-compressor.js";
-import {
-  timeValidate
-} from "../../../utils/tools.js";
-import { ImagePreview } from "vant";
-import { getMybbTodayNew } from "../../../api/common";
-import { onMounted, ref } from 'vue';
-import { upImage } from "@/api/common";
-import { hintToast } from "@/utils/tools";
-import router from "@/router";
-const clockList = ref();
-const rangeShow = ref(true);
-const showPicker = ref(false);
-const columns = ref([
-]);
-const params = ref({
-  bbid: "",//报备id,
-  bxdid: "",//必巡id
-  tpid: '',//附件
-})
-const baseUrl = ref("");
-const workTips = ref()
-const Loadtion = ref({
-  jd: "暂无",
-  wd: "暂无",
-  radius: 5000
-});
-// 文件预览
-async function afterRead(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  file.status = "uploading";
-  upImage(data).then((res) => {
-    console.log(res, 'res');
-    file.status = "done";
-    file.message = "上传成功";
-    params.value.tpid = res;
-  });
-}
-
-
-
-const beforeRead = (file) => {
-  // 判断相册里面的照片是不是最新拍摄的照片
-  let timestamp = file.lastModified;
-  let newTime = new Date().getTime() - 5 * 60 * 1000;
-  if (timestamp < newTime) {
-    hintToast('请重新拍摄最新时间的拍照')
-    return true
-  } else {
-    return true
-  }
-}
-const photoFn = () => {
-  try {
-    bridge.pZ("photo");
-  } catch (err) {
-    console.log(err, 'err');
-
-  }
-}
-
-
-//预览图片
-function onClickImg(url) {
-  ImagePreview([url]);
-}
-// 删除图片
-const clearImage = () => {
-  baseUrl.value = ""
-}
-//压缩图片
-const _compressImage = (file) => {
-  return new Promise((resolve, reject) => {
-    new ImageCompressor(file, {
-      quality: 0.6, //压缩质量
-      success(res) {
-        resolve(res);
-      },
-      error(e) {
-        reject(e);
-      },
-    });
-  });
-};
-//获取当前位置信息
-function _getUserLocation(sfdw) {
-  let { lng, lat, zbly } = getLocation();
-  if (lng && lat) {
-    Loadtion.value.jd = lng;
-    Loadtion.value.wd = lat;
-    getBxList()
-  } else {
-    hintToast("暂无坐标信息");
-  }
-}
-const chooseDwFn = () => {
-  showPicker.value = true;
-}
-const onConfirm = (e) => {
-  workTips.value = e.text;
-  params.value.bxdid = e.value;
-  showPicker.value = false;
-}
-// 上班打卡
-const workFn = () => {
-  if (params.value.tpid == '') {
-    hintToast('请拍照再打卡');
-    return
-  }
-  qcckPost(params.value, "/mosty-qwzx/tbQwXfbb/addXfbbDk").then(res => {
-    hintToast('打卡成功');
-    router.back()
-  })
-}
-const onClickRight = () => {
-  router.push('/clockList')
-}
-// 获取报备id
-const getBbInfo = () => {
-  getMybbTodayNew().then(res => {
-    params.value.bbid = res ? res.id : '';
-  })
-}
-// 获取必训点
-const getBxList = () => {
-  qcckGet(Loadtion.value, "/mosty-jcgl/tbJcglBxd/selectNearbyList").then(res => {
-    console.log(res, 'res');
-    columns.value = res.map((item) => {
-      return { text: item.bxdMc, value: item.id }
-    })
-
-  })
-}
-function setimage_base64(pzid, base64) {
-  console.log(base64, 'base64');
-  baseUrl.value = `data:image/jpeg;base64,${base64}`;
-  qcckPost({base64:base64}, "/mosty-base/minio/image/upload/base64").then(res => {
-    params.value.tpid = res;
-  })
-}
-function btof(data, fileName) {
-  const dataArr = data.split(',')
-  const byteString = atob(dataArr[1])
-  const options = {
-    type: 'image/jpeg',
-    endings: 'native'
-  }
-  const u8Arr = new Uint8Array(byteString.length)
-  for (let i = 0; i < byteString.length; i++) {
-    u8Arr[i] = byteString.charCodeAt(i)
-  }
-  return new File([u8Arr], fileName + '.jpg', options)
-}
-onMounted(() => {
-  getBbInfo();
-  _getUserLocation(true); //获取当前位置
-  setInterval(() => {
-    // _getUserLocation(false); //获取当前位置
-  }, 5000);
-  window.setimagebase64 = setimage_base64;
-})
-</script>
-<style lang="scss" scoped>
-.main_box {
-  padding: 10px;
-  box-sizing: border-box;
-}
-
-.top_box {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 10px;
-
-  .left_top {
-    width: 48%;
-    height: 80px;
-    padding: 10px;
-    box-sizing: border-box;
-    top: 61px;
-    left: 10px;
-    gap: 0px;
-    border-radius: 10px;
-    opacity: 0px;
-    background-color: #EDEDED;
-
-    .tip_text {
-      color: #75787F;
-      margin-top: 6px;
-    }
-  }
-}
-
-.upload_box {
-  display: flex;
-
-  .upload_tip {
-    color: #75787F;
-    font-size: 13px;
-  }
-
-  .image_box {
-    position: relative;
-    width: 160px;
-    height: 100px;
-
-    .close_icon {
-      position: absolute;
-      right: 0;
-      top: 0;
-      z-index: 20;
-    }
-
-    ::v-deep .van-image {
-      width: 100%;
-    }
-  }
-
-  .upload_icon_box {
-    border: 1px solid #ccc;
-    text-align: center;
-    width: 160px;
-    height: 100px;
-    line-height: 100px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 10px;
-  }
-}
-
-.dk_box {
-  text-align: center;
-
-  .dk_tip {
-    color: #707070;
-    margin-top: 6px;
-  }
-}
-
-.circle_box {
-  width: 160px;
-  height: 160px;
-  line-height: 160px;
-  margin: 0 auto;
-  margin-top: 40%;
-  border-radius: 50%;
-  color: #fff;
-  font-size: 20px;
-  text-align: center;
-  background: linear-gradient(to bottom, #1DB1FF, #007DE9);
-}
-
-.choose_dw {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  left: 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/components/calendarList.vue b/src/pages/yyzx/components/calendarList.vue
deleted file mode 100644
index e156fc5..0000000
--- a/src/pages/yyzx/components/calendarList.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <ul class="box-rank">
-    <li class="item">
-      <div class="text title">日期</div>
-      <div class="text title">执勤时间</div>
-      <div class="text title">执勤状态</div>
-    </li>
-    <li class="item" v-for="(item, index) in data" :key="index" @click="routePush(item)">
-      <div class="text title">{{ item.time }}</div>
-      <div class="text title">{{ item.zqsj }}</div>
-      <div class="text title" :class="item.zqzt == '请假' ? 'red' : item.zqzt == '未执勤' ? '' : 'green'
-        ">
-        {{ item.zqzt }}
-      </div>
-    </li>
-    <van-empty description="暂无信息" image="default" v-if="data.length <= 0 && !loading" />
-  </ul>
-</template>
-
-<script setup>
-import { ref, defineExpose, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-const router = useRouter();
-const props = defineProps({
-  listData: { type: Array },
-});
-watch(
-  () => props.listData,
-  () => {
-    data.value = props.listData;
-  },
-  { deep: true }
-);
-function routePush(row) {
-  const timeDay = new Date()
-  let y = timeDay.getFullYear()
-  let m = timeDay.getMonth() + 1 < 10 ? '0' + (timeDay.getMonth() + 1) : timeDay.getMonth() + 1
-  let d = timeDay.getDate() < 10 ? '0' + timeDay.getDate() : timeDay.getDate()
-  const dtime = y + '-' + m + '-' + d
-  if (row.zt === "04") {
-    return false;
-  } else {
-    router.push({
-      path: "/xfbbInfo",
-      query: {
-        zt: row.zt,
-        pbid: row.zt === '01' ? row.id : null,
-        bbid: row.zt === '01' ? null : row.id,
-        isDay: dtime === row.time ? 1 : 0
-      },
-    });
-  }
-}
-const loading = ref(false);
-const data = ref([]);
-onMounted(() => {
-  data.value = props.listData;
-})
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.box-rank {
-  width: 100%;
-  height: 100%;
-
-  .item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 8vw;
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-
-    .text {
-      flex: 1;
-      text-align: center;
-    }
-
-    .mc {
-      color: #3e6ee8;
-    }
-  }
-
-  .item:nth-child(2n + 1) {
-    @include table_item_color($table-item-theme);
-  }
-
-  .item:nth-child(1) {
-    background: #3e6ee8 !important;
-    color: #fff;
-  }
-
-  .red {
-    color: red !important;
-  }
-
-  .green {
-    color: #88e9af;
-  }
-
-  .blue {
-    color: #3e6ee8;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/components/calendarListZb.vue b/src/pages/yyzx/components/calendarListZb.vue
deleted file mode 100644
index 2c2b6b6..0000000
--- a/src/pages/yyzx/components/calendarListZb.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <ul class="box-rank">
-    <li class="item">
-      <div class="text title">日期</div>
-      <div class="text title">执勤时间</div>
-      <div class="text title">执勤状态</div>
-    </li>
-    <li class="item" v-for="(item, index) in data" :key="index" @click="routePush(item)">
-      <div class="text title">{{ item.time }}</div>
-      <div class="text title">{{ item.zqsj }}</div>
-      <div class="text title" :class="item.zqzt == '请假' ? 'red' : item.zqzt == '未值班' ? '' : 'green'
-        ">
-        {{ item.zqzt }}
-      </div>
-    </li>
-    <van-empty description="暂无信息" image="default" v-if="data.length <= 0 && !loading" />
-  </ul>
-</template>
-
-<script setup>
-import { ref, defineExpose, watch, onMounted } from "vue";
-import { useRouter } from "vue-router";
-const router = useRouter();
-const props = defineProps({
-  listData: { type: Array },
-});
-watch(
-  () => props.listData,
-  () => {
-    data.value = props.listData;
-  },
-  { deep: true }
-);
-function routePush(row) {
-  const timeDay = new Date()
-  let y = timeDay.getFullYear()
-  let m = timeDay.getMonth() + 1 < 10 ? '0' + (timeDay.getMonth() + 1) : timeDay.getMonth() + 1
-  let d = timeDay.getDate() < 10 ? '0' + timeDay.getDate() : timeDay.getDate()
-  const dtime = y + '-' + m + '-' + d
-  if (row.zt === "04") {
-    return false;
-  } else {
-    router.push({
-      path: "/yyzx/views/addZbbbInfo",
-      query: {
-        zt: row.zt,
-        id: row.id,
-        flag: dtime === row.time ? 1 : 0,
-        text: row.zqzt
-      },
-    });
-  }
-}
-const loading = ref(false);
-const data = ref([]);
-onMounted(() => {
-  data.value = props.listData;
-})
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.box-rank {
-  width: 100%;
-  height: 100%;
-
-  .item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 8vw;
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-
-    .text {
-      flex: 1;
-      text-align: center;
-    }
-
-    .mc {
-      color: #3e6ee8;
-    }
-  }
-
-  .item:nth-child(2n + 1) {
-    @include table_item_color($table-item-theme);
-  }
-
-  .item:nth-child(1) {
-    background: #3e6ee8 !important;
-    color: #fff;
-  }
-
-  .red {
-    color: red !important;
-  }
-
-  .green {
-    color: #88e9af;
-  }
-
-  .blue {
-    color: #3e6ee8;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/components/normalReport.vue b/src/pages/yyzx/components/normalReport.vue
deleted file mode 100644
index bd6119c..0000000
--- a/src/pages/yyzx/components/normalReport.vue
+++ /dev/null
@@ -1,446 +0,0 @@
-<template>
-  <div class="container">
-    <van-form>
-      <div class="title_tab">值班班次</div>
-      <van-cell title="值班日期" @click="calShow = true">
-        <template #value>
-          <span>{{ chooseTime }}</span>
-        </template>
-      </van-cell>
-      <van-calendar v-model:show="calShow" @confirm="onConfirm" :min-date="minDate" :max-date="maxDate"
-        color="#3e6ee8"></van-calendar>
-      <van-field v-model="normalForm.bcmc" name="班次" is-link readonly label="班次" placeholder="请选择班次" input-align="right"
-        @click="showDialogfn('qwbc')" />
-      <van-field readonly v-if="normalForm.bcsc" v-model="normalForm.bcsc" input-align="right" label="班次时段" />
-      <div class="title_tab">值班人员</div>
-      <van-field v-model="normalForm.zbld" name="值班领导" required input-align="right" label="值班领导" is-link readonly
-        placeholder="请值班领导" :rules="[{ required: true, message: '请选择值班领导' }]" @click="showDialogfn('zbld')" />
-      <van-field v-model="normalForm.zhz" readonly input-align="right" name="picker" label="指挥长" placeholder="请选择指挥长"
-        @click="showDialogfn('zhz')" is-link />
-      <van-field v-model="normalForm.zzzhz" readonly input-align="right" name="picker" label="专职指挥长"
-        placeholder="请选择专职指挥长" @click="showDialogfn('zzzhz')" is-link />
-      <van-field v-model="normalForm.fz" readonly input-align="right" name="picker" label="法制" placeholder="请选择法制"
-        @click="showDialogfn('fz')" is-link />
-      <van-cell class="mulSelect" title="值班民警" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('mj')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in list.mj" :key="index">
-              <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'mj')" plain>{{ item.jlxm
-                }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="值班辅警" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('fj')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in list.fj" :key="index">
-              <van-tag closeable @close="deleteCheckTag(item, index, 'fj')" color="#7232dd" plain>{{ item.jlxm
-                }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <div class="title_tab">联系方式</div>
-      <van-field v-model="normalForm.zbdh" name="值班电话" label="值班电话" type="tel" placeholder="请选择值班电话"
-        input-align="right" />
-      <van-field v-model="normalForm.hh" name="呼号" label="呼号" type="digit" placeholder="请输入呼号" input-align="right" />
-      <div style="margin: 16px 0; padding: 0 5vw">
-        <van-button style="margin: 16px 0" round @click="editFn()" block type="success" v-if="list.bbInfo">
-          结束报备
-        </van-button>
-        <van-button round @click="_submitZbbbData" block type="primary" v-else>
-          开始报备
-        </van-button>
-      </div>
-    </van-form>
-    <!-- 负责人 -->
-    <Select bclx="01" :checked="r_checked" :selectType="selectType" :show="showSelect" :checkedList="list.checkedList"
-      @update:cancel="showSelect = false" @update:confirm="onComfirm" :key="selectIndex" />
-  </div>
-</template>
-
-<script setup>
-import { Dialog, Toast } from "vant";
-import { dateFormat, timeValidate, hintToast } from "../../../utils/tools.js";
-import { computed, ref, reactive, onMounted, watch, defineEmits } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import Select from "../../../components/Select.vue";
-import {
-  getMyZbbbData,
-  getMyZbpbData,
-  submitZbbbData,
-  startAndEndZbbbData,
-  endTaskStatus,
-} from "../../../api/yyzxApi.js";
-import { getBcList, getXfqList, getKfdList } from "../../../api/xfbbAndZbbb.js";
-const router = useRouter();
-const route = useRoute();
-const emit = defineEmits(["setTitle"]);
-//表单数据
-const normalForm = reactive({
-  bcmc: "",
-  bcsc: "",
-  zbld: "",
-  zhz: "",
-  zzzhz: "",
-  fz: "",
-  hh: "",
-  bcsc: "",
-  zbdh: "",
-});
-//选择数据
-const list = reactive({
-  mj: [], //选中的民警数据
-  fj: [], //选中的辅警数据
-  bcList: [], //班次信息
-  bpInfo: { zbmj: [], zbfj: [], jlList: [], zbpbId: "", zbrq: "", qwbcid: "" }, //无报备的排班信息
-  bbInfo: null, //报备信息
-  checkedList: [], //默认选中的民辅警数据
-});
-
-const showSelect = ref(false);
-const r_checked = ref(""); //单选框默认选中
-const selectIndex = ref(1); //选择器组件KEY
-const selectType = ref(""); //选择的类型
-// 巡防日期
-const minDate = new Date(2000, 0, 1);
-const maxDate = new Date(2050, 0, 1);
-const calShow = ref(false);
-const chooseTime = ref(timeValidate(new Date(), "ymd"));
-const titleTime = ref();
-function onConfirm(val) {
-  calShow.value = false;
-  chooseTime.value = timeValidate(val, "ymd");
-  titleTime.value = timeValidate(val, "ymd");
-}
-onMounted(() => {
-  _getBcData();
-  _getMyZbbbData();
-});
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return;
-  switch (selectType.value) {
-    case "qwbc":
-      r_checked.value = val[0].key;
-      onbcConfirm(val[0]);
-      break;
-    case "zbld":
-    case "zhz":
-    case "zzzhz":
-    case "fz":
-      if (r_checked.value == val[0].key) {
-        r_checked.value = "";
-        if (selectType.value == "zbld") normalForm.zbld = "";
-        if (selectType.value == "zhz") normalForm.zhz = "";
-        if (selectType.value == "zzzhz") normalForm.zzzhz = "";
-        if (selectType.value == "fz") normalForm.fz = "";
-      } else {
-        r_checked.value = val[0].key;
-        onfzrConfirm(val[0]);
-      }
-      break;
-    case "mj":
-      // list.mj = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "fj":
-      // list.fj = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-  }
-}
-//打开选择框
-function showDialogfn(val) {
-  if (selectType.value !== val) r_checked.value = "";
-  selectType.value = val;
-  showSelect.value = true;
-  selectIndex.value++;
-}
-//开始报备
-function _submitZbbbData() {
-  Reflect.deleteProperty(list.bpInfo, "zbmj");
-  Reflect.deleteProperty(list.bpInfo, "zbfj");
-  list.bpInfo.jlList = [...list.fj, ...list.mj];
-  if (!list.bpInfo.id) {
-    hintToast("没有排班信息");
-    return;
-  }
-  list.bpInfo.zbpbId = list.bpInfo.id; //排班ID
-  list.bpInfo.zbrq = dateFormat();
-  submitZbbbData(list.bpInfo).then((res) => {
-    hintToast("成功");
-    _startZbbbData(res, 0);
-    _endTaskStatus("04", list.bpInfo.mrjlid, 2);
-  });
-}
-//结束任务
-function _endTaskStatus(rwxl, ywid, rwzt) {
-  let data = { rwxl, ywid, rwzt };
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    data.jd = location.app_x;
-    data.wd = location.app_y;
-  } catch (error) { }
-  endTaskStatus(data).then((res) => { });
-}
-//结束报备
-function editFn() {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认结束报备!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    _startZbbbData(list.bbInfo.id, 1);
-  });
-}
-//提交开始||结束报备
-function _startZbbbData(id, bbzt) {
-  startAndEndZbbbData({ id, bbzt }).then((res) => {
-    list.bpInfo = null;
-    router.go(-1);
-  });
-}
-//获取我的值班报备信息
-function _getMyZbbbData() {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  getMyZbbbData()
-    .then((res) => {
-      if (res) {
-        list.bbInfo = res;
-        emit("setTitle", "值班报备信息");
-        _setHxData(res);
-        Toast.clear();
-      } else {
-        //没有报备信息调用
-        _getMyZbpbData();
-      }
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-}
-//获取我的值班排班信息
-function _getMyZbpbData() {
-  getMyZbpbData().then((res) => {
-    //回显班次数据
-    emit("setTitle", "值班排班信息");
-    if (res) {
-      _setHxData(res);
-      list.bpInfo = res;
-    } else {
-      hintToast("没有值班和排班信息");
-    }
-    Toast.clear();
-  });
-}
-//设置页面回显
-function _setHxData(res) {
-  let info = list.bcList.find((item) => {
-    return item.id == res.qwbcid;
-  });
-  if (info) onbcConfirm(info);
-  //值班人
-  normalForm.zbld = `${res.zbldXm ? res.zbldXm : ""} ${res.zbldDh ? res.zbldDh : ""
-    }`;
-  normalForm.zbdh = res.zbldDh ? res.zbldDh : "";
-
-  normalForm.zhz = `${res.zbzhzXm ? res.zbzhzXm : ""} ${res.zbzhzDh ? res.zbzhzDh : ""
-    }`;
-  normalForm.zzzhz = `${res.zzzhzXm ? res.zzzhzXm : ""} ${res.zzzhzDh ? res.zzzhzDh : ""
-    }`;
-  normalForm.fz = `${res.fzzbXm ? res.fzzbXm : ""} ${res.fzzbDh ? res.fzzbDh : ""
-    }`;
-  //呼号
-  normalForm.hh = res.hh;
-  //民辅警
-  list.mj = JSON.parse(res.zbmj);
-  list.fj = JSON.parse(res.zbfj);
-}
-//选中的班次数据
-function onbcConfirm(val) {
-  list.bpInfo.qwbcid = val.id;
-  normalForm.bcmc = val.bcmc;
-  normalForm.bcsc = `${val.kssj} - ${val.jssj}`;
-}
-//获取班次数据
-function _getBcData() {
-  return new Promise((ok) => {
-    let data = {
-      type: 2,
-      keyword: "",
-      bclx: "01",
-    };
-    getBcList(data).then((res) => {
-      if (res) {
-        for (let i = 0; i < res.length; i++) {
-          res[i].value = `${res[i].ssbm}-${res[i].bcmc}`;
-          res[i].key = res[i].id;
-        }
-        list.bcList = res;
-      }
-      ok();
-    });
-  });
-}
-//选中领导数据
-function onfzrConfirm(val) {
-  switch (selectType.value) {
-    case "zbld":
-      normalForm.zbld = `${val.xm} ${val.lxdh}`;
-      normalForm.zbdh = val.lxdh;
-      break;
-    case "zhz":
-      normalForm.zhz = `${val.xm} ${val.lxdh}`;
-      break;
-    case "zzzhz":
-      normalForm.zzzhz = `${val.xm} ${val.lxdh}`;
-      break;
-    case "fz":
-      normalForm.fz = `${val.xm} ${val.lxdh}`;
-      break;
-  }
-}
-//删除选中的民辅警数据
-function deleteCheckTag(item, index, val) {
-  switch (val) {
-    case "mj":
-      list.mj.splice(index, 1);
-      break;
-    case "fj":
-      list.fj.splice(index, 1);
-      break;
-  }
-}
-//选中民辅警数据
-const toggle = (item) => {
-  switch (selectType.value) {
-    case "mj":
-      list.mj.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xbdm: item.xbdm,
-        id: item.ryid,
-        qwjzId: "",
-        jlId: item.ryid,
-      });
-      break;
-    case "fj":
-      list.fj.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        id: item.id,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xbdm: item.xbdm,
-        qwjzId: "",
-        jlId: item.id,
-      });
-      break;
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-
-.title_tab {
-  @include font_color($font-color-theme);
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-
-.van-cell:after {
-  display: none;
-}
-
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-
-.popupTitle {
-  color: #fff;
-}
-</style>
diff --git a/src/pages/yyzx/components/specialReport.vue b/src/pages/yyzx/components/specialReport.vue
deleted file mode 100644
index ac8ab13..0000000
--- a/src/pages/yyzx/components/specialReport.vue
+++ /dev/null
@@ -1,1215 +0,0 @@
-<template>
-  <div class="container">
-    <van-config-provider :theme-vars="themeVars">
-      <van-form @submit="onSubmit">
-        <van-field v-model="specialForm.xfrq" name="巡防日期" label="巡防日期" placeholder="请选择巡防日期"
-          :rules="[{ required: true, message: '请选择巡防日期' }]" right-icon="calendar-o" input-align="right"
-          @click="showXfrq = true" />
-        <div class="title_tab">人员车辆</div>
-        <van-field v-model="specialForm.fzrXm" readonly name="picker" input-align="right" is-link label="负责人"
-          placeholder="请选择负责人" @click="showfzrPicker = true" />
-
-        <van-cell class="mulSelect" title="民警" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('mj')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.mj" :key="index">
-                <van-tag closeable @close="deleteCheckTag(item, index, 'mj')" color="#7232dd" plain>{{ item.text
-                  }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'mj')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <van-cell class="mulSelect" title="辅警" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('fj')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.fj" :key="index">
-                <van-tag closeable @close="deleteCheckTag(item, index, 'fj')" color="#7232dd" plain>{{ item.text
-                  }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'fj')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <div class="title_tab">装备</div>
-        <van-cell class="mulSelect" title="智能装备" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('zn')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.zn" :key="index">
-                <van-tag closeable @close="deleteCheckTag(item, index, 'zn')" color="#7232dd" plain>{{ item.text
-                  }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'zn')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <van-cell class="mulSelect" title="警用器械" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('jy')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.jy" :key="index">
-                <van-tag closeable @close="deleteCheckTag(item, index, 'jy')" color="#7232dd" plain>{{ item.text
-                  }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'jy')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-        <div class="title_tab">巡逻</div>
-        <van-cell class="mulSelect" title="巡防车辆" color="#1989fa">
-          <template #right-icon>
-            <van-icon @click.stop="showDialogfn('cl')" name="add-o" color="#1989fa" size="22" />
-          </template>
-          <template #default>
-            <div class="selected-box">
-              <div class="check-item-tag" v-for="(item, index) in list.cl" :key="index">
-                <van-tag closeable @close="deleteCheckTag(item, index, 'cl')" color="#7232dd" plain>{{ item.text
-                  }}</van-tag>
-                <!-- <van-badge>
-                  <template #content>
-                    <van-icon
-                      name="cross"
-                      class="badge-icon"
-                      @click="deleteCheckTag(item, index, 'cl')"
-                    />
-                  </template>
-                </van-badge> -->
-              </div>
-            </div>
-          </template>
-        </van-cell>
-
-        <!-- <div class="titlebbSjy">武器装备</div> -->
-        <van-field class="change" name="radio" label="巡逻方式">
-          <template #input>
-            <van-radio-group v-model="specialForm.xlfs" direction="horizontal" :disabled="disable">
-              <van-radio shape="square" checked-color="#3e6ee8" name="1">步巡</van-radio>
-              <van-radio shape="square" checked-color="#3e6ee8" name="0">车巡</van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-field class="change" name="radio" label="着装类型">
-          <template #input>
-            <van-radio-group v-model="specialForm.zzlx" direction="horizontal" :disabled="disable">
-              <van-radio shape="square" checked-color="#3e6ee8" name="0">制服</van-radio>
-              <van-radio shape="square" checked-color="#3e6ee8" name="1">便衣</van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-field class="change" name="radio" label="武装类型">
-          <template #input>
-            <van-radio-group v-model="specialForm.wzlx" direction="horizontal" :disabled="disable">
-              <van-radio shape="square" checked-color="#3e6ee8" name="0">武装</van-radio>
-              <van-radio shape="square" checked-color="#3e6ee8" name="1">非武装</van-radio>
-            </van-radio-group>
-          </template>
-        </van-field>
-        <van-row>
-          <van-col span="24" v-for="(item, index) in list.jy" :key="index">
-            <van-field class="change" name="radio" label-width="50%" :label="item.qxmc" input-align="right">
-              <template #input>
-                <van-stepper v-model="item.qxsl" step="1" />
-              </template>
-            </van-field>
-          </van-col>
-        </van-row>
-        <van-row>
-          <van-col span="24">
-            <van-field rows="3" type="textarea" v-model="specialForm.bz" name="备注" placeholder="备注信息" />
-          </van-col>
-        </van-row>
-        <div style="margin: 16px 0">
-          <van-button :loading="loading" round @click="submit" block type="primary">
-            {{ route.query.reportTitle === "报备" ? "提交" : "结束报备" }}
-          </van-button>
-        </div>
-      </van-form>
-    </van-config-provider>
-
-    <van-popup v-model:show="showXfrq" position="bottom">
-      <van-datetime-picker v-model="specialForm.xfrq" type="month-day" title="选择巡防日期" :min-date="minDate"
-        :max-date="maxDate" :formatter="formatter" @confirm="onXfrqConfirm" @change="xfChange"
-        @cancel="showXfrq = false" />
-    </van-popup>
-    <van-popup v-model:show="showjzPicker" position="bottom">
-      <van-picker :columns="list.jzList" :columns-field-names="customJzFieldName" @confirm="onjzConfirm"
-        @cancel="showjzPicker = false" />
-    </van-popup>
-    <van-popup v-model:show="showfzrPicker" position="bottom">
-      <van-search v-model="list.phone" placeholder="请输入负责人电话号码" @update:model-value="getMJList()" />
-      <van-picker :columns="list.fzrList" @confirm="onfzrConfirm" @cancel="showfzrPicker = false"
-        :columns-field-names="customfzrFieldNamed" />
-    </van-popup>
-    <van-popup v-model:show="selfDefinedPopup" :style="{ width: '80%' }">
-      <div class="popupTitle">{{ popupTitle }}</div>
-      <van-search v-model="list.text" :placeholder="`请输入`" @update:model-value="getJYList(popupTitle)" />
-      <div class="check-data-box">
-        <van-checkbox-group v-model="checkedList">
-          <van-cell-group inset>
-            <van-cell v-for="(item, index) in list.mulChooseList" clickable :key="item" :title="`${item.text}`">
-              <template #right-icon>
-                <van-checkbox :name="item.text" :ref="(el) => (checkboxRefs[index] = el)"
-                  @click="toggle(item, index)" />
-              </template>
-            </van-cell>
-          </van-cell-group>
-        </van-checkbox-group>
-      </div>
-      <div class="popbtn-box">
-        <van-button style="flex: 1" type="default" size="small" @click="selfDefinedPopup = false">取消
-        </van-button>
-        <van-button style="flex: 1" type="primary" size="small" @click="popSure">确定</van-button>
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import {
-  selectDeckList,
-  addXFBB,
-  queryJzList,
-  tbJcglXfll,
-  getQwdj,
-  getQwbc,
-  getXfq,
-} from "../../../api/report.js";
-import {
-  selectNextPage,
-  sysUser,
-  getZnzb,
-  selectJyqx,
-  getXfclList,
-  selectKfdList,
-} from "../../../api/patrolBasicInfo";
-import {
-  getBxdList,
-  finishReport,
-  getMybbTodayNew,
-  getMyXfpbToday,
-  getBcxx,
-  getKfd,
-  getXfqs,
-} from "../../../api/common";
-import { timeFormat } from "../../../utils/index";
-import { computed, ref, reactive, onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
-const router = useRouter();
-const route = useRoute();
-//主题色
-const themeType = ref(getStorage("themeSetting"));
-const themeVars = ref({
-  cellBackgroundColor: themeType.value == "light" ? "#fff" : "#041634",
-  fieldInputTextColor: themeType.value == "light" ? "#333" : "#fff",
-  fieldLabelColor: themeType.value == "light" ? "#333" : "#fff",
-  cellTextColor: themeType.value == "light" ? "#333" : "#fff",
-  radioLabelColor: themeType.value == "light" ? "#333" : "#fff",
-  cellBorderColor: themeType.value == "light" ? "#dbdbdb" : "#001e6b",
-});
-const specialForm = reactive({
-  xlfs: "1",
-  zzlx: "1",
-  wzlx: "1",
-  qwdjLabel: "",
-  qwdj: "",
-  startEndDate: "",
-  ksDate: "",
-  jsDate: "",
-  ksTime: "",
-  jsTime: "",
-  kssj: "",
-  jssj: "",
-  jzLabel: "",
-  jzMc: "",
-  jzId: "",
-  xfbmLabel: "",
-  xfbm: "",
-  xfbmdm: "",
-  ssbm: "",
-  ssbmdm: "",
-  fzrXm: "",
-  fzrSfzh: "",
-  fzrLxdh: "",
-  fzrId: "",
-  znzbList: [],
-  jyqxList: [],
-  clList: [],
-  jlList: [],
-  bz: "",
-  xfrq: timeFormat(new Date()),
-  jgts: 0,
-  bcmc: "",
-  xfbm: "",
-  xfbmdm: "",
-  xffwid: "",
-  xffwlx: "",
-  xlfa: "1", //巡逻方案
-});
-const list = reactive({
-  columns: [],
-  jzList: [],
-  ssbmList: [],
-  fzrList: [],
-  phone: "",
-  fzrTotal: 0,
-  mjList: [],
-  fjList: [],
-  fjXm: "",
-  mjXm: "",
-  zbList: [],
-  jyqxList: [],
-  clList: [],
-  cph: "",
-  sbmc: "",
-  qxMc: "",
-  text: "",
-  mulChooseList: [],
-  mj: [],
-  fj: [],
-  zn: [],
-  jy: [],
-  cl: [],
-  scoutsRangeList: [
-    {
-      text: "巡防区",
-      value: "巡防区",
-      children: [],
-    },
-    {
-      text: "快反点",
-      value: "快反点",
-      children: [],
-    },
-  ],
-  xfqList: [],
-  kfdList: [],
-  rcfaList: [],
-  tsfaList: [],
-  bxdMc: "",
-});
-onMounted(() => {
-  getIsReport();
-  getXUJZList();
-  getDepts();
-  getMJList();
-  getFj();
-  getMJ();
-  getznzbs();
-  getJyqx();
-  getCl();
-  getQwLevel();
-  getQwbcList();
-  getSourtRange();
-});
-// 判断已报备还是未报备
-function getIsReport() {
-  let flag = route.query.reportTitle;
-  if (route.query.reportType === "02") {
-    if (flag === "报备") {
-      getMyXfpbToday().then((res1) => {
-        specialForm.bbzt = "0";
-        specialForm.ksTime = res1.kssj;
-        specialForm.jsTime = res1.jssj;
-        specialForm.fzrXm = res1.fzrXm;
-        specialForm.fzrId = res1.fzrId;
-        specialForm.jzMc = res1.jzMc;
-        specialForm.wzlx = res1.wzlx;
-        specialForm.xffwlx = res1.xffwlx;
-        specialForm.jzId = res1.jzId;
-        specialForm.qwbcId = res1.pbId;
-        specialForm.xffwid = res1.xffwid;
-        specialForm.zqsc = res1.zqsc;
-        specialForm.xfrq = timeFormat(new Date());
-        getXffwList(res1.xffwid);
-        specialForm.xlfs = res1.xlfs;
-        specialForm.fzrLxdh = res1.fzrLxdh;
-        specialForm.fzrSfzh = res1.fzrSfzh;
-        specialForm.bz = res1.bz;
-        specialForm.kssj = res1.kssj;
-        specialForm.jssj = res1.jssj;
-        specialForm.jd = "104.13407";
-        specialForm.wd = "29.99572";
-        // specialForm.xlfaMc = res1.xlfaMc
-        specialForm.famc = res1.xlfaMc;
-        specialForm.xlfaLx = res1.xlfaLx ? res1.xlfaLx : "01";
-        specialForm.xlfaId = res1.xlfaId;
-        if (specialForm.xlfaLx === "02") {
-          specialForm.xlfaMc = res1.xlfaMc;
-        }
-        getBcxxList(res1.qwbcId);
-        list.cl = JSON.parse(res1.pbcl);
-        if (list.cl.length > 0) {
-          specialForm.xlfs = "0";
-        }
-        list.cl.forEach((ele) => {
-          ele.text = ele.jdchphm;
-        });
-        list.fj = JSON.parse(res1.pbfj);
-        list.fj.forEach((f) => {
-          f.text = f.jlxm;
-        });
-        list.mj = JSON.parse(res1.pbmj);
-        list.mj.forEach((m) => {
-          m.text = m.jlxm;
-        });
-        list.zn = JSON.parse(res1.txzb);
-        list.zn.forEach((m) => {
-          m.text = m.sbmc;
-        });
-        list.jy = JSON.parse(res1.jyqx);
-        list.jy.forEach((m) => {
-          m.text = m.qxmc;
-          m.qxsl = m.sl;
-        });
-      });
-    } else if (flag === "已报备") {
-      getMybbTodayNew().then((res2) => {
-        getBcxxList(res2.qwbcId);
-        specialForm.xffwlx = res2.xffwlx;
-        specialForm.xffwid = res2.xffwid;
-        getXffwList(res2.xffwid);
-        specialForm.id = res2.id;
-        specialForm.ksTime = res2.bbkssj ? res2.bbkssj.split(" ")[1] : "";
-        specialForm.jsTime = res2.bbjssj ? res2.bbjssj.split(" ")[1] : "";
-        specialForm.fzrXm = res2.fzrXm;
-        specialForm.fzrId = res2.fzrId;
-        specialForm.jzMc = res2.jzMc;
-        specialForm.bz = res2.bz;
-        specialForm.famc = res2.xlfaMc;
-        specialForm.xlfaLx = res2.xlfaLx ? res2.xlfaLx : "01";
-        specialForm.xlfaId = res2.xlfaId;
-        specialForm.kssj = res2.kssj;
-        specialForm.jssj = res2.jssj;
-        specialForm.jzId = res2.jzId;
-        specialForm.xfpbId = res2.qwbcId;
-        specialForm.zqsc = res2.zqsc;
-        specialForm.jd = "104.13407";
-        specialForm.wd = "29.99572";
-        specialForm.xfrq = timeFormat(new Date());
-        // specialForm.xlfaMc = res2.xlfaMc
-        if (res2.xlfaLx === "02") {
-          specialForm.xlfaMc = res2.xlfaMc;
-        }
-        list.cl = JSON.parse(res2.pbcl);
-        if (list.cl.length > 0) {
-          specialForm.xlfs = "0";
-        }
-        list.cl.forEach((ele) => {
-          ele.text = ele.jdchphm;
-        });
-        list.fj = JSON.parse(res2.pbfj);
-        list.fj.forEach((f) => {
-          f.text = f.jlxm;
-        });
-        list.mj = JSON.parse(res2.pbmj);
-        list.mj.forEach((m) => {
-          m.text = m.jlxm;
-        });
-        list.zn = JSON.parse(res2.txzb);
-        list.zn.forEach((m) => {
-          m.text = m.sbmc;
-        });
-        list.jy = JSON.parse(res2.jyqx);
-        list.jy.forEach((m) => {
-          m.text = m.qxmc;
-          m.qxsl = m.qxsl;
-        });
-        specialForm.wzlx = res2.wzlx;
-        specialForm.xffwlx = res2.xffwlx;
-        specialForm.xlfs = res2.xlfs;
-        specialForm.xffwid = res2.xffwid;
-      });
-    }
-  }
-}
-// 查询班次信息
-function getBcxxList(val) {
-  getBcxx(val).then((res) => {
-    specialForm.bcmc = res.bcmc ? res.bcmc : "";
-  });
-}
-// 查询巡防范围通过id查询
-function getXffwList(val) {
-  if (specialForm.xffwlx === "1") {
-    getXfqs({
-      id: val,
-    }).then((res) => {
-      specialForm.xfqMc = res.xfqMc;
-    });
-  } else if (specialForm.xffwlx === "2") {
-    getKfd({
-      id: val,
-    }).then((res) => {
-      specialForm.kfdMc = res.kfdMc;
-    });
-  }
-}
-// 勤务等级
-const showqwPicker = ref(false);
-
-function getQwLevel() {
-  getQwdj({
-    pageSize: 200,
-    pageCurrent: 1,
-    fbzt: 1,
-  }).then((res) => {
-    qwdjList.value = res.records;
-    qwdjList.value.forEach((item) => {
-      if (item.qwdj === "01") {
-        item.text = "一级勤务";
-      } else if (item.qwdj === "02") {
-        item.text = "二级勤务";
-      } else if (item.qwdj === "03") {
-        item.text = "三级勤务";
-      } else if (item.qwdj === "04") {
-        item.text = "日常勤务";
-      }
-    });
-  });
-}
-const qwdjList = ref([]);
-
-function onqwConfirm(value) {
-  specialForm.qwdjLabel = value.text;
-  specialForm.qwdj = value.value;
-  showqwPicker.value = false;
-}
-// 选择勤务班次
-const showbcPicker = ref(false);
-
-function onbcConfirm(val) {
-  specialForm.bcmc = val.bcmc;
-  specialForm.ksTime = val.kssj;
-  specialForm.jsTime = val.jssj;
-  specialForm.qwbcId = val.id;
-  specialForm.zqsc = val.zqsc;
-  showbcPicker.value = false;
-}
-const bcList = ref([]);
-
-function getQwbcList() {
-  getQwbc({
-    pageSize: 200,
-    pageCurrent: 1,
-    bcmc: "",
-    bclx: "02",
-  }).then((res) => {
-    bcList.value = res.records;
-    bcList.value.forEach((item) => {
-      item.text = item.bcmc;
-    });
-  });
-}
-// 开始结束日期
-const calendarShow = ref(false);
-
-function onCalendarConfirm(values) {
-  // specialForm.startEndDate = timeFormat(values[0]) + '至' + timeFormat(values[1])
-  // specialForm.ksDate = timeFormat(values[0])
-  // specialForm.jsDate = timeFormat(values[1])
-  specialForm.xfrq = timeFormat(values) + " " + "00:00:00";
-  calendarShow.value = false;
-}
-// 开始时间
-const showksPicker = ref(false);
-
-function onksConfirm(val) {
-  specialForm.kssj = val + ":" + "00";
-  // specialForm.kssj = specialForm.ksDate + ' ' + specialForm.ksTime
-  showksPicker.value = false;
-}
-
-function ksChange(val) {
-  specialForm.kssj = val + ":" + "00";
-}
-// 结束时间
-const showjsPicker = ref(false);
-
-function onjsConfirm(val) {
-  specialForm.jssj = val + ":" + "00";
-  // specialForm.jssj = specialForm.jsDate + ' ' + specialForm.jsTime
-  showjsPicker.value = false;
-}
-const showXfrq = ref(false);
-const currentDate = ref(new Date());
-const minDate = new Date();
-const maxDate = new Date(2050, 10, 1);
-const formatter = (type, val) => {
-  if (type === "month") {
-    return `${val}月`;
-  }
-  if (type === "day") {
-    return `${val}日`;
-  }
-  return val;
-};
-//巡防日期
-function onXfrqConfirm(val) {
-  let time = new Date(val);
-  let year = time.getFullYear();
-  let month = time.getMonth() + 1;
-  let day = time.getDate();
-  specialForm.xfrq = year + "-" + month + "-" + day;
-  showXfrq.value = false;
-}
-
-function jsChange(val) {
-  specialForm.jssj = val + ":" + "00";
-}
-
-function xfChange(val) {
-  let time = new Date(val);
-  let year = time.getFullYear();
-  let month = time.getMonth() + 1;
-  let day = time.getDate();
-  specialForm.xfrq = year + "-" + month + "-" + day;
-}
-// 巡防范围
-const showsrPicker = ref(false);
-
-function onsrChange(value) {
-  specialForm.xffwid =
-    value.selectedOptions[value.selectedOptions.length - 1].id;
-  specialForm.xffwlx = value.selectedOptions[0].text;
-}
-// 选择警组
-const showjzPicker = ref(false);
-
-function onjzConfirm(val) {
-  list.mj = [];
-  list.fj = [];
-  list.cl = [];
-  list.zn = [];
-  list.jy = [];
-  specialForm.jzMc = val.jzMc;
-  specialForm.fzrXm = val.ddMjxm;
-  specialForm.fzrLxdh = val.ddDh;
-  specialForm.fzrId = val.ddMjid;
-  specialForm.fzrSfzh = val.ddMjsfzh;
-  specialForm.jh = val.ddMjjh;
-  specialForm.jzId = val.id;
-  specialForm.ssbm = val.ssbm;
-  specialForm.ssbmdm = val.ssbmdm;
-  // 民警辅警已有赋值
-  val.jzryList.forEach((m) => {
-    if (m.jllx === "01") {
-      list.mj.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xbdm: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-    if (m.jllx === "02") {
-      list.fj.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xbdm: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-  });
-  // 车辆
-  val.clList.forEach((c) => {
-    list.cl.push({
-      clId: c.clId,
-      jdchphm: c.jdchphm,
-      text: c.jdchphm,
-      jdchpzldm: c.jdchpzldm,
-      qwjzId: c.qwjzId,
-    });
-  });
-  // 警用器械
-  val.jyqxList.forEach((j) => {
-    list.jy.push({
-      qxid: j.qxId,
-      qxmc: j.qxmc,
-      text: j.qxmc,
-      qxsl: j.sl ? j.sl : 1,
-      qxlx: j.qxlx,
-      qwjzId: j.qwjzId,
-    });
-  });
-  // 智能装备
-  val.txzbList.forEach((z) => {
-    list.zn.push({
-      sbmc: z.sbmc,
-      text: z.sbmc,
-      txzblx: z.txzblx,
-      txzbId: z.zbId,
-      qwjzId: z.qwjzId,
-      hh: z.hh,
-    });
-  });
-  showjzPicker.value = false;
-}
-const customJzFieldName = {
-  text: "jzMc",
-};
-// 查询警组
-function getXUJZList() {
-  queryJzList({
-    pageSize: 20,
-    pageCurrent: 1,
-  }).then((res) => {
-    list.jzList = res.records;
-  });
-}
-// 巡防部门
-const showxfPicker = ref(false);
-
-function onxfConfirm(val) {
-  showxfPicker.value = false;
-}
-const customFieldNamed = {
-  text: "orgName",
-  value: "orgName",
-  children: "childDeptList",
-};
-const showbmPicker = ref(false);
-
-function onChange(value, selectedOptions) {
-  specialForm.ssbmdm =
-    value.selectedOptions[value.selectedOptions.length - 1].id;
-}
-// 查询部门
-function getDepts() {
-  selectNextPage({}).then((res) => {
-    list.ssbmList = [res.records[0]];
-  });
-}
-// 选择负责人
-const showfzrPicker = ref(false);
-
-function onfzrConfirm(val) {
-  specialForm.fzrXm = val.userName;
-  specialForm.jzMc = val.userName + "-" + "警组";
-  specialForm.fzrSfzhL = val.idEntityCard;
-  specialForm.fzrLxdh = val.telePhone;
-  specialForm.fzrId = val.id;
-  showfzrPicker.value = false;
-}
-const customfzrFieldNamed = {
-  text: "userName",
-};
-// 查询负责人
-function getMJList() {
-  sysUser({
-    current: 1,
-    size: 50,
-    phone: list.phone,
-  }).then((res) => {
-    list.fzrList = res.records;
-    list.fzrTotal = res.total;
-  });
-}
-
-// 查询民警辅警 智能装备 警用器械 巡防车辆
-function getJYList(val) {
-  switch (val) {
-    case "选择民警":
-      list.mjXm = list.text;
-      getMJ();
-      list.mulChooseList = list.mjList;
-      break;
-    case "选择辅警":
-      list.fjXm = list.text;
-      getFj();
-      list.mulChooseList = list.fjList;
-      break;
-    case "选择智能装备":
-      list.sbmc = list.text;
-      getznzbs();
-      list.mulChooseList = list.zbList;
-      break;
-    case "选择警用器械":
-      list.qxMc = list.text;
-      getJyqx();
-      list.mulChooseList = list.jyqxList;
-      break;
-    case "选择巡防车辆":
-      list.cph = list.text;
-      getCl();
-      list.mulChooseList = list.clList;
-      break;
-  }
-}
-// 民警
-function getMJ() {
-  tbJcglXfll({
-    pageCurrent: 1,
-    pageSize: 50,
-    fl: "01", // 民警
-    xm: list.mjXm,
-  }).then((res) => {
-    list.mjList = res.records;
-    list.mjList.forEach((item) => {
-      item.text = item.xm;
-    });
-  });
-}
-// 辅警
-function getFj() {
-  tbJcglXfll({
-    pageCurrent: 1,
-    pageSize: 50,
-    fl: "02", // 辅警
-    xm: list.fjXm,
-  }).then((res) => {
-    list.fjList = res.records;
-    list.fjList.forEach((item) => {
-      item.text = item.xm;
-    });
-  });
-}
-// 智能装备
-function getznzbs() {
-  // 智能装备
-  getZnzb({
-    pageNo: 1,
-    pageSize: 50,
-    sbmc: list.sbmc,
-  }).then((res) => {
-    list.zbList = res.records;
-    list.zbList.forEach((item) => {
-      item.text = item.sbmc;
-    });
-  });
-}
-
-function getJyqx() {
-  // 警用器械
-  selectJyqx({
-    pageNo: 1,
-    pageSize: 50,
-    qxMc: list.qxMc,
-  }).then((res) => {
-    list.jyqxList = res.records;
-    list.jyqxList.forEach((item) => {
-      item.text = item.qxMc;
-    });
-  });
-}
-
-function getCl() {
-  // 巡防车辆
-  getXfclList({
-    pageCurrent: 1,
-    pageSize: 50,
-    cph: list.cph,
-  }).then((res) => {
-    list.clList = res.records;
-    list.clList.forEach((item) => {
-      item.text = item.cph;
-    });
-  });
-}
-// 弹框标题
-const checkList = reactive({});
-const checkedList = ref([]);
-const checkboxRefs = ref([]);
-const popupTitle = ref("");
-const selfDefinedPopup = ref(false);
-
-function showDialogfn(val) {
-  list.text = "";
-  switch (val) {
-    case "mj":
-      popupTitle.value = "选择民警";
-      checkedList.value = list.mj.map((el) => el.text);
-      list.mulChooseList = list.mjList;
-      break;
-    case "fj":
-      popupTitle.value = "选择辅警";
-      checkedList.value = list.fj.map((el) => el.text);
-      list.mulChooseList = list.fjList;
-      break;
-    case "zn":
-      popupTitle.value = "选择智能装备";
-      checkedList.value = list.zn.map((el) => el.text);
-      list.mulChooseList = list.zbList;
-      break;
-    case "jy":
-      popupTitle.value = "选择警用器械";
-      checkedList.value = list.jy.map((el) => el.text);
-      list.mulChooseList = list.jyqxList;
-      break;
-    case "cl":
-      popupTitle.value = "选择巡防车辆";
-      checkedList.value = list.cl.map((el) => el.text);
-      list.mulChooseList = list.clList;
-      break;
-  }
-  selfDefinedPopup.value = true;
-}
-
-function popSure() {
-  selfDefinedPopup.value = false;
-}
-const toggle = (item, index) => {
-  switch (popupTitle.value) {
-    case "选择民警":
-      if (!list.mj.map((m) => m.text).includes(item.text)) {
-        list.mj.push({
-          jh: item.jh,
-          jllx: item.fl,
-          jlxm: item.xm,
-          text: item.xm,
-          nl: 0,
-          qwjzId: "",
-          jlId: item.ryid,
-          sfzh: item.sfzh,
-          xbdm: item.xbdm,
-          xm: item.jlxm,
-          jh: item.jh,
-          lxdh: item.lxdh,
-          id: item.ryid,
-        });
-      } else {
-        list.mj.splice(list.mj.map(m1 => m1.jlxm).indexOf(item.xm), 1)
-      }
-      break;
-    case "选择辅警":
-      if (!list.fj.map((f) => f.text).includes(item.text)) {
-        list.fj.push({
-          jh: item.jh,
-          jllx: item.fl,
-          jlxm: item.xm,
-          text: item.xm,
-          nl: 0,
-          qwjzId: "",
-          jlId: item.id,
-          sfzh: item.sfzh,
-          xbdm: item.xbdm,
-          xm: item.jlxm,
-          jh: item.jh,
-          lxdh: item.lxdh,
-          id: item.id,
-        });
-      } else {
-        list.fj.splice(list.fj.map(f1 => f1.jlxm).indexOf(item.jlxm), 1)
-      }
-      break;
-    case "选择智能装备":
-      if (!list.zn.map((z) => z.text).includes(item.text)) {
-        list.zn.push({
-          sbmc: item.sbmc,
-          text: item.sbmc,
-          txzblx: item.scode,
-          txzbId: item.id,
-          hh: item.sbbh,
-        });
-      } else {
-        list.zn.splice(list.zn.map(f1 => f1.text).indexOf(item.text), 1)
-      }
-      break;
-    case "选择警用器械":
-      if (!list.jy.map((j) => j.qxid).includes(item.id)) {
-        list.jy.push({
-          qxid: item.id,
-          qxmc: item.qxMc,
-          text: item.qxMc,
-          qxsl: item.sl,
-          qxlx: item.scode,
-        });
-      } else {
-        list.jy.splice(list.jy.map(f1 => f1.text).indexOf(item.text), 1)
-      }
-      if (item.scode === "01") {
-        specialForm.wzlx = "1";
-      }
-      break;
-    case "选择巡防车辆":
-      if (!list.cl.map((c) => c.clId).includes(item.cid)) {
-        specialForm.xlfs = "0";
-        list.cl.push({
-          clId: item.cid,
-          jdchphm: item.cph,
-          text: item.cph,
-          jdchpzldm: item.cllx,
-        });
-      } else {
-        list.cl.splice(list.cl.map(f1 => f1.text).indexOf(item.text), 1)
-      }
-      break;
-  }
-};
-
-function deleteCheckTag(item, index, val) {
-  switch (val) {
-    case "mj":
-      list.mj.splice(index, 1);
-      break;
-    case "fj":
-      list.fj.splice(index, 1);
-      break;
-    case "zn":
-      list.zn.splice(index, 1);
-      break;
-    case "jy":
-      list.jy.splice(index, 1);
-      if (!list.jy.map((j) => j.scode).includes("01")) {
-        specialForm.wzlx = "0";
-      }
-      break;
-    case "cl":
-      list.cl.splice(index, 1);
-      if (list.cl == false) {
-        specialForm.xlfs = "1";
-      }
-      break;
-  }
-}
-// 查询巡防范围
-function getSourtRange() {
-  getXfq({
-    pageCurrent: 1,
-    pageSize: 200,
-  }).then((res) => {
-    let xfq = res.records;
-    list.xfqList = res.records;
-    list.scoutsRangeList[0].children = xfq;
-  });
-  selectKfdList({
-    pageNum: 1,
-    pageSize: 200,
-  }).then((res) => {
-    let kfd = res.records;
-    list.kfdList = res.records;
-    list.scoutsRangeList[1].children = kfd;
-  });
-}
-
-// 日常方案
-const showrcfaPicker = ref(false);
-
-function onrcfaConfirm() {
-  showrcfaPicker.value = false;
-}
-
-function getFaList() {
-  getBxdList({
-    pageSize: 50,
-    pageCurrent: 1,
-    bxdMc: list.bxdMc,
-  }).then((res) => {
-    list.records = res.records;
-  });
-}
-// 特殊方案
-const showtsfaPicker = ref(false);
-
-function ontsfaConfirm() {
-  showtsfaPicker.value = false;
-}
-// 巡防区
-const filedxfqNames = {
-  text: "xfqMc",
-};
-const showxfqPicker = ref(false);
-
-function onxfqConfirm(val) {
-  specialForm.xffwid = val.id;
-  specialForm.xfqMc = val.xfqMc;
-  specialForm.xffwmc = val.xfqMc;
-  showxfqPicker.value = false;
-}
-// 快反点
-const filedkfdNames = {
-  text: "kfdMc",
-};
-const showkfdPicker = ref(false);
-
-function onkfdConfirm(val) {
-  specialForm.xffwid = val.kfdId;
-  specialForm.kfdMc = val.kfdMc;
-  specialForm.xffwmc = val.kfdMc;
-  showkfdPicker.value = false;
-}
-
-// 新增报备接口
-function submit() {
-  specialForm.jlList = [...list.mj, ...list.fj];
-  specialForm.clList = list.cl;
-  specialForm.jyqxList = list.jy;
-  specialForm.znzbList = list.zn;
-  const params = {
-    xlfs: specialForm.xlfs,
-    wzlx: specialForm.wzlx,
-    zzlx: specialForm.zzlx,
-    ssbmdm: specialForm.ssbmdm,
-    ssbm: specialForm.ssbm,
-    xfrq: specialForm.xfrq,
-    xffwlx: specialForm.xffwlx,
-    xffwid: specialForm.xffwid,
-    qwbcId: specialForm.qwbcId,
-    kssj: specialForm.ksTime,
-    jssj: specialForm.jsTime,
-    zqsc: specialForm.zqsc,
-    jzId: specialForm.jzId,
-    fzrXm: specialForm.fzrXm,
-    fzrId: specialForm.fzrId,
-    jzMc: specialForm.jzMc,
-    fzrSfzh: specialForm.fzrSfzh,
-    fzrLxdh: specialForm.fzrLxdh,
-    bz: specialForm.bz,
-    jlList: specialForm.jlList,
-    znzbList: specialForm.znzbList,
-    jyqxList: specialForm.jyqxList,
-    clList: specialForm.clList,
-    bblx: "02",
-  };
-  if (route.query.reportTitle === "报备") {
-    addXFBB(params).then((res) => {
-      finishReport({
-        bbzt: "0",
-        id: res,
-      }).then((res) => { });
-      router.push("/home");
-    });
-  } else if (route.query.reportTitle === "已报备") {
-    finishReport({
-      bbzt: "1",
-      id: specialForm.id,
-    }).then((res) => {
-      router.push("/home");
-    });
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-
-.title_tab {
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-
-.van-cell:after {
-  display: none;
-}
-
-.van-cell {
-  background: #e4e9f6;
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-
-.popupTitle {
-  color: #fff;
-}
-</style>
diff --git a/src/pages/yyzx/deptxfbbCalendar/index.vue b/src/pages/yyzx/deptxfbbCalendar/index.vue
deleted file mode 100644
index 3f08ecb..0000000
--- a/src/pages/yyzx/deptxfbbCalendar/index.vue
+++ /dev/null
@@ -1,462 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="部门巡防报备清单" :showLeft="true" />
-    <div class="calenderBox">
-      <div class="calender-head">
-        <div class="btn" @click="last">
-          <van-icon name="arrow-left" color="#fff" />
-        </div>
-        <div class="text">{{ Year }}年{{ month }}月</div>
-        <div class="btn" @click="next">
-          <van-icon name="arrow" color="#fff" />
-        </div>
-      </div>
-      <!-- 日历 -->
-      <div class="list">
-        <ul class="week">
-          <li class="days" v-for="(item, index) in week" :key="index">
-            {{ item }}
-          </li>
-        </ul>
-        <div class="wrap">
-          <div @click="checkDay(Year + '-' + month + '-' + item.value)" class="item"
-            v-for="(item, index) in calendarList" :key="index">
-            <div class="num" :class="calendarActive == Year + '-' + month + '-' + item.value ? 'active' : ''">
-              {{ item.value }}<span v-show="item.value">日</span>
-            </div>
-            <div class="status" v-show="item.value">
-              <div v-for="item2 in item.list" :key="item2.id">
-                <span @click="itemClick(item)" v-show="item.value" :style="{ background: item.color }">{{ item2.fzrXm }}
-                  {{ item2.kssj.split(":")[0] + ":" + item2.kssj.split(":")[1] }}
-                  {{ item2.jssj.split(":")[0] + ":" + item2.jssj.split(":")[1] }}
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-for="item in zbInfo.list" :key="item.id" class="list-item item_box">
-      <div class="title">部门巡防报备详情</div>
-      <div>
-        <div class="num-text">负责人：{{ item.fzrXm }}</div>
-        <div class="num-text">
-          巡防民警：{{ checkJSON(item.pbmj, 'jlxm') }}
-        </div>
-        <div class="num-text">
-          巡防辅警：{{ checkJSON(item.pbfj, 'jlxm') }}
-        </div>
-        <div class="num-text">
-          巡防车辆：{{ checkJSON(item.pbcl, 'jdchphm') }}
-        </div>
-        <div class="num-text">负责人电话：{{ item.fzrLxdh }}</div>
-        <div class="num-text">巡防时间：{{ item.kssj }} - {{ item.jssj }}</div>
-      </div>
-    </div>
-    <div v-if="zbInfo.list.length === 0" style="text-align: center; padding: 12px 0; color: #828282">
-      暂无今日报备
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { getXfbbByMonth } from "../../../api/calender";
-import TopNav from "../../../components/topNav.vue";
-import { onMounted, reactive, ref } from "vue";
-import { useRouter } from "vue-router";
-import { Toast } from "vant";
-const zbInfo = ref({
-  list: [],
-});
-const router = useRouter();
-const week = ref(["周日", "周一", "周二", "周三", "周四", "周五", "周六"]);
-const Year = ref(new Date().getFullYear()); //日历上的年份
-const month = ref(new Date().getMonth() + 1); //日历上的月份
-const Day = ref(new Date().getDate()); //日历上的天份
-const nowYear = ref(new Date().getFullYear());
-const nowmonth = ref(new Date().getMonth() + 1);
-const nowDay = ref(new Date().getDate());
-//日历选中高亮
-const calendarActive = ref("");
-const starttime = ref("");
-const endtime = ref("");
-const nowtime = ref("");
-
-const calendarList = ref([]);
-onMounted(() => {
-  Draw(nowYear.value, nowmonth.value);
-  let time_month = nowmonth.value; //现在的月份
-  let time_day = nowDay.value; //现在的天数
-  if (nowmonth.value < 10) {
-    time_month = 0 + "" + nowmonth.value;
-  }
-  if (nowDay.value < 10) {
-    time_day = 0 + "" + nowDay.value;
-  }
-  nowtime.value = nowYear.value + "-" + time_month + "-" + time_day;
-  calendarActive.value =
-    nowYear.value + "-" + nowmonth.value + "-" + nowDay.value;
-  starttime.value = nowtime.value;
-  endtime.value = nowtime.value;
-});
-//处理JSON数据
-function checkJSON(row, key) {
-  var data = []
-  try {
-    data = JSON.parse(row)
-  } catch (error) {
-    data = []
-  }
-  var str = ''
-  try {
-    str = data.map(item => item[key]).join(',')
-  } catch (error) {
-
-  }
-  return !str ? '暂无' : str
-}
-function itemClick(e) {
-  zbInfo.value = e;
-}
-//状态字典
-const ztDict = [
-  {
-    label: "无报备",
-    value: "00",
-    color: "#7b7b7b",
-  },
-  {
-    label: "有报备",
-    value: "01",
-    color: "#51fb06",
-  },
-  {
-    label: "今日报备",
-    value: "02",
-    color: "#51fb06",
-  },
-  {
-    label: "今日排班",
-    value: "03",
-    color: "#7b7b7b",
-  },
-  {
-    label: "无",
-    value: "04",
-    color: "#7b7b7b",
-  },
-  {
-    label: "有排班",
-    value: "05",
-    color: "#7b7b7b",
-  },
-  {
-    label: "无排班",
-    value: "06",
-    color: "#7b7b7b",
-  },
-];
-//状态数据处理
-function checkZt(list = []) {
-  var zt = [];
-  if (list.length > 0) {
-    zt = list.map((item) => {
-      return {
-        text: ztDict.filter((item2) => item2.value === item.zt)[0].label,
-        color: ztDict.filter((item2) => item2.value === item.zt)[0].color,
-        id: item.id,
-        zt: item.zt,
-      };
-    });
-  }
-  return zt;
-}
-const isToday = ref(true);
-function Draw(Year, Month) {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  getXfbbByMonth({ time: Year + "-" + Month })
-    .then((res) => {
-      const copyRes = JSON.parse(JSON.stringify(res)).map((c) => {
-        var ccc = [];
-        if (!c.list) {
-          ccc = [];
-        } else {
-          ccc = c.list.map((ci) => {
-            return {
-              ...ci,
-              zt: c.type,
-            };
-          });
-        }
-        return {
-          ...c,
-          label: ztDict.filter((item2) => item2.value === c.type)[0].label,
-          color: ztDict.filter((item2) => item2.value === c.type)[0].color,
-          list: ccc,
-        };
-      });
-      calendarList.value = copyRes.map((item, index) => {
-        return {
-          value: index + 1,
-          kssj: "20:00", //假数据
-          jssj: "23:59",
-          status: checkZt(item.list), //假的状态
-          count: Year + "-" + Month + "-" + item.day,
-          ...item,
-        };
-      });
-      if (isToday.value) {
-        var toTime = new Date();
-        var m =
-          toTime.getMonth() < 9
-            ? "0" + (toTime.getMonth() + 1)
-            : toTime.getMonth() + 1;
-        var d = toTime.getDay() < 10 ? "0" + toTime.getDay() : toTime.getDay();
-        var toDay = toTime.getFullYear() + "-" + m + "-" + d;
-        calendarList.value.forEach((v) => {
-          if (v.time === toDay) {
-            zbInfo.value = v;
-            isToday.value = false;
-          }
-        });
-      }
-      for (
-        var i = 1, firstDay = new Date(Year, Month - 1, 1).getDay();
-        i <= firstDay;
-        i++
-      ) {
-        calendarList.value.unshift("");
-      }
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-}
-function checkDay(val) {
-  calendarActive.value = val;
-}
-// 上个月
-function last() {
-  month.value--;
-  if (month.value == 0) {
-    month.value = 12;
-    Year.value--;
-  }
-  Draw(Year.value, month.value);
-}
-// 下个月
-function next() {
-  month.value++;
-  if (month.value == 13) {
-    month.value = 1;
-    Year.value++;
-  }
-  Draw(Year.value, month.value);
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.calenderBox {
-  width: 100%;
-  padding: 1vw;
-  box-sizing: border-box;
-
-  .calender-head {
-    width: 100%;
-    height: 15vw;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-    font-weight: bold;
-    line-height: 40px;
-    position: relative;
-
-    .change {
-      position: absolute;
-      right: 1vw;
-      bottom: 2vw;
-      cursor: pointer;
-      color: #3e6ee8;
-      @include font_size($font_medium_s);
-    }
-
-    .btn {
-      width: 7vw;
-      height: 7vw;
-      line-height: 7vw;
-      text-align: center;
-      border-radius: 1vw;
-      background: #3e6ee8;
-      color: #fff;
-    }
-
-    .text {
-      margin: 0 4vw;
-      @include font_color($font-color-theme);
-    }
-  }
-
-  .week {
-    width: 100%;
-    display: flex;
-    flex-wrap: nowrap;
-    text-align: center;
-    height: 10vw;
-    line-height: 10vw;
-    background: #164acc;
-    color: #fff;
-
-    .days {
-      flex: 1;
-    }
-  }
-
-  .wrap {
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: calc((100% / 7) - 1.3px);
-      border: 1px solid #3e6ee8;
-      border-top: none;
-      font-size: 10px;
-      min-height: 15vw;
-
-      .num {
-        text-align: right;
-        padding-right: 1vw;
-        box-sizing: border-box;
-        @include font_color($font-color-theme);
-      }
-
-      .num.active {
-        color: #1adb10;
-      }
-
-      .status {
-        text-align: center;
-        margin: 1vw 0;
-
-        span {
-          background: #3e6ee8;
-          padding: 1px 1vw;
-          display: block;
-          width: 10vw;
-          color: #fff;
-          border-radius: 1vw;
-          margin: 6px auto;
-        }
-
-        .green {
-          background: #1adb10;
-        }
-
-        .gray {
-          background: #83868f;
-        }
-      }
-
-      .time {
-        font-size: 10px;
-        // height: 5vw;
-        // line-height: 7vw;
-        color: #3e6ee8;
-        text-align: center;
-      }
-
-      .greenColor {
-        color: #1adb10;
-      }
-
-      .grayColr {
-        color: #83868f;
-      }
-
-      .BlueColor {
-        color: #3e6ee8;
-      }
-    }
-
-    .item:nth-child(7n + 2) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 3) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 4) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 5) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 6) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 7) {
-      border-left: none;
-    }
-  }
-}
-
-.list {
-  //   max-height: calc(100vh - 35vw);
-  // overflow: hidden;
-  // overflow-y: auto;
-}
-
-.list-item {
-  padding: 3vw;
-  margin: 2vh 5vw;
-  border-radius: 2vw;
-
-  .phone-icon {
-    position: absolute;
-    right: 5vw;
-  }
-
-  .address-box {
-    display: flex;
-    justify-content: space-between;
-
-    .adress-left {
-      color: #3e6ee8;
-    }
-  }
-
-  .name-text {
-    @include font_size($font_medium);
-    color: #3e6ee8;
-    margin-bottom: 1vh;
-    font-weight: bold;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-  }
-
-  .title {
-    @include font_size($font_medium);
-    font-weight: 550;
-  }
-
-  .num-text {
-    @include font_size($font_medium_s);
-    color: #2b2b2b;
-    padding: 4px 0;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/deptzbbbCalendar/index.vue b/src/pages/yyzx/deptzbbbCalendar/index.vue
deleted file mode 100644
index f9407fe..0000000
--- a/src/pages/yyzx/deptzbbbCalendar/index.vue
+++ /dev/null
@@ -1,461 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="部门值班报备清单" :showLeft="true" />
-    <div class="calenderBox">
-      <div class="calender-head">
-        <div class="btn" @click="last">
-          <van-icon name="arrow-left" color="#fff" />
-        </div>
-        <div class="text">{{ Year }}年{{ month }}月</div>
-        <div class="btn" @click="next">
-          <van-icon name="arrow" color="#fff" />
-        </div>
-      </div>
-      <!-- 日历 -->
-      <div class="list">
-        <ul class="week">
-          <li class="days" v-for="(item, index) in week" :key="index">
-            {{ item }}
-          </li>
-        </ul>
-        <div class="wrap">
-          <div @click="checkDay(Year + '-' + month + '-' + item.value)" class="item"
-            v-for="(item, index) in calendarList" :key="index">
-            <div class="num" :class="calendarActive == Year + '-' + month + '-' + item.value
-              ? 'active'
-              : ''
-              ">
-              {{ item.value }}<span v-show="item.value">日</span>
-            </div>
-            <div class="status" v-show="item.value">
-              <div v-for="item2 in item.list" :key="item2.id">
-                <span @click="itemClick(item)" v-show="item.value" :style="{ background: item.color }">{{ item2.zbldXm
-                  }}
-                  {{
-                    item2.kssj.split(":")[0] + ":" + item2.kssj.split(":")[1]
-                  }}
-                  {{
-                    item2.jssj.split(":")[0] + ":" + item2.jssj.split(":")[1]
-                  }}
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="list-item item_box">
-      <div class="title">部门值班报备详情</div>
-      <div v-for="item in zbInfo.list" :key="item.id">
-        <div class="num-text">值班领导：{{ item.zbldXm }}</div>
-        <div class="num-text" v-if="item.zbmj && item.zbmj.length > 0">
-          值班民警：{{
-            JSON.parse(item.zbmj)
-              .map((jl) => jl.jlxm)
-              .join("、") || "暂无"
-          }}
-        </div>
-        <div class="num-text" v-if="item.zbfj && item.zbfj.length > 0">
-          值班辅警：{{
-            JSON.parse(item.zbfj)
-              .map((jl) => jl.jlxm)
-              .join("、") || "暂无"
-          }}
-        </div>
-        <div class="num-text">值班电话：{{ item.zbldDh }}</div>
-        <div class="num-text">值班时间：{{ item.kssj }} - {{ item.jssj }}</div>
-      </div>
-    </div>
-    <div v-if="zbInfo.list.length === 0" style="text-align: center; padding: 12px 0; color: #828282">
-      无今日值班
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { getDeptByMonth } from "../../../api/calender";
-import TopNav from "../../../components/topNav.vue";
-import { onMounted, reactive, ref } from "vue";
-import { useRouter } from "vue-router";
-import { Toast } from "vant";
-const zbInfo = ref({
-  list: [],
-});
-//日历选中高亮
-const calendarActive = ref("");
-const router = useRouter();
-const week = ref(["周日", "周一", "周二", "周三", "周四", "周五", "周六"]);
-const Year = ref(new Date().getFullYear()); //日历上的年份
-const month = ref(new Date().getMonth() + 1); //日历上的月份
-const Day = ref(new Date().getDate()); //日历上的天份
-const nowYear = ref(new Date().getFullYear());
-const nowmonth = ref(new Date().getMonth() + 1);
-const nowDay = ref(new Date().getDate());
-
-const starttime = ref("");
-const endtime = ref("");
-const nowtime = ref("");
-
-const calendarList = ref([]);
-onMounted(() => {
-  Draw(nowYear.value, nowmonth.value);
-  let time_month = nowmonth.value; //现在的月份
-  let time_day = nowDay.value; //现在的天数
-  if (nowmonth.value < 10) {
-    time_month = 0 + "" + nowmonth.value;
-  }
-  if (nowDay.value < 10) {
-    time_day = 0 + "" + nowDay.value;
-  }
-  nowtime.value = nowYear.value + "-" + time_month + "-" + time_day;
-  calendarActive.value =
-    nowYear.value + "-" + nowmonth.value + "-" + nowDay.value;
-  starttime.value = nowtime.value;
-  endtime.value = nowtime.value;
-});
-function itemClick(e) {
-  zbInfo.value = e;
-}
-function checkDay(val) {
-  calendarActive.value = val;
-}
-//状态字典
-const ztDict = [
-  {
-    label: "无报备",
-    value: "00",
-    color: "#7b7b7b",
-  },
-  {
-    label: "有报备",
-    value: "01",
-    color: "#51fb06",
-  },
-  {
-    label: "今日报备",
-    value: "02",
-    color: "#51fb06",
-  },
-  {
-    label: "今日排班",
-    value: "03",
-    color: "#7b7b7b",
-  },
-  {
-    label: "无",
-    value: "04",
-    color: "#7b7b7b",
-  },
-  {
-    label: "有排班",
-    value: "05",
-    color: "#7b7b7b",
-  },
-  {
-    label: "无排班",
-    value: "06",
-    color: "#7b7b7b",
-  },
-];
-//状态数据处理
-function checkZt(list = []) {
-  var zt = [];
-  if (list.length > 0) {
-    zt = list.map((item) => {
-      return {
-        text: ztDict.filter((item2) => item2.value === item.zt)[0].label,
-        color: ztDict.filter((item2) => item2.value === item.zt)[0].color,
-        id: item.id,
-        zt: item.zt,
-      };
-    });
-  }
-  return zt;
-}
-const isToday = ref(true);
-function Draw(Year, Month) {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  getDeptByMonth({ time: Year + "-" + Month })
-    .then((res) => {
-      const copyRes = JSON.parse(JSON.stringify(res)).map((c) => {
-        var ccc = [];
-        if (!c.list) {
-          ccc = [];
-        } else {
-          ccc = c.list.map((ci) => {
-            return {
-              ...ci,
-              zt: c.type,
-            };
-          });
-        }
-        return {
-          ...c,
-          label: ztDict.filter((item2) => item2.value === c.type)[0].label,
-          color: ztDict.filter((item2) => item2.value === c.type)[0].color,
-          list: ccc,
-        };
-      });
-      calendarList.value = copyRes.map((item, index) => {
-        return {
-          value: index + 1,
-          kssj: "20:00", //假数据
-          jssj: "23:59",
-          status: checkZt(item.list), //假的状态
-          count: Year + "-" + Month + "-" + item.day,
-          ...item,
-        };
-      });
-      if (isToday.value) {
-        var toTime = new Date();
-        var m =
-          toTime.getMonth() < 9
-            ? "0" + (toTime.getMonth() + 1)
-            : toTime.getMonth() + 1;
-        var d =
-          toTime.getDate() < 10 ? "0" + toTime.getDate() : toTime.getDate();
-        var toDay = toTime.getFullYear() + "-" + m + "-" + d;
-        calendarList.value.forEach((v) => {
-          if (v.time === toDay) {
-            zbInfo.value = v;
-            isToday.value = false;
-          }
-        });
-      }
-      for (
-        var i = 1, firstDay = new Date(Year, Month - 1, 1).getDate();
-        i <= firstDay;
-        i++
-      ) {
-        calendarList.value.unshift("");
-      }
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-}
-// 上个月
-function last() {
-  month.value--;
-  if (month.value == 0) {
-    month.value = 12;
-    Year.value--;
-  }
-  Draw(Year.value, month.value);
-}
-// 下个月
-function next() {
-  month.value++;
-  if (month.value == 13) {
-    month.value = 1;
-    Year.value++;
-  }
-  Draw(Year.value, month.value);
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.calenderBox {
-  width: 100%;
-  padding: 1vw;
-  box-sizing: border-box;
-
-  .calender-head {
-    width: 100%;
-    height: 15vw;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-    font-weight: bold;
-    line-height: 40px;
-    position: relative;
-
-    .change {
-      position: absolute;
-      right: 1vw;
-      bottom: 2vw;
-      cursor: pointer;
-      color: #3e6ee8;
-      @include font_size($font_medium_s);
-    }
-
-    .btn {
-      width: 7vw;
-      height: 7vw;
-      line-height: 7vw;
-      text-align: center;
-      border-radius: 1vw;
-      background: #3e6ee8;
-      color: #fff;
-    }
-
-    .text {
-      margin: 0 4vw;
-      @include font_color($font-color-theme);
-    }
-  }
-
-  .week {
-    width: 100%;
-    display: flex;
-    flex-wrap: nowrap;
-    text-align: center;
-    height: 10vw;
-    line-height: 10vw;
-    background: #164acc;
-    color: #fff;
-
-    .days {
-      flex: 1;
-    }
-  }
-
-  .wrap {
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-
-    .item {
-      width: calc((100% / 7) - 1.3px);
-      border: 1px solid #3e6ee8;
-      border-top: none;
-      font-size: 10px;
-      min-height: 15vw;
-
-      .num {
-        text-align: right;
-        padding-right: 1vw;
-        box-sizing: border-box;
-        @include font_color($font-color-theme);
-      }
-
-      .num.active {
-        color: #1adb10;
-      }
-
-      .status {
-        text-align: center;
-        margin: 1vw 0;
-
-        span {
-          background: #3e6ee8;
-          padding: 1px 1vw;
-          display: block;
-          width: 10vw;
-          color: #fff;
-          border-radius: 1vw;
-          margin: 6px auto;
-        }
-
-        .green {
-          background: #1adb10;
-        }
-
-        .gray {
-          background: #83868f;
-        }
-      }
-
-      .time {
-        font-size: 10px;
-        // height: 5vw;
-        // line-height: 7vw;
-        color: #3e6ee8;
-        text-align: center;
-      }
-
-      .greenColor {
-        color: #1adb10;
-      }
-
-      .grayColr {
-        color: #83868f;
-      }
-
-      .BlueColor {
-        color: #3e6ee8;
-      }
-    }
-
-    .item:nth-child(7n + 2) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 3) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 4) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 5) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 6) {
-      border-left: none;
-    }
-
-    .item:nth-child(7n + 7) {
-      border-left: none;
-    }
-  }
-}
-
-.list {
-  max-height: calc(100vh - 35vw);
-  // overflow: hidden;
-  // overflow-y: auto;
-}
-
-.list-item {
-  padding: 3vw;
-  margin: 2vh 5vw;
-  border-radius: 2vw;
-
-  .phone-icon {
-    position: absolute;
-    right: 5vw;
-  }
-
-  .address-box {
-    display: flex;
-    justify-content: space-between;
-
-    .adress-left {
-      color: #3e6ee8;
-    }
-  }
-
-  .name-text {
-    @include font_size($font_medium);
-    color: #3e6ee8;
-    margin-bottom: 1vh;
-    font-weight: bold;
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-  }
-
-  .title {
-    @include font_size($font_medium);
-    font-weight: 550;
-  }
-
-  .num-text {
-    @include font_size($font_medium_s);
-    color: #2b2b2b;
-    padding: 4px 0;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/dhcr/index.vue b/src/pages/yyzx/dhcr/index.vue
deleted file mode 100644
index f2659ec..0000000
--- a/src/pages/yyzx/dhcr/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="'盘查人员信息'" />
-    <van-form>
-      <div class="title_tab other_type_title">人员信息</div>
-      <div
-        @click="routerPush(item)"
-        class="info_box item_box"
-        v-for="(item, i) in userInfo"
-        :key="i"
-      >
-        <div class="item">
-          <span class="name">姓名</span>：
-          <span class="text">
-            <span class="info">{{ item.xm ? item.xm : "未知" }}</span>
-          </span>
-        </div>
-
-        <div class="item">
-          <span class="name">权重</span>：
-          <span class="text">
-            <span class="info">{{ item.qz }}</span>
-          </span>
-        </div>
-
-        <div class="item">
-          <span class="name">身份证号</span>：
-          <span class="text">
-            <span class="info">{{ item.zjhm }}</span>
-          </span>
-        </div>
-      </div>
-    </van-form>
-    <van-empty
-      description="暂无数据"
-      image="default"
-      v-if="userInfo.length <= 0"
-    />
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted } from "vue";
-import TopNav from "../../../components/topNav";
-import { useRoute, useRouter } from "vue-router";
-import { hintToast } from "../../../utils/tools.js";
-import { Toast ,showLoadingToast} from "vant";
-import { editYyzxApi } from "../../../api/yyzxApi.js";
-const router = useRouter();
-const route = useRoute();
-const userInfo = ref([]);
-const TOASTT = ref()
-onMounted(() => {
-  if (route.query.dhhm) {
-    _getUserInfo(route.query.dhhm);
-  }
-});
-// 电话
-function _getUserInfo(val) {
-  TOASTT.value = Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  editYyzxApi(`/mosty-hczx/tbHcBpcry/getRyListBySjhm/${val}`, {})
-    .then((res) => {
-      TOASTT.value.clear();
-      if (res.length > 0) userInfo.value = res;
-    })
-    .catch((err) => {
-      TOASTT.value.clear();
-    });
-}
-function routerPush(row) {
-  router.push({
-    path: "/quarantinePersonnel",
-    query: { sfzh: row.zjhm, pcsrlx: "6", dhpc: route.query.dhhm },
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-.title_tab {
-  margin: 2vw 0 2vw 6vw;
-}
-
-.info_box {
-  margin: 2vw 4vw;
-  padding: 2vw;
-  box-sizing: border-box;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-  .item {
-    display: flex;
-    justify-content: space-between;
-    background-color: #e8eeff;
-    margin-bottom: 2vw;
-    padding: 2vw;
-    box-sizing: border-box;
-    .name {
-      display: inline-block;
-      width: 14vw;
-      text-align-last: justify;
-    }
-    .text {
-      display: inline-block;
-      width: calc(100% - 15vw);
-      .info {
-        float: right;
-      }
-    }
-  }
-}
-.rycard {
-  display: flex;
-  img {
-    margin-right: 2.5vw;
-  }
-  .item_ry {
-    line-height: 1.5em;
-  }
-}
-</style>
diff --git a/src/pages/yyzx/index.vue b/src/pages/yyzx/index.vue
deleted file mode 100644
index af2da34..0000000
--- a/src/pages/yyzx/index.vue
+++ /dev/null
@@ -1,254 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="应用中心" :showRight="false" :showLeft="false" />
-    <YyzxItem title="置顶" :list="zdList.list" />
-    <!-- <YyzxItem title="勤务中心" :list="qwzxList.list" />
-    <YyzxItem title="预警中心" :list="yjzxList.list" />
-    <YyzxItem title="指令中心" :list="zlzxList.list" /> -->
-    <!-- <YyzxItem title="警情中心" :list="wqList.list" /> -->
-    <!-- <YyzxItem title="核查中心" :list="hcList.list" /> -->
-    <!-- <YyzxItem title="任务中心" :list="rwzxList.list" /> -->
-    <!-- <YyzxItem title="公共应用" :list="ggyyList.list" /> -->
-    <!-- 底部tas -->
-    <BottomTabs type="yyzx" />
-    <!-- 盘人 -->
-    <checkedPeople ref="peo" :key="zdgzKey + 'pr'" />
-    <!-- 盘车 -->
-    <checkedCar ref="car" :key="zdgzKey + 'pc'" />
-
-    <PcModel ref="dhcr" :key="zdgzKey + 'dhcr'"></PcModel>
-    <div style="height: 14.8666vw"></div>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, onUnmounted, onActivated } from "vue";
-import checkedCar from "../spsHome/components/checkCar.vue";
-import checkedPeople from "../spsHome/components/checkPeople.vue";
-import YyzxItem from "../../components/yyzxItem.vue";
-import BottomTabs from "../../components/bottomTabs.vue";
-import TopNav from "../../components/topNav.vue";
-import PcModel from "../../components/pcModel.vue";
-import emitter from "../../utils/eventBus.js";
-import { onBeforeRouteLeave } from "vue-router";
-
-const peo = ref(); //盘查人员组件对象
-const car = ref(); //盘查车辆组件对象
-const dhcr = ref(); //电话查人组件对象
-const zdgzKey = ref(1);
-const hcList = reactive({
-  list: [
-    {
-      name: "人员盘查",
-      imgUrl: require("../../assets/images/menu-yyhc.png"),
-      path: "pr",
-    },
-    {
-      name: "车辆盘查",
-      imgUrl: require("../../assets/images/menu-clhc.png"),
-      path: "pc",
-    },
-    {
-      name: "人员盘查列表",
-      imgUrl: require("../../assets/images/rypclb.png"),
-      path: "/yyzx/views/pcry",
-    },
-    {
-      name: "车辆盘查列表",
-      imgUrl: require("../../assets/images/clpclb.png"),
-      path: "/yyzx/views/clpc",
-    },
-    {
-      name: "巡访管理",
-      imgUrl: require("../../assets/images/11.png"),
-      path: "/Declaration",
-    },
-  ],
-});
-const wqList = reactive({
-  list: [
-    {
-      name: "警情统计",
-      imgUrl: require("../../assets/images/menu-yjzl.png"),
-      path: "/jqfx",
-    },
-    {
-      name: "警情列表",
-      imgUrl: require("../../assets/images/menu-yjzl.png"),
-      path: "/yyzx/jqxx/index",
-    },
-  ],
-});
-const rwzxList = reactive({
-  list: [
-    {
-      name: "任务统计",
-      imgUrl: require("../../assets/images/rwtj.png"),
-      path: "/yyzx/rwzx",
-    },
-    {
-      name: "任务列表",
-      imgUrl: require("../../assets/images/rwtj.png"),
-      path: "/rwlist",
-    },
-  ],
-});
-const zlzxList = reactive({
-  list: [
-    {
-      name: "指令统计",
-      imgUrl: require("../../assets/images/menu-zlzx.png"),
-      path: "/yyzx/zlzx/zlTotal",
-    },
-    {
-      name: "指令列表",
-      imgUrl: require("../../assets/images/menu-zlzx.png"),
-      path: "/yyzx/zlzx/zlzxIndex",
-    },
-  ],
-});
-const yjzxList = reactive({
-  list: [
-    {
-      name: "预警统计",
-      imgUrl: require("../../assets/images/yjtj.png"),
-      path: "/yyzx/yjxx/yjTotal",
-    },
-    {
-      name: "预警列表",
-      imgUrl: require("../../assets/images/menu-yjzx.png"),
-      path: "/yyzx/yjxx/index",
-    },
-  ],
-});
-const qwzxList = reactive({
-  list: [
-    {
-      name: "今日勤务",
-      imgUrl: require("../../assets/images/qwtj.png"),
-      path: "/qwCenter",
-    },
-    // 存在问题
-    // {
-    //   name: "历史勤务",
-    //   imgUrl: require("../../assets/images/qwtj.png"),
-    //   path: "/hisQwCenter",
-    // },
-    {
-      name: "巡防报备",
-      imgUrl: require("../../assets/images/menu-rwzx.png"),
-      path: "/yyzx/xfbb/addXfbb",
-    },
-    {
-      name: "临时勤务报备",
-      imgUrl: require("../../assets/images/menu-rwzx.png"),
-      path: "/yyzx/xfbb/addtsXfbb",
-    },
-    {
-      name: "值班报备",
-      imgUrl: require("../../assets/images/zbbb.png"),
-      path: "/yyzx/views/addZbbb",
-    },
-    {
-      name: "我的巡防",
-      imgUrl: require("../../assets/images/xfbbqd.png"),
-      path: "/calendar",
-    },
-    {
-      name: "我的值班",
-      imgUrl: require("../../assets/images/zbbb.png"),
-      path: "/zbbbCalendar",
-    },
-    {
-      name: "临时勤务列表",
-      imgUrl: require("../../assets/images/menu-rwzx.png"),
-      path: "/yyzx/xfbb/tsXfbbList",
-    },
-    {
-      name: "部门值班",
-      imgUrl: require("../../assets/images/zbbb.png"),
-      path: "/deptzbbbCalendar",
-    },
-    {
-      name: "部门巡防",
-      imgUrl: require("../../assets/images/xfbbqd.png"),
-      path: "/deptxfbbCalendar",
-    },
-    {
-      name: "人员休假",
-      imgUrl: require("../../assets/images/xfbbqd.png"),
-      path: "/deptryxjCalendar",
-    },
-  ],
-});
-//置顶
-const zdList = reactive({
-  list: [
-    {
-      name: "人员盘查",
-      imgUrl: require("../../assets/images/menu-yyhc.png"),
-      path: "pr",
-    },
-    {
-      name: "车辆盘查",
-      imgUrl: require("../../assets/images/menu-clhc.png"),
-      path: "pc",
-    },
-    {
-      name: "打卡",
-      imgUrl: require("../../assets/images/menu-dk.png"),
-      path: "/clock",
-    },
-  ],
-});
-//公共应用
-const ggyyList = reactive({
-  list: [
-    {
-      name: "意见反馈",
-      imgUrl: require("../../assets/yyzx/yjsj.png"),
-      path: "/yjsj",
-    },
-    {
-      name: "意见反馈统计",
-      imgUrl: require("../../assets/images/yjfktj.png"),
-      path: "/xttj",
-    },
-  ],
-});
-onActivated(() => {
-  zdgzKey.value++;
-});
-onMounted(() => {
-  zdgzKey.value++;
-  //点击盘查功能
-  emitter.on("onClickPc", (res) => {
-    if (res == "pr") {
-      checkPeople();
-    } else if (res == "/dhcr") {
-      checkDhcr();
-    } else {
-      checkCar();
-    }
-  });
-});
-onUnmounted(() => {
-  emitter.off("onClickPc");
-  localStorage.removeItem('XF_Active')
-});
-//点击盘人
-function checkPeople() {
-  peo.value.handleOpen();
-}
-//点击盘车
-function checkCar() {
-  car.value.handleOpen();
-}
-// 点击电弧查人
-function checkDhcr() {
-  dhcr.value.peoplePopupShow = true;
-}
-</script>
-
-<style lang="scss" scoped>
-</style>
diff --git a/src/pages/yyzx/jqxx/gljqList.vue b/src/pages/yyzx/jqxx/gljqList.vue
deleted file mode 100644
index 017f5a6..0000000
--- a/src/pages/yyzx/jqxx/gljqList.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template>
-  <!-- 关联警情 -->
-  <div style="padding-top:13vw">
-    <TopNav navTitle="关联警情" :showRight="false" :showLeft="true" />
-    <List
-      v-for="(item, index) in list"
-      :key="index"
-      :item="item"
-    />
-  </div>
-</template>
-
-<script setup>
-import List from "../../../components/JqList.vue";
-import TopNav from "../../../components/topNav.vue";
-import { onMounted, ref } from "vue";
-import { getGljq } from "../../../api/jqxx";
-import { useRoute } from "vue-router";
-const route = useRoute()
-const list = ref([]);
-function getList() {
-  getGljq({ jjdbh:route.query.jjdbh }).then((res) => {
-    list.value = res;
-  });
-}
-onMounted(() => {
-  getList();
-});
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/jqxx/index.vue b/src/pages/yyzx/jqxx/index.vue
deleted file mode 100644
index 4e20ced..0000000
--- a/src/pages/yyzx/jqxx/index.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="警情列表" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs
-          :list="tabs"
-          @onYjjb="onSelect"
-          :type="'car'"
-          :key="tabsIndex"
-        ></Tabs>
-        <Search
-          placeholder="请输入关键字"
-          v-model="kwd"
-          :isSx="true"
-          @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"
-        ></Search>
-      </div>
-    </van-sticky>
-    <SxPopup
-      :showPopup="showPopup"
-      :list="yjxx.sxList"
-      :p_top="145"
-      @update:close="showPopup = false"
-      @update:onConfirm="onConfirm"
-      :kssj="dateFormat()"
-      :jssj="dateFormat()"
-    />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text=" "
-        @load="onLoad"
-        offset="1"
-        :immediate-check="false"
-      >
-        <List
-          v-for="(item, index) in yjxx.list"
-          :key="index"
-          :item="item"
-          path="/yyzx/jqxx/jqDetail"
-        />
-        <van-empty
-          description="没有警情信息"
-          image="default"
-          v-if="yjxx.list.length <= 0 && showEmpty"
-        />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/JqList.vue";
-import { setTimeQuantum, dateFormat } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted, watch } from "vue";
-import { getJqList, getStatistics } from "../../../api/jqxx";
-const tabs = ref([
-  {
-    name: "全部警情",
-    value: null,
-    count: 0,
-  },
-  {
-    name: "刑事警情",
-    value: 1,
-    count: 0,
-  },
-  {
-    name: "行政警情",
-    value: 2,
-    count: 0,
-  },
-  {
-    name: "交通警情",
-    value: 3,
-    count: 0,
-  },
-  {
-    name: "其他",
-    value: 4,
-    count: 0,
-  },
-]);
-const sx = ref([setTimeQuantum()]);
-sx.value[0].array[0].isCheck = true;
-const yjxx = reactive({
-  sxList: sx.value, //筛选条件数据
-  list: [], //预警列表数据,
-  total: 0,
-});
-const params = ref({
-  pageNum: 1,
-  pageSize: 10,
-  bjnr: "",
-  bjlb: "",
-  endTime: dateFormat(),
-  startTime: dateFormat(),
-});
-const tabsIndex = ref(1);
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const loadingPull = ref(false);
-const showEmpty = ref(false);
-const showPopup = ref(false); //筛选弹窗
-//下拉刷新
-function onRefresh() {
-  tabsIndex.value++;
-  yjxx.list = [];
-  params.value.pageNum = 1;
-  params.value.bjnr = "";
-  params.value.bjlb = "";
-  params.value.endTime = "";
-  params.value.startTime = "";
-  getList();
-  getJqtj();
-}
-//获取警情列表
-function getList() {
-  loading.value = false;
-  getJqList(params.value)
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (res.records && res.records.length > 0) {
-        yjxx.list.push(...res.records);
-      } else {
-        showEmpty.value = true;
-      }
-      yjxx.total = res.total;
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-function onLoad() {
-  if (yjxx.list >= yjxx.total) {
-    finished.value = true;
-    return;
-  }
-  params.value.pageNum++;
-  getList();
-}
-//获取警情统计数据
-function getJqtj() {
-  const data = {
-    endTime: params.value.endTime,
-    startTime: params.value.startTime,
-    bjnr: params.value.bjnr,
-  };
-  getStatistics(data).then((res) => {
-    tabs.value[0].count = res.jtCount + res.qtCount + res.xsCount + res.xzCount;
-    tabs.value[1].count = res.xsCount;
-    tabs.value[2].count = res.xzCount;
-    tabs.value[3].count = res.jtCount;
-    tabs.value[4].count = res.qtCount;
-  });
-}
-onMounted(() => {
-  getList();
-  getJqtj();
-});
-/**
- * tab选择
- * @param {Object} val
- */
-function onSelect(val) {
-  // loading.value = true;
-  finished.value = false;
-  yjxx.list = [];
-  params.value.bjnr = "";
-  params.value = {
-    pageNum: 1,
-    pageSize: 10,
-    endTime: params.value.endTime,
-    startTime: params.value.startTime,
-    bjlb: !val ? null : val,
-  };
-  getList();
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.list = [];
-  params.value.bjnr = val;
-  params.value = {
-    pageNum: 1,
-    pageSize: 20,
-    endTime: "",
-    startTime: "",
-    bjlb: !val ? null : val,
-  };
-  getList();
-  getJqtj();
-}
-function onConfirm(val) {
-  yjxx.list = [];
-  params.value.startTime = val.startTime;
-  params.value.endTime = val.endTime;
-  getList();
-  getJqtj();
-  showPopup.value = false;
-}
-</script>
-
-<style>
-</style>
diff --git a/src/pages/yyzx/jqxx/jqDetail.vue b/src/pages/yyzx/jqxx/jqDetail.vue
deleted file mode 100644
index 072c8b1..0000000
--- a/src/pages/yyzx/jqxx/jqDetail.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div style="padding-top: 14vw">
-    <TopNav navTitle="警情详情" :showRight="false" :showLeft="true" />
-    <div class="ry_info">
-      <List :item="jqDetail" path="/yyzx/jqxx/jqDetail" />
-    </div>
-    <!-- <Steps :data="stepsData">
-      <template v-slot:default="{ scope }">
-        <div class="content">
-          <div class="cont_l">
-            <div class="text title">{{ scope.title }}</div>
-            <div class="text">执行人:{{ scope.zxr }}</div>
-            <div class="text">执行部门:{{ scope.zxbm }}</div>
-          </div>
-        </div>
-      </template>
-    </Steps> -->
-    <div class="mapPattern">
-      <van-button round block type="primary" @click="routerPush('/yyzx/jqxx/gljqList')"> 关联警情 </van-button>
-    </div>
-  </div>
-</template>
-<script setup>
-import List from "../../../components/JqList.vue";
-import TopNav from "../../../components/topNav.vue";
-import Steps from "../../../components/Steps.vue";
-import { getJqInfo } from "../../../api/jqxx";
-import { onMounted, ref } from "vue";
-import { useRoute } from "vue-router";
-import router from "../../../router";
-const route = useRoute()
-const jqDetail = ref({});
-const stepsData = ref([
-  {
-    title: "接到警情",
-    zxr: "张三",
-    zxbm: "高新区派出所",
-    time: "2022-10-27 20:11:26",
-  },
-  {
-    title: "接到警情",
-    zxr: "张三",
-    zxbm: "高新区派出所",
-    time: "2022-10-27 20:11:26",
-  },
-  {
-    title: "接到警情",
-    zxr: "张三",
-    zxbm: "高新区派出所",
-    time: "2022-10-27 20:11:26",
-  }
-]);
-//获取详情
-function getInfo(){
-  getJqInfo(route.query.id).then(res=>{
-    jqDetail.value = res
-  })
-}
-function routerPush(path){
-  router.push({
-    path:path,
-    query:{jjdbh:jqDetail.value.jjdbh}
-  })
-}
-onMounted(()=>{
-  getInfo()
-})
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.ry_info {
-  margin: 2vw 3vw;
-  border-radius: 2vw;
-  @include jrtz_fill_color($jrtz-fill-color-theme);
-}
-.content {
-  display: flex;
-  padding-bottom: 20px;
-  .cont_l {
-    margin-right: 16px;
-    .text{
-      line-height: 5.5vw;
-    }
-    .title{
-       @include font_size($font_medium);
-       font-weight: 550;
-    }
-    
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/jqxx/mryq.vue b/src/pages/yyzx/jqxx/mryq.vue
deleted file mode 100644
index eb279dc..0000000
--- a/src/pages/yyzx/jqxx/mryq.vue
+++ /dev/null
@@ -1,329 +0,0 @@
-<template>
-  <div class="mryq_box">
-    <div class="title red">
-      <span>每</span>
-      <span>日</span>
-      <span>要</span>
-      <span>情</span>
-    </div>
-    <div class="dw_rq d_bottom">
-      <span>单位：巡警大队 </span>
-      <span> 2022年11月8日 </span>
-    </div>
-    <div class="dw_rq">
-      <span>审核领导：邱文宇 </span>
-      <span> 撰稿人：胡云建 </span>
-    </div>
-    <div class="text_box">
-      <span class="twxc_title"> 1、发案情况：</span><br />
-      &emsp;&emsp;街面实发警情共8件（相对昨日减少6件），其中盗窃三车警情3件（相对昨日减少3件），扒窃警情5件（相对昨日增加2件），车财警情0件（相对昨日减少5件）。<br />
-      <span class="twxc_title"> 2、今日发案分布：</span><br />
-      <div class="table_box">
-        <div class="fafb_table_header header">
-          <div>单位</div>
-          <div>芳草</div>
-          <div>桂溪</div>
-          <div>合作</div>
-          <div>和平</div>
-          <div>石羊</div>
-          <div>西园</div>
-          <div>肖家</div>
-          <div>新川</div>
-          <div>会展</div>
-          <div>益州</div>
-          <div>中和</div>
-          <div>合计</div>
-        </div>
-        <div class="data_box">
-          <div class="table_box">
-            <div
-              class="fafb_table_header right"
-              v-for="item in mryq.fafb"
-              :key="item"
-            >
-              <div>{{ Object.keys(item)[0] }}</div>
-              <div v-for="_item in item[Object.keys(item)[0]]" :key="_item">
-                {{ _item }}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <span class="twxc_title"> 3、热点区域图：</span><br />
-      <span class="twxc_title"> 4、巡大天网巡查情况：</span><br />
-      <div class="twxc_box">
-        <div v-for="item in mryq.twxc" :key="item" class="twxc_item">
-          <div class="twxc_title">{{ item.ssbm }}</div>
-          <div>重点区域：{{ item.zdqu }}</div>
-          <div>巡控时段：{{ item.xksd }}</div>
-          <div>必巡线、必巡点：{{ item.bxxBxd }}</div>
-          <div>天网杆号：{{ item.twgh }}</div>
-          <div>巡查时间：{{ item.xcsj }}</div>
-          <div>巡查原因：{{ item.xcyy }}</div>
-          <div>巡逻质效：{{ item.xlzx }}</div>
-        </div>
-      </div>
-      <span class="twxc_title"> 5、警情图巡情况：</span><br />
-      <div class="twxc_box">
-        <div v-for="item in mryq.jqtx" :key="item" class="twxc_item">
-          <div class="twxc_title">{{ item.ssbm }}</div>
-          <div>图巡时段：{{ item.txsd }}</div>
-          <div>点位地址：{{ item.dwdz }}</div>
-          <div>天网号：{{ item.twh }}</div>
-          <div>巡查情况：{{ item.xcqk }}</div>
-          <div>巡查原因：{{ item.xcyy }}</div>
-          <div>巡逻质效：{{ item.xlzx }}</div>
-          <div>存在问题：{{ item.czwt }}</div>
-          <div>整改措施：{{ item.zgcs }}</div>
-        </div>
-      </div>
-      <span class="twxc_title"> 6、移动巡逻盘查数据：</span><br />
-      <div class="table_box">
-        <div class="fafb_table_header header" style="width: 30%">
-          <div></div>
-          <div>卡点与街面巡防</div>
-          <div>芳草</div>
-          <div>桂溪</div>
-          <div>合作</div>
-          <div>和平</div>
-          <div>石羊</div>
-          <div>西园</div>
-          <div>肖家</div>
-          <div>新川</div>
-          <div>会展</div>
-          <div>益州</div>
-          <div>中和</div>
-        </div>
-        <div class="data_box" style="width: 70%">
-          <div class="table_box">
-            <div
-              class="fafb_table_header right"
-              v-for="item in mryq.ydxlpc"
-              :key="item"
-              :style="Object.keys(item)[0] == '盘查合计数' ? 'width:18%' : ''"
-            >
-              <div>{{ Object.keys(item)[0] }}</div>
-              <div class="two_table">
-                <div
-                  v-for="_item in item[Object.keys(item)[0]]"
-                  :key="_item"
-                  :style="_item.title == '人员、车辆' ? 'width:100%' : ''"
-                >
-                  {{ _item.title }}
-                </div>
-              </div>
-
-              <template style="display: flex">
-                <div
-                  class="total_item_sum"
-                  v-for="_item in item[Object.keys(item)[0]]"
-                  :key="_item"
-                  :style="_item.title == '人员、车辆' ? 'width:100%' : ''"
-                >
-                  <div v-for="_it in _item.arr" :key="_it">
-                    {{ _it }}
-                  </div>
-                </div>
-              </template>
-            </div>
-          </div>
-        </div>
-      </div>
-      <span class="twxc_title">7、质效评估：</span><br />
-      &emsp;&emsp;今日和平（三个警情，相比昨日上升一个，于上月环比上升1件）、桂溪、西园、合作、肖家所有街面实发六类侵财警情，巡逻防控未取得质效；其余各所无街面实发六类侵财警情，巡逻防控取得质效。<br />
-      <span class="twxc_title">8、工作指令：</span><br />
-      &emsp;&emsp;今日街面实发警情8件，分布于***地方，巡大、各所根据发案时段、发案区域合理部署警力在街面警情热点区域开展巡逻防控和逢疑必查工作。
-    </div>
-  </div>
-</template>
-<script setup>
-import { reactive } from "vue";
-const mryq = reactive({
-  fafb: [
-    { 两抢: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-    { 汽盗: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-    { 车财: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-    { 三车: [0, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 3] },
-    { 扒窃: [0, 0, 1, 1, 0, 2, 1, 0, 0, 0, 0, 4] },
-    { 六类汇总: [0, 1, 3, 1, 0, 2, 1, 0, 0, 0, 0, 8] },
-  ],
-  twxc: [
-    {
-      ssbm: "桂溪",
-      zdqu: "名都路沿线周边",
-      xksd: "00:00-04:00",
-      bxxBxd: "名都路沿线",
-      twgh: "D-09030939",
-      xcsj: "11月7日 01:00-02:00",
-      xcyy: "车财易发案区域",
-      xlzx: "巡查时段无警力巡逻，无街面发案",
-    },
-    {
-      ssbm: "合作",
-      zdqu: "龙湖时代天街周边",
-      xksd: "18:00-21:00",
-      bxxBxd: "龙湖时代天街周边道路沿线",
-      twgh: "Y-09055102",
-      xcsj: "11月6日 19:00-20:00",
-      xcyy: "扒窃易发案区域",
-      xlzx: "巡查时段无警力巡逻，无街面发案",
-    },
-    {
-      ssbm: "石羊",
-      zdqu: "复城国际周边",
-      xksd: "19:00-22:00",
-      bxxBxd: "盛华南路沿线",
-      twgh: "D-09040960",
-      xcsj: "11月7日 20:00-21:00",
-      xcyy: "三车易发案区域",
-      xlzx: "巡查时段有警车巡逻，无街面发案",
-    },
-  ],
-  jqtx: [
-    {
-      ssbm: "中和所",
-      txsd: "11月7日 01:00-02:00",
-      dwdz: "紫竹广场",
-      twh: "09025301",
-      xcqk: "巡查时段无警力巡逻，无街面发案",
-      xcyy: "车财易发案区域",
-      xlzx: "无街面发案",
-      czwt: "1、巡查时段街面三车随意停放，无人员管理。",
-      zgcs: "加强巡逻遥控，规范停车",
-    },
-    {
-      ssbm: "合作所",
-      txsd: "11月7日 01:00-02:00",
-      dwdz: "紫竹广场",
-      twh: "09025301",
-      xcqk: "巡查时段无警力巡逻，无街面发案",
-      xcyy: "车财易发案区域",
-      xlzx: "无街面发案",
-      czwt: "1、巡查时段街面三车随意停放，无人员管理。",
-      zgcs: "加强巡逻遥控，规范停车",
-    },
-  ],
-  ydxlpc: [
-    {
-      盘车人员: [
-        { title: "移交人员数", arr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-        { title: "人员合计数", arr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-      ],
-    },
-    {
-      盘查车辆: [
-        { title: "移交车辆数", arr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-        { title: "车辆合计数", arr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-      ],
-    },
-    {
-      盘查物品: [
-        { title: "人员物品数", arr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-        { title: "车辆物品数", arr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-      ],
-    },
-    {
-      盘查合计数: [
-        { title: "人员、车辆", arr: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] },
-      ],
-    },
-  ],
-});
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.mryq_box {
-  padding: 0 3vw 5vw 3vw;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-  .title {
-    font-size: 10vw;
-    text-align: center;
-    padding: 5vw 15vw 2vw 15vw;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    //   letter-spacing: 40px;
-  }
-  .dw_rq {
-    display: flex;
-    justify-content: space-between;
-    @include font_size($font_medium);
-    font-weight: 600;
-    padding: 1vw;
-  }
-  .d_bottom {
-    border-bottom: 3px solid red;
-  }
-  .text_box {
-    line-height: 5.5vw;
-    .table_box {
-      display: flex;
-      .header {
-        width: 15%;
-        text-align: center;
-        & > div {
-          height: 5vw;
-        }
-      }
-      .header:nth-child(1) {
-        border-left: 1px solid #999;
-      }
-      .data_box {
-        width: 85%;
-        overflow-x: scroll;
-        .table_box {
-          display: flex;
-          width: 230%;
-        }
-        .right {
-          width: 28%;
-          & > div {
-            height: 5vw;
-          }
-        }
-      }
-    }
-    .twxc_box {
-      .twxc_item {
-        border-bottom: 1px solid #eff0f5;
-        padding: 2vw 0;
-      }
-    }
-    .twxc_title {
-      display: inline-block;
-      @include font_size($font_medium);
-      font-weight: 600;
-      margin: 2vw 0;
-    }
-  }
-}
-.two_table {
-  display: flex;
-  & > div {
-    width: 50%;
-  }
-}
-.total_item_sum {
-  width: 50%;
-  text-align: center;
-  & > div {
-    border-top: 1px solid #999;
-    border-right: 1px solid #999;
-    height: 5vw;
-  }
-  & > div:last-child {
-    border-bottom: 1px solid #999;
-  }
-}
-.fafb_table_header {
-  & > div {
-    text-align: center;
-    border-top: 1px solid #999;
-    border-right: 1px solid #999;
-  }
-  & > div:last-child {
-    border-bottom: 1px solid #999;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/rwzx/components/barChart.vue b/src/pages/yyzx/rwzx/components/barChart.vue
deleted file mode 100644
index 8c97fe0..0000000
--- a/src/pages/yyzx/rwzx/components/barChart.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-import * as echarts from "echarts";
-export default {
-  props: ["list"],
-  watch: {
-    list: {
-      handler(val) {
-        this.hamdlegfChart();
-      },
-      immediate: true,
-      deep: true,
-    },
-  },
-  data() {
-    return {
-      echid: "",
-      themeType: getStorage("themeSetting"),
-    };
-  },
-  created() {
-    this.echid = "echi_et" + new Date().getTime();
-  },
-  mounted() {
-    this.hamdlegfChart();
-  },
-  methods: {
-    hamdlegfChart() {
-      if (document.getElementById(this.echid)) {
-        let myChart = echarts.init(document.getElementById(this.echid));
-        var option = {
-          grid: {
-            left: "0",
-            right: "0",
-            bottom: "48",
-            top: "10",
-            containLabel: true,
-          },
-          legend: {
-            left: "center",
-            bottom: 0, //具体
-            textStyle: {
-              color: this.themeType == "light" ? "#333" : "#fff",
-            },
-          },
-          tooltip: {},
-          dataset: {
-            source: this.list,
-          },
-          xAxis: {
-            type: "category",
-            axisLabel: {
-              color: this.themeType == "light" ? "#333" : "#fff",
-            },
-          },
-          yAxis: {
-            splitLine: { show: false },
-            axisLabel: {
-              color: this.themeType == "light" ? "#333" : "#fff",
-            },
-          },
-          series: [
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  // barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#1eabff",
-                    },
-                    {
-                      offset: 1,
-                      color: "#4760ff",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  // barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#88f2b9",
-                    },
-                    {
-                      offset: 1,
-                      color: "#0dda72",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  // barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#ffd91b",
-                    },
-                    {
-                      offset: 1,
-                      color: "#ff8e43",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  // barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#f87373",
-                    },
-                    {
-                      offset: 1,
-                      color: "#e81b1b",
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              type: "bar",
-              barWidth: 9,
-              itemStyle: {
-                normal: {
-                  // barBorderRadius: [5, 5, 5, 5],
-                },
-              },
-              color: [
-                {
-                  type: "linear",
-                  x: 0,
-                  y: 0,
-                  x2: 0,
-                  y2: 1,
-                  colorStops: [
-                    {
-                      offset: 0,
-                      color: "#f9906f",
-                    },
-                    {
-                      offset: 1,
-                      color: "#f05654",
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        };
-        option && myChart.setOption(option);
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-.gfChart {
-  margin-top: 1vw;
-  height: 100%;
-  width: 100%;
-  margin: 0 auto;
-}
-</style>
diff --git a/src/pages/yyzx/rwzx/components/ranking.vue b/src/pages/yyzx/rwzx/components/ranking.vue
deleted file mode 100644
index 653dcea..0000000
--- a/src/pages/yyzx/rwzx/components/ranking.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <ul class="box-rank">
-    <li class="item">
-      <div class="text title">名次</div>
-      <div class="text title" v-if="active == 1">名称</div>
-      <div class="text title">完成数</div>
-      <div class="text title">未完成</div>
-      <div class="text title">完成</div>
-      <div class="text title dep" style="text-align: center">部门</div>
-    </li>
-    <li class="item" v-for="(item, index) in data" :key="index">
-      <div class="text title mc" v-if="index == 0">
-        <van-image
-          width="5vw"
-          height="5vw"
-          fit="contain"
-          :src="require('../../../../assets/gxapp/j.png')"
-        />
-      </div>
-      <div class="text title mc" v-else-if="index == 1">
-        <van-image
-          width="5vw"
-          height="5vw"
-          fit="contain"
-          :src="require('../../../../assets/gxapp/y.png')"
-        />
-      </div>
-      <div class="text title mc" v-else-if="index == 2">
-        <van-image
-          width="5vw"
-          height="5vw"
-          fit="contain"
-          :src="require('../../../../assets/gxapp/t.png')"
-        />
-      </div>
-      <div class="text title mc" v-else>{{ index + 1 }}</div>
-      <div class="text title" v-if="active == 1">{{ item.jsrmc }}</div>
-      <div class="text title">{{ item.ys }}</div>
-      <div class="text title">{{ item.ns }}</div>
-      <div class="text title">{{ (item.rate * 100).toFixed(0) }}%</div>
-      <div class="text title dep">{{ item.ssbm }}</div>
-    </li>
-    <van-empty description="暂无信息" image="default" v-if="data.length <= 0" />
-  </ul>
-</template>
-
-<script setup>
-import { ref, onMounted } from "vue";
-import { getGrphbData,getBmpm } from "../../../../api/rwzx.js";
-const props = defineProps({
-  active: Number, //选中的排行榜  0部门  1 个人
-});
-//个人排行榜数据
-const data = ref([]);
-if (props.active == 1) {
-  _getGrphbData();
-} else {
-	_getBmpm()
-}
-//获取个人排行榜数据
-function _getGrphbData() {
-  getGrphbData({}).then((res) => {
-    if (res.length > 0) data.value = res;
-  });
-}
-//获取部门排名数据
-function _getBmpm(){
-	getBmpm({}).then(res => {
-		 if (res.length > 0) data.value = res;
-	})
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../../assets/styles/mixin.scss";
-.box-rank {
-  width: 100%;
-  height: 100%;
-  .item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    @include font_size($font_medium_s);
-    height: 8vw;
-    .text {
-      flex: 2;
-      text-align: center;
-    }
-    .mc {
-      color: #3e6ee8;
-    }
-    .dep {
-      flex: 3;
-      display: inline-block;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      text-align: left;
-    }
-  }
-  .item:nth-child(2n + 1) {
-    @include table_item_color($table-item-theme);
-  }
-  .item:nth-child(1) {
-    background: #3e6ee8 !important;
-    color: #fff;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/rwzx/components/sircleChart.vue b/src/pages/yyzx/rwzx/components/sircleChart.vue
deleted file mode 100644
index 0780b30..0000000
--- a/src/pages/yyzx/rwzx/components/sircleChart.vue
+++ /dev/null
@@ -1,344 +0,0 @@
-<template>
-	<div :id="echid" class="gfChart"></div>
-</template>
-
-<script>
-	import * as echarts from "echarts";
-	export default {
-		props: ["datas"],
-		watch: {
-			datas: {
-				handler(val) {
-					this.hamdlegfChart();
-				},
-				immediate: true,
-				deep: true,
-			},
-		},
-		data() {
-			return {
-				echid: "",
-				themeType: getStorage("themeSetting"),
-			};
-		},
-		created() {
-			this.echid = "ech_rw" + new Date().getTime();
-		},
-		mounted() {
-			this.hamdlegfChart();
-		},
-		methods: {
-			hamdlegfChart() {
-				if (document.getElementById(this.echid)) {
-					let myChart = echarts.init(document.getElementById(this.echid));
-					var option = {
-						grid: {
-							left: "0",
-							right: "0",
-							bottom: "0",
-							top: "0",
-							containLabel: true,
-						},
-						tooltip: {
-							trigger: "item",
-						},
-						legend: {
-							bottom: "5",
-							left: "center",
-							textStyle: {
-								color: this.themeType == "light" ? "#333" : "#fff",
-							},
-						},
-						graphic: {
-							type: "text",
-							left: 133,
-							top: 107,
-							style: {
-								text: "任务类型",
-								textAlign: "center",
-								fill: "#377aff",
-								fontSize: 14,
-								fontWeight: 600,
-							},
-						},
-						series: [{
-							name: "Access From",
-							type: "pie",
-							radius: ["30%", "50%"],
-							center: ["50%", "40%"],
-							avoidLabelOverlap: false,
-							label: {
-								alignTo: "edge",
-								edgeDistance: 10,
-								textStyle: {
-									fontSize: 13,
-									// color: "#000",
-									lineHeight: 30,
-								},
-								formatter: function(data) {
-									//自定义,加个判断 渲染不同样式 配🍱
-									if (data.name == "已完成") {
-										return (
-											"{name|" +
-											data.name +
-											"}" +
-											"{value|" +
-											data.value +
-											" }" +
-											" \n" +
-											"{num1|" +
-											data.percent +
-											"%" +
-											"}"
-										);
-									}
-									if (data.name == "超期完成") {
-										return (
-											"{name|" +
-											data.name +
-											"}" +
-											"{value|" +
-											data.value +
-											" }" +
-											" \n" +
-											"{num2|" +
-											data.percent +
-											"%" +
-											"}"
-										);
-									}
-									if (data.name == "超期进行中") {
-										return (
-											"{name|" +
-											data.name +
-											"}" +
-											"{value|" +
-											data.value +
-											" }" +
-											" \n" +
-											"{num3|" +
-											data.percent +
-											"%" +
-											"}"
-										);
-									}
-									if (data.name == "进行中") {
-										return (
-											"{name|" +
-											data.name +
-											"}" +
-											"{value|" +
-											data.value +
-											" }" +
-											" \n" +
-											"{num4|" +
-											data.percent +
-											"%" +
-											"}"
-										);
-									}
-									if (data.name == "超期未完成") {
-										return (
-											"{name|" +
-											data.name +
-											"}" +
-											"{value|" +
-											data.value +
-											" }" +
-											" \n" +
-											"{num5|" +
-											data.percent +
-											"%" +
-											"}"
-										);
-									}
-								},
-								rich: {
-									num1: {
-										fontSize: 16,
-										fontWeight: 600,
-										color: "#1bb0ff",
-									},
-									num2: {
-										fontSize: 16,
-										fontWeight: 600,
-										color: "#ffde19",
-									},
-									num3: {
-										fontSize: 16,
-										fontWeight: 600,
-										color: "#f87373",
-									},
-									num4: {
-										fontSize: 16,
-										fontWeight: 600,
-										color: "#88f2b9",
-									},
-									num5: {
-										fontSize: 16,
-										fontWeight: 600,
-										color: "#f05654",
-									},
-								},
-							},
-							labelLine: {
-								length: 8,
-								length2: 20,
-								maxSurfaceAngle: 80,
-							},
-							labelLayout: function(params) {
-								const isLeft = params.labelRect.x < myChart.getWidth() / 2;
-								const points = params.labelLinePoints;
-								points[2][0] = isLeft ?
-									params.labelRect.x :
-									params.labelRect.x + params.labelRect.width;
-								return {
-									labelLinePoints: points,
-								};
-							},
-							emphasis: {
-								label: {
-									show: true,
-									fontSize: "20",
-									fontWeight: "bold",
-								},
-							},
-							data: [{
-									value: this.datas.ywc,
-									name: "已完成",
-									itemStyle: {
-										normal: {
-											//颜色渐变
-											color: new echarts.graphic.LinearGradient(
-												1,
-												0,
-												1,
-												1, //(上-下 渐变)
-												[{
-														offset: 1,
-														color: "#4760ff"
-													},
-													{
-														offset: 0.5,
-														color: "#1bb0ff"
-													},
-												]
-											),
-										},
-									},
-								},
-								{
-									value: this.datas.jxz,
-									name: "进行中",
-									itemStyle: {
-										normal: {
-											//颜色渐变
-											color: new echarts.graphic.LinearGradient(
-												1,
-												0,
-												1,
-												1, //(左上-右下 渐变)
-												[{
-														offset: 0,
-														color: "#88f2b9",
-													},
-													{
-														offset: 1,
-														color: "#0dda72",
-													},
-												],
-											),
-										},
-									},
-								},
-								{
-									value: this.datas.cqwc,
-									name: "超期完成",
-									itemStyle: {
-										normal: {
-											//颜色渐变
-											color: new echarts.graphic.LinearGradient(
-												1,
-												0,
-												1,
-												1, //(左上-右下 渐变)
-												[{
-														offset: 1,
-														color: "#ff8747"
-													},
-													{
-														offset: 0.5,
-														color: "#ffde19"
-													},
-												]
-											),
-										},
-									},
-								},
-								{
-									value: this.datas.cqjxz,
-									name: "超期进行中",
-									itemStyle: {
-										normal: {
-											//颜色渐变
-											color: new echarts.graphic.LinearGradient(
-												1,
-												0,
-												1,
-												1, //(左上-右下 渐变)
-												[{
-														offset: 1,
-														color: "#ea2121"
-													},
-													{
-														offset: 0.5,
-														color: "#f87373"
-													},
-												]
-											),
-										},
-									},
-								},
-
-								{
-									value: this.datas.cqwwc,
-									name: "超期未完成",
-									itemStyle: {
-										normal: {
-											//颜色渐变
-											color: new echarts.graphic.LinearGradient(
-												1,
-												0,
-												1,
-												1, //(左上-右下 渐变)
-												[{
-														offset: 1,
-														color: "#f05654"
-													},
-													{
-														offset: 0.5,
-														color: "#f9906f"
-													},
-												]
-											),
-										},
-									},
-								},
-							],
-						}, ],
-					};
-					option && myChart.setOption(option);
-				}
-			},
-		},
-	};
-</script>
-
-<style scoped>
-	.gfChart {
-		margin-top: 1vw;
-		height: 100%;
-		width: 100%;
-		margin: 0 auto;
-	}
-</style>
diff --git a/src/pages/yyzx/rwzx/components/statics.vue b/src/pages/yyzx/rwzx/components/statics.vue
deleted file mode 100644
index d8ed929..0000000
--- a/src/pages/yyzx/rwzx/components/statics.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <ul class="statics-rwzx">
-    <li class="item item_box">
-      <div class="title">任务总数</div>
-      <div class="number numb">{{ rwCount.all }}</div>
-    </li>
-    <li class="item item_box">
-      <div class="title">超期进行中</div>
-      <div class="number numb">{{ rwCount.cqjxz }}</div>
-    </li>
-    <li class="item item_box">
-      <div class="title">超期完成</div>
-      <div class="number numb">{{ rwCount.cqwc }}</div>
-    </li>
-    <li class="item item_box">
-      <div class="title">进行中</div>
-      <div class="number numb">{{ rwCount.jxz }}</div>
-    </li>
-    <li class="item item_box">
-      <div class="title">已完成</div>
-      <div class="number numb">{{ rwCount.ywc }}</div>
-    </li>
-    <li class="item item_box">
-      <div class="title">超期未完成</div>
-      <div class="number numb">{{ rwCount.cqwwc }}</div>
-    </li>
-  </ul>
-</template>
-
-<script setup>
-import { getRwCount } from "../../../../api/rwzx.js";
-import { reactive, ref, onMounted } from "vue";
-//任务统计数据
-const rwCount = ref({
-  all: 0,
-  cqjxz: 0,
-  cqwc: 0,
-  jxz: 0,
-  ywc: 0,
-  cqwwc: 0,
-});
-onMounted(() => {
-  _getRwCount();
-});
-//获取统计数量
-function _getRwCount() {
-  getRwCount({}).then((res) => {
-    if (res) rwCount.value = res;
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../../assets/styles/mixin.scss";
-.statics-rwzx {
-  width: 100%;
-  height: 100%;
-  min-height: 26vw;
-  padding-top: 4vw;
-  box-sizing: border-box;
-  overflow: hidden;
-  .item {
-    float: left;
-    width: 31%;
-    border-radius: 2vw;
-    overflow: hidden;
-    margin-bottom: 4vw;
-    .title {
-      height: 7vw;
-      text-align: center;
-      line-height: 7vw;
-      @include font_size($font_medium_s);
-      background: #3e6ee8;
-      color: #fff;
-    }
-    .number {
-      height: 10vw;
-      text-align: center;
-      line-height: 10vw;
-    }
-  }
-  li:nth-child(3n + 2) {
-    margin-left: 3%;
-    margin-right: 3%;
-  }
-}
-</style>
diff --git a/src/pages/yyzx/rwzx/index.vue b/src/pages/yyzx/rwzx/index.vue
deleted file mode 100644
index 3159471..0000000
--- a/src/pages/yyzx/rwzx/index.vue
+++ /dev/null
@@ -1,317 +0,0 @@
-<template>
-  <van-config-provider :theme-vars="themeVars">
-    <div style="padding-top: 13vw">
-      <TopNav navTitle="任务中心" :showRight="false" :showLeft="true" />
-
-      <div style="padding: 0 4vw; box-sizing: border-box">
-        <!-- 数据统计 -->
-        <div class="mainBox">
-          <Statics></Statics>
-        </div>
-        <!-- 任务类型统计 -->
-        <div class="item_box">
-          <div class="container">
-            <div class="strip_box">
-              <span class="strip"></span>
-              <span class="total_title">任务类型统计</span>
-            </div>
-            <div class="title-right">
-              <span v-if="rwTypeTime == 1"> 今日</span>
-              <span v-if="rwTypeTime == 2"> 近7日</span>
-              <span v-if="rwTypeTime == 3"> 近30日</span>
-              <img
-                src="../../../assets/images/xiala.png"
-                width
-                class="img"
-                alt=""
-                @click="isShowDataCount1 = true"
-              />
-              <van-action-sheet v-model:show="isShowDataCount1">
-                <van-picker
-                  :columns="timeList"
-                  @confirm="change_data_count"
-                  @cancel="isShowDataCount1 = false"
-                />
-              </van-action-sheet>
-            </div>
-          </div>
-          <div class="coulum">
-            <barChart :list="rwTypeList.list"></barChart>
-          </div>
-        </div>
-
-        <!-- 任务完成情况 -->
-        <div class="item_box">
-          <div class="container">
-            <div class="strip_box">
-              <span class="strip"></span>
-              <span class="total_title">任务完成情况</span>
-            </div>
-            <div class="title-right">
-              <span v-if="rwWcTime == 1"> 今日</span>
-              <span v-if="rwWcTime == 2"> 近7日</span>
-              <span v-if="rwWcTime == 3"> 近30日</span>
-              <img
-                src="../../../assets/images/xiala.png"
-                width
-                class="img"
-                alt=""
-                @click="isShowDataCount2 = true"
-              />
-              <van-action-sheet v-model:show="isShowDataCount2">
-                <van-picker
-                  :columns="timeList"
-                  @confirm="change_data_count2"
-                  @cancel="isShowDataCount2 = false"
-                />
-              </van-action-sheet>
-            </div>
-          </div>
-          <div class="coulumBar">
-            <SircleChart
-              :datas="reWcCountDtaa"
-              v-if="reWcCountDtaa"
-            ></SircleChart>
-          </div>
-        </div>
-
-        <!-- 排行榜 -->
-        <div class="rankBox">
-          <van-tabs
-            title-active-color="#3e6ee8"
-            color="#3e6ee8"
-            :background="themeType == 'light' ? '#fff' : '#041634'"
-            :title-inactive-color="themeType == 'light' ? '#333' : '#fff'"
-            v-model:active="active"
-            @change="onActive"
-          >
-            <van-tab
-              :title="item"
-              v-for="(item, index) in rankingList"
-              :key="index"
-            >
-            </van-tab>
-          </van-tabs>
-          <div class="item_box ranking">
-            <Ranking :active="active" :key="activeIndex"></Ranking>
-          </div>
-        </div>
-      </div>
-    </div>
-  </van-config-provider>
-</template>
-
-<script setup>
-import { ref, onMounted, reactive } from "vue";
-import TopNav from "../../../components/topNav.vue";
-import Statics from "./components/statics.vue";
-import barChart from "./components/barChart.vue";
-import SircleChart from "./components/sircleChart.vue";
-import Ranking from "./components/ranking.vue";
-import { getRwTypeCount, getRwCount } from "../../../api/rwzx.js";
-import { Toast } from "vant";
-//时间段选择数据
-const timeList = ref(["今日", "近7日", "近30天"]);
-const rankingList = ref(["部门排行榜", "个人排行榜"]);
-const active = ref(0); //选中排行榜
-const rwTypeTime = ref(1); //任务类型统计默认时间
-const rwWcTime = ref(1); //任务完成统计默认时间
-const isShowDataCount1 = ref(false); //任务类型统计时间弹窗
-const isShowDataCount2 = ref(false); //任务完成统计时间弹窗
-const reWcCountDtaa = ref(null); //任务完成统计数据
-const activeIndex = ref(1);
-const rwTypeList = reactive({
-  list: [],
-}); //任务类型统计数据
-const themeType = ref(getStorage("themeSetting"));
-onMounted(() => {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  Promise.all([_getRwTypeCount(), _getRwCount()])
-    .then((res) => {
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-});
-//切换排行版
-function onActive(e) {
-  activeIndex.value++;
-}
-//获取任务成统计数据
-function _getRwCount() {
-  getRwCount({
-    dateType: rwWcTime.value,
-  }).then((res) => {
-    if (res) reWcCountDtaa.value = res;
-  });
-}
-//获取任务类型统计数据
-function _getRwTypeCount() {
-  getRwTypeCount({
-    dateType: rwTypeTime.value,
-  }).then((res) => {
-    let arr = [
-      ["product", "已完成", "进行中", "超期完成", "超期进行中", "超期未完成"],
-    ];
-    for (let i = 0; i < res.length; i++) {
-      switch (res[i].dm) {
-        case "01":
-          arr[1] = _setRwTypeData(res[i]);
-          break;
-        case "02":
-          arr[2] = _setRwTypeData(res[i]);
-          break;
-        case "03":
-          arr[3] = _setRwTypeData(res[i]);
-          break;
-        case "04":
-          arr[4] = _setRwTypeData(res[i]);
-          break;
-        case "05":
-          arr[5] = _setRwTypeData(res[i]);
-          break;
-      }
-    }
-    rwTypeList.list = arr;
-  });
-}
-//设置任务类型图标数据
-function _setRwTypeData(item) {
-  let arr = [];
-  for (let it in item) {
-    if (it == "ct") item[it] = item[it].replace("任务", "");
-    switch (it) {
-      case "ct":
-        arr[0] = item[it];
-        break;
-      case "ywc":
-        arr[1] = item[it];
-        break;
-      case "jxz":
-        arr[2] = item[it];
-        break;
-      case "cqwc":
-        arr[3] = item[it];
-        break;
-      case "cqjxz":
-        arr[4] = item[it];
-        break;
-      case "cqwwc":
-        arr[5] = item[it];
-        break;
-    }
-  }
-  return arr;
-}
-//确认选中的时间
-function change_data_count(val) {
-  switch (val) {
-    case "今日":
-      rwTypeTime.value = 1;
-      break;
-    case "近7日":
-      rwTypeTime.value = 2;
-      break;
-    case "近30天":
-      rwTypeTime.value = 3;
-      break;
-  }
-  isShowDataCount1.value = false;
-  _getRwTypeCount();
-}
-//选中的任务完成的查询时间
-function change_data_count2(val) {
-  switch (val) {
-    case "今日":
-      rwWcTime.value = 1;
-      break;
-    case "近7日":
-      rwWcTime.value = 2;
-      break;
-    case "近30天":
-      rwWcTime.value = 3;
-      break;
-  }
-  isShowDataCount2.value = false;
-  _getRwCount();
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.mainBox {
-  box-sizing: border-box;
-
-  .dataCount {
-    height: 40vw;
-  }
-}
-
-.item_box {
-  @include font_size($font_medium_s);
-  padding: 3vw;
-  box-sizing: border-box;
-  margin-bottom: 4vw;
-
-  .container {
-    margin: 3vw;
-    border-radius: 5px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .strip_box {
-      display: flex;
-      align-items: center;
-
-      .strip {
-        display: inline-block;
-        width: 4px;
-        height: 14px;
-        background-color: #1989fa;
-        margin-right: 2vw;
-      }
-
-      .total_title {
-        @include font_size($font_medium);
-      }
-    }
-
-    .title-right {
-      background: #3e6ee8;
-      color: #fff;
-      padding: 0.5vw 2vw;
-      border-radius: 1vw;
-    }
-  }
-
-  .coulum {
-    width: 100%;
-    height: 54vw;
-  }
-
-  .coulumBar {
-    width: 100%;
-    height: 75vw;
-  }
-}
-
-.rankBox {
-  // margin-top: 8vw;
-  .ranking {
-    margin-top: 4vw;
-  }
-
-  ::v-deep .van-tab__text--ellipsis {
-    font-size: 4vw;
-    font-weight: 600;
-  }
-}
-</style>
diff --git a/src/pages/yyzx/ryxj/components/addEidt.vue b/src/pages/yyzx/ryxj/components/addEidt.vue
deleted file mode 100644
index 1045f2d..0000000
--- a/src/pages/yyzx/ryxj/components/addEidt.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<template>
-  <div>
-    <TopNav :navTitle="title" :showRight="false" :showLeft="true" />
-    <div class="concent">
-      <van-form @submit="onSubmit">
-        <van-field
-          v-model="form.sqrXm"
-          name="sqrXm"
-          label="申请人"
-          readonly
-          label-width="70px"
-        />
-        <van-field
-          v-model="form.sqbm"
-          name="sqbm"
-          label="申请人部门"
-          readonly
-          label-width="70px"
-        />
-        <van-field
-          v-model="form.qjlxmc"
-          name="qjlxmc"
-          label="请假类型"
-          is-link
-          label-width="70px"
-          required
-          :rules="[{ required: true, message: '请假类型' }]"
-          @click="chooseQJLX"
-        />
-        <van-field
-          v-model="form.kssj"
-          name="kssj"
-          label="开始时间"
-          readonly
-          is-link
-          label-width="70px"
-          required
-          :rules="[{ required: true, message: '请选择开始时间' }]"
-          @click="chooseTime('kssj')"
-        />
-        <van-field
-          v-model="form.jssj"
-          name="jssj"
-          readonly
-          label="结束时间"
-          is-link
-          label-width="70px"
-          required
-          :rules="[{ required: true, message: '请选择结束时间' }]"
-          @click="chooseTime('jssj')"
-        />
-        <van-field
-          v-model="form.bz"
-          name="bz"
-          label="备注"
-          type="textarea"
-          label-width="70px"
-        />
-        <div style="margin: 16px 0; padding: 0 5vw">
-          <van-button
-            :loading="loading"
-            round
-            native-type="submit"
-            block
-            type="primary"
-          >
-            提交</van-button
-          >
-        </div>
-      </van-form>
-    </div>
-
-    <!-- 时间选择 -->
-    <van-popup v-model:show="showksPicker" position="bottom">
-      <van-datetime-picker
-        v-model="time"
-        type="date"
-        title="请选择时间"
-        :min-hour="minTime"
-        :min-date="minDate"
-        :formatter="formatter"
-        @confirm="onksConfirm"
-        @change="ksChange"
-        @cancel="showksPicker = false"
-      />
-    </van-popup>
-    <!-- 请假类型 -->
-    <van-dialog
-      :show="showSetting"
-      title="请选择请假类型"
-      show-cancel-button
-      @confirm="onConfirm"
-      @cancel="showSetting = false"
-      confirmButtonColor="#3e6ee8"
-    >
-      <van-radio-group v-model="isActive">
-        <van-radio v-for="item in D_BZ_QXJLX" :key="item.dm" :name="item.dm">{{
-          item.zdmc
-        }}</van-radio>
-      </van-radio-group>
-    </van-dialog>
-  </div>
-</template>
-
-<script setup>
-import router from "../../../../router/index.js";
-import { getDictList, setDict } from "../../../../utils/dict";
-import {
-  ryqjListById,
-  ryqjListEdit,
-  ryqjListAdd,
-} from "../../../../api/qwzx.js";
-import TopNav from "../../../../components/topNav.vue";
-import { timeValidate, hintToast } from "../../../../utils/tools.js";
-import {
-  ref,
-  reactive,
-  onMounted,
-  getCurrentInstance,
-  watch,
-  computed,
-} from "vue";
-import { useRoute } from "vue-router";
-const { D_BZ_QXJLX } = getDictList("D_BZ_QXJLX"); //字典信息请假类型
-const { proxy } = getCurrentInstance();
-const route = useRoute();
-const user = ref(JSON.parse(window.localStorage.getItem("userInfo")));
-const form = ref({
-  sqrXm: user.value.userName,
-  sqbm: user.value.deptName,
-  sqbmid: user.value.deptList[0].deptId,
-  qjlx: "",
-  qjlxmc: "",
-  kssj: "",
-  jssj: "",
-  bz: "",
-  sqrlx: "01",
-  sqrId: user.value.id,
-});
-const minDate = computed({
-  get: () => {
-    if (!form.value.kssj) {
-      return new Date();
-    } else if (timeType.value === "jssj") {
-      return new Date(form.value.kssj);
-    } else {
-      return new Date();
-    }
-  },
-});
-const title = ref("");
-const time = ref("");
-const minTime = timeValidate(new Date(), "ymd");
-const isActive = ref(null);
-const timeType = ref(null);
-const showSetting = ref(false);
-const showksPicker = ref(false);
-
-watch(
-  () => D_BZ_QXJLX,
-  (newValue) => {
-    if (newValue._object.D_BZ_QXJLX.length > 0) init();
-  },
-  { deep: true }
-);
-onMounted(() => {
-  // init()
-});
-
-// 初始化
-function init() {
-  if (route.query.type == "add") {
-    title.value = "新增人员请假";
-  } else {
-    title.value = "修改人员请假";
-    getInfoByID(route.query.id);
-  }
-}
-
-// 根据id查询时间
-function getInfoByID(id) {
-  ryqjListById(id).then((res) => {
-    form.value = res;
-    let obj = D_BZ_QXJLX.value.find((v) => {
-      return v.dm == form.value.qjlx;
-    });
-    if (obj) {
-      form.value.qjlxmc = obj.zdmc;
-    }
-  });
-}
-
-// 编辑 - 新增请假类型
-function onSubmit(e) {
-  if (route.query.id && route.query.type == "edit") {
-    let { qjlxmc, ...params } = form.value;
-    ryqjListEdit(params).then((res) => {
-      router.go(-1);
-      hintToast("编辑成功");
-    });
-  }
-  if (route.query.type == "add") {
-    let { qjlxmc, ...params } = form.value;
-    ryqjListAdd(params).then((res) => {
-      hintToast("新增成功");
-      router.go(-1);
-    });
-  }
-}
-
-// 请假类型
-function chooseQJLX() {
-  showSetting.value = true;
-}
-
-//确认用户的选择请假类型
-function onConfirm() {
-  showSetting.value = false;
-  form.value.qjlx = isActive.value;
-  let obj = D_BZ_QXJLX.value.find((v) => {
-    return v.dm == isActive.value;
-  });
-  form.value.qjlxmc = obj.zdmc;
-}
-// 时间点击
-function chooseTime(val) {
-  timeType.value = val;
-  showksPicker.value = true;
-}
-// 时间选择
-function onksConfirm(val) {
-  showksPicker.value = false;
-  switch (timeType.value) {
-    case "kssj":
-      form.value.kssj = timeValidate(val, "ymd");
-      form.value.jssj = form.value.kssj;
-      break;
-    case "jssj":
-      form.value.jssj = timeValidate(val, "ymd");
-      break;
-  }
-  timeType.value = null;
-}
-function ksChange(val) {
-  switch (timeType.value) {
-    case "kssj":
-      form.value.kssj = timeValidate(val, "ymd");
-      break;
-    case "jssj":
-      form.value.jssj = timeValidate(val, "ymd");
-      break;
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../../assets/styles/mixin.scss";
-.concent {
-  margin-top: 16vw;
-}
-::v-deep .van-radio-group {
-  padding: 5vw;
-}
-
-::v-deep .van-radio {
-  padding: 2vw 0;
-}
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 4%;
-  width: 92%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/ryxj/index.vue b/src/pages/yyzx/ryxj/index.vue
deleted file mode 100644
index 6042feb..0000000
--- a/src/pages/yyzx/ryxj/index.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <div>
-      <TopNav 
-        navTitle="人员休假" 
-        :showRight="true"
-        :showLeft="true"
-        rightIcon="add-o"
-        @clickRight="onClickRight('','add')"
-      />
-  </div>
-  <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-    <van-list
-      v-model:loading="loading"
-      :finished="finished"
-      finished-text=" "
-      @load="onLoad"
-      offset="30"
-      :immediate-check="false"
-    >
-      <ul class="rest">
-        <li class="rest-item" v-for="(item,index) in datalist.list" :key="index">
-          <div class="title">
-            <span class="bt">{{item.sqrXm}}的提交请假</span>
-            <span class="time">{{item.xtCjsj}}</span>
-          </div>
-          <div class="item">请假类型：{{setDict(item.qjlx, D_BZ_QXJLX)}}</div>
-          <div class="item">开始时间：{{item.kssj}}</div>
-          <div class="item">结束时间：{{item.jssj}}</div>
-          <div class="item-bottom">
-            <span class="pass"></span>
-            <span class="edit" @click="onClickRight(item.id,'edit')">修改</span>
-          </div>
-        </li>
-        <van-empty 
-          v-if="datalist.list.length<=0"
-          description="暂无请假记录" 
-          image="default"/>
-      </ul>
-    </van-list>
-  </van-pull-refresh>
-</template>
-
-<script setup>
-import { ryqjList } from "../../../api/qwzx.js";
-import TopNav from "../../../components/topNav.vue";
-import router from "../../../router/index.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted,getCurrentInstance} from "vue";
-const { D_BZ_QXJLX } = getDictList("D_BZ_QXJLX"); //字典信息请假类型
-const { proxy } = getCurrentInstance();
-const user = ref(JSON.parse(window.localStorage.getItem("userInfo")));
-const datalist = reactive({
-  list:[]
-})
-const finished = ref(false)
-const loading = ref(false)
-const loadingPull = ref(false);
-const pageCurrent = ref(1)
-const pageSize = ref(10)
-const total = ref(0)
-onMounted(() => {
-  getDataList()
-});
-// 查询列表
-function getDataList(){
-  let params = {
-    pageCurrent:pageCurrent.value,
-    pageSize:pageSize.value,
-  }
-  loading.value = true
-  ryqjList(params).then((res)=>{
-    if(pageCurrent.value == 1){
-      datalist.list = res.records
-    }else{
-      datalist.list = datalist.list.concat(res.records)
-    }
-    loadingPull.value = false;
-    loading.value = false
-    pageCurrent.value = res.pages
-    pageSize.value = res.size
-    total.value = res.total
-  }).catch(()=>{
-    loading.value = false
-  })
-}
-
-//触底加载
-function onLoad() {
-  if (datalist.list.length == total.value) {
-    finished.value = true;
-    return;
-  }
-  pageCurrent.value += 1;
-  getDataList();
-}
-
-//下拉刷新
-function onRefresh() {
-  pageCurrent.value = 1;
-  finished.value = false
-  getDataList();
-}
-//跳转添加页面
-function onClickRight(id,type) {
-  router.push({path:"/deptryxjCalendar/addEdit",query:{id,type}});
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.van-pull-refresh {
-  margin-top: 16vw;
-  .rest{
-    width: 100%;
-    height: 100%;
-    padding: 0 4vw;
-    box-sizing: border-box;
-    .rest-item{
-      border-bottom: 1px solid #e9e9e9;
-      padding: 1vw 0;
-      box-sizing: border-box;
-      .title{
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        height: 6vw;
-        .bt{
-          font-weight: 600;
-          @include font_size($font_medium_s);
-        }
-        .time{
-          color: #cccccc;
-          @include font_size($font_medium_s);
-        }
-      }
-      .item{
-        line-height: 5vw;
-        @include font_size($font_medium_s);
-      }
-      .item-bottom{
-        @include font_size($font_medium_s);
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        height: 6vw;
-        .pass{
-          color: #06ae56;
-        }
-        .edit{
-          color: #10aeff;
-        }
-
-      }
-    }
-  }
-}
-
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/views/calendar.vue b/src/pages/yyzx/views/calendar.vue
deleted file mode 100644
index a956291..0000000
--- a/src/pages/yyzx/views/calendar.vue
+++ /dev/null
@@ -1,351 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="我的巡防清单" :showLeft="true" />
-    <div class="calenderBox">
-      <div class="calender-head">
-        <div class="btn" @click="last">
-          <van-icon name="arrow-left" color="#fff" />
-        </div>
-        <div class="text">{{ Year }}年{{ month }}月</div>
-        <div class="btn" @click="next">
-          <van-icon name="arrow" color="#fff" />
-        </div>
-        <div class="change" @click="isChange = !isChange">
-          <van-icon name="exchange" size="16" color="#3e6ee8" />
-          {{ isChange ? "切换表格" : "切换列表" }}
-        </div>
-      </div>
-      <!-- 日历列表 -->
-      <div v-if="!isChange" class="list">
-        <ul class="week">
-          <li class="days" v-for="(item, index) in week" :key="index">
-            {{ item }}
-          </li>
-        </ul>
-        <div class="wrap">
-          <div class="item" v-for="(item, index) in calendarList" :key="index">
-            <div class="num">
-              {{ item.value }}<span v-show="item.value">日</span>
-            </div>
-            <div class="status" v-show="item.value">
-              <span
-                @click="routePush(evn, item)"
-                v-for="(evn, index) in item.status"
-                :key="index + 'evn'"
-                v-show="item.value"
-                :style="{ background: evn.color }"
-                >{{ evn.text }}</span
-              >
-            </div>
-            <div
-              class="time"
-              :class="
-                item.status == '请假'
-                  ? 'greenColor'
-                  : item.status == '未报备'
-                  ? 'grayColr'
-                  : ''
-              "
-              v-show="item.value"
-            ></div>
-          </div>
-        </div>
-      </div>
-
-      <!-- 日历列表 -->
-      <div v-else class="list">
-        <CalendarList :listData="listData"></CalendarList>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { getPbbbByMonth } from "../../../api/calender";
-import TopNav from "../../../components/topNav.vue";
-import CalendarList from "../components/calendarList.vue";
-import { onMounted, reactive, ref } from "vue";
-import { useRouter } from "vue-router";
-import { Toast } from "vant";
-const router = useRouter();
-const isChange = ref(false);
-const week = ref(["周日", "周一", "周二", "周三", "周四", "周五", "周六"]);
-const Year = ref(new Date().getFullYear()); //日历上的年份
-const month = ref(new Date().getMonth() + 1); //日历上的月份
-const Day = ref(new Date().getDate()); //日历上的天份
-const listData = ref([]);
-const nowYear = ref(new Date().getFullYear());
-const nowmonth = ref(new Date().getMonth() + 1);
-const nowDay = ref(new Date().getDate());
-const starttime = ref("");
-const endtime = ref("");
-const nowtime = ref("");
-
-const calendarList = ref([]);
-onMounted(() => {
-  Draw(nowYear.value, nowmonth.value);
-  let time_month = nowmonth.value; //现在的月份
-  let time_day = nowDay.value; //现在的天数
-  if (nowmonth.value < 10) {
-    time_month = 0 + "" + nowmonth.value;
-  }
-  if (nowDay.value < 10) {
-    time_day = 0 + "" + nowDay.value;
-  }
-  nowtime.value = nowYear.value + "-" + time_month + "-" + time_day;
-  starttime.value = nowtime.value;
-  endtime.value = nowtime.value;
-});
-function routePush(e, t) {
-  const timeDay = new Date();
-  let y = timeDay.getFullYear();
-  let m =
-    timeDay.getMonth() + 1 < 10
-      ? "0" + (timeDay.getMonth() + 1)
-      : timeDay.getMonth() + 1;
-  let d = timeDay.getDate() < 10 ? "0" + timeDay.getDate() : timeDay.getDate();
-  const dtime = y + "-" + m + "-" + d;
-  if (e.zt === "04") {
-    return false;
-  } else {
-    router.push({
-      path: "/xfbbInfo",
-      query: {
-        zt: e.zt,
-        pbid: e.zt === "01" ? e.id : null,
-        bbid: e.zt === "01" ? null : e.id,
-        isDay: dtime === t.count ? 1 : 0,
-      },
-    });
-  }
-}
-//状态字典
-const ztDict = [
-  {
-    label: "未执勤",
-    value: "01",
-    color: "#7b7b7b",
-  },
-  {
-    label: "执勤中",
-    value: "02",
-    color: "#51fb06",
-  },
-  {
-    label: "已执勤",
-    value: "03",
-    color: "#0084ff",
-  },
-  {
-    label: "请假",
-    value: "04",
-    color: "#f00",
-  },
-];
-//状态数据处理
-function checkZt(list = []) {
-  var zt = [];
-  if (list.length > 0) {
-    zt = list.map((item) => {
-      return {
-        text: ztDict.filter((item2) => item2.value === item.zt)[0].label,
-        color: ztDict.filter((item2) => item2.value === item.zt)[0].color,
-        id: item.id,
-        zt: item.zt,
-      };
-    });
-  }
-  return zt;
-}
-function Draw(Year, Month) {
-  getPbbbByMonth({ time: Year + "-" + Month })
-    .then((res) => {
-      listData.value = [];
-      res.map((item) => {
-        if (item.list.length === 0) {
-          listData.value.push({
-            time: Year + "-" + Month + "-" + item.day,
-            zqsj: "--",
-            zqzt: "--",
-            zt: "04",
-          });
-        } else {
-          item.list.map((env) => {
-            listData.value.push({
-              time: Year + "-" + Month + "-" + item.day,
-              zqsj: env.time,
-              zqzt: ztDict.filter((item2) => item2.value === env.zt)[0].label,
-              zt: env.zt,
-              id: env.id,
-            });
-          });
-        }
-      });
-      calendarList.value = res.map((item, index) => {
-        return {
-          value: index + 1,
-          kssj: "20:00", //假数据
-          jssj: "23:59",
-          status: checkZt(item.list), //假的状态
-          count: Year + "-" + Month + "-" + item.day,
-        };
-      });
-      for (
-        var i = 1, firstDay = new Date(Year, Month - 1, 1).getDay();
-        i <= firstDay;
-        i++
-      ) {
-        calendarList.value.unshift("");
-      }
-    })
-    .catch((err) => {});
-}
-// 上个月
-function last() {
-  month.value--;
-  if (month.value == 0) {
-    month.value = 12;
-    Year.value--;
-  }
-  Draw(Year.value, month.value);
-}
-// 下个月
-function next() {
-  month.value++;
-  if (month.value == 13) {
-    month.value = 1;
-    Year.value++;
-  }
-  Draw(Year.value, month.value);
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.calenderBox {
-  width: 100%;
-  padding: 1vw;
-  box-sizing: border-box;
-  .calender-head {
-    width: 100%;
-    height: 15vw;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-    font-weight: bold;
-    line-height: 40px;
-    position: relative;
-    .change {
-      position: absolute;
-      right: 1vw;
-      bottom: 2vw;
-      cursor: pointer;
-      color: #3e6ee8;
-      @include font_size($font_medium_s);
-    }
-    .btn {
-      width: 7vw;
-      height: 7vw;
-      line-height: 7vw;
-      text-align: center;
-      border-radius: 1vw;
-      background: #3e6ee8;
-      color: #fff;
-    }
-    .text {
-      margin: 0 4vw;
-      @include font_color($font-color-theme);
-    }
-  }
-  .week {
-    width: 100%;
-    display: flex;
-    flex-wrap: nowrap;
-    text-align: center;
-    height: 10vw;
-    line-height: 10vw;
-    background: #164acc;
-    color: #fff;
-    .days {
-      flex: 1;
-    }
-  }
-  .wrap {
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-    .item {
-      width: calc((100% / 7) - 1.3px);
-      border: 1px solid #3e6ee8;
-      border-top: none;
-      font-size: 10px;
-      min-height: 15vw;
-      .num {
-        text-align: right;
-        padding-right: 1vw;
-        box-sizing: border-box;
-        @include font_color($font-color-theme);
-      }
-      .status {
-        text-align: center;
-        margin: 1vw 0;
-        span {
-          background: #3e6ee8;
-          padding: 1px 1vw;
-          display: block;
-          width: 10vw;
-          color: #fff;
-          border-radius: 1vw;
-          margin: 6px auto;
-        }
-        .green {
-          background: #1adb10;
-        }
-        .gray {
-          background: #83868f;
-        }
-      }
-      .time {
-        font-size: 10px;
-        // height: 5vw;
-        // line-height: 7vw;
-        color: #3e6ee8;
-        text-align: center;
-      }
-      .greenColor {
-        color: #1adb10;
-      }
-      .grayColr {
-        color: #83868f;
-      }
-      .BlueColor {
-        color: #3e6ee8;
-      }
-    }
-    .item:nth-child(7n + 2) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 3) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 4) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 5) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 6) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 7) {
-      border-left: none;
-    }
-  }
-}
-.list {
-  max-height: calc(100vh - 35vw);
-  // overflow: hidden;
-  // overflow-y: auto;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/views/clpc.vue b/src/pages/yyzx/views/clpc.vue
deleted file mode 100644
index da9d957..0000000
--- a/src/pages/yyzx/views/clpc.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="盘查车辆" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs
-          :list="tabs"
-          @onYjjb="onSelect"
-          :type="'car'"
-          :key="tabsIndex"
-        ></Tabs>
-        <Search
-          placeholder="请输入关键字"
-          v-model="infoValue"
-          :isSx="true"
-          @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"
-        ></Search>
-      </div>
-    </van-sticky>
-    <SxPopup
-      :showPopup="showPopup"
-      :list="pccl.sxList"
-      :p_top="145"
-      @update:close="showPopup = false"
-      @update:onConfirm="onConfirm"
-    />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list
-        :finished="finished"
-        finished-text=" "
-        @load="onLoad"
-        offset="1"
-        :immediate-check="false"
-      >
-        <List
-          v-for="(item, index) in pccl.list"
-          :key="index"
-          :item="item"
-          :dict="{ D_BZ_HPZL }"
-        />
-        <van-empty
-          description="暂无信息"
-          image="default"
-          v-if="pccl.list.length <= 0 && showEmpty"
-        />
-      </van-list>
-      <van-loading style="text-align: center" v-if="loading"
-        >加载中...</van-loading
-      >
-    </van-pull-refresh>
-  </div>
-</template>
-<script setup>
-import { ref, reactive, onMounted } from "vue";
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/pcclList.vue";
-import { setTimeQuantum } from "../../../utils/tools.js";
-import { getClpcPcList, getClpcCount } from "../../../api/common.js";
-import { getDictList, setDict } from "../../../utils/dict";
-const { D_BZ_YJLX, D_BZ_TYJB, D_BZ_PCCLJG, D_BZ_HPZL } = getDictList(
-  "D_BZ_YJLX",
-  "D_BZ_TYJB",
-  "D_BZ_PCCLJG",
-  "D_BZ_HPZL"
-); //字典信息
-const showEmpty = ref(false);
-const loading = ref(false);
-const loadingPull = ref(false);
-const finished = ref(false);
-const infoValue = ref("");
-const showPopup = ref(false); //筛选弹窗
-const pccljg = ref("");
-const tabsIndex = ref(1);
-const pccl = reactive({
-  page: 1,
-  kssj: "",
-  jssj: "",
-  total: 0,
-  sxList: [{}, setTimeQuantum()], //筛选条件数据
-  list: [],
-});
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-  },
-  {
-    name: "放行",
-    count: 0,
-  },
-  {
-    name: "移交",
-    count: 0,
-  },
-  {
-    name: "盘查",
-    count: 0,
-  },
-]);
-onMounted(() => {
-  // getCount("1");
-  // getCount("2");
-  // getCount("9");
-  getCount();
-  getData();
-});
-
-// 切换tabs
-function onSelect(val) {
-  pccl.page = 1;
-  switch (val) {
-    case 0:
-      pccljg.value = "";
-      break;
-    case 1:
-      pccljg.value = "1";
-      break;
-    case 2:
-      pccljg.value = "2";
-      break;
-    case 3:
-      pccljg.value = "9";
-      break;
-  }
-  getData();
-}
-
-// 时间筛选
-function onConfirm(val) {
-  pccl.list = [];
-  pccl.page = 1;
-  pccl.kssj = val.startTime;
-  pccl.jssj = val.endTime;
-  getData();
-  getCount();
-}
-
-// 滚动加载
-function onLoad() {
-  if (pccl.page >= pccl.total) {
-    finished.value = true;
-    return;
-  }
-  pccl.page += 1;
-  getData();
-}
-
-// 搜索
-function onSearch(val) {
-  pccl.list = [];
-  pccl.page = 1;
-  pccljg.value = "";
-  pccl.jssj = "";
-  pccl.kssj = "";
-  infoValue.value = val;
-  getData();
-  getCount();
-}
-
-// 统计
-function getCount(val) {
-  let params = {
-    // pcclJg: val,
-    // pageCurrent: 1,
-    // pageSize: 10,
-    hphm: infoValue.value,
-    kssj: pccl.kssj,
-    jssj: pccl.jssj,
-  };
-  getClpcCount(params).then((res) => {
-    tabs.value[1].count = res.fx;
-    tabs.value[2].count = res.yj;
-    tabs.value[3].count = res.pc;
-    tabs.value[0].count = res.All;
-    // switch (val) {
-    //   case "1":
-    //     tabs.value[1].count = res.total;
-    //     break;
-    //   case "2":
-    //     tabs.value[2].count = res.total;
-    //     break;
-    //   case "9":
-    //     tabs.value[3].count = res.total;
-    //     break;
-    //   case "":
-    //     tabs.value[0].count = res.total;
-    //     break;
-    // }
-  });
-}
-//下拉刷新
-function onRefresh() {
-  pccl.list = [];
-  pccl.page = 1;
-  // pccljg.value = "";
-  pccl.jssj = "";
-  pccl.kssj = "";
-  infoValue.value = "";
-  tabsIndex.value++;
-  // getCount("1");
-  // getCount("2");
-  // getCount("9");
-  // getCount("");
-  getData();
-}
-// 获取列表
-function getData(val) {
-  loading.value = true;
-  let params = {
-    pcclJg: pccljg.value,
-    kssj: pccl.kssj,
-    jssj: pccl.jssj,
-    pageCurrent: pccl.page,
-    pageSize: 10,
-    hphm: infoValue.value,
-  };
-  // loading.value = true
-  getClpcPcList(params)
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      let arr = res.records ? res.records : [];
-      if (!res.records || res.records.length <= 0) showEmpty.value = true;
-      if (pccl.page == 1) {
-        pccl.list = arr;
-      } else {
-        pccl.list = pccl.list.concat(arr);
-      }
-      switch (val) {
-        case "1":
-          tabs.value[1].count = res.total;
-          break;
-        case "2":
-          tabs.value[2].count = res.total;
-          break;
-        case "9":
-          tabs.value[3].count = res.total;
-          break;
-        case "":
-          tabs.value[0].count = res.total;
-          break;
-      }
-      pccl.total = res.total;
-    })
-    .catch(() => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-</script>
-
-<style lang="scss" scoped>
-.van-list {
-  height: calc(100vh - 38vw);
-  overflow: hidden;
-  overflow-y: auto;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/views/feedBack.vue b/src/pages/yyzx/views/feedBack.vue
deleted file mode 100644
index 3a2759e..0000000
--- a/src/pages/yyzx/views/feedBack.vue
+++ /dev/null
@@ -1,303 +0,0 @@
-<template>
-	<div class="">
-		<TopNav navTitle="预警指令反馈" />
-
-		<div class="contentBox">
-			<div class="item_box item">
-				<van-field 
-					v-model="formData.time" 
-					placeholder="请选择处置时间"
-					rows="2" 
-					label="处置时间" 
-					label-width="60px" 
-					input-align="right"
-					right-icon="arrow-down" 
-					@click="show = true" />
-				<van-popup 
-					v-model:show="show" 
-					position="bottom" 
-					:style="{height:'30%'}">
-					<van-datetime-picker 
-						v-model="time" 
-						type="datatime" 
-						title="选择时间"
-						@confirm="chooseTime"
-						@cancel="show = false"
-					/>
-				</van-popup>
-			</div>
-			<div class="item_box item">
-				<van-field 
-					v-model="fknrCnt" 
-					label="处置地点" 
-					autosize type="textarea" 
-					label-width="60px"
-					placeholder="请输入处置地点"/>
-			</div>
-
-			<div class="item_box item">
-				<van-field 
-					v-model="formData.czcs" 
-					placeholder="请选择处置措施"
-					rows="2" label="处置措施" label-width="60px" input-align="right"
-					right-icon="arrow-down" @click="isShowType = true" />
-				<van-action-sheet v-model:show="isShowType">
-					<van-picker 
-						:columns="diposalMeasure"
-						@confirm="chooseCzcs"
-						@cancel="isShowType = false" 
-					/>
-				</van-action-sheet>
-			</div>
-
-			<div class="item_box item">
-				<van-field 
-					v-model="formData.czjg" 
-					rows="2" 
-					label="处置结果" 
-					placeholder="请选择处置结果"
-					label-width="60px" input-align="right"
-					right-icon="arrow-down" @click="isShow = true" />
-				<van-action-sheet v-model:show="isShow">
-					<van-picker 
-						:columns="disposalResults"
-						@confirm="chooseCzjg"
-						@cancel="isShow = false" 
-					/>
-				</van-action-sheet>
-			</div>
-
-			<div class="item_box item itemTextArea">
-				<van-field 
-					v-model="formData.czjgms" 
-					rows="2" 
-					label="处置经过描述" 
-					autosize 
-					type="textarea" 
-					label-width="100px"
-					maxlength="200" 
-					placeholder="请输入处置经过描述" 
-					show-word-limit/>
-			</div>
-
-			<div class="item_box item">
-				<div class="flex-item">
-					<van-field 
-						v-model="formData.czmj" 
-						label="处置民警" 
-						autosize 
-						type="textarea" 
-						label-width="60px"
-						placeholder="请输入处置民警"/>
-						<div class="czBtn"  @click="addMj">按钮</div>
-				</div>
-				<div class="policeCardWrap">
-					<div class="policeCardCon" v-for="(item,index) in mjList" :key="index">
-						<div class="policeCard">{{item}}</div>
-						<span class="close" @click="deleteMj(index)">
-							<van-icon name="close"></van-icon>
-						</span>
-						
-					</div>
-				</div>
-			</div>
-
-			<div class="info_box item_box">
-				<div class="title">文件上传</div>
-				<van-uploader :after-read="afterRead" v-model="fileList" />
-			</div>
-		</div>
-		<div @click="formSubmit()" class="btnWrap">
-			<van-button :loading="loading" round block type="primary">提交</van-button>
-		</div>
-	</div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import router from "../../../router";
-import { ref, onMounted } from "vue";
-const time = ref(new Date())
-const loading = ref(false)
-const show = ref(false)
-const isShow = ref(false)
-const isShowType = ref(false)
-const formData = ref({
-	time: '', //时间
-	czcs:'',//处置措施
-	czjg:'',//处置结果
-    disposalArea: '',
-    diposalMeasure: '1',
-    disposalResults: '1',
-    czjgms: '',
-    czmj: '',
-    imageUrl: []
-})
-const index1 = ref('')
-const index2 = ref(0)
-const diposalMeasure = ref(['抓捕', '管控'])
-const disposalResults = ref(['抓获', '未抓获'])
-const mjList = ref(['张三'])
-const upImgGroup = ref([])
-const fileList = ref([]);
-
-// 选择时间
-function chooseTime(val){
-	formData.value.time = dateFormat(val)
-	show.value = false
-}
-
-// 选择处置措施
-function chooseCzcs(val){
-	formData.value.czcs = val
-	isShowType.value = false
-}
-
-// 选择处置结果
-function chooseCzjg(val){
-	formData.value.czjg = val
-	isShow.value = false
-}
-
-function formSubmit(e) {
-	let that = this
-	router.push("/yjzl");
-    // uni.showModal({
-    //     content: '是否提交反馈信息',
-    //     confirmText: '确认',
-    //     showCancel: false,
-    //     success(res) {
-    //         if (res.confirm) {
-    //             that.$post('/dispatchWarning/yjzl/doDeal', {
-    //                 'czsj': that.date,
-    //                 'czddxz': that.formData.disposalArea,
-    //                 'czcs': that.formData.diposalMeasure,
-    //                 'czjg': that.formData.disposalResults,
-    //                 'czjgms': that.formData.czjgms,
-    //                 'czmj': that.mjList.join(','),
-    //                 'yjzlId': that.xqId,
-    //                 'fileids': that.imgs.join(',')
-    //             }).then(res => {
-    //                 uni.navigateBack({
-    //                     delta: 2
-    //                 })
-    //             }).catch(err =>{
-    //                 uni.showToast({
-    //                     title:err
-    //                 })
-    //             })
-    //         }
-    //     }
-    // })
-}
-// 删除民警
-function deleteMj(index) {
-    mjList.value.splice(index, 1)
-}
-// 新增民警
-function addMj() {
-    mjList.value.push(formData.value.czmj)
-    formData.value.czmj = ''
-}
-// 时间处理
-function dateFormat(time) {
-    let date = new Date(time);
-    let year = date.getFullYear();
-    let month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
-    let day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
-    let hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
-    let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
-    let seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
-    return year + "-" + month + "-" + day + ' ' + hours + ':' + minutes + ':' + seconds;
-}
-
-function getDate(type) {
-    const date = new Date();
-    let year = date.getFullYear();
-    let month = date.getMonth() + 1;
-    let day = date.getDate();
-
-    if (type === 'start') {
-        year = year - 60;
-    } else if (type === 'end') {
-        year = year + 2;
-    }
-    month = month > 9 ? month : '0' + month;
-    day = day > 9 ? day : '0' + day;
-    return `${year}-${month}-${day}`;
-}
-
-
-function afterRead(file) {
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.contentBox{
-	margin-top: 14vw;
-	padding: 3vw 2vw;
-	box-sizing: border-box;
-	.item{
-		margin-bottom: 4vw;
-		.flex-item{
-			position: relative;
-			.czBtn{
-				width: 10vw;
-				position: absolute;
-				top: 4vw;
-				right: 4vw;
-				color: rgb(66, 136, 231);
-				@include font_size($font_medium_s);
-			}
-		}
-		.policeCardWrap {
-			padding: 1vw;
-			box-sizing: border-box;
-			display: flex;
-			flex-wrap: wrap;
-			.policeCardCon {
-				position: relative;
-				@include font_size($font_medium_s);
-				background-color: #092C5D;
-				margin-right: 2vw;
-				text-align: center;
-				margin-bottom: 2vw;
-				border-radius: 1vw;
-				color: #fff;
-				.policeCard {
-					padding: 1vw 5vw;
-					box-sizing: border-box;
-				}
-				.close{
-					position: absolute;
-					right: 0vw;
-					top: 0vw;
-				}
-			}
-
-		}
-	}
-	.info_box{
-		padding: 4vw;
-		box-sizing: border-box;
-		.title {
-			@include font_size($font_medium);
-			margin-bottom: 4vw;
-		}
-
-	}
-	.itemTextArea{
-		::v-deep .van-field__control{
-			height: 200px !important;
-		}
-	}
-}
-
-.btnWrap {
-	padding: 2vw 4vw;
-}
-	
-
-	
-</style>
diff --git a/src/pages/yyzx/views/hisQwCenter.vue b/src/pages/yyzx/views/hisQwCenter.vue
deleted file mode 100644
index 5e49779..0000000
--- a/src/pages/yyzx/views/hisQwCenter.vue
+++ /dev/null
@@ -1,1207 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="titleTime ? `${titleTime}日勤务` : '历史勤务'" />
-    <van-cell title="选择时间" @click="calShow = true">
-      <template #value>
-        <span>{{ chooseTime }}</span>
-      </template>
-    </van-cell>
-    <van-calendar
-      v-model:show="calShow"
-      @confirm="onConfirm"
-      :min-date="minDate"
-      :max-date="maxDate"
-      color="#3e6ee8"
-    ></van-calendar>
-    <div class="tabs-box">
-      <div class="tab-item item_box" v-for="(item, index) in tabs" :key="index">
-        <div
-          class="tab-title"
-          :class="
-            item.name === '街面警力'
-              ? 'bg2'
-              : item.name === '请休假'
-              ? 'bg3'
-              : 'bg1'
-          "
-        >
-          {{ item.name }}
-        </div>
-        <div class="tab-num">
-          <div @click="getTabNum(item.leftText + '-' + item.name)">
-            <span
-              class="num-text1"
-              :class="
-                item.name === '街面警力'
-                  ? 'text-color2'
-                  : item.name === '请休假'
-                  ? 'text-color3'
-                  : 'text-color1'
-              "
-              >{{ item.leftNum }}</span
-            ><br />{{ item.leftText }}
-          </div>
-          <div @click="getTabNum(item.rightText + '-' + item.name)">
-            <span
-              class="num-text2"
-              :class="
-                item.name === '街面警力'
-                  ? 'text-color2'
-                  : item.name === '请休假'
-                  ? 'text-color3'
-                  : 'text-color1'
-              "
-              >{{ item.rightNum }}</span
-            ><br />{{ item.rightText }}
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="select-box">
-      <van-tabs
-        v-model:active="active"
-        @change="tabChange"
-        title-active-color="#3e6ee8"
-        color="#3e6ee8"
-        :background="themeType == 'light' ? '#fff' : '#041634'"
-        :title-inactive-color="themeType == 'light' ? '#333' : '#fff'"
-      >
-        <van-tab v-for="(ele, index) in selectList" :key="index" :name="ele">
-          <template #title
-            ><span>{{ ele }}</span></template
-          >
-        </van-tab>
-      </van-tabs>
-    </div>
-    <!-- 警力清单 -->
-    <div class="police-list" v-if="active === '警力清单'">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished1"
-        finished-text="没有数据了"
-        offset="100"
-        @load="onLoad(1)"
-        :immediate-check="false"
-      >
-        <div
-          class="list-item item_box"
-          v-for="(l, index1) in list.policeList"
-          :key="index1"
-        >
-          <!-- <div class="phone-icon">
-            <van-icon name="phone-circle-o" color="#25b882" size="30" />
-          </div> -->
-          <!-- <div class="name-text">{{ l.zbld }}</div> -->
-          <div class="title">{{ l.ssbmmc }}</div>
-          <div>
-            总数<span class="num-text1">&nbsp;{{ l.jl }}&nbsp;</span>人,
-            民警<span class="num-text2">&nbsp;{{ l.mj }}&nbsp;</span>人,
-            辅警<span class="num-text3">&nbsp;{{ l.fj }}&nbsp;</span>人
-          </div>
-          <div>值班领导: {{ l.zbld }}, 值班电话: {{ l.zbldDh }}</div>
-          <div class="line"></div>
-          <div class="address-box">
-            <div class="adress-left" v-if="l.wzXz">
-              <van-icon name="location-o" color="#3e6ee8" />
-              {{ l.wzXz }}
-            </div>
-          </div>
-        </div>
-      </van-list>
-    </div>
-    <!-- 街面警力 -->
-    <div class="police-street" v-if="active === '街面警力'">
-      <div>
-        <van-checkbox-group v-model="checked" @change="selectChange">
-          <div class="police-select">
-            <van-checkbox shape="square" name="0">
-              <span class="police-o patroling"></span> 巡逻中
-              {{ cjz }}</van-checkbox
-            >
-            <van-checkbox shape="square" name="1">
-              <span class="police-o plicing"></span> 处警中
-              {{ xlz }}</van-checkbox
-            >
-            <van-checkbox shape="square" name="2">
-              <span class="police-o offing"></span> 离线 {{ lx }}</van-checkbox
-            >
-            <!-- <van-button type="primary" size="mini">全部呼叫</van-button> -->
-          </div>
-        </van-checkbox-group>
-      </div>
-      <van-list
-        v-model:loading="loading"
-        :finished="finished2"
-        finished-text="没有数据了"
-        offset="1"
-        @load="onLoad(2)"
-        :immediate-check="false"
-      >
-        <div
-          class="list-item item_box"
-          v-for="(s, index2) in list.streetList"
-          :key="index2"
-        >
-          <div class="phone-icon">
-            <van-icon name="phone-circle-o" color="#25b882" size="30" />
-          </div>
-          <div class="name-text">
-            <span
-              class="police-o plicing"
-              :class="
-                s.xfzt == '0'
-                  ? 'patroling'
-                  : s.xfzt == '1'
-                  ? 'plicing'
-                  : 'offing'
-              "
-            ></span
-            >&nbsp;{{ s.jzMc }}
-          </div>
-          <div>
-            民警<span class="num-text2">&nbsp;{{ s.mjsl }}&nbsp;</span>人,
-            辅警<span class="num-text3">&nbsp;{{ s.fjsl }}&nbsp;</span>人,
-            联系电话: {{ s.fzrLxdh }}
-          </div>
-          <div>
-            巡组负责人：{{ s.fzrXm }} <br />
-            巡组成员：{{ s.pname }} <br />
-            巡组车辆：{{ s.clname }}
-          </div>
-          <div class="second-line">
-            巡逻时长:{{s.xfsc != "" && s.xfsc > 0 ? (s.xfsc / 3600).toFixed(2): 0}}h,
-            巡逻里程:{{s.xflc ? (s.xflc / 1000).toFixed(2) : 0 }}km
-          </div>
-          <div class="line"></div>
-          <div class="address-box">
-            <div class="adress-left">
-              <van-icon name="location-o" color="#3e6ee8" />
-              {{ s.dqwz }}
-            </div>
-            <!-- <div>{{ s.xflc ? s.xflc : 0 }}km</div> -->
-          </div>
-        </div>
-      </van-list>
-    </div>
-    <!-- 不在岗警力 -->
-    <div class="police-off" v-if="active === '不在岗警力'">
-      <van-list
-        v-model:loading="loading1"
-        :finished="finished3"
-        finished-text="没有数据了"
-        offset="10"
-        @load="onLoad(3)"
-        :immediate-check="false"
-      >
-        <div
-          class="list-item item_box"
-          v-for="(o, index3) in list.offList"
-          :key="index3"
-        >
-          <div class="name-text">
-            <span class="police-o patroling"></span>&nbsp;{{ o.sqr_xm }}
-          </div>
-          <div class="context-co">
-            部门: {{ o.ssbm }}, 联系电话: {{ o.lxdh }}
-          </div>
-          <div class="context-co">休假时间: {{ o.kssj }}--{{ o.jssj }}</div>
-        </div>
-      </van-list>
-    </div>
-    <van-popup
-      v-model:show="showList"
-      round
-      :style="{ height: '60%', width: '90%' }"
-    >
-      <div class="jllbsty">{{ jlTitle }}</div>
-      <div class="police-list">
-        <van-list
-          v-model:loading="loading4"
-          :finished="finished4"
-          finished-text="没有数据了"
-          offset="100"
-          @load="onLoad(4)"
-          :immediate-check="false"
-        >
-          <div
-            class="list-item item_box detail_box"
-            v-for="(el, index5) in list.jlList"
-            :key="index5"
-          >
-            <van-image
-              width="80px"
-              height="85px"
-              :class="_getBase64(l)"
-              :src="el.baseUrl"
-              style="flex: 1"
-              v-if="el.wzXz"
-            >
-              <template v-slot:loading>
-                <van-loading type="spinner" size="20" />
-              </template>
-            </van-image>
-            <div class="detail_item">
-              <div class="user_info">
-                <div>
-                  <span v-if="jlsign === 1">{{ el.username }}</span>
-                  <span v-if="jlsign === 2">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 7">{{ el.user_name }}</span>
-                  <span v-if="jlsign === 3">{{ el.xm }}</span>
-                  <span v-if="jlsign === 4">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 5">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 6">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 8">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 9">{{ el.sqr_xm }}</span>
-                  <span v-if="el.age > 0"> {{ el.age }}岁 </span>
-                  <span v-if="jlsign === 1">{{ setDict(el.mz, D_BZ_MZ) }}</span>
-                  <span v-if="jlsign === 3">{{
-                    setDict(el.mzdm, D_BZ_MZ)
-                  }}</span>
-                </div>
-                <van-tag v-if="jlsign === 1" type="primary">{{
-                  setDict(el.jllx, D_BZ_JLLX)
-                }}</van-tag>
-                <van-tag v-if="jlsign === 2" type="primary">{{
-                  setDict(el.jllx, D_BZ_JLLX)
-                }}</van-tag>
-                <van-tag v-if="jlsign === 3" type="primary">{{
-                  setDict(el.fl, D_BZ_JLLX)
-                }}</van-tag>
-                <van-tag v-if="jlsign === 4" type="primary">{{
-                  setDict(el.jllx, D_BZ_JLLX)
-                }}</van-tag>
-                <van-tag v-if="jlsign === 5" type="primary">{{
-                  setDict(el.jllx, D_BZ_JLLX)
-                }}</van-tag>
-                <van-tag v-if="jlsign === 6" type="primary">{{
-                  setDict(el.jllx, D_BZ_JLLX)
-                }}</van-tag>
-                <van-tag v-if="jlsign === 7" type="primary">{{
-                  el.position_name
-                }}</van-tag>
-                <van-tag v-if="jlsign === 8" type="primary">{{
-                  setDict(el.jllx, D_BZ_JLLX)
-                }}</van-tag>
-                <van-tag v-if="jlsign === 9" type="primary">{{
-                  setDict(el.sqrlx, D_BZ_JLLX)
-                }}</van-tag>
-              </div>
-              <div v-if="jlsign === 1">身份证号: {{ el.sfz }}</div>
-              <div v-if="jlsign === 2">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 3">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 4">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 5">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 6">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 7">身份证号: {{ el.id_entity_card }}</div>
-              <div v-if="jlsign === 8">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 9">联系电话: {{ el.lxdh }}</div>
-              <!-- <div>所属部门: {{ el.ssbm }}</div> -->
-            </div>
-          </div>
-        </van-list>
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import {
-  getMjQb,
-  getMjZg,
-  getFjQb,
-  getFjZg,
-  getKcd,
-  getJmjl,
-  getQxj,
-  getJlqd,
-  getJmxz,
-  getBzgjlqd,
-  getQb,
-  getZg,
-  qbList,
-  jlqbsu,
-  jlzgsu,
-  qbmjsu,
-  zgmjsu,
-  qbfjsu,
-  zgfjsu,
-  mjkcdsu,
-  fjkcdsu,
-  mjjmjlsu,
-  fjjmjlsu,
-  mjqxjsu,
-  fjqxjsu,
-  selectJmllList,
-} from "../../../api/qwzx";
-import { ref, reactive, onMounted } from "vue";
-import { Toast } from "vant";
-import { useRouter, useRoute } from "vue-router";
-import TopNav from "../../../components/topNav.vue";
-import { timeValidate, getBase64 } from "../../../utils/tools";
-import { getDictList, setDict } from "../../../utils/dict";
-const { D_BZ_JLLX, D_BZ_MZ } = getDictList("D_BZ_JLLX", "D_BZ_MZ"); //字典信息
-const router = useRouter();
-const route = useRoute();
-const themeType = ref(getStorage("themeSetting"));
-onMounted(() => {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  Promise.all([getMjTj(), getJlqdList(), getBzgjlqdList()])
-    .then((res) => {
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-});
-const minDate = new Date(2000, 0, 1);
-const maxDate = new Date();
-const calShow = ref(false);
-const chooseTime = ref(timeValidate(new Date(), "ymd"));
-const titleTime = ref();
-function onConfirm(val) {
-  calShow.value = false;
-  chooseTime.value = timeValidate(val, "ymd");
-  titleTime.value = timeValidate(val, "ymd");
-  getJlqdList();
-  getJmxzList("0,1,2");
-  getBzgjlqdList();
-  getMjTj();
-}
-const tabs = ref([
-  {
-    name: "警力",
-    leftText: "全部",
-    rightText: "在岗",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "民警",
-    leftText: "全部",
-    rightText: "在岗",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "辅警",
-    leftText: "全部",
-    rightText: "在岗",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "可抽调",
-    leftText: "民警",
-    rightText: "辅警",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "街面警力",
-    leftText: "民警",
-    rightText: "辅警",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "请休假",
-    leftText: "民警",
-    rightText: "辅警",
-    leftNum: 0,
-    rightNum: 0,
-  },
-]);
-const showList = ref(false);
-const selectList = ref(["警力清单", "街面警力", "不在岗警力"]);
-const active = ref("警力清单");
-const list = reactive({
-  policeList: [],
-  streetList: [],
-  offList: [],
-  jlList: [],
-});
-
-const finished1 = ref(false);
-const finished2 = ref(false);
-const finished3 = ref(false);
-const finished4 = ref(false);
-const loading = ref(false);
-const loading1 = ref(false);
-const loading4 = ref(false);
-const total1 = ref(0);
-const total2 = ref(0);
-const total3 = ref(0);
-const total4 = ref(0);
-const checked = ref(["0", "1", "2"]);
-
-function tabChange(val) {
-  pageCurrent1.value = 1;
-  pageCurrent2.value = 1;
-  pageCurrent3.value = 1;
-  pageCurrent4.value = 1;
-  finished3.value = false;
-  finished2.value = false;
-  finished1.value = false;
-  finished4.value = false;
-  loading.value = false;
-  loading1.value = false;
-  loading4.value = false;
-  switch (val) {
-    case "警力清单":
-      getJlqdList();
-      break;
-    // case "警力列表":
-    //   getJllbList();
-    case "街面警力":
-      list.streetList = [];
-      temp.value = "0,1,2";
-      checked.value = ["0", "1", "2"];
-      getJmxzList("0,1,2");
-      break;
-    case "不在岗警力":
-      getBzgjlqdList();
-      break;
-  }
-}
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, item.yjTp);
-}
-// 点击数字
-const jlTitle = ref(); // 弹框标题
-const jlsign = ref();
-function getTabNum(val, current) {
-  showList.value = true;
-  loading4.value = true;
-  finished4.value = false;
-  if (current) {
-    pageCurrent4.value = current;
-  } else {
-    pageCurrent4.value = 1;
-    list.jlList = [];
-  }
-  const params = ref({
-    bbrq: chooseTime.value,
-    pageCurrent: pageCurrent4.value,
-    pageSize: 10,
-  });
-  const params2 = ref({
-    pageNum: pageCurrent4.value,
-    pageSize: 10,
-    xfbmdm: '',
-    jllx: '02'
-  })
-  // getJllbList();
-  jlTitle.value = val;
-  switch (val) {
-    case "全部-警力":
-      jlsign.value = 1;
-      jlqbsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "在岗-警力":
-      jlsign.value = 1;
-      jlzgsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "全部-民警":
-      jlsign.value = 7;
-      qbmjsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.list ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "在岗-民警":
-      jlsign.value = 2;
-      zgmjsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "全部-辅警":
-      jlsign.value = 3;
-      qbfjsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "在岗-辅警":
-      jlsign.value = 8;
-      zgfjsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "民警-可抽调":
-      jlsign.value = 4;
-      mjkcdsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "辅警-可抽调":
-      jlsign.value = 4;
-      fjkcdsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "民警-街面警力":
-      jlsign.value = 5;
-      params2.value.jllx = '01'
-      selectJmllList(params2.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "辅警-街面警力":
-      jlsign.value = 5;
-      params2.value.kssj = chooseTime.value + " 00:00:00";
-      params2.value.jssj = chooseTime.value + " 23:59:59";
-      params2.value.jllx = '02'
-      selectJmllList(params2.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "民警-请休假":
-      jlsign.value = 6;
-      mjqxjsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-    case "辅警-请休假":
-      jlsign.value = 9;
-      fjqxjsu(params.value).then((res) => {
-        loading4.value = false;
-        if (pageCurrent4.value > 1) {
-          list.jlList = [...list.jlList, ...res.records];
-        } else {
-          list.jlList = res.records ? res.records : [];
-        }
-        records;
-        total4.value = res.pages;
-      }).catch(()=>{
-        loading4.value = false;
-      });
-      break;
-  }
-}
-// 统计模块
-const tjList = reactive({
-  mjQb: 0,
-  mjZg: 0,
-});
-function getMjTj() {
-  // 全部
-  getQb({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[0].leftNum = res;
-  });
-  getZg({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[0].rightNum = res;
-  });
-  // 民警
-  getMjQb({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[1].leftNum = res;
-  });
-  getMjZg({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[1].rightNum = res;
-  });
-
-  // 辅警
-  getFjQb({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[2].leftNum = res;
-  });
-  getFjZg({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[2].rightNum = res;
-  });
-
-  // 可抽调
-  getKcd({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[3].leftNum = res[0].mj;
-    tabs.value[3].rightNum = res[0].fj;
-  });
-  // 街面警力 有问题 街面警力 只能统计当天
-  getJmjl({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[4].leftNum = res.mj;
-    tabs.value[4].rightNum = res.fj;
-  });
-  // 请休假
-  getQxj({ qjrq: chooseTime.value }).then((res) => {
-    tabs.value[5].leftNum = res[0].mj;
-    tabs.value[5].rightNum = res[0].fj;
-  });
-}
-
-// 警力清单
-const pageCurrent1 = ref(1);
-function getJlqdList() {
-  loading.value = true;
-  const params = {
-    pageCurrent: pageCurrent1.value,
-    pageSize: 10,
-    bbrq: timeValidate(new Date(), "ymd"),
-  };
-  getJlqd(params)
-    .then((res) => {
-      loading.value = false;
-      if (pageCurrent1.value > 1) {
-        list.policeList.push(...res);
-      } else {
-        list.policeList = res ? res : [];
-      }
-      total1.value = res.total;
-      list.policeList.forEach((item) => {
-        item.bmfjsl = item.bmfjsl ? item.bmfjsl : 0;
-        item.bmmjsl = item.bmmjsl ? item.bmmjsl : 0;
-      });
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-}
-
-// 警力列表
-const pageCurrent4 = ref(1);
-function getJllbList() {
-  const params = {
-    bbrq: chooseTime.value,
-    pageCurrent: pageCurrent4.value,
-    pageSize: 10,
-  };
-  qbList(params).then((res) => {
-    loading4.value = false;
-    if (pageCurrent4.value > 1) {
-      list.jlList.push(...res.list);
-    } else {
-      list.jlList = res.list;
-    }
-    total4.value = res.total;
-  });
-}
-
-// 街面巡组
-const temp = ref("0,1,2");
-function selectChange(val) {
-  loading.value = true;
-  pageCurrent2.value = 1;
-  list.streetList = [];
-  let arr = [];
-  checked.value.forEach((i) => {
-    arr.push(i);
-  });
-  if (arr.length > 0) {
-    temp.value = arr.join(",");
-  } else {
-    temp.value = "";
-  }
-  getJmxzList(temp.value);
-}
-const pageSize2 = ref(20);
-const pageCurrent2 = ref(1);
-
-const cjz = ref(0);
-const xlz = ref(0);
-const lx = ref(0);
-function getJmxzList(xfzt) {
-  let data = {
-    bbrq: chooseTime.value,
-    xfzt,
-    pageSize: pageSize2.value,
-    pageCurrent: pageCurrent2.value,
-  };
-  getJmxz(data)
-    .then((res) => {
-      loading.value = false;
-      if (res.records.length > 0) {
-        res.records.forEach((item) => {
-          let cltemp = [];
-          if (item.pbcl != null) {
-            let cltemp = JSON.parse(item.pbcl).map((el) => el.jdchphm);
-          }
-          let clname = cltemp.join(",");
-          let mjtemp = [];
-          if (item.pbfj != "[]" && item.pbfj != null) {
-            mjtemp.push([...JSON.parse(item.pbfj).map((x) => x.jlxm)]);
-          }
-          if (item.pbmj != "[]" && item.pbmj != null) {
-            mjtemp.push([...JSON.parse(item.pbmj).map((y) => y.jlxm)]);
-          }
-          let pname = mjtemp.join(",");
-          item.clname = clname;
-          item.pname = pname;
-        });
-      }
-      if (pageCurrent2.value > 1) {
-        list.streetList = list.streetList.concat(res.records);
-      } else {
-        list.streetList = res.records;
-      }
-      total2.value = res.total;
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-}
-
-function getXfztNum(xfzt) {
-  let data = {
-    bbrq: chooseTime.value,
-    xfzt,
-    pageSize: pageSize2.value,
-    pageCurrent: pageCurrent2.value,
-  };
-  getJmxz(data).then((res) => {
-    if (xfzt === "0") {
-      cjz.value = res.total ? res.total : 0;
-    } else if (xfzt === "1") {
-      xlz.value = res.total ? res.total : 0;
-    } else if (xfzt === "2") {
-      lx.value = res.total ? res.total : 0;
-    }
-  });
-}
-
-// 不在岗警力清单
-const pageCurrent3 = ref(1);
-function getBzgjlqdList() {
-  loading1.value = true;
-  const params = {
-    pageCurrent: pageCurrent3.value,
-    pageSize: 10,
-    qjrq: chooseTime.value,
-  };
-  getBzgjlqd(params)
-    .then((res) => {
-      loading1.value = false;
-      if (pageCurrent3.value == 1) {
-        if (res) list.offList = res.list;
-      } else {
-        res.list.forEach((item) => {
-          list.offList.push(item);
-        });
-      }
-      total3.value = res.total;
-    })
-    .catch((err) => {
-      loading1.value = false;
-    });
-}
-
-function onLoad(val) {
-  switch (val) {
-    case 1:
-      if (pageCurrent1.value * 10 < total1.value && total1.value > 10) {
-        finished1.value = false;
-        pageCurrent1.value++;
-        getJlqdList();
-      } else {
-        finished1.value = true;
-      }
-      break;
-    case 2:
-      if (
-        list.streetList.length < total2.value &&
-        list.streetList.length != 0
-      ) {
-        finished2.value = false;
-        pageCurrent2.value++;
-        getJmxzList(temp.value);
-      } else {
-        finished2.value = true;
-      }
-      break;
-    case 3:
-      if (list.offList && list.offList.length < total3.value) {
-        finished3.value = false;
-        pageCurrent3.value++;
-        getBzgjlqdList();
-      } else {
-        finished3.value = true;
-      }
-      if (list.offList && list.offList.length == 0) {
-        finished3.value = true;
-        loading1 = true;
-      }
-      break;
-    case 4:
-      if (pageCurrent4.value >= total4.value) {
-        finished4.value = true;
-      } else {
-        finished4.value = false;
-        pageCurrent4.value++;
-        getTabNum(jlTitle.value, pageCurrent4.value);
-      }
-      break;
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.container {
-  @include font_size($font_medium_s);
-}
-.empty-box {
-  line-height: 8vh;
-  text-align: center;
-}
-.tabs-box {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  align-items: center;
-  padding: 3vw;
-  .tab-item {
-    width: 45vw;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    margin: 1vh 0;
-    border-radius: 2vw;
-    .tab-title {
-      border-radius: 2vw 2vw 0 0;
-      color: #fff;
-      padding: 1vw;
-      text-align: center;
-    }
-    .bg1 {
-      background-color: #3e6ee8;
-    }
-    .bg2 {
-      background-color: #eea82f;
-    }
-    .bg3 {
-      background-color: #25b882;
-    }
-    .tab-num {
-      padding: 3vw;
-      display: flex;
-      justify-content: space-between;
-      & > div {
-        text-align: center;
-      }
-      .num-text1,
-      .num-text2 {
-        font-size: 20px;
-      }
-      .text-color1 {
-        color: #3e6ee8;
-      }
-      .text-color2 {
-        color: #eea82f;
-      }
-      .text-color3 {
-        color: #25b882;
-      }
-    }
-  }
-}
-.line {
-  height: 1px;
-  @include bottm_tab_top_color($bottom-border-top-clore-theme);
-  margin: 2vw 0;
-}
-.police-list {
-  @include font_color($font-color-theme);
-  padding: 3vw;
-  .list-item {
-    padding: 3vw;
-    margin: 2vh 0;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    border-radius: 2vw;
-    .phone-icon {
-      position: absolute;
-      right: 5vw;
-    }
-    .address-box {
-      display: flex;
-      justify-content: space-between;
-      .adress-left {
-        color: #3e6ee8;
-      }
-    }
-    .name-text {
-      @include font_size($font_medium);
-      color: #3e6ee8;
-      margin-bottom: 1vh;
-      font-weight: bold;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-    }
-    .title {
-      @include font_size($font_medium);
-      font-weight: 550;
-    }
-    .num-text1 {
-      @include font_size($font_large_s);
-      color: #3e6ee8;
-    }
-    .num-text2 {
-      @include font_size($font_large_s);
-      color: #eea82f;
-    }
-    .num-text3 {
-      @include font_size($font_large_s);
-      color: #25b882;
-    }
-  }
-}
-.police-street {
-  .police-select {
-    @include font_color($font-color-theme);
-    margin: 3vw;
-    display: flex;
-    justify-content: space-between;
-  }
-  padding: 3vw;
-  .list-item {
-    padding: 3vw;
-    margin: 2vh 0;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    border-radius: 2vw;
-    color: #333;
-    .phone-icon {
-      position: absolute;
-      right: 5vw;
-    }
-    .address-box {
-      display: flex;
-      justify-content: space-between;
-      .adress-left {
-        color: #3e6ee8;
-      }
-    }
-    .name-text {
-      @include font_size($font_medium);
-      margin-bottom: 1vh;
-      font-weight: bold;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-    }
-    .num-text1 {
-      @include font_size($font_large_s);
-      color: #3e6ee8;
-    }
-    .num-text2 {
-      @include font_size($font_large_s);
-      color: #eea82f;
-    }
-    .num-text3 {
-      @include font_size($font_large_s);
-      color: #25b882;
-    }
-  }
-  .second-line {
-    color: #25b882;
-  }
-}
-.police-o {
-  display: inline-block;
-  width: 2vw;
-  height: 2vw;
-  border-radius: 2vw;
-}
-.plicing {
-  background-color: rgb(248, 16, 16);
-}
-.patroling {
-  background-color: #25b882;
-}
-.offing {
-  background-color: #a8a8a8;
-}
-.police-off {
-  .police-select {
-    margin: 3vw;
-    display: flex;
-    justify-content: space-between;
-  }
-  padding: 3vw;
-  .list-item {
-    padding: 3vw;
-    margin: 2vh 0;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    border-radius: 2vw;
-    color: #333;
-    .phone-icon {
-      position: absolute;
-      right: 5vw;
-    }
-    .address-box {
-      display: flex;
-      justify-content: space-between;
-      .adress-left {
-        color: #3e6ee8;
-      }
-    }
-    .name-text {
-      @include font_size($font_medium);
-      color: #3e6ee8;
-      margin-bottom: 1vh;
-      font-weight: bold;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-    }
-    .num-text1 {
-      @include font_size($font_large_s);
-      color: #3e6ee8;
-    }
-    .num-text2 {
-      @include font_size($font_large_s);
-      color: #eea82f;
-    }
-    .num-text3 {
-      @include font_size($font_large_s);
-      color: #25b882;
-    }
-  }
-  .context-co {
-    color: #333;
-    @include font_size($font_medium_s);
-    line-height: 3vh;
-  }
-  .second-line {
-    color: #25b882;
-  }
-}
-.detail_box {
-  margin-top: 1vw;
-  display: flex;
-  position: relative;
-
-  .detail_item {
-    flex: 3.5;
-    margin-left: 2vw;
-
-    .user_info {
-      @include font_size($font_medium);
-      display: flex;
-      justify-content: space-between;
-      font-weight: 600;
-      color: #507ce9;
-
-      & > div > span {
-        display: inline-block;
-        margin-right: 2vw;
-      }
-    }
-
-    .item {
-      line-height: 6vw;
-    }
-  }
-}
-.jllbsty {
-  text-align: center;
-  @include font_size($font_medium);
-  color: #507ce9;
-  margin-top: 2vh;
-}
-::v-deep .van-nav-bar {
-  background-color: #3e6ee8;
-}
-::v-deep .van-nav-bar__title {
-  color: #fff;
-}
-::v-deep .van-nav-bar .van-icon {
-  color: #fff;
-}
-::v-deep .van-tabs__line {
-  background-color: #3e6ee8;
-}
-::v-deep .van-checkbox__label {
-  @include font_color($font-color-theme);
-  color: #333;
-}
-</style>
diff --git a/src/pages/yyzx/views/pcry.vue b/src/pages/yyzx/views/pcry.vue
deleted file mode 100644
index f7d95c8..0000000
--- a/src/pages/yyzx/views/pcry.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="盘查人员" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs :list="tabs" @onYjjb="onSelect" :type="'car'" :key="tabsIndex"></Tabs>
-        <Search placeholder="请输入人员姓名" v-model="kwd" :isSx="true" @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"></Search>
-      </div>
-    </van-sticky>
-    <SxPopup :showPopup="showPopup" :list="yjxx.sxList" :p_top="145" @update:close="showPopup = false"
-      @update:onConfirm="onConfirm" />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list v-model:loading="loading" :finished="finished" finished-text=" " @load="onLoad" offset="1"
-        :immediate-check="false">
-        <List v-for="(item, index) in yjxx.list" :key="index" :item="item"
-          :dict="{ D_BZ_YJLX, D_BZ_TYJB, D_BZ_PCCLJG }" />
-        <van-empty description="暂无信息" image="default" v-if="yjxx.list.length <= 0 && showEmpty" />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-
-<script setup>
-import { getYjxxTj, getPageList } from "../../../api/yjxx.js";
-import { getRypcList, getRypcCount } from "../../../api/common.js";
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/PcList.vue";
-import { setTimeQuantum } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted, watch } from "vue";
-const showEmpty = ref(false);
-const { D_BZ_YJLX, D_BZ_TYJB, D_BZ_PCCLJG } = getDictList(
-  "D_BZ_YJLX",
-  "D_BZ_TYJB",
-  "D_BZ_PCCLJG"
-); //字典信息
-watch(D_BZ_PCCLJG, (newValue) => {
-  for (let i = 0; i < newValue.length; i++) {
-    newValue[i].name = newValue[i].text;
-    newValue[i].key = newValue[i].dm;
-    newValue[i].isCheck = false;
-  }
-  yjxx.sxList = [
-    {
-      title: "盘查处理结果",
-      isCheckBox: true,
-      array: newValue,
-    },
-  ];
-  //时间段选项
-  yjxx.sxList[1] = setTimeQuantum();
-});
-const tabsIndex = ref(1);
-const total = ref(0);
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    pclx: "",
-  },
-  {
-    name: "盘查",
-    count: 0,
-    pclx: "9",
-  },
-  {
-    name: "移交",
-    count: 0,
-    pclx: "2",
-  },
-  {
-    name: "放行",
-    count: 0,
-    pclx: "1",
-  },
-]);
-const yjxx = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  yjJb: "",
-  yjLx: "",
-  startTime: "",
-  endTime: "",
-  yjLx: "",
-  sxList: [], //筛选条件数据
-  list: [], //预警列表数据
-});
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const loadingPull = ref(false);
-const showPopup = ref(false); //筛选弹窗
-
-onMounted(() => {
-  getList();
-  tj();
-  // tj(9);
-  // tj(2);
-  // tj(1);
-});
-//下拉刷新
-function onRefresh() {
-  yjxx.list = [];
-  yjxx.pageNum = 1;
-  kwd.value = "";
-  yjxx.startTime = "";
-  yjxx.endTime = "";
-  yjxx.yjLx = "";
-  tabsIndex.value++;
-  getList();
-  // tj();
-  // tj(9);
-  // tj(2);
-  // tj(1);
-}
-// 获取警情信息
-function getList() {
-  loading.value = true;
-  getRypcList({
-    pageCurrent: yjxx.pageNum,
-    pageSize: yjxx.pageSize,
-    xm: kwd.value,
-    kssj: yjxx.startTime,
-    jssj: yjxx.endTime,
-    pcclJg: yjxx.yjLx,
-  })
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (!res.records || res.records.length <= 0) showEmpty.value = true;
-      if (yjxx.pageNum == 1) {
-        yjxx.list = res.records;
-      } else {
-        res.records.forEach((item) => {
-          yjxx.list.push(item);
-        });
-      }
-      total.value = res.pages;
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-    });
-}
-function tj(val) {
-  getRypcCount({
-    // pageCurrent: yjxx.pageNum,
-    // pageSize: yjxx.pageSize,
-    xm: kwd.value,
-    kssj: yjxx.startTime,
-    jssj: yjxx.endTime,
-    // pcclJg: val,
-  }).then((res) => {
-    tabs.value[1].count = res.pc;
-    tabs.value[2].count = res.yj;
-    tabs.value[3].count = res.fx;
-    tabs.value[0].count = res.All;
-    // if (val == 9) {
-    //   tabs.value[1].count = res.total;
-    // } else if (val == 2) {
-    //   tabs.value[2].count = res.total;
-    // } else if (val == 1) {
-    //   tabs.value[3].count = res.total;
-    // } else {
-    //   tabs.value[0].count = res.total;
-    // }
-  });
-}
-
-/**
- * tab选择
- * @param {Object} val
- */
-function onSelect(val) {
-  yjxx.pageNum = 1;
-  yjxx.yjLx = tabs.value[val].pclx;
-  getList();
-  // tj();
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.pageNum = 1;
-  getList();
-  tj();
-}
-// 弹框盒子
-function onConfirm(val) {
-  yjxx.startTime = val.startTime;
-  yjxx.endTime = val.endTime;
-  let arr = [];
-  val.list[0].array.forEach((item) => {
-    if (item.isCheck) {
-      arr.push(item.value);
-    }
-  });
-  yjxx.yjLx = arr.join(",");
-  yjxx.pageNum = 1;
-  getList();
-  tj();
-  showPopup.value = false;
-}
-function onLoad() {
-  if (yjxx.pageNum >= total.value) {
-    finished.value = true;
-    return;
-  }
-  yjxx.pageNum += 1;
-  getList();
-}
-</script>
-
-<style scoped></style>
diff --git a/src/pages/yyzx/views/qwCenter.vue b/src/pages/yyzx/views/qwCenter.vue
deleted file mode 100644
index a9243d2..0000000
--- a/src/pages/yyzx/views/qwCenter.vue
+++ /dev/null
@@ -1,1164 +0,0 @@
-<template>
-  <div
-    class="container"
-    style="padding-top: 13vw"
-  >
-    <TopNav navTitle="今日勤务" />
-    <van-calendar v-model:show="calShow" @confirm="onConfirm" :min-date="minDate" :max-date="maxDate" color="#3e6ee8" ></van-calendar>
-    <div class="tabs-box">
-      <div class="tab-item item_box" v-for="(item, index) in tabs" :key="index">
-        <div class="tab-title" :class=" item.name === '街面警力' ? 'bg2' : item.name === '请休假' ? 'bg3' : 'bg1'">
-          {{ item.name }}
-        </div>
-        <div class="tab-num">
-          <div @click="getTabNum(item.leftText + '-' + item.name)">
-            <span class="num-text1" :class=" item.name === '街面警力' ? 'text-color2' : item.name === '请休假' ? 'text-color3' : 'text-color1'"
-            >{{ item.leftNum }}</span><br />{{ item.leftText }}
-          </div>
-          <div @click="getTabNum(item.rightText + '-' + item.name)">
-            <span class="num-text2" :class=" item.name === '街面警力' ? 'text-color2' : item.name === '请休假' ? 'text-color3' : 'text-color1'"
-            >{{ item.rightNum }}</span><br />{{ item.rightText }}
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="select-box">
-      <van-tabs
-        v-model:active="active"
-        @change="tabChange"
-        title-active-color="#3e6ee8"
-        color="#3e6ee8"
-        :background="themeType == 'light' ? '#fff' : '#041634'"
-        :title-inactive-color="themeType == 'light' ? '#333' : '#fff'">
-        <van-tab v-for="(ele, index) in selectList" :key="index" :name="ele">
-          <template #title><span>{{ ele }}</span></template>
-        </van-tab>
-      </van-tabs>
-    </div>
-    <!-- 警力清单 -->
-    <div class="police-list" v-if="active === '警力清单'">
-      <van-list v-model:loading="loading" :finished="finished1" finished-text="没有数据了" offset="100" @load="onLoad(1)" :immediate-check="false" >
-        <div class="list-item item_box" v-for="(l, index1) in list.policeList" :key="index1">
-          <div class="title">{{ l.ssbmmc }}</div>
-          <div>
-            总数<span class="num-text1">&nbsp;{{ l.jl }}&nbsp;</span>人,
-            民警<span class="num-text2">&nbsp;{{ l.mj }}&nbsp;</span>人,
-            辅警<span class="num-text3">&nbsp;{{ l.fj }}&nbsp;</span>人
-          </div>
-          <div>值班领导: {{ l.zbld }}, 值班电话: {{ l.zbldDh }}</div>
-          <div class="line"></div>
-          <div class="address-box">
-            <div class="adress-left" v-if="l.wzXz">
-              <van-icon name="location-o" color="#3e6ee8"/> {{ l.wzXz }}
-            </div>
-          </div>
-        </div>
-      </van-list>
-    </div>
-    <!-- 街面警力 -->
-    <div class="police-street" v-if="active === '街面警力'">
-      <div class="sxBix">
-        <van-checkbox-group v-model="checked" @change="selectChange">
-          <div class="police-select">
-            <van-checkbox shape="square" name="0">
-              <span class="police-o patroling"></span> 巡逻中 {{ cjz }}
-            </van-checkbox>
-            <van-checkbox shape="square" name="1">
-              <span class="police-o plicing"></span> 处警中 {{ xlz }}
-            </van-checkbox>
-            <van-checkbox shape="square" name="2">
-              <span class="police-o offing"></span> 离线 {{ lx }}
-            </van-checkbox>
-          </div>
-        </van-checkbox-group>
-        <van-icon name="bars" size="8vw" @click="showPopup = true"></van-icon>
-      </div>
-      <van-list v-model:loading="loading" :finished="finished2" finished-text="没有数据了" offset="1" @load="onLoad(2)" :immediate-check="false">
-        <div class="list-item item_box" v-for="(s, index2) in list.streetList" :key="index2">
-          <div class="phone-icon" v-if="s.fzrLxdh">
-            <van-icon @click="lxdhText(s)" name="phone-circle-o" color="#25b882" size="30"/>
-          </div>
-          <div class="name-text">
-            <span class="police-o plicing" :class="s.xfzt == '0'? 'patroling': s.xfzt == '1'? 'plicing': 'offing'"></span>&nbsp;{{ s.jzMc ? s.jzMc : s.fzrXm + '巡组'}}
-          </div>
-          <div>
-            民警<span class="num-text2">&nbsp;{{ s.mjsl }}&nbsp;</span>人,
-            辅警<span class="num-text3">&nbsp;{{ s.fjsl }}&nbsp;</span>人,
-            联系电话: {{ s.fzrLxdh }}
-          </div>
-          <div>
-            巡组负责人：{{ s.fzrXm }} <br />
-            巡组成员：{{ s.pname }} <br />
-            巡组车辆：{{ s.clname }}
-          </div>
-          <div class="second-line">
-            巡逻时长:{{s.xfsc != "" && s.xfsc > 0 ? (s.xfsc / 3600).toFixed(2): 0}}h,
-            巡逻里程:{{s.xflc ? (s.xflc / 1000).toFixed(2) : 0 }}km
-          </div>
-          <div class="line"></div>
-          <div class="address-box">
-            <div class="adress-left">
-              <van-icon name="location-o" color="#3e6ee8"/> {{ s.dqwz }}
-            </div>
-          </div>
-        </div>
-      </van-list>
-    </div>
-    <!-- 不在岗警力 -->
-    <div  class="police-off"  v-if="active === '不在岗警力'">
-      <van-list v-model:loading="loading1" :finished="finished3" finished-text="没有数据了"  offset="10" @load="onLoad(3)"  :immediate-check="false" >
-        <div class="list-item item_box" v-for="(o, index3) in list.offList" :key="index3">
-          <div class="name-text">
-            <span class="police-o patroling"></span>&nbsp;{{ o.sqr_xm }}
-          </div>
-          <div class="context-co">
-            部门: {{ o.ssbm }}, 联系电话: {{ o.lxdh }}
-          </div>
-          <div class="context-co">休假时间: {{ o.kssj }}--{{ o.jssj }}</div>
-        </div>
-      </van-list>
-    </div>
-    <van-popup v-model:show="showList" round :style="{ height: '60%', width: '90%' }">
-      <div class="jllbsty">{{ jlTitle }}</div>
-      <div class="police-list">
-        <van-list v-model:loading="loading4" :finished="finished4" finished-text="没有数据了" offset="100" @load="onLoad(4)" :immediate-check="false">
-          <div class="list-item item_box detail_box" v-for="(el, index5) in list.jlList" :key="index5">
-            <van-image width="80px" height="85px" :class="_getBase64(l)" :src="el.baseUrl" style="flex: 1" v-if="el.wzXz">
-              <template v-slot:loading>
-                <van-loading type="spinner" size="20"/>
-              </template>
-            </van-image>
-            <div class="detail_item">
-              <div class="user_info">
-                <div>
-                  <span v-if="jlsign === 1">{{ el.username }}</span>
-                  <span v-if="jlsign === 2">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 7">{{ el.user_name }}</span>
-                  <span v-if="jlsign === 3">{{ el.xm }}</span>
-                  <span v-if="jlsign === 4">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 5">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 6">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 8">{{ el.jlxm }}</span>
-                  <span v-if="jlsign === 9">{{ el.sqr_xm }}</span>
-                  <span v-if="el.age > 0"> {{ el.age }}岁 </span>
-                  <span v-if="jlsign === 1">{{ setDict(el.mz, D_BZ_MZ) }}</span>
-                  <span v-if="jlsign === 3">{{ setDict(el.mzdm, D_BZ_MZ) }}</span>
-                </div>
-                <van-tag v-if="jlsign === 1" type="primary">{{ setDict(el.jllx, D_BZ_JLLX) }}</van-tag>
-                <van-tag v-if="jlsign === 2" type="primary">{{ setDict(el.jllx, D_BZ_JLLX) }}</van-tag>
-                <van-tag v-if="jlsign === 3" type="primary">{{ setDict(el.fl, D_BZ_JLLX)}}</van-tag>
-                <van-tag v-if="jlsign === 4" type="primary">{{ setDict(el.jllx, D_BZ_JLLX)}}</van-tag>
-                <van-tag v-if="jlsign === 5" type="primary" >{{ setDict(el.jllx, D_BZ_JLLX)}}</van-tag>
-                <van-tag v-if="jlsign === 6" type="primary" >民警</van-tag>
-                <van-tag v-if="jlsign === 7" type="primary">{{ el.position_name }}</van-tag>
-                <van-tag v-if="jlsign === 8" type="primary" >{{ setDict(el.jllx, D_BZ_JLLX)}}</van-tag>
-                <van-tag v-if="jlsign === 9" type="primary" >{{ setDict(el.sqrlx, D_BZ_JLLX)}}</van-tag>
-              </div>
-              <div v-if="jlsign === 1">身份证号: {{ el.sfz }}</div>
-              <div v-if="jlsign === 2">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 3">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 4">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 5">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 6">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 7">身份证号: {{ el.id_entity_card }}</div>
-              <div v-if="jlsign === 8">身份证号: {{ el.sfzh }}</div>
-              <div v-if="jlsign === 9">联系电话: {{ el.lxdh }}</div>
-            </div>
-          </div>
-        </van-list>
-      </div>
-    </van-popup>
-    <!-- 勤务分析 -->
-    <div class="qwfx_box" v-if="active === '勤务分析'">
-      <div class="title-box">
-        <div class="title-qwfx">街面民警占比</div>
-        <div class="title-qwfx">街面辅警占比</div>
-      </div>
-      <div class="echarts-box">
-        <div class="title-echarts">
-          <PieCharts :datas="mjData" :key="'mj'+1" id="echMj"/>
-        </div>
-        <div class="title-echarts">
-          <PieCharts :datas="fjData" :key="'fj'+2" id="echFj"/>
-        </div>
-      </div>
-    </div>
-
-    <SxPopup
-      :showPopup="showPopup"
-      :list="sxList"
-      :p_top="40"
-      @update:close="showPopup = false"
-      @update:onConfirm="onConfirmPopup"
-    >
-    </SxPopup>
-  </div>
-</template>
-
-<script setup>
-import SxPopup from "@/components/SxPopupZdy.vue";
-import PieCharts from '@/components/echarts/pieCharts.vue'
-import {getMjQb,getMjZg,getFjQb,getFjZg,getKcd,getJmjl,getQxj,getJlqd,getJmxz,getBzgjlqd,getQb,getZg,qbList,jlqbsu,jlzgsu,qbmjsu, zgmjsu, qbfjsu, zgfjsu, mjkcdsu, fjkcdsu, mjjmjlsu,  fjjmjlsu, mjqxjsu, fjqxjsu, selectJmllList } from "../../../api/qwzx";
-import { ref, reactive, onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import TopNav from "../../../components/topNav.vue";
-import { timeValidate, getBase64 } from "../../../utils/tools";
-import { getDictList, setDict } from "../../../utils/dict";
-import { Dialog, Toast } from "vant";
-const { D_BZ_JLLX, D_BZ_MZ } = getDictList("D_BZ_JLLX", "D_BZ_MZ"); //字典信息
-const router = useRouter();
-const route = useRoute();
-const themeType = ref(getStorage("themeSetting"));
-const mjData = reactive([
-  {name:'街面民警',value:0},
-  {name:'总数',value:0},
-])
-const fjData = reactive([
-  {name:'街面辅警',value:0},
-  {name:'总数',value:0},
-])
-const showPopup = ref(false)
-const searchDate = ref({}) //赛选
-const sxList = reactive([
-  { type:'input', label:'关键字', key:'keyword',placeholder:"请输入部门或者关键字"},
-  { type:'input', label:'负责人', key:'fzrXm',placeholder:"请输入负责人"},
-  { type:'input', label:'警组', key:'jzMc',placeholder:"请输入警组"},
-])
-onMounted(() => {
-  Promise.all([getMjTj(), getJmxzList("0,1,2"), getBzgjlqdList()])
-  // Promise.all([getMjTj(), getJlqdList(), getBzgjlqdList()])
-    .then((res) => {
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-});
-const minDate = new Date(2000, 0, 1);
-const maxDate = new Date();
-const calShow = ref(false);
-const chooseTime = ref(timeValidate(new Date(), "ymd"));
-const titleTime = ref();
-function onConfirm(val) {
-  calShow.value = false;
-  chooseTime.value = timeValidate(val, "ymd");
-  titleTime.value = timeValidate(val, "ymd");
-  getJlqdList();
-  getJmxzList("0,1,2");
-  getBzgjlqdList();
-}
-const tabs = ref([
-  {
-    name: "警力",
-    leftText: "全部",
-    rightText: "在岗",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "民警",
-    leftText: "全部",
-    rightText: "在岗",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "辅警",
-    leftText: "全部",
-    rightText: "在岗",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "可抽调",
-    leftText: "民警",
-    rightText: "辅警",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "街面警力",
-    leftText: "民警",
-    rightText: "辅警",
-    leftNum: 0,
-    rightNum: 0,
-  },
-  {
-    name: "请休假",
-    leftText: "民警",
-    rightText: "辅警",
-    leftNum: 0,
-    rightNum: 0,
-  },
-]);
-const showList = ref(false);
-const selectList = ref(["警力清单", "街面警力", "不在岗警力","勤务分析"]);
-const active = ref("街面警力");
-const list = reactive({
-  policeList: [],
-  streetList: [],
-  offList: [],
-  jlList: [],
-});
-
-const finished1 = ref(false);
-const finished2 = ref(false);
-const finished3 = ref(false);
-const finished4 = ref(false);
-const loading = ref(false);
-const loading1 = ref(false);
-const loading4 = ref(false);
-const total1 = ref(0);
-const total2 = ref(0);
-const total3 = ref(0);
-const total4 = ref(0);
-const checked = ref(["0", "1", "2"]);
-
-function tabChange(val) {
-  pageCurrent1.value = 1;
-  pageCurrent2.value = 1;
-  pageCurrent3.value = 1;
-  pageCurrent4.value = 1;
-  finished3.value = false;
-  finished2.value = false;
-  finished1.value = false;
-  finished4.value = false;
-  loading.value = false;
-  loading1.value = false;
-  loading4.value = false;
-  switch (val) {
-    case "警力清单":
-      getJlqdList();
-      break;
-    // case "警力列表":
-    //   getJllbList();
-    //break
-    case "街面警力":
-      list.streetList = [];
-      temp.value = "0,1,2";
-      checked.value = ["0", "1", "2"];
-      getJmxzList("0,1,2");
-      break;
-    case "不在岗警力":
-      getBzgjlqdList();
-      break;
-  }
-}
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, item.yjTp);
-}
-// 点击数字
-const jlTitle = ref(); // 弹框标题
-const jlsign = ref();
-function getTabNum(val, current) {
-  showList.value = true;
-  loading4.value = true;
-  finished4.value = false;
-  if (current) {
-    pageCurrent4.value = current;
-  } else {
-    pageCurrent4.value = 1;
-    list.jlList = [];
-  }
-  const params = ref({
-    bbrq: chooseTime.value,
-    pageCurrent: pageCurrent4.value,
-    pageSize: 10,
-  });
-  const params2 = ref({
-    pageNum: pageCurrent4.value,
-    pageSize: 10,
-    xfbmdm: "",
-    jllx: "02",
-  });
-  jlTitle.value = val;
-  switch (val) {
-    case "全部-警力":
-      jlsign.value = 1;
-      jlqbsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "在岗-警力":
-      jlsign.value = 1;
-      jlzgsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "全部-民警":
-      jlsign.value = 7;
-      qbmjsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.list ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "在岗-民警":
-      jlsign.value = 2;
-      zgmjsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "全部-辅警":
-      jlsign.value = 3;
-      qbfjsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "在岗-辅警":
-      jlsign.value = 8;
-      zgfjsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "民警-可抽调":
-      jlsign.value = 4;
-      mjkcdsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "辅警-可抽调":
-      jlsign.value = 4;
-      fjkcdsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "民警-街面警力":
-      jlsign.value = 5;
-      params2.value.jllx = "01";
-      selectJmllList(params2.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "辅警-街面警力":
-      jlsign.value = 5;
-      params2.value.kssj = chooseTime.value + " 00:00:00";
-      params2.value.jssj = chooseTime.value + " 23:59:59";
-      params2.value.jllx = "02";
-      selectJmllList(params2.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "民警-请休假":
-      jlsign.value = 6;
-      mjqxjsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-    case "辅警-请休假":
-      jlsign.value = 9;
-      fjqxjsu(params.value)
-        .then((res) => {
-          loading4.value = false;
-          if (pageCurrent4.value > 1) {
-            list.jlList = [...list.jlList, ...res.records];
-          } else {
-            list.jlList = res.records ? res.records : [];
-          }
-          records;
-          total4.value = res.pages;
-        })
-        .catch(() => {
-          loading4.value = false;
-        });
-      break;
-  }
-}
-// 统计模块
-const tjList = reactive({ mjQb: 0, mjZg: 0 });
-function getMjTj() {
-  // 全部
-  getQb({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[0].leftNum = res;
-  });
-  getZg({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[0].rightNum = res;
-  });
-  // 民警
-  getMjQb({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[1].leftNum = res;
-    mjData[1].value = res
-  });
-  getMjZg({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[1].rightNum = res;
-  });
-
-  // 辅警
-  getFjQb({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[2].leftNum = res;
-    fjData[1].value = res
-  });
-  getFjZg({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[2].rightNum = res;
-  });
-
-  // 可抽调
-  getKcd({ bbrq: chooseTime.value }).then((res) => {
-    tabs.value[3].leftNum = res[0].mj;
-    tabs.value[3].rightNum = res[0].fj;
-  });
-  // 街面警力
-  getJmjl().then((res) => {
-    tabs.value[4].leftNum = res.mj;
-    mjData[0].value = res.mj
-    tabs.value[4].rightNum = res.fj;
-    fjData[0].value = res.fj
-  });
-  // 请休假
-  getQxj({ qjrq: chooseTime.value }).then((res) => {
-    tabs.value[5].leftNum = res[0].mj;
-    tabs.value[5].rightNum = res[0].fj;
-  });
-}
-
-// 警力清单
-const pageCurrent1 = ref(1);
-function getJlqdList() {
-  loading.value = true;
-  const params = {
-    pageCurrent: pageCurrent1.value,
-    pageSize: 10,
-    bbrq: timeValidate(new Date(), "ymd"),
-  };
-  getJlqd(params)
-    .then((res) => {
-      loading.value = false;
-      if (pageCurrent1.value > 1) {
-        list.policeList.push(...res);
-      } else {
-        list.policeList = res ? res : [];
-      }
-      total1.value = res.total;
-      list.policeList.forEach((item) => {
-        item.bmfjsl = item.bmfjsl ? item.bmfjsl : 0;
-        item.bmmjsl = item.bmmjsl ? item.bmmjsl : 0;
-      });
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-}
-
-// 警力列表
-const pageCurrent4 = ref(1);
-function getJllbList() {
-  const params = {
-    bbrq: chooseTime.value,
-    pageCurrent: pageCurrent4.value,
-    pageSize: 10,
-  };
-  qbList(params).then((res) => {
-    loading4.value = false;
-    if (pageCurrent4.value > 1) {
-      list.jlList.push(...res.list);
-    } else {
-      list.jlList = res.list;
-    }
-    total4.value = res.total;
-  });
-}
-
-// 街面巡组
-const temp = ref("0,1,2");
-
-function selectChange(val) {
-  loading.value = true;
-  pageCurrent2.value = 1;
-  list.streetList = [];
-  let arr = [];
-  checked.value.forEach((i) => { arr.push(i); });
-  if (arr.length > 0) {
-    temp.value = arr.join(",");
-  } else {
-    temp.value = "";
-  }
-  getJmxzList(temp.value);
-}
-const pageSize2 = ref(20);
-const pageCurrent2 = ref(1);
-
-const cjz = ref(0);
-const xlz = ref(0);
-const lx = ref(0);
-function getJmxzList(xfzt) {
-  let data = {
-    xfzt,
-    pageSize: pageSize2.value,
-    pageCurrent: pageCurrent2.value,
-    ...searchDate.value,
-  };
-  loading.value = true;
-  getJmxz(data)
-    .then((res) => {
-      loading.value = false;
-      if (res.records.length > 0) {
-        res.records.forEach((item) => {
-          let cltemp = [];
-          if (item.pbcl != null) {
-            let cltemp = JSON.parse(item.pbcl).map((el) => el.jdchphm);
-          }
-          let clname = cltemp.join(",");
-          let mjtemp = [];
-          if (item.pbfj != "[]" && item.pbfj != null) {
-            mjtemp.push([...JSON.parse(item.pbfj).map((x) => x.jlxm)]);
-          }
-          if (item.pbmj != "[]" && item.pbmj != null) {
-            mjtemp.push([...JSON.parse(item.pbmj).map((y) => y.jlxm)]);
-          }
-          let pname = mjtemp.join(",");
-          item.clname = clname;
-          item.pname = pname;
-        });
-      }
-      if (pageCurrent2.value > 1) {
-        list.streetList = list.streetList.concat(res.records);
-      } else {
-        list.streetList = res.records;
-      }
-      total2.value = res.total;
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-}
-
-function getXfztNum(xfzt) {
-  let data = {
-    bbrq: chooseTime.value,
-    xfzt,
-    pageSize: pageSize2.value,
-    pageCurrent: pageCurrent2.value,
-  };
-  getJmxz(data).then((res) => {
-    if (xfzt === "0") {
-      cjz.value = res.total ? res.total : 0;
-    } else if (xfzt === "1") {
-      xlz.value = res.total ? res.total : 0;
-    } else if (xfzt === "2") {
-      lx.value = res.total ? res.total : 0;
-    }
-  });
-}
-
-// 不在岗警力清单
-const pageCurrent3 = ref(1);
-function getBzgjlqdList() {
-  loading1.value = true;
-  const params = {
-    pageCurrent: pageCurrent3.value,
-    pageSize: 10,
-    qjrq: chooseTime.value,
-  };
-  getBzgjlqd(params)
-    .then((res) => {
-      loading1.value = false;
-      if (pageCurrent3.value == 1) {
-        if (res) list.offList = res.list;
-      } else {
-        res.list.forEach((item) => {
-          list.offList.push(item);
-        });
-      }
-      total3.value = res.total;
-    })
-    .catch((err) => {
-      loading1.value = false;
-    });
-}
-
-function lxdhText(val) {
-    Dialog.confirm({
-      title: "提示",
-      message: "确定拨打电话" + val.fzrLxdh + "?",
-      confirmButtonColor: "#3e6ee8",
-    }).then((res) => {
-      window.location.href = "tel:" + val.fzrLxdh ;
-    });
-}
-
-function onLoad(val) {
-  switch (val) {
-    case 1:
-      if (pageCurrent1.value * 10 < total1.value && total1.value > 10) {
-        finished1.value = false;
-        pageCurrent1.value++;
-        getJlqdList();
-      } else {
-        finished1.value = true;
-      }
-      break;
-    case 2:
-      if (
-        list.streetList.length < total2.value &&
-        list.streetList.length != 0
-      ) {
-        finished2.value = false;
-        pageCurrent2.value++;
-        getJmxzList(temp.value);
-      } else {
-        finished2.value = true;
-      }
-      break;
-    case 3:
-      if (list.offList && list.offList.length < total3.value) {
-        finished3.value = false;
-        pageCurrent3.value++;
-        getBzgjlqdList();
-      } else {
-        finished3.value = true;
-      }
-      if (list.offList && list.offList.length == 0) {
-        finished3.value = true;
-        loading1 = true;
-      }
-      break;
-    case 4:
-      if (pageCurrent4.value >= total4.value) {
-        finished4.value = true;
-      } else {
-        finished4.value = false;
-        pageCurrent4.value++;
-        getTabNum(jlTitle.value, pageCurrent4.value);
-      }
-      break;
-  }
-}
-// 筛选提交
-const onConfirmPopup = (val) =>{
-  searchDate.value = val
-  selectChange()
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.container {
-  @include font_size($font_medium_s);
-}
-.empty-box {
-  line-height: 8vh;
-  text-align: center;
-}
-.tabs-box {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-  align-items: center;
-  padding: 3vw;
-  .tab-item {
-    width: 45vw;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    margin: 1vh 0;
-    border-radius: 2vw;
-    .tab-title {
-      border-radius: 2vw 2vw 0 0;
-      color: #fff;
-      padding: 1vw;
-      text-align: center;
-    }
-    .bg1 {
-      background-color: #3e6ee8;
-    }
-    .bg2 {
-      background-color: #eea82f;
-    }
-    .bg3 {
-      background-color: #25b882;
-    }
-    .tab-num {
-      padding: 3vw;
-      display: flex;
-      justify-content: space-between;
-      & > div {
-        text-align: center;
-      }
-      .num-text1,
-      .num-text2 {
-        font-size: 20px;
-      }
-      .text-color1 {
-        color: #3e6ee8;
-      }
-      .text-color2 {
-        color: #eea82f;
-      }
-      .text-color3 {
-        color: #25b882;
-      }
-    }
-  }
-}
-.line {
-  height: 1px;
-  @include bottm_tab_top_color($bottom-border-top-clore-theme);
-  margin: 2vw 0;
-}
-.police-list {
-  @include font_color($font-color-theme);
-  padding: 3vw;
-  .list-item {
-    padding: 3vw;
-    margin: 2vh 0;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    border-radius: 2vw;
-    .phone-icon {
-      position: absolute;
-      right: 5vw;
-    }
-    .address-box {
-      display: flex;
-      justify-content: space-between;
-      .adress-left {
-        color: #3e6ee8;
-      }
-    }
-    .name-text {
-      @include font_size($font_medium);
-      color: #3e6ee8;
-      margin-bottom: 1vh;
-      font-weight: bold;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-    }
-    .title {
-      @include font_size($font_medium);
-      font-weight: 550;
-    }
-    .num-text1 {
-      @include font_size($font_large_s);
-      color: #3e6ee8;
-    }
-    .num-text2 {
-      @include font_size($font_large_s);
-      color: #eea82f;
-    }
-    .num-text3 {
-      @include font_size($font_large_s);
-      color: #25b882;
-    }
-  }
-}
-.police-street {
-  .police-select {
-    @include font_color($font-color-theme);
-    margin: 3vw;
-    display: flex;
-    justify-content: space-between;
-  }
-  padding: 3vw;
-  .list-item {
-    padding: 3vw;
-    margin: 2vh 0;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    border-radius: 2vw;
-    color: #333;
-    .phone-icon {
-      position: absolute;
-      right: 5vw;
-    }
-    .address-box {
-      display: flex;
-      justify-content: space-between;
-      .adress-left {
-        color: #3e6ee8;
-      }
-    }
-    .name-text {
-      @include font_size($font_medium);
-      margin-bottom: 1vh;
-      font-weight: bold;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-    }
-    .num-text1 {
-      @include font_size($font_large_s);
-      color: #3e6ee8;
-    }
-    .num-text2 {
-      @include font_size($font_large_s);
-      color: #eea82f;
-    }
-    .num-text3 {
-      @include font_size($font_large_s);
-      color: #25b882;
-    }
-  }
-  .second-line {
-    color: #25b882;
-  }
-}
-.police-o {
-  display: inline-block;
-  width: 2vw;
-  height: 2vw;
-  border-radius: 2vw;
-}
-.plicing {
-  background-color: rgb(248, 16, 16);
-}
-.patroling {
-  background-color: #25b882;
-}
-.offing {
-  background-color: #a8a8a8;
-}
-.police-off {
-  .police-select {
-    margin: 3vw;
-    display: flex;
-    justify-content: space-between;
-  }
-  padding: 3vw;
-  .list-item {
-    padding: 3vw;
-    margin: 2vh 0;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    border-radius: 2vw;
-    color: #333;
-    .phone-icon {
-      position: absolute;
-      right: 5vw;
-    }
-    .address-box {
-      display: flex;
-      justify-content: space-between;
-      .adress-left {
-        color: #3e6ee8;
-      }
-    }
-    .name-text {
-      @include font_size($font_medium);
-      color: #3e6ee8;
-      margin-bottom: 1vh;
-      font-weight: bold;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-    }
-    .num-text1 {
-      @include font_size($font_large_s);
-      color: #3e6ee8;
-    }
-    .num-text2 {
-      @include font_size($font_large_s);
-      color: #eea82f;
-    }
-    .num-text3 {
-      @include font_size($font_large_s);
-      color: #25b882;
-    }
-  }
-  .context-co {
-    color: #333;
-    @include font_size($font_medium_s);
-    line-height: 3vh;
-  }
-  .second-line {
-    color: #25b882;
-  }
-}
-.detail_box {
-  margin-top: 1vw;
-  display: flex;
-  position: relative;
-
-  .detail_item {
-    flex: 3.5;
-    margin-left: 2vw;
-
-    .user_info {
-      @include font_size($font_medium);
-      display: flex;
-      justify-content: space-between;
-      font-weight: 600;
-      color: #507ce9;
-
-      & > div > span {
-        display: inline-block;
-        margin-right: 2vw;
-      }
-    }
-
-    .item {
-      line-height: 6vw;
-    }
-  }
-}
-.jllbsty {
-  text-align: center;
-  @include font_size($font_medium);
-  color: #507ce9;
-  margin-top: 2vh;
-}
-::v-deep .van-nav-bar {
-  background-color: #3e6ee8;
-}
-::v-deep .van-nav-bar__title {
-  color: #fff;
-}
-::v-deep .van-nav-bar .van-icon {
-  color: #fff;
-}
-::v-deep .van-tabs__line {
-  background-color: #3e6ee8;
-}
-::v-deep .van-checkbox__label {
-  @include font_color($font-color-theme);
-  color: #333;
-}
-.qwfx_box{
-  padding: 2vw;
-  box-sizing: border-box;
-  .title-box{
-    display: flex;
-    height: 8vw;
-    align-items: center;
-    .title-qwfx{
-      flex: 1;
-      position: relative;
-      padding-left: 4vw;
-    }
-    .title-qwfx::before{
-      position: absolute;
-      content: '';
-      left: 4px;
-      width: 1vw;
-      height: 4vw;
-      background: rgb(24, 194, 216);
-
-    }
-  }
-  .echarts-box{
-    display: flex;
-    height: 45vw;
-    .title-echarts{
-      flex: 1;
-      height: 100%;
-      border: 1px solid #dbdbdb;
-      box-shadow: 0 0 10px #dbdbdb;
-      margin: 0 1vw;
-    }
-  }
-}
-.sxBix{
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  .van-checkbox-group{
-    flex: 1;
-  }
-}
-</style>
diff --git a/src/pages/yyzx/views/tjyj.vue b/src/pages/yyzx/views/tjyj.vue
deleted file mode 100644
index b37c2a3..0000000
--- a/src/pages/yyzx/views/tjyj.vue
+++ /dev/null
@@ -1,341 +0,0 @@
-<template>
-  <div class="tjyj-box">
-    <TopNav navTitle="添加意见" />
-    <div class="info_box">
-      <div class="yjlx-box info_box item_box">
-        <div class="title">意见类型</div>
-        <van-radio-group v-model="isActive" direction="horizontal" @change="chooseRadio">
-          <van-radio :disabled="status" v-for="(item, index) in radioList" :key="index" :name="item.val">{{ item.name
-                      }}</van-radio>
-        </van-radio-group>
-      </div>
-
-      <div class="item_box">
-        <van-field v-model="seleatDate" rows="2" :disabled="status" label="系统来源" label-width="60px" input-align="right"
-          right-icon="arrow-down" @click="isShowType = true" />
-        <van-action-sheet v-model:show="isShowType">
-          <van-picker :columns="xtlyList" @confirm="groupChange" @cancel="isShowType = false" />
-        </van-action-sheet>
-      </div>
-
-      <div class="item_box">
-        <van-field :disabled="status" v-model="sugesstName" rows="2" label="意见名称" label-width="60px"
-          input-align="right" />
-      </div>
-
-      <div class="item_box">
-        <van-field v-model="fknrCnt" :disabled="status" rows="2" label="意见描述" autosize type="textarea" label-width="60px"
-          :count="!status ? true : false" maxlength="200" placeholder="请输入内容" show-word-limit />
-      </div>
-
-      <div class="info_box item_box">
-        <div class="title">文件上传</div>
-        <van-uploader :after-read="afterRead" :disabled="status" v-model="fileList" />
-      </div>
-    </div>
-    <div class="submit_but" v-if="status">
-      <van-button round @click="status = 0" block type="primary">编辑</van-button>
-      <van-button round :loading="loading" block @click="handleDelete" type="danger">删除</van-button>
-    </div>
-    <div class="submit_but" v-else>
-      <van-button :loading="loading" round @click="submit" block type="primary">提交</van-button>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import {
-  editYyzxApi,
-  deleteYyzxApi,
-  addYyzxApi,
-  uploadImg,
-} from "../../../api/yyzxApi.js";
-import { baseUrl2 } from "../../../utils/request";
-import { ref, onMounted, reactive } from "vue";
-import { useRouter } from "vue-router";
-import { Toast } from "vant";
-import { hintToast } from "../../../utils/tools";
-let userInfo = JSON.parse(getStorage("userInfo")); //用户信息
-const router = useRouter();
-const editInfo = ref({});
-const yjlxValue = ref(1);
-const isActive = ref(1);
-const loading = ref(false);
-const seleatDate = ref("请选择");
-const selectDm = ref("");
-const slectType = ref("系统问题");
-const sugesstName = ref("系统问题-");
-const radioList = ref([
-  {
-    name: "系统问题",
-    val: 1,
-  },
-  {
-    name: "功能改进",
-    val: 2,
-  },
-  {
-    name: "新需求",
-    val: 3,
-  },
-]);
-const fknrCnt = ref("");
-const radioValue = ref("系统问题");
-const isShowType = ref(false);
-const XTFK_LIST = ref([
-  {
-    zdmc: "智慧云览",
-    zddm: "01",
-  },
-  {
-    zdmc: "智慧云踪",
-    zddm: "02",
-  },
-  {
-    zdmc: "智慧云搜",
-    zddm: "03",
-  },
-  {
-    zdmc: "智慧云基",
-    zddm: "04",
-  },
-  {
-    zdmc: "智慧云侦",
-    zddm: "05",
-  },
-  {
-    zdmc: "智慧云法",
-    zddm: "06",
-  },
-  {
-    zdmc: "智慧云指",
-    zddm: "07",
-  },
-  {
-    zdmc: "智慧云眸",
-    zddm: "08",
-  },
-  {
-    zdmc: "智慧云控",
-    zddm: "09",
-  },
-  {
-    zdmc: "智慧云防",
-    zddm: "10",
-  },
-  {
-    zdmc: "智慧云管",
-    zddm: "11",
-  },
-  {
-    zdmc: "智慧云舆",
-    zddm: "12",
-  },
-]);
-const xtlyList = ref([
-  "智慧云览",
-  "智慧云踪",
-  "智慧云搜",
-  "智慧云基",
-  "智慧云侦",
-  "智慧云法",
-  "智慧云指",
-  "智慧云眸",
-  "智慧云控",
-  "智慧云防",
-  "智慧云管",
-  "智慧云舆",
-]);
-const fileList = ref([]);
-const status = ref(0);
-onMounted(() => {
-  if (router.currentRoute.value.query.info) {
-    let obj = JSON.parse(router.currentRoute.value.query.info);
-    editInfo.value = obj;
-    status.value = 1;
-    fknrCnt.value = obj.fknr;
-    let arr = obj.fkfj ? obj.fkfj.split(",") : [];
-    let brr = [];
-    arr.forEach((item) => {
-      let urlImg = baseUrl2 + "/mosty-api/mosty-base/minio/image/download/" + item;
-      let obj = {
-        url: urlImg,
-        codeId: item,
-        isImage: true,
-        status: "done",
-        message: "上传成功",
-      };
-      brr.push(obj);
-    });
-    fileList.value = brr;
-    radioList.value.forEach((item) => {
-      if (obj.fklx == item.val) {
-        isActive.value = item.val;
-        slectType.value = item.name;
-        sugesstName.value = item.name + "-" + seleatDate.value;
-      }
-    });
-    XTFK_LIST.value.forEach((item) => {
-      if (obj.fkxt == item.zddm) {
-        seleatDate.value = item.zdmc;
-        selectDm.value = item.zddm;
-        sugesstName.value = slectType.value + "-" + seleatDate.value;
-      }
-    });
-  } else {
-    status.value = 0;
-  }
-});
-
-function afterRead(file) {
-  const data = new FormData();
-  data.append("file", file.file);
-  file.status = "uploading";
-  file.message = "上传中...";
-  uploadImg(data)
-    .then((res) => {
-      file.status = "done";
-      file.message = "上传成功";
-      file.codeId = res;
-    })
-    .catch(() => {
-      file.status = "failed";
-      file.message = "上传失败";
-    });
-}
-
-function chooseRadio(val) {
-  if (!status.value) {
-    radioList.value.forEach((item) => {
-      if (item.val == val) {
-        yjlxValue.value = val;
-        slectType.value = item.name;
-        sugesstName.value = item.name + "-" + seleatDate.value;
-      }
-    });
-  }
-}
-
-// 系统来源提交
-function groupChange(val) {
-  XTFK_LIST.value.forEach((item) => {
-    if (val == item.zdmc) {
-      seleatDate.value = item.zdmc;
-      selectDm.value = item.zddm;
-      sugesstName.value = slectType.value + "-" + seleatDate.value;
-    }
-  });
-  isShowType.value = false;
-}
-
-// 删除
-function handleDelete() {
-  loading.value = true;
-  // deleteYyzxApi('http://80.35.14.110:8011/mosty-rzzx/tbRzXtfk/delEntity?id=' + editInfo.value.id).then(res => {
-  deleteYyzxApi("/mosty-rzzx/tbRzXtfk/delEntity?id=" + editInfo.value.id)
-    .then((res) => {
-      Toast.success("删除成功");
-      router.push("/yjsj");
-      loading.value = false;
-    })
-    .catch(() => {
-      Toast.fail("删除失败");
-      loading.value = false;
-    });
-}
-// 提交
-function submit() {
-  let imgArr = [];
-  fileList.value.forEach((item) => {
-    imgArr.push(item.codeId);
-  });
-  loading.value = true;
-  if (editInfo.value.id) {
-    editInfo.value.fklx = yjlxValue.value;
-    editInfo.value.fkxt = selectDm.value;
-    editInfo.value.fknr = fknrCnt.value;
-    editInfo.value.fkfj = imgArr.join(",");
-    let params = { ...editInfo.value };
-    editYyzxApi("/mosty-rzzx//tbRzXtfk/updateById", params)
-      .then((res) => {
-        loading.value = false
-        if (res) {
-          hintToast("提交成功");
-          setTimeout(()=>{ router.go(-1); },2e3)
-        } else {
-          hintToast("提交失败");
-        }
-      })
-      .catch(() => {
-        loading.value = false
-        hintToast("提交失败");
-      });
-  } else {
-    let prams = {
-      fklx: yjlxValue.value, //1-系统问题，2-功能改进建议，3-新需求
-      fkxt: selectDm.value,
-      fknr: fknrCnt.value,
-      fkfj: imgArr.join(","),
-      ssbmdm: userInfo.deptList[0].deptId,
-    };
-    addYyzxApi("/mosty-rzzx/tbRzXtfk/addEntity", prams).then((res) => {
-        loading.value = false
-        if (res) {
-          hintToast("提交成功");
-          setTimeout(()=>{
-            router.go(-1);
-          },2e3)
-        } else {
-          hintToast("提交失败");
-        }
-      })
-      .catch(() => {
-        loading.value = false
-        hintToast("提交失败");
-      });
-  }
-}
-
-
-function suceessInfo(info) {
-  this.$refs.uToast.show({
-    type: "success",
-    title: "",
-    icon: false,
-    message: info,
-  });
-  this.loading = false;
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.tjyj-box {
-  padding-top: 13vw;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-.info_box {
-  padding: 4vw;
-}
-
-.item_box {
-  margin-bottom: 4vw;
-}
-
-.title {
-  margin-bottom: 4vw;
-}
-
-::v-deep #van-field-3-input {
-  height: 200px !important;
-}
-
-.submit_but {
-  padding: 2vw 4vw;
-  display: flex;
-}
-</style>
diff --git a/src/pages/yyzx/views/wzzxIndex.vue b/src/pages/yyzx/views/wzzxIndex.vue
deleted file mode 100644
index f1f5b93..0000000
--- a/src/pages/yyzx/views/wzzxIndex.vue
+++ /dev/null
@@ -1,740 +0,0 @@
-<template>
-  <div class="containerBox" style="padding-top: 13vw">
-    <TopNav navTitle="位置中心" />
-    <div class="main">
-      <!-- 位置统计 -->
-      <div class="contant">
-        <div class="header">
-          <span>
-            <van-icon name="friends" size="20px" color="#3e6ee8"></van-icon>
-            <span class="title">实时巡组</span>
-          </span>
-        </div>
-        <ItemList title="今日" :list="dayList" />
-        <ItemList title="近一周" :list="weekList" />
-        <ItemList title="近一月" :list="monthList" />
-      </div>
-
-      <!-- 实时巡组 -->
-      <div class="contant">
-        <div class="header">
-          <span>
-            <van-icon name="friends" size="20px" color="#3e6ee8"></van-icon>
-            <span class="title">实时巡组</span>
-          </span>
-          <div class="callAll" style="font-size: 10px">全部呼叫</div>
-        </div>
-        <div class="select_box">
-          <div>
-            <van-checkbox-group
-              v-model="checked"
-              direction="horizontal"
-              @change="onChangeXfzt"
-            >
-              <van-checkbox
-                icon-size="16"
-                shape="square"
-                :name="item.name"
-                v-for="(item, index) in checkList"
-                :key="index"
-              >
-                <span
-                  class="dian"
-                  :class="
-                    item.name == 0 ? 'online' : item.name == 1 ? 'busy' : ''
-                  "
-                ></span>
-                {{ item.label }}({{ item.value }})
-              </van-checkbox>
-            </van-checkbox-group>
-          </div>
-        </div>
-        <div class="group item_box">
-          <ul class="groupList positionList" ref="xzScroll">
-            <li
-              v-for="item in xzList.list"
-              :key="item.id"
-              @click="handelClick(item)"
-            >
-              <div class="top">
-                <div class="top-cnt">
-                  <span
-                    class="dian online"
-                    title="巡逻中"
-                    v-if="item.xfzt == 0"
-                  ></span>
-                  <span
-                    class="dian busy"
-                    title="处警中"
-                    v-if="item.xfzt == 1"
-                  ></span>
-                  <span class="dian" title="离线" v-if="item.xfzt == 2"></span>
-                  <span class="name">{{ item.jzMc ? item.jzMc:item.fzrXm+'巡组' }}</span
-                  ><br />
-                  <span class="other"
-                    >负责人：{{ item.fzrXm }} ({{ item.fzrLxdh }})</span
-                  >
-                </div>
-                <div class="imgBtn">
-                  <van-icon name="phone-circle-o" color="#25b882" size="30" />
-                </div>
-              </div>
-              <div class="address">
-                <van-icon
-                  name="location"
-                  size="15px"
-                  color="#3e6ee8"
-                ></van-icon>
-                <span>{{ item.dqwz }}</span>
-              </div>
-            </li>
-            <van-loading
-              type="spinner"
-              v-if="xzLoading"
-              style="padding-top: 50vw; text-align: center"
-            />
-            <van-empty
-              image="default"
-              description="无列表数据"
-              v-if="xzList.list.length <= 0 && !xzLoading"
-            />
-          </ul>
-        </div>
-      </div>
-
-      <!-- 人员实时位置 -->
-      <div class="contant">
-        <div class="header">
-          <span>
-            <van-icon name="manager" size="20px" color="#3e6ee8"></van-icon>
-            <span class="title">人员实时位置</span>
-          </span>
-        </div>
-        <div class="group item_box">
-          <Search
-            v-model="localVal"
-            placeholder="请输入相关信息"
-            @update:modelValue="SeachLocation"
-          ></Search>
-          <ul class="groupList positionList" ref="ryScroll">
-            <li
-              v-for="item in wzList.list"
-              :key="item.id"
-              @click="handelClick(item)"
-              style="border-bottom:1px solid #eff0f5"
-            >
-              <div class="top">
-                <div class="top-cnt">
-                  <span class="other">负责人：{{ item.yh_xm }}</span>
-                  <div class="text">
-                    {{ item.dwrq }}
-                    {{ item.kssj ? item.kssj.slice(11, 16) : "00:00" }} —
-                    {{ item.jssj ? item.jssj.slice(11, 16) : "00:00" }}
-                  </div>
-                </div>
-                <div class="imgBtn">
-                  <van-icon name="phone-circle-o" color="#25b882" size="30" />
-                </div>
-              </div>
-              <div class="address" v-if="item.dqwz">
-                <van-icon
-                  name="location"
-                  size="15px"
-                  color="#3e6ee8"
-                ></van-icon>
-                <span>{{ item.dqwz }}</span>
-              </div>
-            </li>
-            <van-loading
-              type="spinner"
-              v-if="renLoading"
-              style="padding-top: 4vw; text-align: center"
-            />
-            <van-empty
-              image="default"
-              description="无列表数据"
-              v-if="wzList.list.length <= 0 && !renLoading"
-            />
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import {
-  locationLCS,
-  locationXZWZS,
-  locationWZRS,
-  locationRYSSWZ,
-  getSelectDeckList,
-} from "../../../api/yyzxApi.js";
-import ItemList from "../../../components/component/itemList.vue";
-import TopNav from "../../../components/topNav.vue";
-import { timeValidate, getRecentDay } from "../../../utils/tools.js";
-import { ref, reactive, onMounted, defineEmits } from "vue";
-import Search from "../../../components/search.vue";
-import { Toast } from "vant";
-const xzLoading = ref(false);
-const xzScroll = ref(null);
-const renLoading = ref(false);
-const ryScroll = ref(null);
-//状态数据
-const Searvalue = ref([]); // 巡组搜索关键字
-const checked = ref([0, 1, 2]); //巡组复选框
-const checkList = reactive([
-  {
-    name: 0,
-    label: "巡逻中",
-    value: 0,
-  },
-  {
-    name: 1,
-    value: 0,
-    label: "处警中",
-  },
-  {
-    name: 2,
-    value: 0,
-    label: "离线",
-  },
-]);
-const today = ref(timeValidate(new Date(), "ymd")); //今天
-const week = ref(getRecentDay(-6, "ymd")); //近7天
-const month = ref(getRecentDay(-29, "ymd"));
-//今日统计数据
-const dayList = ref([
-  {
-    name: "坐标总数",
-    count: 0,
-  },
-  {
-    name: "里程数",
-    count: 0,
-    isShowKm: true,
-  },
-  {
-    name: "巡组位置数",
-    count: 0,
-  },
-]);
-//周统计
-const weekList = ref([
-  {
-    name: "坐标总数",
-    count: 0,
-  },
-  {
-    name: "里程数",
-    count: 0,
-    isShowKm: true,
-  },
-  {
-    name: "巡组位置数",
-    count: 0,
-  },
-]);
-//月统计
-const monthList = ref([
-  {
-    name: "坐标总数",
-    count: 0,
-  },
-  {
-    name: "里程数",
-    count: 0,
-    isShowKm: true,
-  },
-  {
-    name: "巡组位置数",
-    count: 0,
-  },
-]);
-
-let pageCurrent = ref(1);
-let xzTotal = ref(0);
-let xzList = reactive({
-  list: [],
-}); //巡组数据
-
-let wzList = reactive({
-  list: [],
-}); //人员实时位置
-const wzTotal = ref(0);
-const wzPageNum = ref(1);
-const localVal = ref("");
-onMounted(() => {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  // <!-- 位置统计 -->
-  // //里程数 今天 -近七天 -近30天 )
-  // getLcs(today.value, today.value, "day");
-  // getLcs(week.value, today.value, "week");
-  // getLcs(month.value, today.value, "month");
-  // // //位置人数（坐标总数） 今天 -近七天 -近30天
-  // getWzrs(today.value, today.value, "day");
-  // getWzrs(week.value, today.value, "week");
-  // getWzrs(month.value, today.value, "month");
-  // // //巡组位置巡数 今天 -近七天 -近30天
-  // getXzwzs(today.value, today.value, "day");
-  // getXzwzs(week.value, today.value, "week");
-  // getXzwzs(month.value, today.value, "month");
-
-  // // 实时巡组
-  // SelectDeckList(0);
-  // SelectDeckList(1);
-  // SelectDeckList(2);
-  // onChangeXfzt();
-  // // 人员实时位置
-  // getDataList();
-  // scroll("xz");
-  // scroll("ry");
-  Promise.all([
-    getLcs(today.value, today.value, "day"),
-    getLcs(week.value, today.value, "week"),
-    getLcs(month.value, today.value, "month"),
-    getWzrs(today.value, today.value, "day"),
-    getWzrs(week.value, today.value, "week"),
-    getWzrs(month.value, today.value, "month"),
-    getXzwzs(today.value, today.value, "day"),
-    getXzwzs(week.value, today.value, "week"),
-    getXzwzs(month.value, today.value, "month"),
-    SelectDeckList(0),
-    SelectDeckList(1),
-    SelectDeckList(2),
-    onChangeXfzt(),
-    getDataList(),
-    scroll("xz"),
-    scroll("ry"),
-  ])
-    .then((res) => {
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-});
-
-// 里程数
-function getLcs(start, end, type) {
-  let params = {
-    ksrq: start + " 00:00:00",
-    jsrq: end + " 23:59:59",
-  };
-  locationLCS("/mosty-wzzx/wztj/tj/jrlcs", params).then((res) => {
-    if (type == "day") {
-      dayList.value[1].count = (res[0].lcs / 1000).toFixed(0);
-    }
-    if (type == "week") {
-      weekList.value[1].count = (res[0].lcs / 1000).toFixed(0);
-    }
-    if (type == "month") {
-      monthList.value[1].count = (res[0].lcs / 1000).toFixed(0);
-    }
-  });
-}
-
-// 获取位置人数 / 坐标总数
-function getWzrs(start, end, type) {
-  let params = {
-    ksrq: start + " 00:00:00",
-    jsrq: end + " 23:59:59",
-  };
-  locationWZRS(params).then((res) => {
-    if (type == "day") {
-      dayList.value[0].count = res[0].sl;
-    }
-    if (type == "week") {
-      weekList.value[0].count = res[0].sl;
-    }
-    if (type == "month") {
-      monthList.value[0].count = res[0].sl;
-    }
-  });
-}
-
-// 获取巡组位置巡数
-function getXzwzs(start, end, type, status) {
-  let params = {
-    ksrq: start + " 00:00:00",
-    jsrq: end + " 23:59:59",
-  };
-  locationXZWZS("/mosty-wzzx/wztj/tj/jrxzwzs", params).then((res) => {
-    if (type == "day") {
-      dayList.value[2].count = res[0].wzs;
-    }
-    if (type == "week") {
-      weekList.value[2].count = res[0].wzs;
-    }
-    if (type == "month") {
-      monthList.value[2].count = res[0].wzs;
-    }
-  });
-}
-
-//选择巡防状态
-function onChangeXfzt() {
-  let status = checked.value.join(",");
-  pageCurrent.value = 1;
-  xzList.list = [];
-  SelectDeckList(status);
-}
-
-//巡组列表
-function SelectDeckList(xfzt) {
-  let data = {
-    xfzt,
-    pageSize: 10,
-    pageCurrent: pageCurrent.value,
-  };
-  xzLoading.value = true;
-  getSelectDeckList("/mosty-qwzx/tbQwXfbb/selectDeckList", data)
-    .then((res) => {
-      xzLoading.value = false;
-      if (res.records.length > 0) {
-        if (pageCurrent.value == 1) {
-          xzList.list = res.records;
-        } else {
-          xzList.list = xzList.list.concat(res.records);
-        }
-      }
-      xzTotal.value = res.total;
-
-      if (xfzt == 0) {
-        checkList[0].value = res.total;
-      }
-      if (xfzt == 1) {
-        checkList[0].value = res.total;
-      }
-      if (xfzt == 2) {
-        checkList[2].value = res.total;
-      }
-    })
-    .catch(() => {
-      xzLoading.value = false;
-    });
-}
-
-// 清除搜索
-function clearDataSearch() {
-  wzPageNum.value = 1;
-  getDataList();
-}
-
-// 人员事实位置搜索
-function SeachLocation() {
-  wzPageNum.value = 1;
-  getDataList();
-}
-// 人员实时获取数据列表
-function getDataList() {
-  let params = {
-    yhxm: localVal.value,
-    pageCurrent: wzPageNum.value,
-    pageSize: 10,
-  };
-  renLoading.value = true;
-  locationRYSSWZ("/mosty-wzzx/wztj/wz/rywzlb", params)
-    .then((res) => {
-      renLoading.value = false;
-      if (wzPageNum.value == 1) {
-        wzList.list = res.records ? res.records : [];
-      } else {
-        let arr = res.records ? res.records : [];
-        wzList.list = wzList.list.concat(arr);
-      }
-      wzTotal.value = res.total;
-    })
-    .catch(() => {
-      renLoading.value = false;
-    });
-}
-
-//触底加载
-function scroll(type) {
-  let scrollTargetBox = "";
-  if (type == "xz") {
-    scrollTargetBox = xzScroll.value;
-  } else {
-    scrollTargetBox = ryScroll.value;
-  }
-  scrollTargetBox.onscroll = (e) => {
-    var scrollHeight = scrollTargetBox.scrollHeight;
-    var scrollTop = scrollTargetBox.scrollTop;
-    var clientHeight = scrollTargetBox.clientHeight;
-    if (scrollHeight - clientHeight == scrollTop) {
-      //滚动条滚到最底部
-      if (type == "xz") {
-        if (xzList.list.length < xzTotal.value) {
-          pageCurrent++;
-        }
-      } else {
-        if (wzList.list.length < wzTotal.value) {
-          wzPageNum.value++;
-          getDataList();
-        }
-      }
-    }
-  };
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.main {
-  // padding: 0 4vw;
-  box-sizing: border-box;
-  height: calc(100vh - 100px);
-  overflow: hidden;
-  overflow-y: auto;
-  .contant {
-    margin: 2vw 0;
-    .header {
-      height: 10vw;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: 0 3.5vw;
-      // padding: 2vw 0;
-      .icon {
-        display: inline-block;
-        width: 6vw;
-        height: 6vw;
-        border: 1px solid #e5e5e5;
-        margin-right: 2vw;
-      }
-      .title {
-        font-size: 4vw;
-        font-weight: 600;
-        margin-left: 1vw;
-        @include font_color($font-color-theme);
-      }
-    }
-    .select_box {
-      padding-top: 8px;
-      overflow: hidden;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 3.5vw;
-      @include font_size($font_medium_s);
-    }
-    // 位置统计
-    .position {
-      min-height: 40vh;
-      .position-item {
-        height: 24vw;
-        margin-bottom: 2vw;
-        display: flex;
-        border-radius: 2vw;
-        overflow: hidden;
-        box-shadow: 0 0 4px 4px #e5e5e5;
-        .item-left {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          width: 10vw;
-          height: 24vw;
-          background: #1e4eca;
-          font-size: 4vw;
-          color: #fff;
-          padding: 0 2vw;
-          box-sizing: border-box;
-          text-align: center;
-        }
-        .item-right {
-          flex: 1;
-          display: flex;
-          justify-content: space-around;
-          align-items: center;
-          .item {
-            text-align: center;
-            .title {
-              text-align: center;
-              font-size: 4vw;
-            }
-            .numb {
-              font-size: 6vw;
-              font-weight: bold;
-              line-height: 9vw;
-            }
-            .num2 {
-              color: #e36356;
-            }
-            .num3 {
-              color: #205bf3;
-            }
-            .proportion {
-              text-align: center;
-              width: 100%;
-              font-size: 3vw;
-              img {
-                margin: 0 2px 0 4px;
-              }
-              .up-color {
-                color: #2bf242;
-              }
-              .down-color {
-                color: #e64a4a;
-              }
-            }
-          }
-        }
-      }
-    }
-    // 实时巡组
-    .callAll {
-      padding: 2px 5px;
-      background: linear-gradient(#00befb, #0b66d8);
-      border-radius: 1vw;
-      color: #fff;
-      margin-right: 1vw;
-    }
-    .group {
-      // box-shadow: 0 0 10px #ccc;
-      // padding: 4vw 2vw;
-      box-sizing: border-box;
-      margin: 0 3.5vw;
-      .search {
-        display: flex;
-        height: 8vw;
-        // ::v-deep .van-search__content {
-        //   height: 8vw;
-        // }
-        .setchBtn {
-          margin-left: 1vw;
-          background: #2c5ff1;
-          padding: 1vw 4vw;
-          border-radius: 2vw;
-          color: #fff;
-          line-height: 6.5vw;
-          @include font_size($font_medium_s);
-        }
-      }
-      ul.groupList {
-        min-height: 10vh;
-        margin-top: 2vw;
-        overflow: hidden;
-        li {
-          padding-bottom: 2vw;
-          border-radius: 2vw;
-          margin-top: 2vw;
-          position: relative;
-          // background: #f7f7f7;
-          &:first-child {
-            margin-top: 0px;
-          }
-          .top {
-            display: flex;
-            justify-content: space-between;
-            padding: 0 3vw;
-            padding-top: 3vw;
-            line-height: 7vw;
-            padding-bottom: 1vw;
-            .top-cnt {
-              width: 80%;
-              @include font_size($font_medium_s);
-            }
-            .dian {
-              width: 2vw;
-              height: 2vw;
-              border-radius: 50%;
-              background: #999;
-              display: inline-block;
-              vertical-align: middle;
-              margin-right: 2vw;
-              &.online {
-                background: #1fd038;
-              }
-              &.busy {
-                background: #ed0000;
-              }
-            }
-            .name {
-              font-size: 4vw;
-              color: #5471f3;
-              vertical-align: middle;
-            }
-            .other {
-              font-size: 3vw;
-            }
-
-            .imgBtn {
-              padding-top: 10px;
-              margin-left: 2px;
-              img {
-                margin-right: 2vw;
-                width: 6vw;
-                height: 6vw;
-                border: 1px solid #e5e5e5;
-                &:last-child {
-                  margin-right: 0;
-                }
-              }
-            }
-          }
-          li.active {
-            border: 1px solid #108fe7;
-            .checkBox {
-              display: block;
-            }
-          }
-        }
-      }
-      ul.positionList {
-        max-height: 60vh;
-        overflow: hidden;
-        overflow-y: auto;
-      }
-      // 地址
-      .address {
-        margin: 0 2vw;
-        @include bottm_tab_top_color($bottom-border-top-clore-theme);
-        height: 6vw;
-        line-height: 6vw;
-        font-size: 3vw;
-        padding: 2vw 0;
-        img,
-        span {
-          vertical-align: middle;
-        }
-        img {
-          margin-right: 2vw;
-          width: 4vw;
-          height: 4vw;
-          border: 1px solid #e5e5e5;
-        }
-      }
-    }
-    ::v-deep .van-checkbox__label {
-      @include font_color($font-color-theme);
-      font-size: 3vw;
-      .dian {
-        width: 2vw;
-        height: 2vw;
-        border-radius: 50%;
-        background: #999;
-        display: inline-block;
-        vertical-align: middle;
-        margin-right: 1vw;
-        &.online {
-          background: #1fd038;
-        }
-
-        &.busy {
-          background: #ed0000;
-        }
-
-        &.blue {
-          background: #229bf0;
-        }
-      }
-    }
-  }
-}
-</style>
diff --git a/src/pages/yyzx/views/xfbbInfo.vue b/src/pages/yyzx/views/xfbbInfo.vue
deleted file mode 100644
index 1a6637b..0000000
--- a/src/pages/yyzx/views/xfbbInfo.vue
+++ /dev/null
@@ -1,1204 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="obj.bbInfo ? '巡防报备信息' : '巡防排班信息'" />
-    <van-form @submit="onSubmit">
-      <div class="title_tab">班次岗位</div>
-      <van-field
-        v-if="normalForm.bblx == '02'"
-        v-model="normalForm.qwlxMc"
-        required
-        name="勤务类型"
-        readonly
-        is-link
-        label="勤务类型"
-        placeholder="请选择勤务类型"
-        input-align="right"
-        :rules="[{ required: true, message: '请选择勤务类型' }]"
-        @click="qwlxPicker = true"
-      />
-      <van-field
-        v-if="normalForm.bblx == '01'"
-        v-model="normalForm.bcmc"
-        required
-        name="班次"
-        readonly
-        is-link
-        label="班次"
-        placeholder="请选择班次"
-        input-align="right"
-        :rules="[{ required: true, message: '请选择班次' }]"
-        @click="showDialogfn('qwbc')"
-      />
-      <van-field
-        readonly
-        v-if="qzsj"
-        v-model="qzsj"
-        input-align="right"
-        label="班次时段"
-      />
-      <van-field
-        class="change"
-        label-width="70px"
-        required
-        name="radio"
-        label="巡防类型"
-      >
-        <template #input>
-          <van-radio-group
-            v-model="normalForm.xffwlx"
-            direction="horizontal"
-            :disabled="disable"
-          >
-            <van-radio shape="square" checked-color="#3e6ee8" name="1"
-              >巡防区</van-radio
-            >
-            <van-radio shape="square" checked-color="#3e6ee8" name="2"
-              >快反点</van-radio
-            >
-            <van-radio shape="square" checked-color="#3e6ee8" name="3"
-              >检查站</van-radio
-            >
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field
-        v-if="normalForm.xffwlx === '1'"
-        v-model="normalForm.xfqMc"
-        readonly
-        name="picker"
-        label="巡防区"
-        input-align="right"
-        is-link
-        placeholder="请选择巡防区"
-        @click="showDialogfn('xfq')"
-        :rules="[{ required: true, message: '请选择巡防区' }]"
-      />
-      <van-field
-        v-if="normalForm.xffwlx === '2'"
-        v-model="normalForm.kfdMc"
-        readonly
-        name="picker"
-        label="快反点"
-        input-align="right"
-        is-link
-        placeholder="请选择快反点"
-        @click="showDialogfn('kfd')"
-        :rules="[{ required: true, message: '请选择快反点' }]"
-      />
-      <van-field
-        v-if="normalForm.xffwlx === '3'"
-        v-model="normalForm.jczMc"
-        readonly
-        name="picker"
-        label="卡点"
-        input-align="right"
-        is-link
-        placeholder="请选择卡点"
-        @click="showDialogfn('jcz')"
-        :rules="[{ required: true, message: '请选择卡点' }]"
-      />
-      <div class="title_tab">人员车辆</div>
-      <van-field
-        v-if="normalForm.bblx == '01'"
-        v-model="normalForm.jzMc"
-        name="选择警组"
-        readonly
-        input-align="right"
-        label="选择警组"
-        is-link
-        placeholder="请选择警组"
-        :rules="[{ required: true, message: '请选择警组' }]"
-        @click="showDialogfn('jz')"
-      />
-      <van-field
-        v-model="normalForm.fzrInfo"
-        required
-        readonly
-        input-align="right"
-        :clearable="true"
-        name="picker"
-        label="负责人"
-        placeholder="请选择负责人"
-        @click="showDialogfn('fzr')"
-        :rules="[{ required: true, message: '请选择负责人' }]"
-        is-link
-      />
-
-      <van-cell class="mulSelect" title="民警" color="#1989fa">
-        <template #right-icon>
-          <van-icon
-            @click.stop="showDialogfn('mj')"
-            name="add-o"
-            color="#1989fa"
-            size="22"
-          />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div
-              class="check-item-tag"
-              v-for="(item, index) in list.mj"
-              :key="index"
-            >
-              <van-tag
-                color="#7232dd"
-                closeable
-                @close="deleteCheckTag(item, index, 'mj')"
-                plain
-                >{{ item.xm || item.jlxm }}</van-tag
-              >
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="辅警" color="#1989fa">
-        <template #right-icon>
-          <van-icon
-            @click.stop="showDialogfn('fj')"
-            name="add-o"
-            color="#1989fa"
-            size="22"
-          />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div
-              class="check-item-tag"
-              v-for="(item, index) in list.fj"
-              :key="index"
-            >
-              <van-tag
-                closeable
-                @close="deleteCheckTag(item, index, 'fj')"
-                color="#7232dd"
-                plain
-                >{{ item.xm || item.jlxm }}</van-tag
-              >
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="巡防车辆" color="#1989fa">
-        <template #right-icon>
-          <van-icon
-            @click.stop="showDialogfn('cl')"
-            name="add-o"
-            color="#1989fa"
-            size="22"
-          />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div
-              class="check-item-tag"
-              v-for="(item, index) in list.cl"
-              :key="index"
-            >
-              <van-tag
-                color="#7232dd"
-                closeable
-                @close="deleteCheckTag(item, index, 'cl')"
-                plain
-                >{{ item.value || item.jdchphm }}</van-tag
-              >
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <div class="title_tab">装备</div>
-      <van-cell class="mulSelect" title="智能装备" color="#1989fa">
-        <template #right-icon>
-          <van-icon
-            @click.stop="showDialogfn('zn')"
-            name="add-o"
-            color="#1989fa"
-            size="22"
-          />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div
-              class="check-item-tag"
-              v-for="(item, index) in list.zn"
-              :key="index"
-            >
-              <van-tag
-                closeable
-                @close="deleteCheckTag(item, index, 'zn')"
-                color="#7232dd"
-                plain
-                >{{ item.value || item.sbmc }}</van-tag
-              >
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="警用器械" color="#1989fa">
-        <template #right-icon>
-          <van-icon
-            @click.stop="showDialogfn('jy')"
-            name="add-o"
-            color="#1989fa"
-            size="22"
-          />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div
-              class="check-item-tag"
-              v-for="(item, index) in list.jy"
-              :key="index"
-            >
-              <van-tag
-                closeable
-                @close="deleteCheckTag(item, index, 'jy')"
-                color="#7232dd"
-                plain
-                >{{ item.value || item.qxmc }} * {{ item.qxsl }}</van-tag
-              >
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <div class="title_tab">巡逻方式</div>
-
-      <van-field class="change" name="radio" label="巡逻方式">
-        <template #input>
-          <van-radio-group
-            v-model="normalForm.xlfs"
-            direction="horizontal"
-            :disabled="disable"
-          >
-            <van-radio shape="square" checked-color="#3e6ee8" name="1"
-              >步巡</van-radio
-            >
-            <van-radio shape="square" checked-color="#3e6ee8" name="0"
-              >车巡</van-radio
-            >
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field class="change" name="radio" label="着装类型">
-        <template #input>
-          <van-radio-group
-            v-model="normalForm.zzlx"
-            direction="horizontal"
-            :disabled="disable"
-          >
-            <van-radio shape="square" checked-color="#3e6ee8" name="0"
-              >制服</van-radio
-            >
-            <van-radio shape="square" checked-color="#3e6ee8" name="1"
-              >便衣</van-radio
-            >
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field class="change" name="radio" label="武装类型">
-        <template #input>
-          <van-radio-group
-            v-model="normalForm.wzlx"
-            direction="horizontal"
-            :disabled="disable"
-          >
-            <van-radio shape="square" checked-color="#3e6ee8" name="0"
-              >武装</van-radio
-            >
-            <van-radio shape="square" checked-color="#3e6ee8" name="1"
-              >非武装</van-radio
-            >
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-row>
-        <van-col span="24">
-          <van-field
-            rows="3"
-            type="textarea"
-            v-model="normalForm.bz"
-            name="备注"
-            placeholder="备注信息"
-          />
-        </van-col>
-      </van-row>
-      <div
-        style="padding: 0 5vw"
-        v-if="obj.bbInfo && isDays == 1 && qwzt == '02'"
-      >
-        <van-button
-          style="margin: 16px 0"
-          :loading="loading"
-          round
-          @click="editFn(0)"
-          block
-          type="success"
-        >
-          结束报备
-        </van-button>
-      </div>
-      <div
-        style="margin: 16px 0; padding: 0 5vw"
-        v-if="obj.pbInfo && isDays == 1 && qwzt == '01'"
-      >
-        <van-button
-          :loading="loading"
-          round
-          native-type="submit"
-          block
-          type="primary"
-        >
-          开始报备
-        </van-button>
-      </div>
-    </van-form>
-    <!-- 负责人 -->
-    <Select
-      bclx="02"
-      :dwlx="dwlx"
-      :checked="r_checked"
-      :selectType="selectType"
-      :show="showSelect"
-      :checkedList="list.checkedList"
-      @update:cancel="showSelect = false"
-      @update:confirm="onComfirm"
-      :key="selectIndex"
-    />
-    <van-popup v-model:show="qwlxPicker" round position="bottom">
-      <van-picker
-        :columns="normalForm.bblx == '01' ? D_BZ_QWLX : QWLX"
-        @cancel="qwlxPicker = false"
-        @confirm="onQwlxConfirm"
-      />
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-import { getBcList, getXfqList, getKfdList } from "../../../api/xfbbAndZbbb.js";
-import { getItem } from "../../../utils/storage";
-import TopNav from "../../../components/topNav";
-import Select from "../../../components/Select.vue";
-import { getMybbTodayNew } from "../../../api/common";
-import { Dialog, Toast } from "vant";
-import { addXFBB, getPbinfo } from "../../../api/report";
-import { getBbListById, finishReport } from "../../../api/common";
-import { dateFormat, hintToast } from "../../../utils/tools.js";
-import { computed, ref, reactive, onMounted, watch } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { getDictList, setDict } from "../../../utils/dict";
-const showSelect = ref(false);
-let D_BZ_QWLX = [];
-function getQwlx() {
-  D_BZ_QWLX = getDictList("D_BZ_QWLX").D_BZ_QWLX;
-}
-const obj = reactive({ bbInfo: null, pbInfo: null });
-// 是否显示勤务班次弹窗
-const router = useRouter();
-const route = useRoute();
-const userInfo = getItem("userInfo");
-const qzsj = ref("");
-const isUserDept = ref(false); //是否是用户本部门
-const r_checked = ref(""); //单选框默认选中
-const kwd = ref(""); //选择器关键字
-const selectIndex = ref(1); //选择器组件KEY
-const selectType = ref(""); //选择的类型
-const znzbCode = ref(""); //智能装备类型筛选
-const bcList = ref([]); //班次数据
-const dwlx = ref("01");
-// 巡防日期
-const calShow = ref(false); //是否显示巡防日期选择器
-const minDate = new Date(2000, 0, 1);
-const maxDate = new Date(2050, 0, 1);
-const chooseTime = ref(dateFormat("", new Date()));
-const isDays = ref("");
-const qwzt = ref("");
-const normalForm = reactive({
-  xfrq: dateFormat(),
-  bbzt: "0",
-  xlfs: "1",
-  zzlx: "1",
-  wzlx: "2",
-  kssj: "",
-  jssj: "",
-  jzMc: "",
-  jzId: "",
-  ssbm: userInfo.deptName,
-  ssbmdm: userInfo.deptList[0].deptCode,
-  fzrXm: "",
-  fzrSfzh: "",
-  fzrLxdh: "",
-  fzrInfo: "",
-  fzrId: "",
-  znzbList: [],
-  jyqxList: [],
-  clList: [],
-  jlList: [],
-  bz: "",
-  bcmc: "",
-  xffwid: "",
-  xffwlx: "",
-  xffwList: [],
-  xfqMc: "",
-  kfdMc: "",
-  qwlxMc: "",
-  qwlx: "",
-});
-const list = reactive({
-  mulChooseList: [],
-  mj: [],
-  fj: [],
-  zn: [],
-  jy: [],
-  cl: [],
-  xfqList: [],
-  kfdList: [],
-  jczList: [],
-});
-const QWLX = ref([]);
-onMounted(() => {
-  let { bbid, isDay, pbid, zt } = route.query;
-  isDays.value = isDay;
-  qwzt.value = zt;
-  Promise.all([
-    getQwlx(),
-    _getXfqList(),
-    _getKfdList(),
-    getQwbcList(),
-    _getJczList(),
-  ]).then((res) => {
-    if (zt == "01" && pbid) {
-      _getMyXfpbToday(pbid);
-    } else if (zt == "02" || (zt == "03" && bbid)) {
-      _getMybbTodayNew(bbid);
-    }
-    D_BZ_QWLX.value.forEach((el, index) => {
-      if (index != 0) {
-        QWLX.value.push(el);
-      }
-    }); //字典信息
-  });
-});
-//确认巡防日期选择
-function onConfirmTime(val) {
-  calShow.value = false;
-  chooseTime.value = dateFormat("", val);
-  normalForm.xfrq = chooseTime.value;
-}
-// 选择勤务类型
-const qwlxPicker = ref(false);
-function onQwlxConfirm(val) {
-  normalForm.qwlx = val.value;
-  normalForm.qwlxMc = val.text;
-  qwlxPicker.value = false;
-}
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return;
-  switch (selectType.value) {
-    case "jz":
-      if (r_checked.value == val[0].key) {
-        r_checked.value = "";
-        normalForm.jzMc = "";
-        list.mj = [];
-        list.fj = [];
-        list.cl = [];
-        list.zn = [];
-        list.jy = [];
-        normalForm.jzId = "";
-      } else {
-        r_checked.value = val[0].key;
-        onjzConfirm(val[0]);
-      }
-      break;
-    case "qwbc":
-      r_checked.value = val[0].key;
-      onbcConfirm(val[0]);
-      break;
-    case "fzr":
-      r_checked.value = val[0].key;
-      onfzrConfirm(val[0]);
-      break;
-    case "mj":
-      // list.mj = [];
-      list.checkedList = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "fj":
-      // list.fj = [];
-      list.checkedList = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "zn":
-      // list.zn = [];
-      list.checkedList = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "cl":
-      // list.cl = [];
-      list.checkedList = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "jy":
-      // list.jy = [];
-      list.checkedList = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "xfq":
-      list.checkedList = [];
-      normalForm.xfqMc = "";
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "kfd":
-      r_checked.value = val[0].key;
-      onkfdConfirm(val[0]);
-      break;
-    case "jcz":
-      r_checked.value = val[0].key;
-      onkfdConfirm(val[0]);
-      break;
-  }
-}
-//获取用户的报备信息
-function _getMybbTodayNew(id) {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  getBbListById(id)
-    .then((res) => {
-      if (res) {
-        const resData = JSON.parse(JSON.stringify(res));
-        if (!resData.jyqx) {
-          resData.jyqx = JSON.stringify([]);
-        }
-        if (!resData.pbmj) {
-          resData.pbmj = JSON.stringify([]);
-        }
-        if (!resData.pbfj) {
-          resData.pbfj = JSON.stringify([]);
-        }
-        if (!resData.txzb) {
-          resData.txzb = JSON.stringify([]);
-        }
-        if (!resData.pbcl) {
-          resData.pbcl = JSON.stringify([]);
-        }
-        obj.bbInfo = resData;
-        _setSubmitData(resData);
-        Toast.clear();
-      }
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-}
-//获取用户排班信息
-function _getMyXfpbToday(id) {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  getPbinfo({ id, time: dateFormat("", new Date()) })
-    .then((res) => {
-      if (res) {
-        const resData = JSON.parse(JSON.stringify(res));
-        if (!resData.jyqx) {
-          resData.jyqx = JSON.stringify([]);
-        }
-        if (!resData.pbmj) {
-          resData.pbmj = JSON.stringify([]);
-        }
-        if (!resData.pbfj) {
-          resData.pbfj = JSON.stringify([]);
-        }
-        if (!resData.txzb) {
-          resData.txzb = JSON.stringify([]);
-        }
-        if (!resData.pbcl) {
-          resData.pbcl = JSON.stringify([]);
-        }
-        normalForm.xfpbId = resData.id;
-        obj.pbInfo = resData;
-        _setSubmitData(resData);
-      } else {
-        hintToast("没有排班和报备信息，请自行填写并报备");
-      }
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-}
-//设置需要提交的参数
-function _setSubmitData(obj) {
-  let {
-    jzMc,
-    xffwlx,
-    xffwid,
-    jzId,
-    fzrSfzh,
-    fzrXm,
-    fzrLxdh,
-    userName,
-    pbmj,
-    pbfj,
-    txzb,
-    jyqx,
-    pbcl,
-    xlfs,
-    zzlx,
-    wzlx,
-    bz,
-    qwbcId,
-    fzrId,
-    kssj,
-    jssj,
-    zqsc,
-    qwlx,
-    xfpbId,
-    ssbmid,
-  } = obj;
-  normalForm.qwbcId = qwbcId;
-  normalForm.zqsc = zqsc;
-  normalForm.kssj = kssj;
-  normalForm.jssj = jssj;
-  normalForm.jzMc = jzMc;
-  normalForm.jzId = jzId;
-  normalForm.ssbmid = ssbmid;
-  normalForm.xffwlx = xffwlx;
-  normalForm.xffwid = xffwid;
-  normalForm.fzrXm = fzrXm;
-  normalForm.fzrSfzh = fzrSfzh;
-  normalForm.fzrLxdh = fzrLxdh;
-  normalForm.fzrId = fzrId;
-  normalForm.xfpbId = xfpbId;
-  normalForm.fzrInfo = `${fzrXm} ${fzrLxdh}`;
-  normalForm.qwlx = qwlx;
-  D_BZ_QWLX.value.forEach((item) => {
-    if (normalForm.qwlx == item.value) {
-      normalForm.qwlxMc = item.text;
-    }
-  });
-  list.mj = JSON.parse(pbmj);
-  list.fj = JSON.parse(pbfj);
-  list.zn = JSON.parse(txzb);
-  list.jy = JSON.parse(jyqx);
-  list.cl = JSON.parse(pbcl);
-  normalForm.xlfs = xlfs;
-  normalForm.zzlx = zzlx;
-  normalForm.wzlx = wzlx;
-  normalForm.bz = bz;
-
-  if (xffwlx == 1) {
-    normalForm.xfqMc = _setHxData(list.xfqList, "id", xffwid);
-  } else if (xffwlx == 2) {
-    normalForm.kfdMc = _setHxData(list.kfdList, "kfdId", xffwid);
-  } else if (xffwlx == 3) {
-    normalForm.jczMc = _setHxData(list.jczList, "kfdId", xffwid);
-  }
-  //设置班次数据
-  if (normalForm.bblx == "01") {
-    let bcInfo = bcList.value.find((item) => {
-      return qwbcId == item.id;
-    });
-    normalForm.bcmc = bcInfo.bcmc;
-    qzsj.value = bcInfo.kssj + " -- " + bcInfo.jssj;
-  } else {
-    qzsj.value = normalForm.kssj + " -- " + normalForm.jssj;
-  }
-}
-/**
- * 返回回显对象数据
- * @param {*} array 比对数据
- * @param {*} key 比对key
- * @param {*} val 比对值
- */
-function _setHxData(array, key, val) {
-  let arr = [],
-    xrqMc = "";
-  try {
-    arr = val.split(",");
-    if (arr.length == 1) {
-      r_checked.value = val;
-    } else {
-      list.checkedList = arr;
-    }
-  } catch (error) {}
-  for (let i = 0; i < arr.length; i++) {
-    for (let j = 0; j < array.length; j++) {
-      if (arr[i] == array[j].id || arr[i] == array[j].kfdId) {
-        xrqMc += array[j].xfqMc || array[j].kfdMc + ",";
-        normalForm.xffwList.push({
-          fwMc: array[j].xfqMc || array[j].kfdMc,
-          glbid: array[j].id || array[j].kfdId,
-          id: array[j].id || array[j].kfdId,
-          qwlx: "1",
-          xffwlx: normalForm.xffwlx,
-        });
-      }
-    }
-  }
-  return xrqMc;
-}
-//选中的勤务班次数据
-function onbcConfirm(val) {
-  qzsj.value = val.kssj + "-" + val.jssj;
-  normalForm.bcmc = val.bcmc;
-  normalForm.qwbcId = val.id;
-  normalForm.zqsc = val.zqsc;
-  normalForm.kssj = val.kssj;
-  normalForm.jssj = val.jssj;
-}
-
-//选中的警组信息
-function onjzConfirm(val) {
-  list.mj = [];
-  list.fj = [];
-  list.cl = [];
-  list.zn = [];
-  list.jy = [];
-  list.checkedList = [];
-  normalForm.jzMc = val.jzMc;
-  normalForm.jzId = val.id;
-  normalForm.fzrXm = val.ddMjxm;
-  normalForm.fzrLxdh = val.ddDh;
-  normalForm.fzrSfzh = val.ddMjsfzh;
-  normalForm.fzrId = val.ddMjid;
-  // normalForm.xbdm = val.
-  normalForm.jh = val.ddMjjh;
-  normalForm.ssbm = val.ssbm;
-  normalForm.ssbmdm = val.ssbmdm;
-  // 民警辅警已有赋值
-  val.jzryList.forEach((m) => {
-    list.checkedList.push(m.ryId);
-    if (m.jllx === "01") {
-      list.mj.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xbdm: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-    if (m.jllx === "02") {
-      list.fj.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xbdm: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-  });
-  // 车辆
-  if (val.clList.length > 0) {
-    normalForm.xlfs = "0";
-    val.clList.forEach((c) => {
-      list.checkedList.push(c.clId);
-      list.cl.push({
-        clId: c.clId,
-        jdchphm: c.jdchphm,
-        text: c.jdchphm,
-        jdchpzldm: c.jdchpzldm,
-        qwjzId: c.qwjzId,
-      });
-    });
-  }
-
-  // 警用器械
-  val.jyqxList.forEach((j) => {
-    list.checkedList.push(j.id);
-    list.jy.push({
-      qxid: j.qxid,
-      qxmc: j.qxmc,
-      text: j.qxmc,
-      qxsl: j.sl ? j.sl : 1,
-      qxlx: j.qxlx,
-      qwjzId: j.qwjzId,
-    });
-  });
-  // 智能装备
-  val.txzbList.forEach((z) => {
-    list.checkedList.push(z.zbId);
-    list.zn.push({
-      sbmc: z.sbmc,
-      text: z.sbmc,
-      txzblx: z.txzblx,
-      txzbId: z.zbId,
-      qwjzId: z.qwjzId,
-      hh: z.hh,
-    });
-  });
-}
-//选中负责人
-function onfzrConfirm(val) {
-  normalForm.fzrXm = val.xm;
-  normalForm.fzrSfzh = val.sfzh;
-  normalForm.fzrLxdh = val.lxdh;
-  normalForm.fzrId = val.ryid;
-  normalForm.xbdm = val.xbdm;
-  normalForm.fzrInfo = `${val.xm} ${val.lxdh}`;
-}
-// 弹框标题
-const checkedList = ref([]);
-const selfDefinedPopup = ref(false);
-
-//打开选择框
-function showDialogfn(val) {
-  selectType.value = val;
-  showSelect.value = true;
-  if (val == "kfd") {
-    dwlx.value = "01";
-  } else if (val == "jcz") {
-    dwlx.value = "02";
-  }
-  selectIndex.value++;
-}
-//设置选中值
-const toggle = (item) => {
-  switch (selectType.value) {
-    case "mj":
-      list.mj.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xbdm: item.xbdm,
-        id: item.ryid,
-        qwjzId: "",
-        jlId: item.ryid,
-      });
-      break;
-    case "fj":
-      list.fj.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        id: item.id,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xbdm: item.xbdm,
-        qwjzId: "",
-        jlId: item.id,
-      });
-      break;
-    case "zn":
-      list.zn.push({
-        sbmc: item.sbmc,
-        text: item.sbmc,
-        txzblx: item.scode,
-        txzbId: item.id,
-        hh: item.sbbh,
-      });
-      break;
-    case "jy":
-      list.jy.push({
-        qxid: item.id,
-        qxmc: item.qxMc,
-        text: item.qxMc,
-        qxsl: item.sl ? item.sl : 1,
-        qxlx: item.scode,
-      });
-      normalForm.wzlx = "0";
-      break;
-    case "cl":
-      list.cl.push({
-        clId: item.cid,
-        jdchphm: item.cph,
-        text: item.cph,
-        jdchpzldm: item.cllx,
-      });
-      normalForm.xlfs = "0";
-      break;
-  }
-};
-//删除选中数据
-function deleteCheckTag(item, index, val) {
-  switch (val) {
-    case "mj":
-      list.mj.splice(index, 1);
-      break;
-    case "fj":
-      list.fj.splice(index, 1);
-      break;
-    case "zn":
-      list.zn.splice(index, 1);
-      break;
-    case "jy":
-      list.jy.splice(index, 1);
-      list.jyqxList.forEach((el) => {
-        if (el.id === item.qxid) {
-          el.qxsl = 1;
-        }
-      });
-      if (!list.jy.map((j) => j.scode).includes("01")) {
-        normalForm.wzlx = "2";
-      }
-      break;
-    case "cl":
-      list.cl.splice(index, 1);
-      if (list.cl == false) {
-        normalForm.xlfs = "1";
-      }
-      break;
-  }
-}
-// 查询巡防范围
-function _getXfqList() {
-  return new Promise((ok) => {
-    let data = {
-      type: isUserDept.value ? 1 : 2,
-      keyword: kwd.value,
-    };
-    getXfqList(data).then((res) => {
-      let xfq = res;
-      for (let i = 0; i < res.length; i++) {
-        res[i].value = `${res[i].ssbm}-${res[i].xfqMc}`;
-        res[i].key = res[i].id;
-      }
-      list.xfqList = res;
-      ok();
-    });
-  });
-}
-//获取快反点数据
-function _getKfdList() {
-  return new Promise((ok) => {
-    let data = {
-      type: isUserDept.value ? 1 : 2,
-      keyword: kwd.value,
-      dwlx: "01",
-    };
-    getKfdList(data).then((res) => {
-      for (let i = 0; i < res.length; i++) {
-        res[i].value = `${res[i].ssbm}-${res[i].kfdMc}`;
-        res[i].key = res[i].kfdId;
-      }
-      list.kfdList = res;
-      ok();
-    });
-  });
-}
-function _getJczList() {
-  return new Promise((ok) => {
-    let data = {
-      type: isUserDept.value ? 1 : 2,
-      keyword: kwd.value,
-      dwlx: "02",
-    };
-    getKfdList(data).then((res) => {
-      for (let i = 0; i < res.length; i++) {
-        res[i].value = `${res[i].ssbm}-${res[i].kfdMc}`;
-        res[i].key = res[i].kfdId;
-      }
-      list.jczList = res;
-      ok();
-    });
-  });
-}
-//获取班次数据
-function getQwbcList() {
-  return new Promise((ok) => {
-    let data = {
-      type: isUserDept.value ? 1 : 2,
-      keyword: kwd.value,
-      bclx: "02",
-    };
-    getBcList(data).then((res) => {
-      if (res) {
-        for (let i = 0; i < res.length; i++) {
-          res[i].value = `${res[i].ssbm}-${res[i].bcmc}`;
-          res[i].key = res[i].id;
-        }
-        bcList.value = res;
-      }
-      ok();
-    });
-  });
-}
-function onxfqConfirm(val) {
-  normalForm.xfqMc = val.xfqMc;
-  normalForm.xffwid = val.id;
-}
-
-function onkfdConfirm(val) {
-  normalForm.kfdMc = val.kfdMc;
-  normalForm.xffwid = val.kfdId;
-}
-
-// 新增报备接口
-function onSubmit() {
-  normalForm.jlList = [...list.mj, ...list.fj];
-  normalForm.clList = list.cl;
-  normalForm.jyqxList = list.jy;
-  normalForm.znzbList = list.zn;
-  normalForm.xfbmid = normalForm.ssbmid
-    ? normalForm.ssbmid
-    : JSON.parse(window.localStorage.getItem("userInfo")).deptList[0].deptId;
-  // normalForm.xfpbId = obj.pbInfo ? obj.pbInfo.id : "";
-  normalForm.bblx = "01";
-  if (!normalForm.xffwlx) {
-    hintToast("请选择巡防类型！！");
-    return;
-  }
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认报备信息无误!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    addXFBB(normalForm).then((res) => {
-      getMybbTodayNew().then((res) => {
-        userInfo.bbId = res.id;
-        userInfo.jzId = res.jzId;
-        userInfo.jzMc = res.jzMc;
-        setStorage("userInfo", JSON.stringify(userInfo));
-      });
-      hintToast("报备成功");
-      finishReport({
-        bbzt: "0",
-        id: res,
-      }).then((res) => {});
-      router.go(-1);
-    });
-  });
-}
-//结束报备
-function editFn(e) {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认结束报备!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    finishReport({
-      bbzt: "1",
-      id: obj.bbInfo.id,
-    }).then((res) => {
-      userInfo.bbId = "";
-      userInfo.jzId = "";
-      userInfo.jzMc = "";
-      setStorage("userInfo", JSON.stringify(userInfo));
-      hintToast("报备结束成功");
-      router.go(-1);
-    });
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-.title_tab {
-  @include font_color($font-color-theme);
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-.van-cell:after {
-  display: none;
-}
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-.popupTitle {
-  color: #fff;
-}
-::v-deep .van-field__control--custom {
-  justify-content: flex-end;
-}
-::v-deep .van-field__label {
-  margin-right: 0px;
-}
-</style>
diff --git a/src/pages/yyzx/views/xttj.vue b/src/pages/yyzx/views/xttj.vue
deleted file mode 100644
index 77692b4..0000000
--- a/src/pages/yyzx/views/xttj.vue
+++ /dev/null
@@ -1,325 +0,0 @@
-<template>
-  <div class="xttj_box">
-    <TopNav navTitle="系统统计" />
-    <div class="item_box">
-      <div class="strip_box">
-        <span class="strip"></span>
-        <span class="total_title">数据总揽</span>
-      </div>
-      <div class="total_box">
-        <div class="total_item">
-          <span class="numb all">{{ dataForm.total }}</span>
-          <div>全部</div>
-        </div>
-        <div class="total_item">
-          <span class="numb xtwt">{{ dataForm.xtwt }}</span>
-          <div>系统问题</div>
-        </div>
-        <div class="total_item">
-          <span class="numb gngj">{{ dataForm.gngj }}</span>
-          <div>功能改进</div>
-        </div>
-        <div class="total_item">
-          <span class="numb xxq">{{ dataForm.xxq }}</span>
-          <div>新需求</div>
-        </div>
-      </div>
-    </div>
-    <div class="item_box">
-      <div class="strip_box">
-        <span class="strip"></span>
-        <span class="total_title">数据统计</span>
-      </div>
-      <Count :datas="dataCount"></Count>
-    </div>
-    <div class="item_box">
-      <div class="strip_box">
-        <span class="strip"></span>
-        <span class="total_title">部门数据分布</span>
-      </div>
-      <BarEcharts :datas="dataList"></BarEcharts>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import Count from "../../../components/echarts/pieChart.vue";
-import BarEcharts from "../../../components/echarts/pileUpColumn.vue";
-import TopNav from "../../../components/topNav.vue";
-import { getYyzxApi } from "../../../api/yyzxApi.js";
-import { ref, reactive, onMounted } from "vue";
-import { Toast } from "vant";
-const dataCount = ref([]);
-const XTFK_LIST = ref([
-  {
-    zdmc: "智慧云览",
-    zddm: "01",
-  },
-  {
-    zdmc: "智慧云踪",
-    zddm: "02",
-  },
-  {
-    zdmc: "智慧云搜",
-    zddm: "03",
-  },
-  {
-    zdmc: "智慧云基",
-    zddm: "04",
-  },
-  {
-    zdmc: "智慧云侦",
-    zddm: "05",
-  },
-  {
-    zdmc: "智慧云法",
-    zddm: "06",
-  },
-  {
-    zdmc: "智慧云指",
-    zddm: "07",
-  },
-  {
-    zdmc: "智慧云眸",
-    zddm: "08",
-  },
-  {
-    zdmc: "智慧云控",
-    zddm: "09",
-  },
-  {
-    zdmc: "智慧云防",
-    zddm: "10",
-  },
-  {
-    zdmc: "智慧云管",
-    zddm: "11",
-  },
-  {
-    zdmc: "智慧云舆",
-    zddm: "12",
-  },
-]);
-const dataForm = ref({
-  xtwt: 0,
-  gngj: 0,
-  xxq: 0,
-  total: 0,
-});
-const organizationList = ref([]);
-const dataList = ref({
-  Xlist: [],
-  xtwtList: [],
-  gngjList: [],
-  xxqList: [],
-  // treeList: []
-});
-
-onMounted(() => {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  Promise.all([getZzjg(), getDateCount(), getCount()])
-    .then((res) => {
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-});
-// 数据总揽
-function getDateCount() {
-  //1 系统问题 2 功能改进建议 3 新需求
-  getYyzxApi("/mosty-rzzx/yjsj/tjfx/glfktj", {}).then((res) => {
-    if (res && res.length > 0) {
-      res.forEach((v) => {
-        if (v.fklx == 1) {
-          dataForm.value.xtwt = v.sl;
-        }
-        if (v.fklx == 2) {
-          dataForm.value.gngj = v.sl;
-        }
-        if (v.fklx == 3) {
-          dataForm.value.xxq = v.sl;
-        }
-        dataForm.value.total += v.sl;
-      });
-    }
-  });
-}
-// 数据统计
-function getCount() {
-  getYyzxApi("/mosty-rzzx/yjsj/tjfx/gxtfktj", {}).then((res) => {
-    if (res && res.length > 0) {
-      let arr = [];
-      XTFK_LIST.value.forEach((item) => {
-        res.forEach((v) => {
-          let obj = {};
-          obj.name = v.ssbmdm;
-          obj.value = v.sl;
-          if (item.zddm == v.fkxt) {
-            obj.name = item.zdmc;
-            obj.value = v.sl;
-            arr.push(obj);
-          }
-        });
-      });
-      dataCount.value = arr;
-    }
-  });
-}
-// 查询组织机构
-function getZzjg() {
-  getYyzxApi("/mosty-sjzx/xtzd/zzjg", {}).then((res) => {
-    organizationList.value = res;
-    getDepartment();
-  });
-}
-
-function getDepartment() {
-  getYyzxApi("/mosty-rzzx/yjsj/tjfx/xjfktj", {}).then((res) => {
-    if (res && res.length > 0) {
-      let data = res;
-      let brr = unquire(data, "ssbmdm");
-      let crr = [];
-      brr.temp.forEach((item) => {
-        let obj = {
-          ssbmdm: "",
-          fklx1: "1",
-          sl1: 0,
-          fklx2: "2",
-          sl2: 0,
-          fklx3: "3",
-          sl3: 0,
-        };
-        item.forEach((v) => {
-          obj.ssbmdm = v.ssbmdm;
-          if (v.fklx == "1") {
-            obj.sl1 = v.sl;
-          }
-          if (v.fklx == "2") {
-            obj.sl2 = v.sl;
-          }
-          if (v.fklx == "3") {
-            obj.sl3 = v.sl;
-          }
-        });
-        crr.push(obj);
-      });
-
-      let xtwt = [];
-      let gngjjy = [];
-      let xqx = [];
-      let name = [];
-      crr.forEach((it) => {
-        xtwt.push(it.sl1);
-        gngjjy.push(it.sl2);
-        xqx.push(it.sl3);
-      });
-      brr.nameList.forEach((t) => {
-        organizationList.value.forEach((v) => {
-          if (t == v.id) {
-            name.push(v.org_short_name);
-          }
-        });
-      });
-      dataList.value.xtwtList = xtwt;
-      dataList.value.gngjList = gngjjy;
-      dataList.value.xxqList = xqx;
-      dataList.value.Xlist = name;
-    }
-  });
-}
-// 处理数据
-function unquire(arr, key) {
-  let temp = []; //分组数组
-  let nameList = []; //横坐标
-  let obj = {};
-  let newArr = arr.reduce((item, next) => {
-    obj[next.ssbmdm] ? "" : (obj[next.ssbmdm] = true && item.push(next));
-    return item;
-  }, []); //去重
-  for (let i = 0; i < newArr.length; i++) {
-    nameList.push(newArr[i].ssbmdm); //组织结构
-    let brr = [];
-    for (let j = 0; j < arr.length; j++) {
-      if (newArr[i][key] == arr[j][key]) {
-        brr.push(arr[j]);
-      }
-    }
-    temp.push(brr);
-  }
-  let data = {
-    nameList: nameList,
-    temp: temp,
-  };
-  return data;
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.xttj_box {
-  padding-top: 13vw;
-}
-.item_box {
-  margin: 3vw;
-  border-radius: 5px;
-  padding: 3vw;
-  .strip_box {
-    display: flex;
-    align-items: center;
-
-    .strip {
-      display: inline-block;
-      width: 4px;
-      height: 14px;
-      background-color: #1989fa;
-      margin-right: 2vw;
-    }
-
-    .total_title {
-      @include font_size($font_medium);
-    }
-  }
-
-  .total_box {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 7vw;
-
-    .total_item {
-      width: 33.3%;
-      text-align: center;
-      @include font_size($font_medium_s);
-
-      > div {
-        margin-top: 2vw;
-      }
-
-      .numb {
-        font-size: 8vw;
-      }
-    }
-  }
-}
-
-.all {
-  color: #34acfc;
-}
-
-.xtwt {
-  color: #e58c1b;
-}
-
-.gngj {
-  color: #d91d1b;
-}
-
-.xxq {
-  color: #449f87;
-}
-</style>
diff --git a/src/pages/yyzx/views/yjsj.vue b/src/pages/yyzx/views/yjsj.vue
deleted file mode 100644
index ce3fbb0..0000000
--- a/src/pages/yyzx/views/yjsj.vue
+++ /dev/null
@@ -1,270 +0,0 @@
-<template>
-  <div class="yjsj_box">
-    <TopNav navTitle="意见收集" rightIcon="add-o" showRight="true" @clickRight="onClickRight" />
-    <div class="info_box">
-      <div class="info-item item_box" v-for="(item, index) in dataList" :key="index">
-        <div class="item-top">
-          <div class="icon">
-            <img class="iconImg" src="../../../assets/images/time@2x.png" alt="" />
-          </div>
-          <div class="time">{{ item.xt_cjsj }}</div>
-        </div>
-        <div class="item" @click="handleEdit(item)">
-          <div class="title">
-            <span class="title-name">意见名称：</span>
-            <span>{{ item.fklxmc }}-{{ item.fkxtmc }}</span>
-          </div>
-          <div class="info">
-            <span class="title-name">意见描述：</span>
-            <span>{{ item.fknr }}</span>
-          </div>
-          <div class="photo">
-            <div class="list" v-for="(v, i) in item.imgArr" :key="i">
-              <van-image width="80px" height="80px" :src="v" @click.stop="onClickImg(v)"></van-image>
-              <!-- <img class="img" :src="v" alt="" /> -->
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <van-loading type="spinner" style="padding-top: 50vw; text-align: center" v-if="loading" />
-    <van-empty description="无列表数据" image="default" v-if="dataList.length <= 0 && showEmpty" />
-  </div>
-</template>
-
-<script>
-import TopNav from "../../../components/topNav.vue";
-import { getYyzxApi, downLoadImg } from "../../../api/yyzxApi.js";
-import { baseUrl2 } from "../../../utils/request.js";
-import { ImagePreview, Toast } from "vant";
-export default {
-  components: {
-    TopNav,
-  },
-  data() {
-    return {
-      loading: true,
-      showEmpty: false,
-      Page: 1,
-      total: 0,
-      dataList: [],
-      radioList: [
-        {
-          zdmc: "系统问题",
-          zddm: 1,
-        },
-        {
-          zdmc: "功能改进",
-          zddm: 2,
-        },
-        {
-          zdmc: "新需求",
-          zddm: 3,
-        },
-      ],
-      XTFK_LIST: [
-        {
-          zdmc: "智慧云览",
-          zddm: "01",
-        },
-        {
-          zdmc: "智慧云踪",
-          zddm: "02",
-        },
-        {
-          zdmc: "智慧云搜",
-          zddm: "03",
-        },
-        {
-          zdmc: "智慧云基",
-          zddm: "04",
-        },
-        {
-          zdmc: "智慧云侦",
-          zddm: "05",
-        },
-        {
-          zdmc: "智慧云法",
-          zddm: "06",
-        },
-        {
-          zdmc: "智慧云指",
-          zddm: "07",
-        },
-        {
-          zdmc: "智慧云眸",
-          zddm: "08",
-        },
-        {
-          zdmc: "智慧云控",
-          zddm: "09",
-        },
-        {
-          zdmc: "智慧云防",
-          zddm: "10",
-        },
-        {
-          zdmc: "智慧云管",
-          zddm: "11",
-        },
-        {
-          zdmc: "智慧云舆",
-          zddm: "12",
-        },
-      ],
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    //预览图片
-    onClickImg(url) {
-      ImagePreview([url]);
-    },
-    //添加意见
-    onClickRight() {
-      this.$router.push("/tjyj");
-    },
-    // 获取列表
-    getList() {
-      let parsms = {
-        pageNum: this.Page,
-        pageSize: 20,
-      };
-      getYyzxApi("/mosty-rzzx/yjsj/lbcx", parsms)
-        .then((res) => {
-          if (res.records && res.records.length > 0) {
-            this.loading = false;
-            this.dataList = res.records;
-            this.dataList.forEach((item) => {
-              item.fklxmc = "";
-              item.fkxtmc = "";
-              let arr = item.fkfj ? item.fkfj.split(",") : [];
-              let brr = [];
-              arr.forEach((item) => {
-                let url =
-                  baseUrl2 +
-                  "/mosty-api/mosty-base/minio/image/download/" +
-                  item;
-                brr.push(url);
-              });
-              item.imgArr = brr;
-              this.radioList.forEach((v) => {
-                if (item.fklx == v.zddm) {
-                  item.fklxmc = v.zdmc;
-                }
-              });
-              this.XTFK_LIST.forEach((v) => {
-                if (item.fkxt == v.zddm) {
-                  item.fkxtmc = v.zdmc;
-                }
-              });
-              // item.imgArr = arr
-            });
-            this.total = res.total;
-          } else {
-            this.loading = false;
-            this.showEmpty = true;
-          }
-        })
-        .catch((err) => {
-          this.loading = false;
-          this.showEmpty = true;
-        });
-    },
-
-    // 处理意见
-    handleEdit(item) {
-      this.$router.push({
-        path: "/tjyj",
-        query: { info: JSON.stringify(item) },
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.yjsj_box {
-  /* padding: 4vw 3vw; */
-  padding-top: 13vw;
-}
-
-.info_box {
-  overflow: hidden;
-  overflow-y: auto;
-  padding: 4vw 3vw;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-
-.info-item {
-  margin-bottom: 4vw;
-  padding: 3vw;
-  border-radius: 5px;
-}
-
-.info-item:nth-child(1) {
-  margin-top: 0;
-}
-
-.icon {
-  float: left;
-  margin-right: 2vw;
-}
-
-.iconImg {
-  width: 2.93334vw;
-  height: 2.93334vw;
-  margin-right: 1vw;
-  vertical-align: middle;
-}
-
-.item {
-  margin-top: 2vw;
-}
-
-.info {
-  /* span-indent: 2em; */
-  line-height: 6vw;
-}
-
-.title {
-  line-height: 8vw;
-}
-
-.photo {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.list {
-  width: 20vw;
-  height: 20vw;
-  //   border: 1px solid #0c6bcc;
-  margin-right: 2vw;
-  margin-top: 2vw;
-}
-
-.img {
-  width: 20vw;
-  height: 20vw;
-}
-
-.button {
-  position: fixed;
-  bottom: 0vw;
-  width: 60vw;
-  height: 10vw;
-  background: #0c6bcc;
-  color: #fff;
-  line-height: 10vw;
-  border-radius: 4vw;
-  left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/pages/yyzx/views/zbbbInfo.vue b/src/pages/yyzx/views/zbbbInfo.vue
deleted file mode 100644
index dfe4619..0000000
--- a/src/pages/yyzx/views/zbbbInfo.vue
+++ /dev/null
@@ -1,555 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="'值班报备'" />
-    <van-form @submit="onSubmit">
-      <div class="title_tab">值班班次</div>
-      <van-field
-        v-model="normalForm.bcmc"
-        required
-        name="班次"
-        is-link
-        readonly
-        label="班次"
-        placeholder="请选择班次"
-        input-align="right"
-        :rules="[{ required: true, message: '请选择班次' }]"
-        @click="showDialogfn('qwbc')"
-      />
-      <van-field
-        readonly
-        v-if="normalForm.bcsc"
-        v-model="normalForm.bcsc"
-        input-align="right"
-        label="班次时段"
-      />
-      <div class="title_tab">值班人员</div>
-      <van-field
-        v-model="normalForm.zbld"
-        name="值班领导"
-        required
-        input-align="right"
-        label="值班领导"
-        is-link
-        readonly
-        placeholder="请值班领导"
-        :rules="[{ required: true, message: '请选择值班领导' }]"
-        @click="showDialogfn('zbld')"
-      />
-      <van-field
-        v-model="normalForm.zhz"
-        readonly
-        input-align="right"
-        name="picker"
-        label="指挥长"
-        placeholder="请选择指挥长"
-        @click="showDialogfn('zhz')"
-        is-link
-      />
-      <van-field
-        v-model="normalForm.zzzhz"
-        readonly
-        input-align="right"
-        name="picker"
-        label="专职指挥长"
-        placeholder="请选择专职指挥长"
-        @click="showDialogfn('zzzhz')"
-        is-link
-      />
-      <van-field
-        v-model="normalForm.fz"
-        readonly
-        input-align="right"
-        name="picker"
-        label="法制"
-        placeholder="请选择法制"
-        @click="showDialogfn('fz')"
-        is-link
-      />
-
-      <van-cell class="mulSelect" title="值班民警" color="#1989fa">
-        <template #right-icon>
-          <van-icon
-            v-if="route.query.flag == 1"
-            @click.stop="showDialogfn('mj')"
-            name="add-o"
-            color="#1989fa"
-            size="22"
-          />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div
-              class="check-item-tag"
-              v-for="(item, index) in list.mj"
-              :key="index"
-            >
-              <van-tag
-                color="#7232dd"
-                :closeable="route.query.flag == 1"
-                @close="deleteCheckTag(item, index, 'mj')"
-                plain
-                >{{ item.jlxm }}</van-tag
-              >
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="值班辅警" color="#1989fa">
-        <template #right-icon>
-          <van-icon
-            v-if="route.query.flag == 1"
-            @click.stop="showDialogfn('fj')"
-            name="add-o"
-            color="#1989fa"
-            size="22"
-          />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div
-              class="check-item-tag"
-              v-for="(item, index) in list.fj"
-              :key="index"
-            >
-              <van-tag
-                :closeable="route.query.flag == 1"
-                @close="deleteCheckTag(item, index, 'fj')"
-                color="#7232dd"
-                plain
-                >{{ item.jlxm }}</van-tag
-              >
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <div class="title_tab">联系方式</div>
-      <van-field
-        :readonly="route.query.flag == 1 ? false : true"
-        v-model="normalForm.zbdh"
-        name="值班电话"
-        label="值班电话"
-        placeholder="请选择值班电话"
-        input-align="right"
-      />
-      <van-field
-        :readonly="route.query.flag == 1 ? false : true"
-        v-model="normalForm.hh"
-        name="呼号"
-        label="呼号"
-        placeholder="请输入呼号"
-        input-align="right"
-      />
-      <div
-        style="margin: 16px 0; padding: 0 5vw"
-        v-show="route.query.flag == 1"
-      >
-        <van-button
-          :loading="loading"
-          round
-          @click="_submitZbbbData"
-          block
-          type="primary"
-          v-if="route.query.zt === '01'"
-        >
-          开始报备
-        </van-button>
-        <van-button
-          style="margin: 16px 0"
-          :loading="loading"
-          round
-          @click="editFn()"
-          block
-          type="success"
-          v-if="route.query.zt === '02'"
-        >
-          结束报备
-        </van-button>
-      </div>
-    </van-form>
-    <!-- 负责人 -->
-    <Select
-      bclx="01"
-      :checked="r_checked"
-      :selectType="selectType"
-      :show="showSelect"
-      :checkedList="list.checkedList"
-      @update:cancel="showSelect = false"
-      @update:confirm="onComfirm"
-      :key="selectIndex"
-    />
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import normalReport from "../components/normalReport";
-import Select from "../../../components/Select.vue";
-import { Dialog, Toast } from "vant";
-import { dateFormat, hintToast } from "../../../utils/tools.js";
-import { computed, ref, reactive, onMounted, watch } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { getBcList } from "../../../api/xfbbAndZbbb.js";
-import {
-  submitZbbbData,
-  startAndEndZbbbData,
-  endTaskStatus,
-} from "../../../api/yyzxApi.js";
-import { getZbpbZqInfo, gettbQwZbbb } from "../../../api/report.js";
-const active = ref("a");
-const router = useRouter();
-const route = useRoute();
-const showSelect = ref(false);
-const r_checked = ref(""); //单选框默认选中
-const selectIndex = ref(1); //选择器组件KEY
-const selectType = ref(""); //选择的类型
-//表单数据
-const normalForm = reactive({
-  bcmc: "",
-  bcsc: "",
-  zbld: "",
-  zhz: "",
-  zzzhz: "",
-  fz: "",
-  hh: "",
-  bcsc: "",
-});
-//选择数据
-const list = reactive({
-  mj: [], //选中的民警数据
-  fj: [], //选中的辅警数据
-  bcList: [], //班次信息
-  bpInfo: { zbmj: [], zbfj: [], jlList: [], zbpbId: "", zbrq: "", qwbcid: "" }, //无报备的排班信息
-  bbInfo: null, //报备信息
-  checkedList: [], //默认选中的民辅警数据
-});
-
-onMounted(() => {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  Promise.all([_getBcData(), getZbbbxx()])
-    .then((res) => {
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-});
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return;
-  switch (selectType.value) {
-    case "qwbc":
-      r_checked.value = val[0].key;
-      onbcConfirm(val[0]);
-      break;
-    case "zbld":
-    case "zhz":
-    case "zzzhz":
-    case "fz":
-      if (r_checked.value == val[0].key) {
-        r_checked.value = "";
-        if (selectType.value == "zbld") normalForm.zbld = "";
-        if (selectType.value == "zhz") normalForm.zhz = "";
-        if (selectType.value == "zzzhz") normalForm.zzzhz = "";
-        if (selectType.value == "fz") normalForm.fz = "";
-      } else {
-        r_checked.value = val[0].key;
-        onfzrConfirm(val[0]);
-      }
-      break;
-    case "mj":
-      // list.mj = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-    case "fj":
-      // list.fj = [];
-      val.forEach((item) => {
-        list.checkedList.push(item.key);
-        toggle(item);
-      });
-      break;
-  }
-}
-//打开选择框
-function showDialogfn(val) {
-  if (selectType.value !== val) r_checked.value = "";
-  selectType.value = val;
-  showSelect.value = true;
-  selectIndex.value++;
-}
-//开始报备
-function _submitZbbbData() {
-  Reflect.deleteProperty(list.bpInfo, "zbmj");
-  Reflect.deleteProperty(list.bpInfo, "zbfj");
-  list.bpInfo.jlList = [...list.fj, ...list.mj];
-  list.bpInfo.zbpbId = list.bpInfo.id; //排班ID
-  list.bpInfo.zbrq = dateFormat();
-  Dialog.confirm({
-    title: "提示",
-    message: "确认报备信息是否正确！",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    submitZbbbData(list.bpInfo).then((res) => {
-      hintToast("成功")
-      _startZbbbData(res, 0);
-      _endTaskStatus("04", list.bpInfo.mrjlid, 2);
-    });
-  });
-}
-//结束任务
-function _endTaskStatus(rwxl, ywid, rwzt) {
-  let data = { rwxl, ywid, rwzt };
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    data.jd = location.app_x;
-    data.wd = location.app_y;
-  } catch (error) {}
-  endTaskStatus(data).then((res) => {});
-}
-//结束报备
-function editFn() {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认结束报备!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    _startZbbbData(route.query.id, 1);
-  });
-}
-//提交开始||结束报备
-function _startZbbbData(id, bbzt) {
-  startAndEndZbbbData({ id, bbzt }).then((res) => {
-    list.bpInfo = null;
-    router.go(-1);
-  });
-}
-
-// 根据状态查询值班报备信息
-function getZbbbxx() {
-  const temp = route.query;
-  if (temp.zt === "01") {
-    getZbpbZqInfo(temp.id).then((res) => {
-      list.bpInfo = res;
-      _setHxData(res);
-    });
-  } else {
-    gettbQwZbbb(temp.id).then((res) => {
-      list.bpInfo = res;
-      _setHxData(res);
-    });
-  }
-}
-//设置页面回显
-function _setHxData(res) {
-  let info = list.bcList.find((item) => {
-    return item.id == res.qwbcid;
-  });
-  onbcConfirm(info);
-  //值班人
-  normalForm.zbld = `${res.zbldXm ? res.zbldXm : ""} ${
-    res.zbldDh ? res.zbldDh : ""
-  }`;
-  normalForm.zbdh = res.zbldDh ? res.zbldDh : "";
-  normalForm.zhz = `${res.zbzhzXm ? res.zbzhzXm : ""} ${
-    res.zbzhzDh ? res.zbzhzDh : ""
-  }`;
-  normalForm.zzzhz = `${res.zzzhzXm ? res.zzzhzXm : ""} ${
-    res.zzzhzDh ? res.zzzhzDh : ""
-  }`;
-  normalForm.fz = `${res.fzzbXm ? res.fzzbXm : ""} ${
-    res.fzzbDh ? res.fzzbDh : ""
-  }`;
-  // 值班电话
-  //呼号
-  normalForm.hh = res.hh;
-  //民辅警
-  list.mj = JSON.parse(res.zbmj);
-  list.fj = JSON.parse(res.zbfj);
-}
-//选中的班次数据
-function onbcConfirm(val) {
-  normalForm.bcmc = val.bcmc;
-  normalForm.bcsc = `${val.kssj} - ${val.jssj}`;
-}
-//获取班次数据
-function _getBcData() {
-  let data = {
-    type: 2,
-    keyword: "",
-    bclx: "01",
-  };
-  getBcList(data).then((res) => {
-    if (res) {
-      for (let i = 0; i < res.length; i++) {
-        res[i].value = `${res[i].ssbm}-${res[i].bcmc}`;
-        res[i].key = res[i].id;
-      }
-      list.bcList = res;
-    }
-  });
-}
-//选中领导数据
-function onfzrConfirm(val) {
-  switch (selectType.value) {
-    case "zbld":
-      normalForm.zbld = `${val.xm} ${val.lxdh}`;
-      normalForm.zbdh = val.lxdh;
-      break;
-    case "zhz":
-      normalForm.zhz = `${val.xm} ${val.lxdh}`;
-      break;
-    case "zzzhz":
-      normalForm.zzzhz = `${val.xm} ${val.lxdh}`;
-      break;
-    case "fz":
-      normalForm.fz = `${val.xm} ${val.lxdh}`;
-      break;
-  }
-}
-//删除选中的民辅警数据
-function deleteCheckTag(item, index, val) {
-  switch (val) {
-    case "mj":
-      list.mj.splice(index, 1);
-      break;
-    case "fj":
-      list.fj.splice(index, 1);
-      break;
-  }
-}
-//选中民辅警数据
-const toggle = (item) => {
-  switch (selectType.value) {
-    case "mj":
-      list.mj.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xbdm: item.xbdm,
-        id: item.ryid,
-        qwjzId: "",
-        jlId: item.ryid,
-      });
-      break;
-    case "fj":
-      list.fj.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        id: item.id,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xbdm: item.xbdm,
-        qwjzId: "",
-        jlId: item.id,
-      });
-      break;
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.container {
-  margin-top: 2vw;
-}
-.nav_tab {
-  padding: 2vw;
-  display: flex;
-  justify-content: space-around;
-  .tab {
-    background: #a4aec8;
-    color: #fff;
-    height: 32px;
-    line-height: 32px;
-    width: 40vw;
-    text-align: center;
-    border-radius: 16px 16px 16px 0;
-  }
-  .tab.active {
-    background: #517cea;
-  }
-}
-
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-.title_tab {
-  @include font_color($font-color-theme);
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-.van-cell:after {
-  display: none;
-}
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-.popupTitle {
-  color: #fff;
-}
-</style>
diff --git a/src/pages/yyzx/xfbb/addXfbb.vue b/src/pages/yyzx/xfbb/addXfbb.vue
deleted file mode 100644
index 8c4c217..0000000
--- a/src/pages/yyzx/xfbb/addXfbb.vue
+++ /dev/null
@@ -1,1178 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="obj.bbInfo ? '巡防报备信息' : '巡防报备'" :showRight="true" rightIcon="comment-circle-o"
-      @clickRight="onClickRight" />
-    <van-form @submit="onSubmit">
-      <div class="title_tab">班次岗位</div>
-      <!-- @click="handelXfrq" -->
-      <van-cell title="巡防日期">
-        <template #value>
-          <span>{{ chooseTime }}</span>
-        </template>
-      </van-cell>
-      <van-field class="change" required name="radio" label-width="70px" label="勤务类型">
-        <template #input>
-          <van-radio-group v-model="normalForm.qwlx" direction="horizontal" :disabled="disableForm">
-            <van-radio checked-color="#3e6ee8" name="00">街面巡防</van-radio>
-            <van-radio checked-color="#3e6ee8" name="09">护校安园</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field class="change" v-show="normalForm.qwlx == '00'" required name="radio" label-width="70px" label="巡防岗位">
-        <template #input>
-          <van-radio-group v-model="normalForm.xffwlx" direction="horizontal" :disabled="disableForm">
-            <!-- 基本巡组、叠加巡组、警务站巡组、屯警点执勤组、重装巡组、临时勤务 -->
-            <van-radio shape="square" checked-color="#3e6ee8" name="1">基本巡组</van-radio>
-            <van-radio shape="square" checked-color="#3e6ee8" name="2">叠加巡组</van-radio>
-            <van-radio shape="square" checked-color="#3e6ee8" name="3">警务站巡组</van-radio>
-            <van-radio shape="square" checked-color="#3e6ee8" name="4">屯警点执勤组</van-radio>
-            <van-radio shape="square" checked-color="#3e6ee8" name="5">重装巡组</van-radio>
-            <van-radio shape="square" checked-color="#3e6ee8" name="6">临时勤务</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <!-- 护校安园的选择巡防区 -->
-      <van-field v-if="normalForm.qwlx == '09'" v-model="normalForm.xfqMc" readonly name="picker" label="护校安园"
-        input-align="right" is-link placeholder="请选择护校安园" @click="showDialogfn('xfq')" />
-      <!-- 截面巡防的选择 -->
-      <div v-show="normalForm.qwlx == '00'">
-        <van-field v-if="normalForm.xffwlx === '1' || normalForm.xffwlx === '2'" v-model="normalForm.xfqMc" readonly
-          name="picker" :label="normalForm.xffwlx === '1' ? '基本巡组' : '叠加巡组'" input-align="right" is-link
-          :placeholder="normalForm.xffwlx === '1' ? '请选择基本巡组' : '请选择叠加巡组'" @click="showDialogfn('xfq')" />
-        <van-field v-if="normalForm.xffwlx === '4'" v-model="normalForm.kfdMc" readonly name="picker" label="屯警点执勤组"
-          input-align="right" is-link placeholder="请选择屯警点执勤组" @click="showDialogfn('kfd')" />
-        <van-field v-if="normalForm.xffwlx === '3'" v-model="normalForm.jczMc" readonly name="picker" label="警务站巡组"
-          input-align="right" is-link placeholder="请选择警务站巡组" @click="showDialogfn('jcz')" />
-      </div>
-      <van-calendar v-model:show="calShow" @confirm="onConfirmTime" :min-date="minDate" :max-date="maxDate"
-        color="#3e6ee8"></van-calendar>
-      <!-- <van-field v-model="normalForm.bcmc" @click="showDialogfn('qwbc')" name="巡防班次" readonly is-link label="巡防班次"
-        placeholder="请选择巡防班次" input-align="right" /> -->
-      <van-field readonly :rules="[{ required: true, message: '请选择开始时间' }]" required v-model="normalForm.kssj"
-        placeholder="请选择开始时间" input-align="right" is-link label="开始时间" @click="handleStartTime" />
-      <van-field v-model="normalForm.jssj" @click="handleEndTime" readonly
-        :rules="[{ required: true, message: '请选择结束时间' }]" required placeholder="请选择结束时间" input-align="right" is-link
-        label="结束时间" />
-      <van-popup v-model:show="showkssjPicker" position="bottom">
-        <div>开始日期</div>
-        <van-datetime-picker v-model="normalForm.kssjtime" type="time" title="选择时间" @cancel="showkssjPicker = false"
-          @confirm="ksConfirm" />
-      </van-popup>
-      <van-popup v-model:show="showjssjPicker" position="bottom">
-        <van-datetime-picker v-model="normalForm.jssjtime" type="time" title="选择时间" @cancel="showjssjPicker = false"
-          @confirm="jsConfirm" />
-      </van-popup>
-
-
-      <div class="title_tab">人员车辆</div>
-      <!-- <van-field v-model="normalForm.jzMc" name="选择警组" readonly input-align="right" label="选择警组" is-link
-        placeholder="请选择警组" @click="showDialogfn('jz')" /> -->
-      <van-field v-model="normalForm.fzrXm" required readonly input-align="right" :clearable="true" name="picker"
-        label="负责人" :rules="[{ required: true, message: '请选择负责人' }]" />
-
-      <van-cell class="mulSelect" title="民警" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('mj')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.mjList" :key="index">
-              <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'mj')" plain>{{ item.xm ||
-                item.jlxm
-                }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="辅警" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('fj')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.fjList" :key="index">
-              <van-tag closeable @close="deleteCheckTag(item, index, 'fj')" color="#7232dd" plain>{{ item.xm ||
-                item.jlxm
-                }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="巡防车辆" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('cl')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.clList" :key="index">
-              <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'cl')" plain>{{ item.value ||
-                item.jdchphm }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <div class="title_tab">装备</div>
-      <van-cell class="mulSelect" title="智能装备" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('zn')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.znzbList" :key="index">
-              <van-tag closeable @close="deleteCheckTag(item, index, 'zn')" color="#7232dd" plain>{{ item.value ||
-                item.sbmc }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <!-- <van-cell class="mulSelect" title="警用器械" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('jy')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.jyqxList" :key="index">
-              <van-tag closeable @close="deleteCheckTag(item, index, 'jy')" color="#7232dd" plain>{{ item.value ||
-                item.qxmc }} * {{ item.qxsl }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell> -->
-      <van-field class="change" name="radio" label="警用器械">
-        <template #input>
-          <van-radio-group v-model="normalForm.jyqxSfagdxd" direction="horizontal" :disabled="disableForm">
-            <van-radio checked-color="#3e6ee8" name="1">是</van-radio>
-            <van-radio checked-color="#3e6ee8" name="0">否</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field class="change" name="checkbox" label="武器装备">
-        <template #input>
-          <!-- <van-radio-group v-model="normalForm.xlfs" direction="horizontal" :disabled="disableForm">
-            <van-radio checked-color="#3e6ee8" name="1">是</van-radio>
-            <van-radio checked-color="#3e6ee8" name="0">否</van-radio>
-          </van-radio-group> -->
-          <van-checkbox-group v-model="normalForm.wqzbList" :disabled="disableForm">
-            <van-checkbox v-for="item in D_BZ_WQZB" :name="item.dm" :key="item.dm">{{ item.zdmc }}</van-checkbox>
-          </van-checkbox-group>
-        </template>
-      </van-field>
-
-      <div class="title_tab" v-if="normalForm.jyqxList.length > 0">
-        警用器械数量
-      </div>
-      <van-field :disabled="disableForm" v-for="item in normalForm.jyqxList" :key="item.qxid" v-model="item.qxsl"
-        type="digit" :label="item.qxmc">
-      </van-field>
-      <div class="title_tab">巡逻方式</div>
-
-      <van-field class="change" name="radio" label="巡逻方式">
-        <template #input>
-          <van-radio-group v-model="normalForm.xlfs" direction="horizontal" :disabled="disableForm">
-            <van-radio checked-color="#3e6ee8" name="1">步巡</van-radio>
-            <van-radio checked-color="#3e6ee8" name="0">车巡</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field class="change" name="radio" label="着装类型">
-        <template #input>
-          <van-radio-group v-model="normalForm.zzlx" direction="horizontal" :disabled="disableForm">
-            <van-radio checked-color="#3e6ee8" name="0">制服</van-radio>
-            <van-radio checked-color="#3e6ee8" name="1">便衣</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <!-- <van-field class="change" name="radio" label="武装类型">
-        <template #input>
-          <van-radio-group v-model="normalForm.wzlx" direction="horizontal" :disabled="disableForm">
-            <van-radio checked-color="#3e6ee8" name="0">武装</van-radio>
-            <van-radio checked-color="#3e6ee8" name="1">非武装</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field> -->
-      <!-- <van-field class="change" name="radio" label="动中备勤">
-        <template #input>
-          <van-radio-group
-            v-model="normalForm.dzbq"
-            direction="horizontal"
-            :disabled="disableForm"
-          >
-            <van-radio checked-color="#3e6ee8" name="0">否</van-radio>
-            <van-radio checked-color="#3e6ee8" name="1">是</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field> -->
-      <van-row>
-        <van-col span="24">
-          <van-field rows="3" type="textarea" v-model="normalForm.bz" name="备注" :disabled="disableForm"
-            placeholder="备注信息" />
-        </van-col>
-      </van-row>
-      <div style="padding: 0 5vw" v-if="obj.bbInfo">
-        <van-button style="margin: 16px 0" :loading="loading" round @click="editFn(0)" block type="success">
-          下班打卡
-        </van-button>
-      </div>
-      <div style="margin: 16px 0; padding: 0 5vw" v-else>
-        <van-button :loading="loading" round native-type="submit" block type="primary">
-          开始报备
-        </van-button>
-      </div>
-    </van-form>
-    <!-- 负责人 -->
-    <Select bclx="02" :dwlx="dwlx" :xfqSx="xfqSx" :checked="r_checked" :selectType="selectType" :show="showSelect"
-      v-if="showSelect" :checkedList="hasCheckedList" @update:cancel="showSelect = false" @update:confirm="onComfirm"
-      :key="selectIndex" />
-  </div>
-</template>
-
-<script setup>
-import {
-  getKfdListById,
-  getXfqListById,
-  getBcListById,
-} from "../../../api/xfbbAndZbbb.js";
-import { getItem } from "../../../utils/storage";
-import TopNav from "../../../components/topNav";
-import Select from "../../../components/Select.vue";
-import { Dialog, Toast } from "vant";
-import { getDictList, setDict } from "@/utils/dict";
-import { addXFBB } from "../../../api/report";
-import {
-  getMybbTodayNew,
-  finishReport,
-  getMyXfpbToday,
-  getYestoday,
-} from "../../../api/common";
-import {
-  dateFormat,
-  hintToast,
-  getRecentDay,
-  timeValidate,
-} from "../../../utils/tools.js";
-import { ref, reactive, onMounted, watch } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { get } from "vant/lib/utils";
-Toast.allowMultiple();
-const { D_BZ_WQZB } = getDictList("D_BZ_WQZB");
-const router = useRouter();
-const route = useRoute();
-const userInfo = getItem("userInfo");
-const showSelect = ref(false); //弹窗的显示和隐藏
-const dwlx = ref("01"); //弹窗的单位类型
-const xfqSx = ref('01');//巡防区属性 01.基本巡区 02.叠加巡区 03.护校巡区")
-const calShow = ref(false); //是否显示巡防日期选择器
-const chooseTime = ref(dateFormat("", new Date()));
-const minDate = new Date(2000, 0, 1); // 巡防日期最小时间
-const maxDate = new Date(2050, 0, 1); // 巡防日期最大时间
-const disableForm = ref(false);
-const loading = ref(false); //报备按钮的节流
-const normalForm = ref({
-  bcmc: "", //班次名称
-  xfrq: dateFormat(),
-  kssj: "", // 开始时间
-  jssj: "", //结束时间
-  xffwlx: "", //岗位类型
-  xfqMc: "", //巡防区
-  bbzt: "0",
-  xlfs: "1",
-  zzlx: "1",
-  wzlx: "1",
-  jzMc: "",
-  jzId: "",
-  ssbm: userInfo.deptName,
-  ssbmdm: userInfo.deptList[0].deptCode,
-  lxrsfzh: userInfo.idEntityCard,
-  lxrid: userInfo.id,
-  fzrXm: userInfo.userName,
-  fzrSfzh: userInfo.idEntityCard,
-  fzrLxdh: userInfo.mobile,
-  fzrInfo: userInfo.userName,
-  fzrId: userInfo.id,
-  znzbList: [],
-  jyqxList: [],
-  clList: [],
-  jlList: [],
-  bz: "",
-  xffwid: "",
-  xffwList: [],
-  kfdMc: "",
-  jczMc: "",
-  mjList: [],
-  fjList: [],
-  dzbq: "0",
-  wqzbList: [], //武器装备
-  qwlx: '1'
-});
-const selectIndex = ref(1); //选择器组件KEY
-const selectType = ref(""); //弹窗选择的类型
-const showkssjPicker = ref(false); //开始时间结束时间弹窗
-const showjssjPicker = ref(false); //结束时间结束时间弹窗
-const dataList = reactive({
-  bcList: [], //存班次的数据
-  xfqList: [], //存的巡防区域list
-  kfdList: [], //快返点数据
-  jczList: [], //快返点数据
-  jzList: [], //警组数据
-  fzrList: [], //负责人数据
-  mjList: [], //民警数据
-  fjList: [], //辅警数据
-  znzbList: [], //智能装备数据
-  clList: [], //车辆数据
-  jyqxList: [], //警用器械
-});
-// 获取数据
-const list = reactive({
-  xfqList: [], //巡防区
-  kfdList: [], //快返点
-  jczList: [], //检查站
-  bcList: [], //班次数据
-  jyqxList: [], //警用器械
-});
-
-const hasCheckedList = ref([]); //多选状态
-const r_checked = ref(""); //单选框默认选中
-const isUserDept = ref(false); //是否是用户本部门
-const kwd = ref(""); //选择器关键字
-const obj = reactive({ bbInfo: null, pbInfo: null });
-
-watch(
-  () => normalForm.value,
-  (val) => {
-    if (val.kssj && val.jssj) {
-      let startTime = handleTime(val.kssj);
-      let endTime = handleTime(val.jssj);
-      if (startTime >= endTime) {
-        let end = val.jssj.slice(11, 19);
-        normalForm.value.jssj = getRecentDay(1, "ymd") + " " + end;
-      }
-      setZqsc(); //执勤时长
-    }
-  },
-  { immediate: true, deep: true }
-);
-onMounted(() => {
-  _getMybbTodayNew();
-});
-
-// 处理时间
-function handleTime(time) {
-  var deteString = Date.parse(new Date(time));
-  return deteString;
-}
-
-//计算执勤时长
-function setZqsc() {
-  if (normalForm.value.jssj && normalForm.value.kssj) {
-    let start = new Date();
-    let startTime = normalForm.value.kssj.slice(11, 19);
-    start.setHours(startTime.split(":")[0]);
-    start.setMinutes(startTime.split(":")[1]);
-    let end = new Date();
-    let endTime = normalForm.value.jssj.slice(11, 19);
-    end.setHours(endTime.split(":")[0]);
-    end.setMinutes(endTime.split(":")[1]);
-    let time;
-    if (end >= start) {
-      time = parseInt(end - start) / 1000 / 60;
-    } else {
-      end.setDate(end.getDate() + 1);
-      time = parseInt(end - start) / 1000 / 60;
-    }
-    normalForm.value.zqsc = time >> 0;
-  }
-}
-
-// 跳转特殊报备
-function onClickRight() {
-  router.push("/yyzx/xfbb/addtsXfbb");
-}
-
-// 查询巡防范围
-function _getXfqList(id) {
-  getXfqListById(id).then((res) => {
-    res.value = `${res.ssbm}-${res.xfqMc}`;
-    res.key = res.id;
-    list.xfqList = list.xfqList.concat([res]);
-    _setHxData(list.xfqList, "id", res.id, "xfq");
-  });
-}
-//获取快反点数据
-function _getKfdList(id, type) {
-  getKfdListById(id).then((res) => {
-    if (res) {
-      res.value = `${res.ssbm}-${res.kfdMc}`;
-      res.key = res.kfdId;
-      if (type == "kfd") list.kfdList = [res];
-      if (type == "jcz") list.kfdList = [res];
-      _setHxData([res], "kfdId", res.kfdId, type);
-    }
-
-  });
-}
-
-// 根据id获取班次
-function getBcInfoById(id) {
-  getBcListById(id).then((res) => {
-    if (!res) return false;
-    normalForm.value.bcmc = res.bcmc;
-  });
-}
-
-// 点击开始时间
-function handleStartTime() {
-  if (disableForm.value) return false;
-  showkssjPicker.value = true;
-}
-
-// 点击结束时间
-function handleEndTime() {
-  if (disableForm.value) return false;
-  showjssjPicker.value = true;
-}
-
-// 点击巡防日期
-function handelXfrq() {
-  if (disableForm.value) return false;
-  calShow.value = true;
-}
-
-//获取用户的报备信息
-function _getMybbTodayNew() {
-  getMybbTodayNew().then((res) => {
-    if (res) {
-      const resData = JSON.parse(JSON.stringify(res));
-      obj.bbInfo = resData;
-      disableForm.value = true;
-      _setSubmitData(resData);
-    } else {
-      disableForm.value = false;
-      _getMyXfpbToday(); //没有报备信息 查询排版信息
-    }
-  })
-    .catch((err) => { });
-}
-
-//设置需要提交的参数
-function _setSubmitData(obj) {
-  console.log(obj, 'obj');
-  if (!obj) return false;
-  normalForm.value = obj;
-  normalForm.value.xfrq = getRecentDay(0, "ymd");
-  let startTime = obj.kssj || "";
-  let endTime = obj.jssj || "";
-  normalForm.value.kssj = getRecentDay(0, "ymd") + " " + startTime;
-  normalForm.value.jssj = getRecentDay(0, "ymd") + " " + endTime;
-  normalForm.value.bbkssj = timeValidate(new Date());
-  normalForm.value.zbsj = timeValidate(new Date());
-  normalForm.value.mjList = obj.pbmj ? JSON.parse(obj.pbmj) : [];
-  normalForm.value.fjList = obj.pbfj ? JSON.parse(obj.pbfj) : [];
-  normalForm.value.znzbList = obj.txzb ? JSON.parse(obj.txzb) : [];
-  normalForm.value.jyqxList = obj.jyqx ? JSON.parse(obj.jyqx) : [];
-  normalForm.value.clList = obj.pbcl ? JSON.parse(obj.pbcl) : [];
-  normalForm.value.wqzbList = obj.wqzb ? obj.wqzb.split(',') : [];
-  getBcInfoById(obj.qwbcId); //班次
-  if (obj.jzId) dataList.jzList = [{ key: obj.jzId }]; // 警组
-  if (obj.xffwlx == 1) {
-    let ids = obj.xffwid.split(",");
-    normalForm.value.xfqMc = "";
-    ids.forEach((item) => {
-      _getXfqList(item);
-    });
-  } else if (obj.xffwlx == 2) {
-    _getKfdList(obj.xffwid, "kfd");
-  } else if (obj.xffwlx == 3) {
-    _getKfdList(obj.xffwid, "jcz");
-  }
-}
-/**
- * 返回回显对象数据
- * @param {*} array 比对数据
- * @param {*} key 比对key
- * @param {*} val 比对值
- */
-function _setHxData(array, key, val, type) {
-  let arr = val ? val.split(",") : [];
-  switch (type) {
-    case "xfq":
-      normalForm.value.xffwList = [];
-      let data = handelArr(arr, array, key, "XFQ");
-      dataList.xfqList = data.crr;
-      data.crr.forEach((item) => {
-        normalForm.value.xfqMc += item.xfqMc + ",";
-        normalForm.value.xffwList.push({
-          fwMc: item.xfqMc,
-          glbid: item.id,
-          id: item.id,
-          qwlx: "1",
-          xffwlx: normalForm.value.xffwlx,
-        });
-      });
-      break;
-    case "kfd":
-      let obj = handelArr(arr, array, key, "KFD");
-      normalForm.value.kfdMc = obj.str;
-      dataList.kfdList = obj.crr;
-      break;
-    case "jcz":
-      let obj1 = handelArr(arr, array, key, "JCZ");
-      normalForm.value.jczMc = obj1.str;
-      dataList.jczList = obj1.crr;
-      break;
-  }
-}
-
-// 处理数组
-function handelArr(arr, brr, key, type) {
-  let obj = { str: "", crr: [] };
-  for (let i = 0; i < arr.length; i++) {
-    for (let j = 0; j < brr.length; j++) {
-      if (arr[i] == brr[j][key]) {
-        if (type == "XFQ") {
-          obj.str += brr[j].xfqMc + ",";
-        }
-        if (type == "KFD" || type == "JCZ") {
-          obj.str += brr[j].kfdMc + ",";
-        }
-        obj.crr.push(brr[j]);
-      }
-    }
-  }
-  return obj;
-}
-
-//确认巡防日期选择
-function onConfirmTime(val) {
-  calShow.value = false;
-  chooseTime.value = dateFormat("", val);
-  normalForm.c.xfrq = chooseTime.value;
-}
-//打开选择框
-function showDialogfn(type) {
-  if (disableForm.value) return false;
-  selectType.value = type; //选取的类型
-  showSelect.value = true; //打开弹窗
-  hasCheckedList.value = [];
-  r_checked.value = "";
-  if (type == "kfd") {
-    if (normalForm.value.xffwlx == '4') {
-      dwlx.value = "04";
-    } else {
-      dwlx.value = "01";
-    }
-  } else if (type == "jcz") {
-    dwlx.value = "02";
-  }
-  //巡防区属性 01.基本巡区 02.叠加巡区 03.护校巡区")
-  if (type == 'xfq') {
-    if (normalForm.value.xffwlx == '1') {
-      xfqSx.value = '01'
-    } else if (normalForm.value.xffwlx == '2') {
-      xfqSx.value = '02'
-    }
-    if (normalForm.value.qwlx == '09') {
-      xfqSx.value = '03'
-    }
-  }
-  hasChooseData();
-  selectIndex.value++;
-}
-
-// 已经选取的数据回显
-function hasChooseData() {
-  switch (selectType.value) {
-    case "qwbc":
-      if (!dataList.bcList.length) return false;
-      r_checked.value = dataList.bcList[0].key;
-      break;
-    case "xfq":
-      if (!dataList.xfqList.length) return false;
-      hasCheckedList.value = dataList.xfqList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "kfd":
-      if (!dataList.kfdList.length) return false;
-      r_checked.value = dataList.kfdList[0].key;
-      break;
-    case "jcz":
-      if (!dataList.jczList.length) return false;
-      r_checked.value = dataList.jczList[0].key;
-      break;
-    case "jz":
-      if (!dataList.jzList.length) return false;
-      r_checked.value = dataList.jzList[0].key;
-      break;
-    case "fzr":
-      if (!dataList.fzrList.length) return false;
-      r_checked.value = dataList.fzrList[0].key;
-      break;
-    case "mj":
-      if (!dataList.mjList.length) return false;
-      hasCheckedList.value = dataList.mjList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "fj":
-      if (!dataList.fjList.length) return false;
-      hasCheckedList.value = dataList.fjList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "zn":
-      if (!dataList.znzbList.length) return false;
-      hasCheckedList.value = dataList.znzbList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "cl":
-      if (!dataList.clList.length) return false;
-      hasCheckedList.value = dataList.clList.map((item) => {
-        return item.key;
-      });
-      break;
-    case "jy":
-      if (!dataList.jyqxList.length) return false;
-      hasCheckedList.value = dataList.jyqxList.map((item) => {
-        return item.key;
-      });
-      break;
-  }
-}
-
-//获取用户排班信息
-function _getMyXfpbToday() {
-  getMyXfpbToday().then((res) => {
-    if (res) {
-      const resData = JSON.parse(JSON.stringify(res));
-      if (!resData.jyqx) resData.jyqx = JSON.stringify([]);
-      if (!resData.pbmj) resData.pbmj = JSON.stringify([]);
-      if (!resData.pbfj) resData.pbfj = JSON.stringify([]);
-      if (!resData.txzb) resData.txzb = JSON.stringify([]);
-      if (!resData.pbcl) resData.pbcl = JSON.stringify([]);
-      obj.pbInfo = resData;
-      _setSubmitData(resData);
-    } else {
-      hintToast("没有排班和报备信息，请自行填写并报备");
-      getYesterdayDate();
-    }
-  });
-}
-
-// 获取昨天的数据
-function getYesterdayDate() {
-  let data = { sfzh: userInfo.idEntityCard };
-  getYestoday(data).then((res) => {
-    console.log(res);
-    _setSubmitData(res);
-  });
-}
-
-// 开始时间弹窗
-function ksConfirm(val) {
-  normalForm.value.kssj = getRecentDay(0, "ymd") + " " + val + ":00";
-  showkssjPicker.value = false;
-}
-// 结束时间弹窗
-function jsConfirm(val) {
-  normalForm.value.jssj = getRecentDay(0, "ymd") + " " + val + ":00";
-  showjssjPicker.value = false;
-}
-
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return false;
-  switch (selectType.value) {
-    case "qwbc":
-      dataList.bcList = val; //选取的班次数据
-      onbcConfirm(val[0]);
-      break;
-    case "xfq":
-      normalForm.value.xfqMc = "";
-      dataList.xfqList = val; //选取的巡防区数据
-      normalForm.value.xffwList = [];
-      val.forEach((item) => {
-        toggle(item);
-      });
-      break;
-    case "kfd":
-      dataList.kfdList = val; //选取的快返点数据
-      onkfdConfirm(val[0]);
-      break;
-    case "jcz":
-      dataList.jczList = val; //选取的快返点数据
-      onkfdConfirm(val[0]);
-      break;
-    case "jz":
-      dataList.jzList = val; //选取的警组数据
-      onjzConfirm(val[0]);
-      break;
-    case "fzr":
-      dataList.fzrList = val; //选取的负责人数据
-      onfzrConfirm(val[0]);
-      break;
-    case "mj":
-      normalForm.value.mjList = [];
-      dataList.mjList = val;
-      val.forEach((item) => {
-        toggle(item);
-      });
-      break;
-    case "fj":
-      normalForm.value.fjList = [];
-      dataList.fjList = val;
-      val.forEach((item) => {
-        toggle(item);
-      });
-      break;
-    case "zn":
-      dataList.znzbList = val;
-      normalForm.value.znzbList = [];
-      val.forEach((item) => {
-        toggle(item);
-      });
-      break;
-    case "cl":
-      dataList.clList = val;
-      normalForm.value.clList = [];
-      val.forEach((item) => {
-        toggle(item);
-      });
-      break;
-    case "jy":
-      dataList.jyqxList = val;
-      normalForm.value.jyqxList = [];
-      val.forEach((item) => {
-        toggle(item);
-      });
-      break;
-  }
-}
-//选中的勤务班次数据
-function onbcConfirm(val) {
-  normalForm.value.bcmc = val.bcmc;
-  normalForm.value.qwbcId = val.id;
-  normalForm.value.zqsc = val.zqsc;
-  normalForm.value.kssj = getRecentDay(0, "ymd") + " " + val.kssj;
-  normalForm.value.jssj = getRecentDay(0, "ymd") + " " + val.jssj;
-}
-
-//设置选中值
-const toggle = (item) => {
-  switch (selectType.value) {
-    case "xfq":
-      normalForm.value.xfqMc += item.xfqMc + ",";
-      normalForm.value.xffwList.push({
-        fwMc: item.xfqMc,
-        glbid: item.id,
-        id: item.id,
-        qwlx: "1",
-        xffwlx: normalForm.value.xffwlx,
-      });
-      break;
-    case "mj":
-      normalForm.value.mjList.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xfbmid: item.xbdm,
-        id: item.ryid,
-        qwjzId: "",
-        jlId: item.ryid,
-      });
-      break;
-    case "fj":
-      normalForm.value.fjList.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        id: item.id,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xfbmid: item.xbdm,
-        qwjzId: "",
-        jlId: item.id,
-      });
-      break;
-    case "zn":
-      normalForm.value.znzbList.push({
-        sbmc: item.sbmc,
-        text: item.sbmc,
-        txzblx: item.scode,
-        txzbId: item.id,
-        hh: item.sbbh,
-        sfrh: item.sfrh,
-        sfxt: item.sfxt,
-        sfzy: item.sfzy,
-      });
-      break;
-    case "jy":
-      normalForm.value.jyqxList.push({
-        qxid: item.id,
-        qxmc: item.qxMc,
-        text: item.qxMc,
-        qxsl: item.sl ? item.sl : 1,
-        qxlx: item.scode,
-      });
-      normalForm.value.wzlx = "0";
-      break;
-    case "cl":
-      normalForm.value.clList.push({
-        clId: item.cid,
-        jdchphm: item.cph,
-        text: item.cph,
-        jdchpzldm: item.cllx,
-        gpsId: item.gpsId,
-      });
-      normalForm.value.xlfs = "0";
-      break;
-  }
-};
-
-// 警组回显
-function onjzConfirm(val) {
-  normalForm.value.mjList = [];
-  normalForm.value.fjList = [];
-  normalForm.value.clList = [];
-  normalForm.value.znzbList = [];
-  normalForm.value.jyqxList = [];
-  normalForm.value.jzMc = val.jzMc;
-  normalForm.value.jzId = val.id;
-
-  dataList.fzrList = []; //负责人
-  dataList.fzrList = [{ key: val.ddMjid }];
-  normalForm.value.jh = val.ddMjjh;
-
-  // 民警辅警已有赋值
-  dataList.mjList = []; //缓存民警
-  dataList.fjList = []; //缓存辅警
-  val.jzryList.forEach((m) => {
-    m.key = m.ryId;
-    if (m.jllx === "01") {
-      dataList.mjList.push(m);
-      normalForm.value.mjList.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xfbmid: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-    if (m.jllx === "02") {
-      dataList.fjList.push(m);
-      normalForm.value.fjList.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xfbmid: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-  });
-  // 车辆
-  dataList.clList = [];
-  if (val.clList.length > 0) {
-    normalForm.value.xlfs = "0";
-    val.clList.forEach((c) => {
-      c.key = c.clId;
-      dataList.clList.push(c);
-      normalForm.value.clList.push({
-        clId: c.clId,
-        jdchphm: c.jdchphm,
-        text: c.jdchphm,
-        jdchpzldm: c.jdchpzldm,
-        gpsId: c.gpsId,
-        qwjzId: c.qwjzId,
-      });
-    });
-  }
-  // 警用器械
-  dataList.jyqxList = [];
-  val.jyqxList.forEach((j) => {
-    j.key = j.qxId;
-    dataList.jyqxList.push(j);
-    normalForm.value.jyqxList.push({
-      qxid: j.qxid,
-      qxmc: j.qxmc,
-      text: j.qxmc,
-      qxsl: j.sl ? j.sl : 1,
-      qxlx: j.qxlx,
-      qwjzId: j.qwjzId,
-    });
-  });
-  // 智能装备
-  dataList.znzbList = [];
-  val.txzbList.forEach((z) => {
-    z.key = z.zbId;
-    dataList.znzbList.push(z);
-    normalForm.value.znzbList.push({
-      sbmc: z.sbmc,
-      text: z.sbmc,
-      txzblx: z.txzblx,
-      txzbId: z.zbId,
-      qwjzId: z.qwjzId,
-      hh: z.hh,
-      sfrh: z.sfrh,
-      sfxt: z.sfxt,
-      sfzy: z.sfzy,
-    });
-  });
-}
-
-//选中负责人
-function onfzrConfirm(val) {
-  normalForm.value.xfbmid = val.xbdm;
-}
-
-//删除选中数据
-function deleteCheckTag(item, index, val) {
-  if (disableForm.value) return false;
-  switch (val) {
-    case "mj":
-      normalForm.value.mjList.splice(index, 1);
-      dataList.mjList.splice(index, 1);
-      break;
-    case "fj":
-      normalForm.value.fjList.splice(index, 1);
-      dataList.fjList.splice(index, 1);
-      break;
-    case "zn":
-      normalForm.value.znzbList.splice(index, 1);
-      dataList.znzbList.splice(index, 1);
-      break;
-    case "jy":
-      normalForm.value.jyqxList.splice(index, 1);
-      dataList.jyqxList.splice(index, 1);
-      list.jyqxList.forEach((el) => {
-        if (el.id === item.qxid) el.qxsl = 1;
-      });
-      if (!normalForm.value.jyqxList.map((j) => j.scode).includes("01")) {
-        normalForm.value.wzlx = "2";
-      }
-      break;
-    case "cl":
-      normalForm.value.clList.splice(index, 1);
-      dataList.clList.splice(index, 1);
-      if (normalForm.value.clList.length == 0) normalForm.value.xlfs = "1";
-      break;
-  }
-}
-
-// 新增报备接口
-function onSubmit() {
-  normalForm.value.jlList = [...normalForm.value.mjList, ...normalForm.value.fjList,];
-  normalForm.value.xfbmid = normalForm.value.ssbmid ? normalForm.value.ssbmid : userInfo.deptList[0].deptId;
-  normalForm.value.xfpbId = obj.pbInfo ? obj.pbInfo.id : "";
-  normalForm.value.bblx = "01";
-  if (!normalForm.value.xffwlx) return hintToast("请选择巡防类型！！");
-
-  if (!normalForm.value.bz && !normalForm.value.xffwid) {
-    if (normalForm.value.xffwlx == "1" && !normalForm.value.xfqMc) {
-      return hintToast("请选择巡防区或者填写备注");
-    }
-    if (normalForm.value.xffwlx == "2" && !normalForm.value.kfdMc) {
-      return hintToast("请选择快反点或者填写备注");
-    }
-    if (normalForm.value.xffwlx == 3 && !normalForm.value.jczMc) {
-      return hintToast("请选择检查站或者填写备注");
-    }
-  }
-  Dialog.confirm({ title: "提示", message: "是否确认警组信息是否无误,若需要修改警组信息，请结束报备后重新开始!", confirmButtonColor: "#3e6ee8", }).then((res) => {
-    normalForm.value.kssj = normalForm.value.kssj.slice(11, 19);
-    normalForm.value.jssj = normalForm.value.jssj.slice(11, 19);
-    if (!normalForm.value.kssj || !normalForm.value.jssj) return hintToast("请选择时间!");
-    normalForm.value.ssbmdm = userInfo.deptList[0].deptCode
-    normalForm.value.ssbm = userInfo.deptList[0].deptName
-    if (normalForm.value.wqzbList.length > 0) {
-      normalForm.value.wqzb = normalForm.value.wqzbList.join(',')
-    }
-    normalForm.value.id = getUUid()
-    addXFBB(normalForm.value).then((res) => {
-      loading.value = true;
-      getMybbTodayNew().then((_res) => {
-        if (!_res) return false;
-        userInfo.bbId = _res.id;
-        userInfo.jzId = _res.jzId;
-        userInfo.jzMc = _res.jzMc;
-        loading.value = false;
-        setStorage("userInfo", JSON.stringify(userInfo));
-      });
-      hintToast("报备成功!");
-      router.go(-1);
-      finishReport({ bbzt: "0", id: res }).then((res) => { });
-    }).catch(() => {
-      loading.value = false;
-    });
-  });
-}
-
-function getUUid() {
-  var list = [];
-  var hexDigits = "0123456789abcdefghijklmnopqrstuvwxyz";
-  for (var i = 0; i < 32; i++) {
-    list[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-  }
-  list[14] = "4";
-  list[19] = hexDigits.substr((list[19] & 0x3) | 0x8, 1);
-  list[8] = list[13] = list[18] = list[23];
-  let uuid = list.join("");
-  return uuid;
-}
-
-//结束报备
-function editFn(e) {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认结束报备!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    loading.value = true;
-    finishReport({ bbzt: "1", id: obj.bbInfo.id })
-      .then((res) => {
-        loading.value = false;
-        hintToast("报备结束成功");
-        userInfo.bbId = "";
-        userInfo.jzId = "";
-        userInfo.jzMc = "";
-        router.go(-1);
-        setStorage("userInfo", JSON.stringify(userInfo));
-      })
-      .catch(() => {
-        loading.value = false;
-      });
-  });
-}
-
-function onkfdConfirm(val) {
-  if (selectType.value == "jcz") {
-    normalForm.value.jczMc = val.kfdMc;
-  } else {
-    normalForm.value.kfdMc = val.kfdMc;
-  }
-  normalForm.value.xffwid = val.kfdId;
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-
-.title_tab {
-  @include font_color($font-color-theme);
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-
-.van-cell:after {
-  display: none;
-}
-
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-
-.popupTitle {
-  color: #fff;
-}
-
-::v-deep .van-field__label {
-  margin-right: 0px;
-}
-
-::v-deep .van-radio-group--horizontal,
-.van-checkbox-group--horizontal {
-  flex-wrap: wrap;
-  @include font_size($font_medium_s);
-}
-
-::v-deep .van-checkbox-group {
-  display: flex;
-}
-
-::v-deep .van-field__control--custom {
-  justify-content: flex-end;
-}
-
-::v-deep .van-checkbox {
-  margin-left: 10px;
-}
-
-::v-deep .van-radio {
-  margin-bottom: 4px;
-}
-</style>
diff --git a/src/pages/yyzx/xfbb/addtsXfbb.vue b/src/pages/yyzx/xfbb/addtsXfbb.vue
deleted file mode 100644
index 9c652cf..0000000
--- a/src/pages/yyzx/xfbb/addtsXfbb.vue
+++ /dev/null
@@ -1,919 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav navTitle="特殊勤务报备" />
-    <van-form @submit="onSubmit">
-      <div class="title_tab">人员车辆</div>
-      <van-field v-model="normalForm.qwlxMc" required name="勤务类型" readonly is-link label="勤务类型" placeholder="请选择勤务类型"
-        input-align="right" :rules="[{ required: true, message: '请选择勤务类型' }]" @click="qwlxPicker = true" />
-      <van-field v-model="normalForm.jzMc" name="选择警组" readonly input-align="right" label="选择警组" is-link
-        placeholder="请选择警组" @click="showDialogfn('jz')" />
-      <van-field v-model="normalForm.fzrXm" required readonly input-align="right" :clearable="true" name="picker"
-        label="负责人" :rules="[{ required: true, message: '请选择负责人' }]" />
-
-      <van-field v-model="normalForm.zylxmc" name="人员类型" readonly input-align="right" label="选择人员类型" is-link
-        placeholder="请选择人员类型" @click="rylxPicker = true" />
-
-      <van-cell class="mulSelect" title="民警" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('mj')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.mjList" :key="index">
-              <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'mj')" plain>{{ item.xm || item.jlxm
-              }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="辅警" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('fj')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.fjList" :key="index">
-              <van-tag closeable @close="deleteCheckTag(item, index, 'fj')" color="#7232dd" plain>{{ item.xm || item.jlxm
-              }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <van-cell class="mulSelect" title="巡防车辆" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('cl')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.clList" :key="index">
-              <van-tag color="#7232dd" closeable @close="deleteCheckTag(item, index, 'cl')" plain>{{ item.value ||
-                item.jdchphm }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-      <div class="title_tab">装备</div>
-      <van-cell class="mulSelect" title="智能装备" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('zn')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.znzbList" :key="index">
-              <van-tag closeable @close="deleteCheckTag(item, index, 'zn')" color="#7232dd" plain>{{ item.value ||
-                item.sbmc }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-
-      <van-field class="change" name="checkbox" label="武器装备">
-        <template #input>
-          <van-checkbox-group v-model="normalForm.wqzbList" :disabled="disable">
-            <van-checkbox v-for="item in D_BZ_WQZB" :name="item.dm" :key="item.dm">{{ item.zdmc }}</van-checkbox>
-          </van-checkbox-group>
-        </template>
-      </van-field>
-
-      <van-cell class="mulSelect" title="警用器械" color="#1989fa">
-        <template #right-icon>
-          <van-icon @click.stop="showDialogfn('jy')" name="add-o" color="#1989fa" size="22" />
-        </template>
-        <template #default>
-          <div class="selected-box">
-            <div class="check-item-tag" v-for="(item, index) in normalForm.jyqxList" :key="index">
-              <van-tag closeable @close="deleteCheckTag(item, index, 'jy')" color="#7232dd" plain>{{ item.value ||
-                item.qxmc }} * {{ item.qxsl }}</van-tag>
-            </div>
-          </div>
-        </template>
-      </van-cell>
-
-      <div class="title_tab" v-if="normalForm.jyqxList.length > 0">警用器械数量</div>
-      <van-field :disabled="disableForm" v-for="item in normalForm.jyqxList" :key="item.qxid" v-model="item.qxsl"
-        type="digit" :label="item.qxmc">
-      </van-field>
-
-      <div class="title_tab">巡逻方式</div>
-
-      <van-field class="change" name="radio" label="巡逻方式">
-        <template #input>
-          <van-radio-group v-model="normalForm.xlfs" direction="horizontal" :disabled="disable">
-            <van-radio shape="square" checked-color="#3e6ee8" name="1">步巡</van-radio>
-            <van-radio shape="square" checked-color="#3e6ee8" name="0">车巡</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field class="change" name="radio" label="着装类型">
-        <template #input>
-          <van-radio-group v-model="normalForm.zzlx" direction="horizontal" :disabled="disable">
-            <van-radio shape="square" checked-color="#3e6ee8" name="0">制服</van-radio>
-            <van-radio shape="square" checked-color="#3e6ee8" name="1">便衣</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <van-field class="change" name="radio" label="武装类型">
-        <template #input>
-          <van-radio-group v-model="normalForm.wzlx" direction="horizontal" :disabled="disable">
-            <van-radio shape="square" checked-color="#3e6ee8" name="0">武装</van-radio>
-            <van-radio shape="square" checked-color="#3e6ee8" name="1">非武装</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-
-      <van-row>
-        <van-col span="24">
-          <van-field rows="3" :required="normalForm.qwlx == '03' ? true : false"
-            :rules="[{ required: normalForm.qwlx == '03' ? true : false, message: '请输入勤务原因' }]" type="textarea"
-            v-model="normalForm.bz" name="备注" placeholder="备注信息" />
-        </van-col>
-      </van-row>
-      <div style="padding: 0 5vw" v-if="obj.bbInfo">
-        <van-button style="margin: 16px 0" :loading="loading" round @click="editFn(0)" block type="success">
-          下班打卡
-        </van-button>
-      </div>
-      <div style="margin: 16px 0; padding: 0 5vw" v-else>
-        <van-button :loading="loading" round native-type="submit" block type="primary">
-          开始报备
-        </van-button>
-      </div>
-    </van-form>
-    <!-- 负责人 -->
-    <Select bclx="02" :dwlx="dwlx" :checked="r_checked" :selectType="selectType" :show="showSelect"
-      :checkedList="hasCheckedList" @update:cancel="showSelect = false" @update:confirm="onComfirm" :key="selectIndex" />
-
-    <!-- 勤务类型 -->
-    <van-popup v-model:show="qwlxPicker" round position="bottom">
-      <van-picker :columns="D_BZ_QWLX" @cancel="qwlxPicker = false" @confirm="onQwlxConfirm" />
-    </van-popup>
-
-    <!-- 人员类型 -->
-    <van-popup v-model:show="rylxPicker" round position="bottom">
-      <van-picker :columns="D_BZ_RYLX" @cancel="rylxPicker = false" @confirm="onrylxConfirm" />
-    </van-popup>
-
-  </div>
-</template>
-
-<script setup>
-import { getBcList, getXfqList, getKfdList } from "../../../api/xfbbAndZbbb.js";
-import { getItem } from "../../../utils/storage";
-import TopNav from "../../../components/topNav";
-import Select from "../../../components/Select.vue";
-import { Dialog, Toast } from "vant";
-import { addXFBB } from "../../../api/report";
-import { getMybbTodayNew, finishReport, getMyXfpbToday, } from "../../../api/common";
-import { dateFormat, hintToast } from "../../../utils/tools.js";
-import { ref, reactive, onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { getDictList, setDict } from "../../../utils/dict";
-import { get } from "vant/lib/utils";
-Toast.allowMultiple();
-const router = useRouter();
-const route = useRoute();
-const { D_BZ_QWLX, D_BZ_WQZB } = getDictList("D_BZ_QWLX", "D_BZ_WQZB");
-const userInfo = getItem("userInfo");
-const showSelect = ref(false); //弹窗的显示和隐藏
-const dwlx = ref("01"); //弹窗的单位类型
-const calShow = ref(false); //是否显示巡防日期选择器
-const chooseTime = ref(dateFormat("", new Date()));
-const minDate = new Date(2000, 0, 1); // 巡防日期最小时间
-const maxDate = new Date(2050, 0, 1);// 巡防日期最大时间
-const loading = ref(false) //报备按钮的节流
-const rylxPicker = ref(false)
-const D_BZ_RYLX = reactive([
-  { text: '组长', value: '01' },
-  { text: '组员', value: '02' }
-])
-const disableForm = ref(false)
-const normalForm = ref({
-  zylxmc: '组员',
-  zylx: '02',
-  qwlx: '',
-  qwlxMc: '',
-  xfrq: dateFormat(),
-  kssj: "",// 开始时间
-  jssj: "",//结束时间
-  xffwlx: "",//巡防类型
-  bbzt: "0",
-  xlfs: "1",
-  zzlx: "1",
-  wzlx: "2",
-  jzMc: "",
-  jzId: "",
-  ssbm: userInfo.deptName,
-  ssbmdm: userInfo.deptList[0].deptCode,
-  lxrsfzh: userInfo.idEntityCard,
-  lxrid: userInfo.id,
-  fzrXm: userInfo.userName,
-  fzrSfzh: userInfo.idEntityCard,
-  fzrLxdh: userInfo.mobile,
-  fzrInfo: userInfo.userName,
-  fzrId: userInfo.id,
-  znzbList: [],
-  jyqxList: [],
-  clList: [],
-  jlList: [],
-  bz: "",
-  xffwid: "",
-  xffwList: [],
-  kfdMc: "",
-  jczMc: "",
-  mjList: [],
-  fjList: [],
-  wqzbList: []
-
-});
-const selectIndex = ref(1); //选择器组件KEY
-const selectType = ref(""); //弹窗选择的类型
-const showkssjPicker = ref(false); //开始时间结束时间弹窗
-const showjssjPicker = ref(false); //结束时间结束时间弹窗
-const dataList = reactive({
-  bcList: [],//存班次的数据
-  xfqList: [],//存的巡防区域list
-  kfdList: [],//快返点数据
-  jczList: [],//快返点数据
-  jzList: [],//警组数据
-  fzrList: [],//负责人数据
-  mjList: [],//民警数据
-  fjList: [],//辅警数据
-  znzbList: [],//智能装备数据
-  clList: [],//车辆数据
-  jyqxList: []//警用器械
-})
-// 获取数据
-const list = reactive({
-  xfqList: [], //巡防区
-  kfdList: [], //快返点
-  jczList: [], //检查站
-  bcList: [],//班次数据
-});
-// 选择勤务类型
-const qwlxPicker = ref(false);
-
-const hasCheckedList = ref([])//多选状态
-const r_checked = ref(""); //单选框默认选中
-const isUserDept = ref(false); //是否是用户本部门
-const kwd = ref(""); //选择器关键字
-const obj = reactive({ bbInfo: null, pbInfo: null });
-
-
-onMounted(() => {
-  _getMybbTodayNew();
-  // Promise.all([
-  //   _getXfqList(),
-  //   _getKfdList(),
-  //   _getJczList(),
-  // ]).then((res) => {
-  // });
-});
-
-// 查询巡防范围
-function _getXfqList() {
-  return new Promise((ok) => {
-    let data = {
-      type: isUserDept.value ? 1 : 2,
-      keyword: kwd.value,
-    };
-    getXfqList(data).then((res) => {
-      for (let i = 0; i < res.length; i++) {
-        res[i].value = `${res[i].ssbm}-${res[i].xfqMc}`;
-        res[i].key = res[i].id;
-      }
-      list.xfqList = res;
-      ok();
-    });
-  });
-}
-
-// 选择勤务类型
-function onQwlxConfirm(val) {
-  normalForm.value.qwlx = val.value;
-  normalForm.value.qwlxMc = val.text;
-  qwlxPicker.value = false;
-}
-
-// 选择人员类型
-function onrylxConfirm(val) {
-  normalForm.value.zylxmc = val.text
-  normalForm.value.zylx = val.value
-  rylxPicker.value = false
-
-}
-
-//获取检查站数据
-function _getJczList() {
-  return new Promise((ok) => {
-    let data = {
-      dwlx: "02",
-      type: isUserDept.value ? 1 : 2,
-      keyword: kwd.value,
-    };
-    getKfdList(data).then((res) => {
-      for (let i = 0; i < res.length; i++) {
-        res[i].value = `${res[i].ssbm}-${res[i].kfdMc}`;
-        res[i].key = res[i].kfdId;
-      }
-      list.jczList = res;
-      ok();
-    });
-  });
-}
-
-
-
-//获取快反点数据
-function _getKfdList() {
-  return new Promise((ok) => {
-    let data = {
-      dwlx: "01",
-      type: isUserDept.value ? 1 : 2,
-      keyword: kwd.value,
-    };
-    getKfdList(data).then((res) => {
-      for (let i = 0; i < res.length; i++) {
-        res[i].value = `${res[i].ssbm}-${res[i].kfdMc}`;
-        res[i].key = res[i].kfdId;
-      }
-      list.kfdList = res;
-      ok();
-    });
-  });
-}
-
-//获取用户的报备信息
-function _getMybbTodayNew() {
-  getMybbTodayNew().then((res) => {
-    if (res) {
-      const resData = JSON.parse(JSON.stringify(res));
-      obj.bbInfo = resData;
-      disableForm.value = true;
-      _setSubmitData(resData);
-    } else {
-      disableForm.value = false;
-      //没有报备信息 查询排版信息
-      _getMyXfpbToday();
-    }
-  })
-    .catch((err) => {
-    });
-}
-
-//设置需要提交的参数
-function _setSubmitData(obj) {
-  normalForm.value = obj
-  normalForm.value.mjList = obj.pbmj ? JSON.parse(obj.pbmj) : [];
-  normalForm.value.fjList = obj.pbfj ? JSON.parse(obj.pbfj) : [];
-  normalForm.value.znzbList = obj.txzb ? JSON.parse(obj.txzb) : [];
-  normalForm.value.jyqxList = obj.jyqx ? JSON.parse(obj.jyqx) : [];
-  normalForm.value.clList = obj.pbcl ? JSON.parse(obj.pbcl) : [];
-  normalForm.value.wqzbList = obj.wqzb ? obj.wqzb.split(',') : [];
-
-  // 组员类型
-  let lx = D_BZ_RYLX.find(v => { return v.value = obj.zylx })
-  normalForm.value.zylxmc = lx.text
-  // 勤务类型
-  let arr = JSON.parse(JSON.stringify(D_BZ_QWLX))._object.D_BZ_QWLX
-  let textVlue = arr.find(v => { return v.value == obj.qwlx })
-  normalForm.value.qwlxMc = textVlue ? textVlue.text : ''
-  if (obj.jzId) dataList.jzList = [{ key: obj.jzId }]// 警组
-}
-
-// 处理数组
-function handelArr(arr, brr, key, type) {
-  let obj = { str: '', crr: [] }
-  for (let i = 0; i < arr.length; i++) {
-    for (let j = 0; j < brr.length; j++) {
-      if (arr[i] == brr[j][key]) {
-        obj.crr.push(brr[j]);
-      }
-    }
-  }
-  return obj
-}
-
-//确认巡防日期选择
-function onConfirmTime(val) {
-  calShow.value = false;
-  chooseTime.value = dateFormat("", val);
-  normalForm.value.xfrq = chooseTime.value;
-}
-//打开选择框
-function showDialogfn(type) {
-  selectType.value = type; //选取的类型
-  showSelect.value = true; //打开弹窗
-  hasCheckedList.value = []
-  r_checked.value = ''
-  hasChooseData()
-  selectIndex.value++;
-}
-
-// 已经选取的数据回显
-function hasChooseData() {
-  switch (selectType.value) {
-    case 'qwbc':
-      if (!dataList.bcList.length) return false
-      r_checked.value = dataList.bcList[0].key;
-      break;
-
-    case "jz":
-      if (!dataList.jzList.length) return false
-      r_checked.value = dataList.jzList[0].key;
-      break;
-    case "fzr":
-      if (!dataList.fzrList.length) return false
-      r_checked.value = dataList.fzrList[0].key;
-      break;
-    case "mj":
-      if (!dataList.mjList.length) return false
-      hasCheckedList.value = dataList.mjList.map(item => { return item.key })
-      break;
-    case "fj":
-      if (!dataList.fjList.length) return false
-      hasCheckedList.value = dataList.fjList.map(item => { return item.key })
-      break;
-    case "zn":
-      if (!dataList.znzbList.length) return false
-      hasCheckedList.value = dataList.znzbList.map(item => { return item.key })
-      break;
-    case "cl":
-      if (!dataList.clList.length) return false
-      hasCheckedList.value = dataList.clList.map(item => { return item.key })
-      break;
-    case "jy":
-      if (!dataList.jyqxList.length) return false
-      hasCheckedList.value = dataList.jyqxList.map(item => { return item.key })
-      break;
-  }
-}
-
-//获取用户排班信息
-function _getMyXfpbToday() {
-  getMyXfpbToday().then((res) => {
-    if (res) {
-      const resData = JSON.parse(JSON.stringify(res));
-      if (!resData.jyqx) {
-        resData.jyqx = JSON.stringify([]);
-      }
-      if (!resData.pbmj) {
-        resData.pbmj = JSON.stringify([]);
-      }
-      if (!resData.pbfj) {
-        resData.pbfj = JSON.stringify([]);
-      }
-      if (!resData.txzb) {
-        resData.txzb = JSON.stringify([]);
-      }
-      if (!resData.pbcl) {
-        resData.pbcl = JSON.stringify([]);
-      }
-      obj.pbInfo = resData;
-      _setSubmitData(resData);
-    } else {
-      hintToast("没有排班和报备信息，请自行填写并报备");
-    }
-  });
-}
-
-// 开始时间弹窗
-function ksConfirm(val) {
-  normalForm.value.kssj = val + ":00"
-  showkssjPicker.value = false;
-}
-// 结束时间弹窗
-function jsConfirm(val) {
-  normalForm.value.jssj = val + ":00"
-  showjssjPicker.value = false;
-}
-
-//确认选择
-function onComfirm(val) {
-  if (val.length <= 0) return false;
-  switch (selectType.value) {
-    case "qwbc":
-      dataList.bcList = val //选取的班次数据
-      onbcConfirm(val[0]);
-      break;
-    case "jz":
-      dataList.jzList = val //选取的警组数据
-      onjzConfirm(val[0]);
-      break;
-    case "fzr":
-      dataList.fzrList = val //选取的负责人数据
-      onfzrConfirm(val[0]);
-      break;
-    case "mj":
-      normalForm.value.mjList = []
-      dataList.mjList = val
-      val.forEach((item) => { toggle(item); });
-      break;
-    case "fj":
-      normalForm.value.fjList = []
-      dataList.fjList = val
-      val.forEach((item) => { toggle(item); });
-      break;
-    case "zn":
-      dataList.znzbList = val
-      normalForm.value.znzbList = []
-      val.forEach((item) => { toggle(item); });
-      break;
-    case "cl":
-      dataList.clList = val
-      normalForm.value.clList = []
-      val.forEach((item) => { toggle(item); });
-      break;
-    case "jy":
-      dataList.jyqxList = val;
-      normalForm.value.jyqxList = []
-      val.forEach((item) => { toggle(item); });
-      break;
-  }
-}
-//选中的勤务班次数据
-function onbcConfirm(val) {
-  normalForm.value.qwbcId = val.id;
-  normalForm.value.zqsc = val.zqsc;
-  normalForm.value.kssj = val.kssj
-  normalForm.value.jssj = val.jssj
-}
-
-//设置选中值
-const toggle = (item) => {
-  switch (selectType.value) {
-    case "mj":
-      normalForm.value.mjList.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xfbmid: item.xbdm,
-        id: item.ryid,
-        qwjzId: "",
-        jlId: item.ryid,
-      });
-      break;
-    case "fj":
-      normalForm.value.fjList.push({
-        jh: item.jh,
-        jllx: item.fl,
-        jlxm: item.xm,
-        id: item.id,
-        sfzh: item.sfzh,
-        xm: item.xm,
-        lxdh: item.lxdh,
-        xfbmid: item.xbdm,
-        qwjzId: "",
-        jlId: item.id,
-      });
-      break;
-    case "zn":
-      normalForm.value.znzbList.push({
-        sbmc: item.sbmc,
-        text: item.sbmc,
-        txzblx: item.scode,
-        txzbId: item.id,
-        hh: item.sbbh,
-        sfrh: item.sfrh,
-        sfxt: item.sfxt,
-        sfzy: item.sfzy,
-      });
-      break;
-    case "jy":
-      normalForm.value.jyqxList.push({
-        qxid: item.id,
-        qxmc: item.qxMc,
-        text: item.qxMc,
-        qxsl: item.sl ? item.sl : 1,
-        qxlx: item.scode,
-      });
-      normalForm.value.wzlx = "0";
-      break;
-    case "cl":
-      normalForm.value.clList.push({
-        clId: item.cid,
-        jdchphm: item.cph,
-        text: item.cph,
-        jdchpzldm: item.cllx,
-      });
-      normalForm.value.xlfs = "0";
-      break;
-
-  }
-};
-
-// 警组回显
-function onjzConfirm(val) {
-  normalForm.value.mjList = [];
-  normalForm.value.fjList = [];
-  normalForm.value.clList = [];
-  normalForm.value.znzbList = [];
-  normalForm.value.jyqxList = [];
-  normalForm.value.jzMc = val.jzMc;
-  normalForm.value.jzId = val.id;
-
-  dataList.fzrList = [] //负责人
-  dataList.fzrList = [{ key: val.ddMjid }]
-  normalForm.value.jh = val.ddMjjh;
-  normalForm.value.ssbm = val.ssbm;
-  normalForm.value.ssbmdm = val.ssbmdm;
-
-
-  // 民警辅警已有赋值
-  dataList.mjList = [] //缓存民警
-  dataList.fjList = [] //缓存辅警
-  val.jzryList.forEach((m) => {
-    m.key = m.ryId
-    if (m.jllx === "01") {
-      dataList.mjList.push(m);
-      normalForm.value.mjList.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xfbmid: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-    if (m.jllx === "02") {
-      dataList.fjList.push(m);
-      normalForm.value.fjList.push({
-        jh: m.jh,
-        jllx: m.jllx,
-        jlxm: m.jlxm,
-        text: m.jlxm,
-        nl: m.nl,
-        qwjzId: m.qwjzId,
-        jlId: m.ryId,
-        sfzh: m.sfzh,
-        xfbmid: m.xbdm,
-        xm: m.jlxm,
-        jh: m.jh,
-        lxdh: m.lxdh,
-      });
-    }
-  });
-  // 车辆
-  dataList.clList = []
-  if (val.clList.length > 0) {
-    normalForm.value.xlfs = "0";
-    val.clList.forEach((c) => {
-      c.key = c.clId
-      dataList.clList.push(c);
-      normalForm.value.clList.push({
-        clId: c.clId,
-        jdchphm: c.jdchphm,
-        text: c.jdchphm,
-        jdchpzldm: c.jdchpzldm,
-        qwjzId: c.qwjzId,
-      });
-    });
-  }
-  // 警用器械
-  dataList.jyqxList = []
-  val.jyqxList.forEach((j) => {
-    j.key = j.qxId
-    dataList.jyqxList.push(j);
-    normalForm.value.jyqxList.push({
-      qxid: j.qxid,
-      qxmc: j.qxmc,
-      text: j.qxmc,
-      qxsl: j.sl ? j.sl : 1,
-      qxlx: j.qxlx,
-      qwjzId: j.qwjzId,
-    });
-  });
-  // 智能装备
-  dataList.znzbList = []
-  val.txzbList.forEach((z) => {
-    z.key = z.zbId
-    dataList.znzbList.push(z);
-    normalForm.value.znzbList.push({
-      sbmc: z.sbmc,
-      text: z.sbmc,
-      txzblx: z.txzblx,
-      txzbId: z.zbId,
-      qwjzId: z.qwjzId,
-      hh: z.hh,
-      sfrh: z.sfrh,
-      sfxt: z.sfxt,
-      sfzy: z.sfzy,
-    });
-  });
-}
-
-//选中负责人
-function onfzrConfirm(val) {
-  normalForm.value.xfbmid = val.xbdm;
-}
-
-//删除选中数据
-function deleteCheckTag(item, index, val) {
-  switch (val) {
-    case "mj":
-      normalForm.value.mjList.splice(index, 1);
-      dataList.mjList.splice(index, 1);
-      break;
-    case "fj":
-      normalForm.value.fjList.splice(index, 1);
-      dataList.fjList.splice(index, 1);
-      break;
-    case "zn":
-      normalForm.value.znzbList.splice(index, 1);
-      dataList.znzbList.splice(index, 1);
-      break;
-    case "jy":
-      normalForm.value.jyqxList.splice(index, 1);
-      dataList.jyqxList.splice(index, 1);
-      list.jyqxList.forEach((el) => { if (el.id === item.qxid) el.qxsl = 1; });
-      if (!normalForm.value.jyqxList.map((j) => j.scode).includes("01")) {
-        normalForm.value.wzlx = "2";
-      }
-      break;
-    case "cl":
-      normalForm.value.clList.splice(index, 1);
-      dataList.clList.splice(index, 1);
-      if (normalForm.value.clList.length == 0) normalForm.value.xlfs = "1";
-      break;
-  }
-}
-function getUUid() {
-  var list = [];
-  var hexDigits = "0123456789abcdefghijklmnopqrstuvwxyz";
-  for (var i = 0; i < 32; i++) {
-    list[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-  }
-  list[14] = "4";
-  list[19] = hexDigits.substr((list[19] & 0x3) | 0x8, 1);
-  list[8] = list[13] = list[18] = list[23];
-  let uuid = list.join("");
-  return uuid;
-}
-// 新增报备接口
-function onSubmit() {
-  normalForm.value.jlList = [...normalForm.value.mjList, ...normalForm.value.fjList];
-  normalForm.value.xfbmid = normalForm.value.ssbmid ? normalForm.value.ssbmid : userInfo.deptList[0].deptId;
-  normalForm.value.xfpbId = obj.pbInfo ? obj.pbInfo.id : "";
-  normalForm.value.bblx = "02";
-  Dialog.confirm({ title: "提示", message: "是否确认报备信息无误!", confirmButtonColor: "#3e6ee8", }).then((res) => {
-    loading.value = true;
-    if (normalForm.value.wqzbList.length > 0) {
-      normalForm.value.wqzb = normalForm.value.wqzbList.join(',')
-    }
-    normalForm.value.id = getUUid()
-    addXFBB(normalForm.value).then((res) => {
-      getMybbTodayNew().then((_res) => {
-        loading.value = false
-        if (!_res) return false
-        userInfo.bbId = _res.id;
-        userInfo.jzId = _res.jzId;
-        userInfo.jzMc = _res.jzMc;
-        setStorage("userInfo", JSON.stringify(userInfo));
-      }).catch(() => {
-        loading.value = false
-      });;
-      hintToast("报备成功!");
-      router.replace('/Home');
-      finishReport({ bbzt: "0", id: res, }).then((res) => { });
-    }).catch(() => {
-      loading.value = false
-    });
-  });
-}
-
-//结束报备
-function editFn(e) {
-  Dialog.confirm({
-    title: "提示",
-    message: "是否确认结束报备!",
-    confirmButtonColor: "#3e6ee8",
-  }).then((res) => {
-    loading.value = true
-    finishReport({
-      bbzt: "1",
-      id: obj.bbInfo.id,
-    }).then((res) => {
-      loading.value = false
-      hintToast("报备结束成功");
-      userInfo.bbId = "";
-      userInfo.jzId = "";
-      userInfo.jzMc = "";
-      router.go(-1);
-      setStorage("userInfo", JSON.stringify(userInfo));
-    }).catch(() => {
-      loading.value = false
-    });
-  });
-}
-
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.popupTitle {
-  text-align: center;
-  background-color: rgb(11, 137, 247);
-  height: 6vh;
-  line-height: 6vh;
-}
-
-.popbtn-box {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
-.check-item-tag {
-  display: inline-block;
-  margin: 0 6px;
-}
-
-.check-data-box {
-  height: 25vh;
-  overflow: auto;
-}
-
-.time-box {
-  display: flex;
-}
-
-::v-deep .mulSelect .van-cell__title,
-.van-cell__value {
-  flex: unset;
-}
-
-::v-deep .mulSelect .van-cell__value {
-  flex: 1;
-}
-
-.title_tab {
-  @include font_color($font-color-theme);
-  padding-left: 7vw;
-  position: relative;
-  margin: 2vw 0;
-  letter-spacing: 2px;
-}
-
-.title_tab::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 5vw;
-  bottom: 0;
-  width: 4px;
-  background: #3b6be7;
-  border-radius: 2px;
-}
-
-.van-cell:after {
-  display: none;
-}
-
-.van-cell {
-  @include table_item_color($table-item-theme);
-  box-sizing: border-box;
-  border-radius: 4px;
-  padding: 6px;
-  margin: 8px 5%;
-  width: 90%;
-  overflow: hidden;
-  color: var(--van-cell-text-color);
-  font-size: var(--van-cell-font-size);
-  line-height: var(--van-cell-line-height);
-}
-
-.popupTitle {
-  color: #fff;
-}
-
-::v-deep .van-field__label {
-  margin-right: 0px;
-}
-
-::v-deep .van-radio-group--horizontal,
-.van-checkbox-group--horizontal {
-  flex-wrap: nowrap;
-  @include font_size($font_medium_s);
-}
-
-::v-deep .van-field__control--custom {
-  justify-content: flex-end;
-}
-
-::v-deep .van-checkbox-group {
-  display: flex;
-}
-
-::v-deep .van-checkbox {
-  margin-left: 10px;
-}
-</style>
diff --git a/src/pages/yyzx/xfbb/tsXfbbList.vue b/src/pages/yyzx/xfbb/tsXfbbList.vue
deleted file mode 100644
index ba35f67..0000000
--- a/src/pages/yyzx/xfbb/tsXfbbList.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav navTitle="临时勤务列表" />
-    <!-- <van-search
-      v-model="xfqList.xfqMc"
-      placeholder="请输入巡防区名称"
-      @update:model-value="getList(1)"
-    /> -->
-    <van-list
-      v-model:loading="loading"
-      :finished="finished"
-      finished-text="没有更多了"
-      @load="onLoad"
-    >
-      <div
-        class="item-box item_box"
-        v-for="(item, index) in xfqList.list"
-        :key="index"
-      >
-        <div class="titleSJY">勤务说明: {{ item.bz }}</div>
-        <div>
-          勤务时间: {{ item.xfrq }}&nbsp; {{ item.kssj }}&nbsp;至&nbsp;{{
-            item.jssj
-          }}
-        </div>
-        <div><van-icon name="user-o" /> 负责人: {{ item.fzrXm }}</div>
-        <div @click="getPop(item.mjsl, item.pbmj, '民警')">
-          民警数量：{{ item.mjsl }}
-        </div>
-        <div @click="getPop(item.mjsl, item.pbfj, '辅警')">
-          辅警数量：{{ item.fjsl }}
-        </div>
-        <div @click="getPop(item.mjsl, item.pbcl, '车辆')">
-          车辆数量：{{ item.jcsl }}
-        </div>
-        <div>
-          智能装备：
-          <template v-if="item.znzbList.length > 0">
-            <span v-for="(el, index) in item.znzbList" :key="index"
-              >{{ el.sbmc }}&nbsp;</span
-            >
-          </template>
-          <template v-else>无</template>
-        </div>
-        <div>
-          警用器械：
-          <template v-if="item.jyqxList.length > 0">
-            <span v-for="(el2, index2) in item.jyqxList" :key="index2"
-              >{{ el2.sbmc }}&nbsp;</span
-            >
-          </template>
-          <template v-else>无</template>
-        </div>
-      </div>
-    </van-list>
-  </div>
-  <van-popup
-    v-model:show="showList"
-    round
-    :style="{ height: '60%', width: '90%' }"
-  >
-    <div class="jllbsty">{{ popTitle }}</div>
-    <div class="police-list">
-      <van-list
-        v-model:loading="loading4"
-        :finished="finished4"
-        finished-text="没有数据了"
-        offset="100"
-        @load="onLoad(4)"
-        :immediate-check="false"
-      >
-        <div
-          class="list-item item_box detail_box"
-          v-for="(ele, index5) in popList"
-          :key="index5"
-        >
-          <div class="detail_item" v-if="popTitle == '车辆'">
-            <div class="user_info">
-              <div>
-                <span>{{ ele.jdchphm }}</span>
-              </div>
-            </div>
-            <div>车辆号牌类型: {{ setDict(ele.jdchpzldm, D_BZ_CLLX) }}</div>
-          </div>
-          <div class="detail_item" v-else>
-            <div class="user_info">
-              <div>
-                <span>{{ ele.jlxm }}</span>
-                <!-- <span> ({{ ele.sfzh }}) </span> -->
-              </div>
-              <van-tag type="primary">{{
-                setDict(ele.jllx, D_BZ_JLLX)
-              }}</van-tag>
-            </div>
-            <div>身份证号: {{ ele.sfzh }}</div>
-          </div>
-        </div>
-      </van-list>
-    </div>
-  </van-popup>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { getXfbb } from "../../../api/qwzx.js";
-import { getPbbbByMonth } from "../../../api/calender";
-import { ref, reactive, onMounted } from "vue";
-import { getDictList, setDict } from "../../../utils/dict";
-import { useRouter } from "vue-router";
-const router = useRouter();
-const { D_BZ_CLLX, D_BZ_XQLX, D_BZ_JLLX } = getDictList(
-  "D_BZ_CLLX",
-  "D_BZ_XQLX",
-  "D_BZ_JLLX"
-);
-const xfqList = reactive({
-  list: [],
-  xfqMc: "",
-});
-onMounted(() => {
-  getList();
-});
-const loading = ref(false);
-const finished = ref(false);
-const page = ref(1);
-const total = ref(0);
-function getList(val) {
-  loading.value = false;
-  getXfbb({
-    pageCurrent: page.value,
-    pageSize: 10,
-    bblx: "02",
-  })
-    .then((res) => {
-      if (val === 1) {
-        xfqList.list = res.records;
-      } else {
-        res.records.forEach((ele) => {
-          xfqList.list.push(ele);
-        });
-      }
-      total.value = res.total;
-      onLoad();
-      finished.value = true;
-    })
-    .catch((err) => {
-      finished.value = true;
-    });
-}
-function onLoad() {
-  if (page.value * 10 < total.value) {
-    page.value++;
-    getXfqList();
-  }
-}
-const showList = ref(false);
-const popTitle = ref("");
-const popList = ref([]);
-function getPop(sl, item, title) {
-  if (sl > 0) {
-    popTitle.value = title;
-    showList.value = true;
-    popList.value = JSON.parse(item);
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.item-box {
-  padding: 2vw;
-  line-height: 1.8em;
-  margin: 3vw 3vw 0 3vw;
-  border-bottom: 1px solid #f3f3f3;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-}
-.titleSJY {
-  color: #1f6cec;
-  font-weight: bold;
-  @include font_size($font_medium);
-}
-.detail_box {
-  margin-top: 1vw;
-  display: flex;
-  position: relative;
-  @include font_size($font_medium_s);
-  .detail_item {
-    flex: 3.5;
-    margin-left: 2vw;
-
-    .user_info {
-      @include font_size($font_medium);
-      display: flex;
-      justify-content: space-between;
-      font-weight: 600;
-      color: #507ce9;
-
-      & > div > span {
-        display: inline-block;
-        margin-right: 2vw;
-      }
-    }
-
-    .item {
-      line-height: 6vw;
-    }
-  }
-}
-.jllbsty {
-  text-align: center;
-  @include font_size($font_medium);
-  color: #507ce9;
-  margin-top: 2vh;
-}
-.police-list {
-  @include font_color($font-color-theme);
-  padding: 3vw;
-  .list-item {
-    padding: 3vw;
-    margin: 2vh 0;
-    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
-    border-radius: 2vw;
-    .phone-icon {
-      position: absolute;
-      right: 5vw;
-    }
-    .address-box {
-      display: flex;
-      justify-content: space-between;
-      .adress-left {
-        color: #3e6ee8;
-      }
-    }
-    .name-text {
-      @include font_size($font_medium);
-      color: #3e6ee8;
-      margin-bottom: 1vh;
-      font-weight: bold;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-    }
-    .title {
-      @include font_size($font_medium);
-      font-weight: 550;
-    }
-    .num-text1 {
-      @include font_size($font_large_s);
-      color: #3e6ee8;
-    }
-    .num-text2 {
-      @include font_size($font_large_s);
-      color: #eea82f;
-    }
-    .num-text3 {
-      @include font_size($font_large_s);
-      color: #25b882;
-    }
-  }
-}
-</style>
diff --git a/src/pages/yyzx/yjtjInfo/gzyInfo.vue b/src/pages/yyzx/yjtjInfo/gzyInfo.vue
deleted file mode 100644
index d4d991b..0000000
--- a/src/pages/yyzx/yjtjInfo/gzyInfo.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<!--
- * @Author: 孙总
- * @Date: 2022-11-03 10:33:34
- * @LastEditTime: 2022-11-03 10:36:50
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \gx-app\src\pages\yyzx\yjtjInfo\gzyInfo.vue
--->
-<template>
-  <div>
-    <TopNav navTitle="感知源预警清单" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs :list="tabs" @onYjjb="onSelect" :type="'car'"></Tabs>
-        <!-- <Search
-          placeholder="请输入预警人员姓名"
-          v-model="kwd"
-          :isSx="true"
-          @update:sx="showPopup = !showPopup "
-          @update:modelValue="onSearch"
-        ></Search> -->
-      </div>
-    </van-sticky>
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text=""
-        @load="onLoad"
-        offset="1"
-        :immediate-check="false"
-      >
-        <List
-          v-for="(item, index) in yjxx.list"
-          :key="index"
-          :item="item"
-          :path="`/yyzx/yjxx/yjDetail?id=${item.id}`"
-          :dict="{ D_BZ_YJLX, D_BZ_TYJB }"
-        />
-        <van-empty
-          description="暂无预警信息"
-          image="default"
-          v-if="yjxx.list.length <= 0 && !loading"
-        />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import Tabs from "../../../components/tabs.vue";
-import { getYjxxTj, getPageList } from "../../../api/yjxx.js";
-import { useRoute } from "vue-router"
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/YjList.vue";
-import Search from "../../../components/search.vue";
-import { setTimeQuantum } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, watch, reactive, onMounted } from "vue";
-const { D_BZ_YJLX, D_BZ_TYJB } = getDictList("D_BZ_YJLX", "D_BZ_TYJB"); //字典信息
-watch(D_BZ_YJLX, (newValue) => {
-  for (let i = 0; i < newValue.length; i++) {
-    newValue[i].name = newValue[i].text;
-    newValue[i].key = newValue[i].dm;
-    newValue[i].isCheck = false;
-  }
-  yjxx.sxList = [
-    {
-      title: "预警类型",
-      isCheckBox: true,
-      array: newValue,
-    },
-  ];
-  //时间段选项
-  yjxx.sxList[1] = setTimeQuantum();
-});
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    yjjb: "",
-  },
-  {
-    name: "红色预警",
-    count: 0,
-    yjjb: "10",
-  },
-  {
-    name: "橙色预警",
-    count: 0,
-    yjjb: "20",
-  },
-  {
-    name: "黄色预警",
-    count: 0,
-    yjjb: "30",
-  },
-  {
-    name: "蓝色预警",
-    count: 0,
-    yjjb: "40",
-  },
-]);
-const yjxx = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  yjJb: "",
-  yjLx: "",
-  startTime: "",
-  endTime: "",
-  yjLx: "",
-  sxList: [], //筛选条件数据
-  list: [], //预警列表数据
-});
-const { yj_gzyid } = useRoute().query
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const showPopup = ref(false); //筛选弹窗
-const loadingPull = ref(false);
-const total = ref(0);
-onMounted(() => {
-  getList();
-  getTabs();
-});
-//下拉刷新
-function onRefresh() {
-  yjxx.pageNum = 1;
-  yjxx.yjJb = "";
-  kwd.value = "";
-  yjxx.startTime = "";
-  yjxx.endTime = "";
-  yjxx.yjLx = "";
-  yjxx.list = [];
-  getList();
-  getTabs();
-}
-// 预警信息统计
-function getTabs() {
-  getYjxxTj({
-    yjGzyid: yj_gzyid
-  }).then((res) => {
-    res.forEach((element) => {
-      tabs.value[0].count += element.count;
-      if (element.yj_jb == "40") {
-        tabs.value[4].count = element.count;
-      }
-      if (element.yj_jb == "30") {
-        tabs.value[3].count = element.count;
-      }
-      if (element.yj_jb == "20") {
-        tabs.value[2].count = element.count;
-      }
-      if (element.yj_jb == "10") {
-        tabs.value[1].count = element.count;
-      }
-    });
-  });
-}
-// 获取预警信息
-function getList() {
-  loading.value = true;
-  getPageList({
-    pageNum: yjxx.pageNum,
-    pageSize: yjxx.pageSize,
-    yjJb: yjxx.yjJb,
-    yjRyxm: kwd.value,
-    startTime: yjxx.startTime,
-    endTime: yjxx.endTime,
-    yjLx: yjxx.yjLx,
-    yjGzyid: yj_gzyid
-  })
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (yjxx.pageNum == 1) {
-        yjxx.list = res.records;
-      } else {
-        res.records.forEach((item) => {
-          yjxx.list.push(item);
-        });
-      }
-      total.value = res.pages;
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-}
-/**
- * tab选择
- * @param {Object} val
- */
-function onSelect(val) {
-  yjxx.pageNum = 1;
-  yjxx.yjJb = tabs.value[val].yjjb;
-  getList();
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.pageNum = 1;
-  getList();
-}
-// 弹框盒子
-function onConfirm(val) {
-  yjxx.startTime = val.startTime;
-  yjxx.endTime = val.endTime;
-  let arr = [];
-  val.list[0].array.forEach((item) => {
-    if (item.isCheck) {
-      arr.push(item.value);
-    }
-  });
-  yjxx.yjLx = arr.join(",");
-  yjxx.pageNum = 1;
-  getList();
-  showPopup.value = false;
-}
-function onLoad() {
-  if (yjxx.pageNum >= total.value) {
-    finished.value = true;
-    return;
-  }
-  yjxx.pageNum += 1;
-  getList();
-}
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/yjtjInfo/pcsyjinfo.vue b/src/pages/yyzx/yjtjInfo/pcsyjinfo.vue
deleted file mode 100644
index 4525d71..0000000
--- a/src/pages/yyzx/yjtjInfo/pcsyjinfo.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="派出所预警分析" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs :list="tabs" @onYjjb="onSelect" :type="'car'"></Tabs>
-        <Search
-          placeholder="请输入预警人员姓名"
-          v-model="kwd"
-          :isSx="true"
-          @update:sx="showPopup = !showPopup "
-          @update:modelValue="onSearch"
-        ></Search>
-      </div>
-    </van-sticky>
-    <SxPopup
-      :showPopup="showPopup"
-      :list="yjxx.sxList"
-      :p_top="145"
-      @update:close="showPopup = false"
-      @update:onConfirm="onConfirm"
-    />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text=""
-        @load="onLoad"
-        offset="1"
-        :immediate-check="false"
-      >
-        <List
-          v-for="(item, index) in yjxx.list"
-          :key="index"
-          :item="item"
-          :path="`/yyzx/yjxx/yjDetail?id=${item.id}`"
-          :dict="{ D_BZ_YJLX, D_BZ_TYJB }"
-        />
-        <van-empty
-          description="暂无预警信息"
-          image="default"
-          v-if="yjxx.list.length <= 0 && !loading"
-        />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-
-<script setup>
-import { getYjxxTj, getPageList } from "../../../api/yjxx.js";
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/YjList.vue";
-import { setTimeQuantum } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted, watch } from "vue";
-import { useRoute } from 'vue-router';
-const { D_BZ_YJLX, D_BZ_TYJB } = getDictList("D_BZ_YJLX", "D_BZ_TYJB"); //字典信息
-watch(D_BZ_YJLX, (newValue) => {
-  for (let i = 0; i < newValue.length; i++) {
-    newValue[i].name = newValue[i].text;
-    newValue[i].key = newValue[i].dm;
-    newValue[i].isCheck = false;
-  }
-  yjxx.sxList = [
-    {
-      title: "预警类型",
-      isCheckBox: true,
-      array: newValue,
-    },
-  ];
-  //时间段选项
-  yjxx.sxList[1] = setTimeQuantum();
-});
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    yjjb: "",
-  },
-  {
-    name: "红色预警",
-    count: 0,
-    yjjb: "10",
-  },
-  {
-    name: "橙色预警",
-    count: 0,
-    yjjb: "20",
-  },
-  {
-    name: "黄色预警",
-    count: 0,
-    yjjb: "30",
-  },
-  {
-    name: "蓝色预警",
-    count: 0,
-    yjjb: "40",
-  },
-]);
-const yjxx = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  yjJb: "",
-  yjLx: "",
-  startTime: "",
-  endTime: "",
-  yjLx: "",
-  sxList: [], //筛选条件数据
-  list: [], //预警列表数据
-});
-const { yj_ssbm, yj_ssbmdm } = useRoute().query
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const showPopup = ref(false); //筛选弹窗
-const loadingPull = ref(false);
-const total = ref(0);
-onMounted(() => {
-  getList();
-  getTabs();
-});
-//下拉刷新
-function onRefresh() {
-  yjxx.pageNum = 1;
-  yjxx.yjJb = "";
-  kwd.value = "";
-  yjxx.startTime = "";
-  yjxx.endTime = "";
-  yjxx.yjLx = "";
-  yjxx.list = [];
-  getList();
-  getTabs();
-}
-// 预警信息统计
-function getTabs() {
-  getYjxxTj({
-      ssbmdm: yj_ssbmdm
-  }).then((res) => {
-    res.forEach((element) => {
-      tabs.value[0].count += element.count;
-      if (element.yj_jb == "40") {
-        tabs.value[4].count = element.count;
-      }
-      if (element.yj_jb == "30") {
-        tabs.value[3].count = element.count;
-      }
-      if (element.yj_jb == "20") {
-        tabs.value[2].count = element.count;
-      }
-      if (element.yj_jb == "10") {
-        tabs.value[1].count = element.count;
-      }
-    });
-  });
-}
-// 获取预警信息
-function getList() {
-  loading.value = true;
-  getPageList({
-    pageNum: yjxx.pageNum,
-    pageSize: yjxx.pageSize,
-    yjJb: yjxx.yjJb,
-    yjRyxm: kwd.value,
-    startTime: yjxx.startTime,
-    endTime: yjxx.endTime,
-    yjLx: yjxx.yjLx,
-    ssbmdm: yj_ssbmdm
-  })
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (yjxx.pageNum == 1) {
-        yjxx.list = res.records;
-      } else {
-        res.records.forEach((item) => {
-          yjxx.list.push(item);
-        });
-      }
-      total.value = res.total;
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-}
-/**
- * tab选择
- * @param {Object} val
- */
-function onSelect(val) {
-  yjxx.pageNum = 1;
-  yjxx.yjJb = tabs.value[val].yjjb;
-  getList();
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.pageNum = 1;
-  getList();
-}
-// 弹框盒子
-function onConfirm(val) {
-  yjxx.startTime = val.startTime;
-  yjxx.endTime = val.endTime;
-  let arr = [];
-  val.list[0].array.forEach((item) => {
-    if (item.isCheck) {
-      arr.push(item.value);
-    }
-  });
-  yjxx.yjLx = arr.join(",");
-  yjxx.pageNum = 1;
-  getList();
-  showPopup.value = false;
-}
-function onLoad() {
-  if (yjxx.list.length >= total.value) {
-    finished.value = true;
-    return;
-  }
-  yjxx.pageNum += 1;
-  getList();
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/pages/yyzx/yjtjInfo/ryyjinfo.vue b/src/pages/yyzx/yjtjInfo/ryyjinfo.vue
deleted file mode 100644
index 9f0648c..0000000
--- a/src/pages/yyzx/yjtjInfo/ryyjinfo.vue
+++ /dev/null
@@ -1,222 +0,0 @@
-<!--
- * @Author: 孙总
- * @Date: 2022-11-03 10:33:34
- * @LastEditTime: 2022-11-03 10:36:50
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \gx-app\src\pages\yyzx\yjtjInfo\gzyInfo.vue
--->
-<template>
-  <div>
-    <TopNav navTitle="人员预警清单" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs :list="tabs" @onYjjb="onSelect" :type="'car'"></Tabs>
-        <!-- <Search
-          placeholder="请输入预警人员姓名"
-          v-model="kwd"
-          :isSx="true"
-          @update:sx="showPopup = !showPopup "
-          @update:modelValue="onSearch"
-        ></Search> -->
-      </div>
-    </van-sticky>
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text=""
-        @load="onLoad"
-        offset="1"
-        :immediate-check="false"
-      >
-        <List
-          v-for="(item, index) in yjxx.list"
-          :key="index"
-          :item="item"
-          :path="`/yyzx/yjxx/yjDetail?id=${item.id}`"
-          :dict="{ D_BZ_YJLX, D_BZ_TYJB }"
-        />
-        <van-empty
-          description="暂无预警信息"
-          image="default"
-          v-if="yjxx.list.length <= 0 && !loading"
-        />
-      </van-list>
-    </van-pull-refresh>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import Tabs from "../../../components/tabs.vue";
-import { getYjxxTj, getPageList } from "../../../api/yjxx.js";
-import { useRoute } from "vue-router"
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/YjList.vue";
-import Search from "../../../components/search.vue";
-import { setTimeQuantum } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, watch, reactive, onMounted } from "vue";
-const { D_BZ_YJLX, D_BZ_TYJB } = getDictList("D_BZ_YJLX", "D_BZ_TYJB"); //字典信息
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    yjjb: "",
-  },
-  {
-    name: "红色预警",
-    count: 0,
-    yjjb: "10",
-  },
-  {
-    name: "橙色预警",
-    count: 0,
-    yjjb: "20",
-  },
-  {
-    name: "黄色预警",
-    count: 0,
-    yjjb: "30",
-  },
-  {
-    name: "蓝色预警",
-    count: 0,
-    yjjb: "40",
-  },
-]);
-const yjxx = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  yjJb: "",
-  yjLx: "",
-  startTime: "",
-  endTime: "",
-  yjLx: "",
-  sxList: [], //筛选条件数据
-  list: [], //预警列表数据
-});
-//时间段选项
-yjxx.sxList[1] = setTimeQuantum();
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const showPopup = ref(false); //筛选弹窗
-const loadingPull = ref(false);
-const total = ref(0);
-const { yj_rysfzh, yj_ryxm  } = useRoute().query
-onMounted(() => {
-  // getList();
-  getTabs();
-});
-//下拉刷新
-function onRefresh() {
-  yjxx.pageNum = 1;
-  yjxx.yjJb = "";
-  kwd.value = "";
-  yjxx.startTime = "";
-  yjxx.endTime = "";
-  yjxx.yjLx = "";
-  yjxx.list = [];
-  getList();
-  getTabs();
-}
-// 预警信息统计
-function getTabs() {
-  getYjxxTj({
-    yjRysfzh: yj_rysfzh,
-    yjRyxm: yj_ryxm
-  }).then((res) => {
-    res.forEach((element) => {
-      tabs.value[0].count += element.count;
-      if (element.yj_jb == "40") {
-        tabs.value[4].count = element.count;
-      }
-      if (element.yj_jb == "30") {
-        tabs.value[3].count = element.count;
-      }
-      if (element.yj_jb == "20") {
-        tabs.value[2].count = element.count;
-      }
-      if (element.yj_jb == "10") {
-        tabs.value[1].count = element.count;
-      }
-    });
-  });
-}
-// 获取预警信息
-function getList() {
-  loading.value = true;
-  getPageList({
-    pageNum: yjxx.pageNum,
-    pageSize: yjxx.pageSize,
-    yjJb: yjxx.yjJb,
-    yjRyxm: yj_ryxm,
-    // startTime: yjxx.startTime,
-    // endTime: yjxx.endTime,
-    // yjLx: 1,
-    yjRysfzh: yj_rysfzh
-  })
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (yjxx.pageNum == 1) {
-        yjxx.list = res.records;
-      } else {
-        res.records.forEach((item) => {
-          yjxx.list.push(item);
-        });
-      }
-      total.value = res.pages;
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-}
-getList();
-/**
- * tab选择
- * @param {Object} val
- */
-function onSelect(val) {
-  yjxx.pageNum = 1;
-  yjxx.yjJb = tabs.value[val].yjjb;
-  getList();
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.pageNum = 1;
-  getList();
-}
-// 弹框盒子
-function onConfirm(val) {
-  yjxx.startTime = val.startTime;
-  yjxx.endTime = val.endTime;
-  let arr = [];
-  val.list[0].array.forEach((item) => {
-    if (item.isCheck) {
-      arr.push(item.value);
-    }
-  });
-  yjxx.yjLx = arr.join(",");
-  yjxx.pageNum = 1;
-  getList();
-  showPopup.value = false;
-}
-function onLoad() {
-  if (yjxx.pageNum >= total.value) {
-    finished.value = true;
-    return;
-  }
-  finished.value = false;
-  yjxx.pageNum += 1;
-  getList();
-}
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/yjxx/components/lineChart.vue b/src/pages/yyzx/yjxx/components/lineChart.vue
deleted file mode 100644
index 2b754ac..0000000
--- a/src/pages/yyzx/yjxx/components/lineChart.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <div id="lineCharts" class="chartsBox"></div>
-</template>
-
-<script setup>
-import { dateFormat } from "../../../../utils/tools.js";
-import { getGsdYj } from "../../../../api/yjxx.js";
-import * as echarts from "echarts";
-import { ref, onMounted, defineProps, watch } from "vue";
-import { getListHotMap } from "../../../../api/yjxx.js";
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 0,
-  }
-});
-watch(()=> props.type, (val)=>{
-  getList()
-})
-function lineChartFn() {
-  var chartDom = document.getElementById("lineCharts");
-  var myChart = echarts.init(chartDom, "");
-  var option;
-  option = {
-    tooltip: {
-      trigger: "axis",
-    },
-    legend: {
-      data: ["人员预警", "车辆预警", "事件预警"],
-    },
-    grid: {
-      left: "3%",
-      right: "5%",
-      bottom: "3%",
-      top: "18%",
-      containLabel: true,
-    },
-    xAxis: {
-      type: "category",
-      boundaryGap: false,
-      data: ["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22"],
-    },
-    yAxis: {
-      type: "value",
-    },
-    series: [
-      {
-        name: "人员预警",
-        type: "line",
-        data: manList.value,
-        smooth: true,
-        itemStyle: {
-          normal: {
-            color: "#177FFF",
-          },
-        },
-      },
-      {
-        name: "车辆预警",
-        type: "line",
-        data: carList.value,
-        smooth: true,
-        itemStyle: {
-          normal: {
-            color: "#ffcc40",
-          },
-        },
-      },
-      {
-        name: "事件预警",
-        type: "line",
-        data: evtList.value,
-        smooth: true,
-        itemStyle: {
-          normal: {
-            color: "#F6426C",
-          },
-        },
-      },
-    ],
-  };
-  option && myChart.setOption(option);
-  document.getElementById("lineCharts").setAttribute("_echarts_instance_", "");
-}
-const timeList = [
-  "0",
-  "2",
-  "4",
-  "6",
-  "8",
-  "10",
-  "12",
-  "14",
-  "16",
-  "18",
-  "20",
-  "22",
-];
-const manList = ref([]);
-const carList = ref([]);
-const evtList = ref([]);
-function getList() {
-  let tempList = ref([]);
-  let m = [];
-  let c = [];
-  let e = [];
-  getGsdYj({
-    // kssj: dateFormat() + " " + "00:00:00",
-    // jssj: dateFormat() + " " + "23:59:59",
-    type: props.type + 1,
-  }).then((res) => {
-    tempList.value = res;
-    if (tempList.value && tempList.value.length > 0) {
-      tempList.value.forEach((el) => (el.sj = el.h));
-      tempList.value.forEach((item) => {
-        if (item.type === "1") {
-          m.push(item);
-        }
-        if (item.type === "2") {
-          c.push(item);
-        }
-        if (item.type === "3") {
-          e.push(item);
-        }
-      });
-      manList.value = compareArray(timeList, m);
-      carList.value = compareArray(timeList, c);
-      evtList.value = compareArray(timeList, e);
-      lineChartFn();
-    }
-  });
-}
-function compareArray(timeList, targetList) {
-  let list = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-  for (let item of targetList) {
-    let _index = timeList.findIndex((c) => c == item.sj);
-    if (_index > -1) {
-      list[_index] = item.total;
-    }
-  }
-  return list;
-}
-onMounted(() => {
-  getList();
-  lineChartFn();
-});
-</script>
-
-<style lang="scss" scoped>
-.chartsBox {
-  height: 55vw;
-  padding: 10px 0 0 0;
-  box-sizing: border-box;
-}
-</style>
diff --git a/src/pages/yyzx/yjxx/components/lineChartPcs.vue b/src/pages/yyzx/yjxx/components/lineChartPcs.vue
deleted file mode 100644
index fe903d0..0000000
--- a/src/pages/yyzx/yjxx/components/lineChartPcs.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <div id="lineChartsPcs" class="chartsBox"></div>
-</template>
-
-<script setup>
-import { dateFormat } from "../../../../utils/tools.js";
-import * as echarts from "echarts";
-import { ref, onMounted, defineProps, watch } from "vue";
-import { pcsyjpm } from "../../../../api/yjxx.js";
-import { getRecentDay } from "../../../../utils/tools";
-import router from "../../../../router/index.js";
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 0,
-  },
-});
-watch(
-  () => props.type,
-  (val) => {
-    getList();
-  }
-);
-function lineChartFn() {
-  var chartDom = document.getElementById("lineChartsPcs");
-  var myChart = echarts.init(chartDom, "");
-  var option;
-  option = {
-    tooltip: {
-      trigger: "axis",
-    },
-    legend: {
-      data: ["派出所预警总数"],
-    },
-    grid: {
-      left: "3%",
-      right: "5%",
-      bottom: "3%",
-      top: "18%",
-      containLabel: true,
-    },
-    xAxis: {
-      type: "category",
-      boundaryGap: false,
-      data: xdata.value,
-    },
-    yAxis: {
-      type: "value",
-    },
-    series: [
-      {
-        name: "派出所预警总数",
-        type: "line",
-        data: datas.value,
-        smooth: true,
-        itemStyle: {
-          normal: {
-            color: "#177FFF",
-          },
-        },
-      },
-    ],
-  };
-  myChart.on("click", "series.line", function (params) {
-    let row = {};
-    tempList.value.forEach((item) => {
-      if (item.ssbm === params.name) {
-        row.yj_ssbmdm = item.ssbmdm;
-        row.yj_ssbm = item.ssbm;
-      }
-    });
-
-    router.push({
-      path: "/yyzx/yjtjInfo/pcsyjinfo",
-      query: row,
-    });
-  });
-  option && myChart.setOption(option);
-  document
-    .getElementById("lineChartsPcs")
-    .setAttribute("_echarts_instance_", "");
-}
-const tempList = ref([]);
-const xdata = ref([]);
-const datas = ref([]);
-function getList() {
-  pcsyjpm({
-    kssj: getRecentDay(props.type, "ymd"),
-    jssj: getRecentDay(0, "ymd"),
-  }).then((res) => {
-    tempList.value = res;
-    if (tempList.value && tempList.value.length > 0) {
-      tempList.value.forEach((item) => {
-        xdata.value.push(item.ssbm);
-        datas.value.push(item.total);
-      });
-      lineChartFn();
-    }
-  });
-}
-onMounted(() => {
-  getList();
-  lineChartFn();
-});
-</script>
-
-<style lang="scss" scoped>
-.chartsBox {
-  height: 55vw;
-  padding: 10px 0 0 0;
-  box-sizing: border-box;
-}
-</style>
diff --git a/src/pages/yyzx/yjxx/components/peopleRanking.vue b/src/pages/yyzx/yjxx/components/peopleRanking.vue
deleted file mode 100644
index 4938859..0000000
--- a/src/pages/yyzx/yjxx/components/peopleRanking.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <!-- <div v-if="dataLoad" class="empty-box">数据加载中...</div> -->
-  <div class="cccc">
-    <ul class="rankingBox" v-if="list.length > 0">
-      <li v-for="item in list" :key="item.yj_rysfzh">
-        <div class="leftBox">
-          <div class="top">
-            <span class="dian blue"></span
-            ><span @click="routerPush(item)" class="name text_title"
-              >{{ item.yj_ryxm }}（{{ item.yj_rysfzh }}）</span>
-          </div>
-
-          <div class="jdtBox">
-            <div
-              class="jdt"
-              :style="{
-                width: (parseInt(item.total) / totalWidth) * 100 + '%',
-              }"
-            ></div>
-          </div>
-        </div>
-        <div class="rightBox">
-          <span class="numb">{{ item.total }}</span> 次
-        </div>
-      </li>
-    </ul>
-    <van-empty description="暂无数据" v-if="list.length === 0" />
-  </div>
-</template>
-
-<script setup>
-import { dateFormat } from "../../../../utils/tools.js";
-import { getManRankYj } from "../../../../api/yjxx.js";
-import { ref, reactive, watch, onMounted, defineProps } from "vue";
-import router from "../../../../router/index.js";
-import { getRecentDay } from "../../../../utils/tools";
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 0,
-  }
-});
-watch(()=> props.type, (val)=>{
-  getList()
-})
-const list = ref([]);
-const totalWidth = ref(0);
-const dataLoad = ref(true);
-function getList() {
-  getManRankYj({
-    kssj: getRecentDay(props.type, 'ymd'),
-    jssj: dateFormat(),
-  })
-    .then((res) => {
-      list.value = res;
-      if (list.value && list.value.length > 0) {
-        dataLoad.value = false;
-        totalWidth.value = Math.max(...list.value.map((item) => item.total));
-      }
-    })
-    .catch((err) => {
-      dataLoad.value = false;
-    });
-}
-function routerPush(row){
-  router.push({
-    path:'/yyzx/yjtjInfo/ryyjinfo',
-    query:row
-  })
-}
-onMounted(() => {
-  getList();
-});
-</script>
-
-<style lang="scss" scoped>
-.cccc {
-  height: 55vw;
-  overflow: auto;
-  margin-top: 1.5vw;
-}
-ul.rankingBox {
-  height: 100%;
-  overflow: auto;
-  li {
-    display: flex;
-    justify-content: space-between;
-    padding-top: 8px;
-    .leftBox {
-      flex: 1;
-      .top {
-        height: 28px;
-        .name {
-          font-size: 14px;
-          vertical-align: middle;
-        }
-      }
-      .jdtBox {
-        height: 7px;
-        background: #dbdbdb;
-        border-radius: 4px;
-        overflow: hidden;
-        .jdt {
-          background: #00c0fa;
-          height: 100%;
-          border-radius: 4px;
-        }
-      }
-    }
-    .rightBox {
-      width: 68px;
-      text-align: right;
-      color: #4896ff;
-      font-size: 14px;
-      line-height: 50px;
-      height: 34px;
-      .numb {
-        font-size: 14px;
-        color: #333;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/pages/yyzx/yjxx/components/ranking.vue b/src/pages/yyzx/yjxx/components/ranking.vue
deleted file mode 100644
index 76e263f..0000000
--- a/src/pages/yyzx/yjxx/components/ranking.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-10-07 14:10:51
- * @LastEditTime: 2022-10-14 15:49:47
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \rsga\src\views\moduleHome\warningCenter\components\ranking.vue
--->
-<template>
-  <!-- <div v-if="dataLoad" class="empty-box">数据加载中...</div> -->
-  <ul class="rankingBox" v-if="list.length > 0">
-    <li v-for="item in list" :key="item.yj_gzyid">
-      <template v-if="item.yj_gzymc">
-        <div class="leftBox">
-          <div class="top">
-            <span class="dian blue"></span>
-            <span @click="routerPush(item)" class="name text_title">{{
-              item.yj_gzymc
-            }}</span>
-          </div>
-
-          <div class="jdtBox">
-            <div
-              class="jdt"
-              :style="{
-                width: (parseInt(item.total) / totalWidth) * 100 + '%',
-              }"
-            ></div>
-          </div>
-        </div>
-        <div class="rightBox">
-          <span class="numb">{{ item.total }}</span> 次
-        </div>
-      </template>
-    </li>
-  </ul>
-  <van-empty description="暂无数据" v-if="list.length === 0" />
-</template>
-
-<script setup>
-import { dateFormat } from "../../../../utils/tools.js";
-import { getGzyYj } from "../../../../api/yjxx.js";
-import { ref, reactive, watch, onMounted } from "vue";
-import { getRecentDay } from "../../../../utils/tools";
-import router from "../../../../router/index.js";
-const props = defineProps({
-  type: {
-    type: Number,
-    default: 0,
-  }
-});
-watch(()=> props.type, (val)=>{
-  getList()
-})
-const list = ref([]);
-const totalWidth = ref(0);
-const dataLoad = ref(true);
-function getList() {
-  getGzyYj({
-    kssj: getRecentDay(props.type, 'ymd'),
-    jssj: dateFormat(),
-  })
-    .then((res) => {
-      list.value = res;
-      if (list.value && list.value.length > 0) {
-        dataLoad.value = false;
-        totalWidth.value = Math.max(
-          ...list.value
-            .filter((item) => !item.yj_gzymc === false)
-            .map((item) => item.total)
-        );
-      }
-    })
-    .catch((err) => {
-      dataLoad.value = false;
-    });
-}
-function routerPush(row) {
-  router.push({
-    path: "/yyzx/yjtjInfo/gzyInfo",
-    query: row,
-  });
-}
-onMounted(() => {
-  getList();
-});
-</script>
-
-<style lang="scss" scoped>
-ul.rankingBox {
-  height: 55vw;
-  overflow: auto;
-  margin-top: 1.5vw;
-  li {
-    display: flex;
-    justify-content: space-between;
-    padding-top: 8px;
-    .leftBox {
-      flex: 1;
-      .top {
-        height: 28px;
-        display: flex;
-        align-items: center;
-        .name {
-          font-size: 14px;
-          vertical-align: middle;
-          flex: 50;
-        }
-        .dian {
-          flex: 1.455;
-          display: inline-block;
-          width: 2vw !important;
-          height: 2vw !important;
-          border-radius: 50%;
-          background: #4896ff;
-          margin-right: 0.5vw;
-        }
-      }
-      .jdtBox {
-        height: 7px;
-        background: #dbdbdb;
-        border-radius: 4px;
-        overflow: hidden;
-        .jdt {
-          background: #00c0fa;
-          height: 100%;
-          border-radius: 4px;
-        }
-      }
-    }
-    .rightBox {
-      width: 68px;
-      text-align: right;
-      color: #4896ff;
-      font-size: 14px;
-      line-height: 50px;
-      height: 34px;
-      .numb {
-        font-size: 14px;
-        color: #333;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/pages/yyzx/yjxx/index.vue b/src/pages/yyzx/yjxx/index.vue
deleted file mode 100644
index 98a2c3f..0000000
--- a/src/pages/yyzx/yjxx/index.vue
+++ /dev/null
@@ -1,261 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="预警信息" :showRight="false" :showLeft="true" />
-    <van-sticky>
-      <div class="sticky_box">
-        <Tabs
-          :list="tabs"
-          @onYjjb="onSelect"
-          :type="'car'"
-          :key="tabsIndex"
-        ></Tabs>
-        <Search
-          placeholder="请输入预警人员姓名"
-          v-model="kwd"
-          :isSx="true"
-          @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"
-        ></Search>
-      </div>
-    </van-sticky>
-    <SxPopup
-      :showPopup="showPopup"
-      :list="yjxx.sxList"
-      :p_top="145"
-      @update:close="showPopup = false"
-      @update:onConfirm="onConfirm"
-      :kssj="dateFormat()"
-      :jssj="dateFormat()"
-    />
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list
-        :finished="finished"
-        finished-text=""
-        @load="onLoad"
-        offset="1"
-        :immediate-check="false"
-      >
-        <List
-          v-for="(item, index) in yjxx.list"
-          :key="index"
-          :item="item"
-          :path="`/yyzx/yjxx/yjDetail?id=${item.id}`"
-          :dict="{ D_BZ_YJLX, D_BZ_TYJB }"
-        />
-      </van-list>
-    </van-pull-refresh>
-    <van-loading style="text-align: center" v-if="loading"
-      >加载中...</van-loading
-    >
-    <van-empty description="暂无预警信息" image="default" v-if="showEmpty" />
-  </div>
-</template>
-<script>
-export default {
-  name: "yyzx/yjxx/index",
-};
-</script>
-<script setup>
-import { getYjxxTj, getPageList } from "../../../api/yjxx.js";
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import Tabs from "../../../components/tabs.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import List from "../../../components/YjList.vue";
-import { setTimeQuantum, dateFormat } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, reactive, onMounted, watch, onActivated } from "vue";
-import { useRoute,onBeforeRouteLeave } from "vue-router";
-import { Toast } from "vant";
-
-const { D_BZ_YJLX, D_BZ_TYJB } = getDictList("D_BZ_YJLX", "D_BZ_TYJB"); //字典信息
-watch(D_BZ_YJLX, (newValue) => {
-  for (let i = 0; i < newValue.length; i++) {
-    newValue[i].name = newValue[i].text;
-    newValue[i].key = newValue[i].dm;
-    newValue[i].isCheck = false;
-  }
-  yjxx.sxList = [
-    {
-      title: "预警类型",
-      isCheckBox: true,
-      array: newValue,
-    },
-  ];
-  //时间段选项
-  yjxx.sxList[1] = setTimeQuantum();
-  yjxx.sxList[1].array[0].isCheck = true;
-});
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    yjjb: "",
-  },
-  {
-    name: "红色预警",
-    count: 0,
-    yjjb: "10",
-  },
-  {
-    name: "橙色预警",
-    count: 0,
-    yjjb: "20",
-  },
-  {
-    name: "黄色预警",
-    count: 0,
-    yjjb: "30",
-  },
-  {
-    name: "蓝色预警",
-    count: 0,
-    yjjb: "40",
-  },
-]);
-const yjxx = reactive({
-  pageNum: 1,
-  pageSize: 10,
-  yjJb: "",
-  yjLx: "",
-  startTime: "",
-  endTime: "",
-  yjLx: "",
-  sxList: [], //筛选条件数据
-  list: [], //预警列表数据
-});
-const kwd = ref("");
-const finished = ref(false);
-const loading = ref(false);
-const showPopup = ref(false); //筛选弹窗
-const loadingPull = ref(false);
-const showEmpty = ref(false);
-const total = ref(0);
-const tabsIndex = ref(1);
-onMounted(() => {
-  let yjlx = useRoute().query.yjLx;
-  if (yjlx != yjxx.yjLx) {
-    yjxx.yjLx = useRoute().query.yjLx;
-    yjxx.pageNum = 1;
-    yjxx.yjJb = "";
-    kwd.value = "";
-    yjxx.startTime = dateFormat();
-    yjxx.endTime = dateFormat();
-    yjxx.list = [];
-    getList();
-    getTabs();
-  }
-});
-//下拉刷新
-function onRefresh() {
-  yjxx.pageNum = 1;
-  yjxx.yjJb = "";
-  kwd.value = "";
-  yjxx.startTime = dateFormat();
-  yjxx.endTime = dateFormat();
-  yjxx.yjLx = "";
-  yjxx.list = [];
-  finished.value = false;
-  loading.value = false;
-  loadingPull.value = false;
-  tabsIndex.value++;
-  getList();
-  getTabs();
-}
-// 预警信息统计
-function getTabs() {
-  getYjxxTj({ kssj: yjxx.startTime, jssj: yjxx.endTime }).then((res) => {
-    tabs.value[0].count = 0;
-    res.forEach((element) => {
-      tabs.value[0].count += element.count;
-      if (element.yj_jb == "40") {
-        tabs.value[4].count = element.count;
-      }
-      if (element.yj_jb == "30") {
-        tabs.value[3].count = element.count;
-      }
-      if (element.yj_jb == "20") {
-        tabs.value[2].count = element.count;
-      }
-      if (element.yj_jb == "10") {
-        tabs.value[1].count = element.count;
-      }
-    });
-  });
-}
-// 获取预警信息
-function getList() {
-  loading.value = true;
-  showEmpty.value = false;
-  getPageList({
-    pageNum: yjxx.pageNum,
-    pageSize: yjxx.pageSize,
-    yjJb: yjxx.yjJb,
-    yjRyxm: kwd.value,
-    startTime: yjxx.startTime,
-    endTime: yjxx.endTime,
-    yjLx: yjxx.yjLx,
-  })
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      if (res.records.length === 0) {
-        showEmpty.value = true;
-      } else {
-        showEmpty.value = false;
-      }
-      if (yjxx.pageNum == 1) {
-        yjxx.list = res.records;
-      } else {
-        res.records.forEach((item) => {
-          yjxx.list.push(item);
-        });
-      }
-      total.value = res.total;
-    })
-    .catch((err) => {
-      loading.value = false;
-      showEmpty.value = true;
-      loadingPull.value = false;
-    });
-}
-/**
- * tab选择
- * @param {Object} val
- */
-function onSelect(val) {
-  yjxx.list = [];
-  loading.value = true;
-  showEmpty.value = false;
-  yjxx.pageNum = 1;
-  yjxx.yjJb = tabs.value[val].yjjb;
-  getList();
-}
-/**
- * 关键字搜索
- * @param {Object} val
- */
-function onSearch(val) {
-  yjxx.pageNum = 1;
-  getList();
-}
-// 弹框盒子
-function onConfirm(val) {
-  yjxx.startTime = val.startTime;
-  yjxx.endTime = val.endTime;
-  yjxx.pageNum = 1;
-  getList();
-  showPopup.value = false;
-}
-function onLoad() {
-  if (yjxx.list.length >= total.value) {
-    finished.value = true;
-    return;
-  }
-  yjxx.pageNum += 1;
-  getList();
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/src/pages/yyzx/yjxx/yjDetail.vue b/src/pages/yyzx/yjxx/yjDetail.vue
deleted file mode 100644
index 07214fd..0000000
--- a/src/pages/yyzx/yjxx/yjDetail.vue
+++ /dev/null
@@ -1,620 +0,0 @@
-<template>
-  <div class="">
-    <TopNav navTitle="预警轨迹详情" :showRight="false" :showLeft="true" />
-    <div v-if="!!Object.keys(yjRyDetail).length">
-      <van-sticky>
-        <div class="sticky_box">
-          <Tabs :list="tabs" @onYjjb="onSelect" :type="'car'"></Tabs>
-          <div class="ry_info">
-            <List
-              :item="yjRyDetail"
-              style="border: none"
-              :dict="{ D_BZ_YJLX, D_BZ_TYJB }"
-            />
-            <div class="but_box">
-              <van-button
-                round
-                type="primary"
-                style="margin: 0 2vw; padding: 0 5vw"
-                @click="onClickPr"
-                size="mini"
-              >
-                人员档案
-              </van-button>
-              <van-button
-                round
-                type="warning"
-                style="margin: 0 2vw; padding: 0 5vw"
-                @click="onClickPc"
-                size="mini"
-              >
-                {{ zlCount > 0 ? "指令详情" : "转为指令" }}
-              </van-button>
-              <van-button
-                round
-                style="margin: 0 2vw; padding: 0 5vw"
-                type="success"
-                size="mini"
-                :to="`/yyzx/yjxx/yjMapPoint?id=${yjRyDetail.id}`"
-                @click="onClickZf"
-              >
-                地图模式
-              </van-button>
-            </div>
-          </div>
-        </div>
-      </van-sticky>
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text="没有轨迹数据了"
-        @load="onLoad"
-        offset="1"
-        :immediate-check="false"
-      >
-        <Steps :data="stepsData" time="yjFssj">
-          <template v-slot:default="{ scope }">
-            <div class="content">
-              <div class="cont_l">
-                <div v-if="scope.yjjb === '10'" class="red bg_red">红色</div>
-                <div v-else-if="scope.yjjb === '40'" class="blue bg_bule">
-                  蓝色
-                </div>
-                <div v-else-if="scope.yjjb === '20'" class="orange bg_orange">
-                  橙色
-                </div>
-                <div v-else class="yellow bg_yellow">黄色</div>
-                <div class="text">
-                  来源:{{ setDict(scope.yjSjly, D_BZ_SJLYUAN) }}
-                </div>
-                <div class="text">
-                  相似度:{{ scope.xsd ? scope.xsd * 100 + "%" : "" }}
-                </div>
-                <div class="text">管辖派出所：{{ scope.ssbm }}</div>
-                <div class="text">地址：{{ scope.yjDz }}</div>
-              </div>
-            </div>
-          </template>
-        </Steps>
-      </van-list>
-    </div>
-    <!-- <van-loading style="marginTop: 10vh;textAlign:center;" v-else-if="!Object.keys(yjRyDetail).length" vertial type="spinner" size="24px">加载中</van-loading> -->
-
-    <van-popup
-      v-model:show="turnZl"
-      :style="{ height: '75%', width: '90%' }"
-      round
-      placement="top"
-    >
-      <van-field name="radio" label="类型">
-        <template #input>
-          <van-radio-group
-            v-model="checked"
-            direction="horizontal"
-            @change="checkedChange"
-          >
-            <van-radio name="01">人员</van-radio>
-            <van-radio name="02">部门</van-radio>
-            <van-radio name="03">巡组</van-radio>
-          </van-radio-group>
-        </template>
-      </van-field>
-      <div class="nr_box">
-        <template v-if="switchFlag == '01'">
-          <van-cell class="ry_cell" title="人员">
-            <template #value>
-              <span v-if="array.length == 0">请选择人员</span>
-              <span v-else v-for="(item, index) in array" :key="index">
-                <van-tag plain type="primary">{{ item.xm }}</van-tag
-                >&nbsp;
-              </span>
-            </template>
-          </van-cell>
-          <van-cell>
-            <template #title>
-              <van-radio-group
-                v-model="checkedry"
-                direction="horizontal"
-                @change="checkedChangery"
-              >
-                <van-radio name="1">本部门</van-radio>
-                <van-radio name="2">全部</van-radio>
-              </van-radio-group>
-            </template>
-          </van-cell>
-
-          <van-search
-            v-model="form.pname"
-            placeholder="请输入人员姓名"
-            @update:model-value="getUserOrDeptList"
-            @search="getUserOrDeptList"
-            @cancel="getUserOrDeptList"
-          ></van-search>
-          <div style="height: 36vh; overflow: auto">
-            <SelectCell
-              v-my-load="onPload"
-              :list="pList"
-              title="xm"
-              showSfzh="sfzh"
-              @update:choose="onSelectList"
-            />
-          </div>
-        </template>
-        <template v-if="switchFlag == '02'">
-          <van-field
-            v-model="form.fielddept"
-            readonly
-            is-link
-            label="部门"
-            placeholder="请选择部门"
-          >
-          </van-field>
-          <div class="deptBox">
-            <van-cascader
-              v-model="form.deptName"
-              :closeable="false"
-              @change="onChange"
-              :show-header="false"
-              title="请选择部门"
-              :options="options"
-              :field-names="customFieldName"
-            >
-            </van-cascader>
-          </div>
-        </template>
-        <template v-if="switchFlag == '03'">
-          <van-cell title="巡组">
-            <template #value>
-              <span v-if="xzArray.length == 0">请选择巡组</span>
-              <span v-else v-for="(item, index) in xzArray" :key="index">
-                <van-tag plain type="primary">{{
-                  item.jzMc ? item.jzMc : item.fzrXm + "巡组"
-                }}</van-tag
-                >&nbsp;
-              </span>
-            </template>
-          </van-cell>
-          <div style="textalign: center" v-if="xzList.length <= 0">无巡组</div>
-          <SelectCell
-            :list="xzList"
-            title="jzMc"
-            showSfzh=""
-            @update:choose="onSelectXzList"
-          />
-        </template>
-      </div>
-
-      <div class="yp_btn">
-        <van-button
-          size="small"
-          icon="edit"
-          type="warning"
-          block
-          @click="onSubmit"
-        >
-          转为指令
-        </van-button>
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script setup>
-//局部懒加载指令
-const vMyLoad = {
-  mounted: (el, binding) => {
-    el.addEventListener("scroll", function () {
-      const condition =
-        this.scrollHeight - this.scrollTop === this.clientHeight;
-      if (condition) {
-        binding.value();
-      }
-    });
-  },
-};
-import {
-  getSyrkYjxx,
-  getInfo,
-  getStatistics,
-  selectPage,
-  selectNextPage,
-  yjConvertZl,
-} from "../../../api/yjxx.js";
-import { getJmxz } from "../../../api/qwzx";
-import { getXfllList } from "../../../api/common.js";
-import SelectCell from "../../../components/SelectCell.vue";
-import { getRecentDay, timeValidate } from "../../../utils/tools";
-import TopNav from "../../../components/topNav.vue";
-import Steps from "../../../components/Steps.vue";
-import Tabs from "../../../components/tabs.vue";
-import List from "../../../components/YjList.vue";
-import { getBase64 } from "../../../utils/tools.js";
-import { Toast } from "vant";
-import router from "../../../router";
-import {
-  ref,
-  onMounted,
-  reactive,
-  watch,
-  defineComponent,
-  onActivated,
-} from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { getDictList, setDict } from "../../../utils/dict";
-const route = useRoute();
-var queryId = route.query.id;
-onActivated(() => {
-  if (queryId !== route.query.id) {
-    getYjDetail();
-    getUserOrDeptList();
-    queryId = route.query.id;
-  }
-});
-const { D_BZ_SJLYUAN, D_BZ_YJLX, D_BZ_TYJB } = getDictList(
-  "D_BZ_SJLYUAN",
-  "D_BZ_YJLX",
-  "D_BZ_TYJB"
-); //字典信息
-//预警人员详情
-const yjRyDetail = ref({});
-const stepsData = ref([]);
-const tabs = ref([
-  {
-    name: "今日预警",
-    count: 0,
-  },
-  {
-    name: "近7天",
-    count: 0,
-  },
-  {
-    name: "近30天",
-    count: 0,
-  },
-  {
-    name: "累计预警",
-    count: 0,
-  },
-]);
-const zlCount = ref();
-const turnZl = ref(false); // 转为指令
-const checked = ref("01");
-const options = ref([]);
-const pList = ref([]);
-const loading = ref(false);
-const form = reactive({
-  fielddept: "",
-  fieldname: "",
-  pname: "",
-  casValue: "",
-  deptName: "",
-});
-const kssj = ref(getRecentDay(0, "ymd"));
-const jssj = ref(getRecentDay(0, "ymd"));
-onMounted(() => {
-  getYjDetail();
-});
-const customFieldName = {
-  text: "orgName",
-  value: "orgName",
-  children: "childDeptList",
-};
-const customFieldFzrName = {
-  text: "userName",
-};
-//人员懒加载
-const pLoading = ref(false);
-const pFinished = ref(false);
-const queryPlist = reactive({
-  page: 1,
-  size: 10,
-  total: 0,
-});
-function onPload() {
-  if (pList.value.length >= queryPlist.total) {
-    return;
-  }
-  queryPlist.page++;
-  getPlist();
-}
-const { id } = useRoute().query;
-// 获取预警信息详情
-function getYjDetail() {
-  getInfo(route.query.id).then((res) => {
-    yjRyDetail.value = res;
-    zlCount.value = yjRyDetail.value.sfFszl;
-    getListBySfz();
-    getTjList();
-  });
-}
-// 通过身份证或车牌号查询
-const size = ref(10);
-const current = ref(1);
-const total = ref(0);
-const finished = ref(false);
-function getListBySfz() {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  loading.value = true;
-  getSyrkYjxx({
-    zjhm: yjRyDetail.value.yjRysfzh,
-    cph: yjRyDetail.value.yjClcph,
-    pageCurrent: current.value,
-    pageSize: size.value,
-    kssj: kssj.value,
-    jssj: jssj.value,
-  })
-    .then((res) => {
-      loading.value = false;
-      Toast.clear();
-      res.records.forEach((item) => {
-        stepsData.value.push(item);
-      });
-      total.value = res.pages;
-    })
-    .catch((err) => {
-      loading.value = false;
-      Toast.clear();
-    });
-}
-// 统计查询
-function getTjList() {
-  getStatistics({
-    yjRysfzh: yjRyDetail.value.yjRysfzh,
-    yjClcph: yjRyDetail.value.yjClcph,
-  }).then((res) => {
-    tabs.value[3].count = res.all;
-    tabs.value[2].count = res.data30;
-    tabs.value[1].count = res.data7;
-    tabs.value[0].count = res.today;
-  });
-}
-function onSelect(val) {
-  stepsData.value = [];
-  finished.value = false;
-  current.value = 1;
-  switch (val) {
-    case 0:
-      kssj.value = getRecentDay(0, "ymd");
-      jssj.value = getRecentDay(0, "ymd");
-      break;
-    case 1:
-      kssj.value = getRecentDay(-7, "ymd");
-      jssj.value = getRecentDay(0, "ymd");
-      break;
-    case 2:
-      kssj.value = getRecentDay(-30, "ymd");
-      jssj.value = getRecentDay(0, "ymd");
-      break;
-    default:
-      kssj.value = "";
-      jssj.value = "";
-      break;
-  }
-  getListBySfz();
-}
-// 指令详情或者转为指令
-function onClickPc() {
-  if (zlCount.value > 0) {
-  }
-  if (zlCount.value == 0) {
-    turnZl.value = true;
-    form.pname = "";
-    form.fieldname = "";
-    form.fielddept = "";
-    array.value = [];
-    xzArray.value = [];
-    checkedry.value = "1";
-    getUserOrDeptList();
-  }
-}
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, item.yjTp);
-}
-// 切换
-const switchFlag = ref("01");
-function checkedChange(val) {
-  switchFlag.value = val;
-}
-// 人员本部门和全部切换
-const checkedry = ref("1");
-function checkedChangery(val) {
-  xzArray.value = [];
-  checkedry.value = val;
-  getUserOrDeptList();
-}
-function getPlist() {
-  pLoading.value = true;
-  getXfllList({
-    jllx: "01",
-    type: checkedry.value,
-    keyword: form.pname,
-    pageCurrent: queryPlist.page,
-    pageSize: queryPlist.size,
-  }).then((res) => {
-    pLoading.value = false;
-    queryPlist.total = res.total;
-    if (queryPlist.page === 1) {
-      pList.value = res.records;
-    } else {
-      pList.value.push(...res.records);
-    }
-  });
-}
-// 查询用户和部门信息和巡组
-const xzList = ref([]);
-function getUserOrDeptList() {
-  getPlist();
-  selectNextPage({
-    size: 100,
-    current: 1,
-  }).then((res) => {
-    options.value = [res.records[0]];
-  });
-  // 巡组
-  getJmxz({
-    bbrq: timeValidate(new Date(), "ymd"),
-    xfzt: "0,1,2",
-    bblx: "02",
-    pageSize: 100,
-    pageCurrent: 1,
-  }).then((res) => {
-    xzList.value = res.records;
-  });
-}
-const bmArray = ref([]);
-function onChange(value, selectedOptions) {
-  bmArray.value = [];
-  form.fielddept = value.value;
-  bmArray.value.push(value.selectedOptions[value.selectedOptions.length - 1]);
-}
-// 人员选择
-function onChangeName(val) {
-  form.fieldname = val.userName;
-}
-// 转指令确认按钮
-function onSubmit() {
-  turnZl.value = false;
-  let temp = [];
-  switch (switchFlag.value) {
-    case "01": // 人员
-      if (array.value.length > 0) {
-        array.value.forEach((item) => {
-          temp.push({
-            zxrLx: "01",
-            zxrId: item.id,
-            zxrJllx: item.fl,
-            zxrXm: item.xm,
-            zxrSfz: item.sfzh,
-            zxrDh: item.lxdh,
-            bz: "",
-          });
-        });
-      }
-      break;
-    case "02": // 部门
-      if (bmArray.value.length > 0) {
-        bmArray.value.forEach((item) => {
-          temp.push({
-            zxrLx: "02",
-            ssbmid: item.id,
-            ssbmmc: item.orgName,
-            bz: "",
-          });
-        });
-      }
-      break;
-    case "03": // 巡组
-      if (xzArray.value.length > 0) {
-        xzArray.value.forEach((item) => {
-          temp.push({
-            zxrLx: "03",
-            zxrXzid: item.id,
-            zxrXzmc: item.jzMc,
-          });
-        });
-      }
-      break;
-  }
-  yjConvertZl({
-    yjid: route.query.id,
-    zxrList: temp,
-  }).then((res) => {
-  });
-}
-
-function onLoad() {
-  if (current.value >= total.value) {
-    finished.value = true;
-    return;
-  }
-  current.value += 1;
-  getListBySfz();
-}
-// 选中的文件
-const array = ref([]);
-function onSelectList(val) {
-  array.value = val.list;
-}
-
-// 选中的巡组
-const xzArray = ref([]);
-function onSelectXzList(val) {
-  xzArray.value = val.list;
-}
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.ry_info {
-  margin: 2vw 3vw;
-  border-radius: 2vw;
-  @include jrtz_fill_color($jrtz-fill-color-theme);
-  padding-bottom: 2vw;
-}
-
-.but_box {
-  display: flex;
-  margin-top: 1vw;
-}
-.text {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  line-height: 3.5vw;
-  margin-top: 2vw;
-}
-.content {
-  display: flex;
-  padding-bottom: 20px;
-  .cont_l {
-    margin-right: 16px;
-    .red,
-    .yellow,
-    .blue,
-    .orange {
-      display: inline-block;
-      padding: 2px 16px;
-      border-radius: 10px;
-      @include font_size($font_medium_s);
-      color: #fff;
-    }
-  }
-}
-.yp_btn {
-  margin: 10px 10vw;
-  display: flex;
-  justify-content: center;
-}
-.nr_box {
-  height: 57vh;
-}
-.deptBox {
-  height: 57vh;
-  // overflow-y: auto;
-}
-::v-deep .van-tabs__track {
-  height: 44vh;
-  overflow-y: auto;
-}
-::v-deep .ry_cell .van-cell__value {
-  flex: 3;
-  max-height: 8vh;
-  overflow: hidden;
-  overflow-y: auto;
-}
-::v-deep .ry_cell .van-cell__title {
-  flex: 1;
-}
-::v-deep .ry .van-cell__value {
-  flex: 8;
-}
-::v-deep .ry .van-cell__title {
-  flex: 1;
-}
-</style>
diff --git a/src/pages/yyzx/yjxx/yjMapPoint.vue b/src/pages/yyzx/yjxx/yjMapPoint.vue
deleted file mode 100644
index 904edbc..0000000
--- a/src/pages/yyzx/yjxx/yjMapPoint.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="地图模式" :showRight="false" :showLeft="true" />
-    <GdMap />
-    <div class="top_btn">
-      <span @click="checkActive(!isRlt)">{{
-        isRlt ? "点位图" : "热力图"
-      }}</span>
-    </div>
-    <div class="map_but_box">
-      <van-button round block type="primary" :to="`/yyzx/yjxx/yjDetail?id=${useRoute().query.id}`">
-        列表模式
-      </van-button>
-    </div>
-  </div>
-</template>
-<script setup>
-import { getSyrkYjxx, getInfo } from "../../../api/yjxx.js";
-import { ref, onMounted } from "vue";
-import { useRoute } from "vue-router";
-import TopNav from "../../../components/topNav.vue";
-import GdMap from "../../../components/GdMap/index.vue";
-import YjItem from "../../../components/yjItem.vue";
-import emitter from "../../../utils/eventBus.js";
-import { hintToast } from "../../../utils/tools.js";
-const item = ref(null); // 警情数据
-const isRlt = ref(false);
-onMounted(() => {
-  window.closeMapTitle = closeMapTitle;
-  getYjDetail();
-});
-const yjRyDetail = ref({});
-const stepsData = ref([]);
-// 获取预警信息详情
-function getYjDetail() {
-  getInfo(useRoute().query.id).then((res) => {
-    yjRyDetail.value = res;
-    getListBySfz(1);
-  });
-}
-//关闭弹窗dom
-function closeMapTitle(val) {
-  let doms = document.getElementById(val);
-  doms.remove();
-}
-
-// 通过身份证查人
-function getListBySfz(val) {
-  getSyrkYjxx({
-    zjhm: yjRyDetail.value.yjRysfzh,
-    cph: yjRyDetail.value.yjClcph,
-    pageCurrent: 1,
-    pageSize: 100,
-  }).then((res) => {
-    stepsData.value = res.records;
-    let coords = [];
-    let arr = [];
-    let array = [];
-    for (let index = 0; index < stepsData.value.length; index++) {
-      if (
-        stepsData.value[index].jd != null &&
-        stepsData.value[index].wd != null
-      ) {
-        coords.push({
-          jd: stepsData.value[index].jd,
-          wd: stepsData.value[index].wd,
-          yjDz: stepsData.value[index].yjGzymc,
-          yjFssj: stepsData.value[index].yjFssj,
-        });
-        arr.push(stepsData.value[index].jd);
-        arr.push(stepsData.value[index].wd);
-        let obj = {
-          lng: stepsData.value[index].jd,
-          lat: stepsData.value[index].wd,
-          count: 1,
-        };
-        array.push(obj);
-      }
-    }
-    let coordsStr = arr.join(",");
-    // 点位图
-    if (val == 1) {
-      if (coords.length > 0) {
-        emitter.emit("bd_closeOverlay");
-        emitter.emit("addPointArea", {
-          coords: coords,
-          icon: require("../../../assets/pointIcon/icon-gzy.png"),
-          flag: "yj",
-        });
-      } else {
-        hintToast("点位没有坐标信息！");
-      }
-    } else {
-      if (array.length > 0) {
-        emitter.emit("bd_closeOverlay");
-        emitter.emit("thermodynamicChart", {
-          flag: "rlt",
-          arr: array,
-        });
-      } else {
-        hintToast("热力图没有坐标信息！");
-      }
-    }
-  });
-}
-//切看地图查看方式
-function checkActive(flag) {
-  isRlt.value = flag;
-  if (flag) {
-    getListBySfz(2);
-  } else {
-    getListBySfz(1);
-  }
-}
-//设置点位图
-// function setPoint() {
-//   emitter.emit("bd_closeOverlay");
-//   let coords = [
-//     { jd: "104.046207", wd: "30.62707" },
-//     { jd: "104.064353", wd: "30.617933" },
-//     { jd: "104.063922", wd: "30.641426" },
-//   ];
-//   emitter.emit("addPointArea", {
-//     coords: coords,
-//     icon: require("../../../assets/pointIcon/icon-gzy.png"),
-//     flag: "yj",
-//   });
-//   emitter.emit(
-//     "drawLine",
-//     "104.046207,30.62707,104.064353,30.617933,104.063922,30.641426"
-//   );
-// }
-// //随机生成坐标
-// function setPint() {
-//   let array = [];
-//   for (let i = 0; i < 2000; i++) {
-//     let obj = {
-//       lng: 104.019822 + Math.random() / 5,
-//       lat: 30.450369 + Math.random() / 5,
-//       count: 1,
-//     };
-//     array.push(obj);
-//   }
-//   return array;
-// }
-// //设置热力图
-// function setRlt() {
-//   emitter.emit("bd_closeOverlay");
-//   emitter.emit("deletePointArea", "drawLine");
-//   emitter.emit("thermodynamicChart", {
-//     flag: "rlt",
-//     arr: setPint(),
-//   });
-// }
-</script>
-<style lang="scss" scoped>
-.map_but_box {
-  position: absolute;
-  bottom: 10vw;
-  width: 50%;
-  left: 50%;
-  z-index: 99;
-  margin-left: -25%;
-}
-
-.top_btn {
-  position: fixed;
-  top: 16vw;
-  left: 0;
-  right: 12px;
-  height: 24px;
-  color: #fff;
-  z-index: 9;
-  text-align: right;
-
-  span {
-    display: inline-block;
-    border: 1px solid #fff;
-    line-height: 22px;
-    padding: 0 12px;
-    border-radius: 12px;
-    font-size: 14px;
-  }
-
-  span.active {
-    background: #517cea;
-    border-color: #517cea;
-  }
-}
-</style>
diff --git a/src/pages/yyzx/yjxx/yjTotal.vue b/src/pages/yyzx/yjxx/yjTotal.vue
deleted file mode 100644
index 58e472c..0000000
--- a/src/pages/yyzx/yjxx/yjTotal.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <div style="padding-top: 15vw">
-    <TopNav navTitle="预警统计" :showRight="false" :showLeft="true" />
-    <TopSelectTime @chenge:time="onSelectTime" />
-    <TopTotal :list="yjTotal.list" />
-    <!-- 任务完成情况 -->
-    <div class="item_box gsdyj_box">
-      <div class="other_type_title">各时段预警</div>
-      <LineChart :type="timeType" />
-    </div>
-    <div class="item_box gsdyj_box">
-      <div class="other_type_title">感知源预警排名</div>
-      <Ranking :type="timeNum" />
-    </div>
-    <div class="item_box gsdyj_box">
-      <div class="other_type_title">人员预警排名</div>
-      <PeopleRanking :type="timeNum" />
-    </div>
-    <div class="item_box gsdyj_box">
-      <div class="other_type_title">派出所预警分析</div>
-      <LineChartPcs :type="timeNum"/>
-    </div>
-  </div>
-</template>
-<script setup>
-import { ref, onMounted, reactive } from "vue";
-import TopNav from "../../../components/topNav.vue";
-import TopSelectTime from "../../../components/topSelectTime.vue";
-import TopTotal from "../../../components/topTotal";
-import LineChart from "./components/lineChart.vue";
-import LineChartPcs from "./components/lineChartPcs.vue";
-import PeopleRanking from "./components/peopleRanking.vue";
-import Ranking from "./components/ranking.vue";
-import { getYjxxTjYjlx } from "../../../api/yjxx.js";
-import { getRecentDay } from "../../../utils/tools";
-const timeActive = ref(0);
-const yjTotal = reactive({
-  list: [
-    {
-      title: "预警总数",
-      count: 0,
-    },
-    {
-      title: "人员预警",
-      count: 0,
-    },
-    {
-      title: "车辆预警",
-      count: 0,
-    },
-    {
-      title: "事件预警",
-      count: 0,
-    },
-    {
-      title: "重点人员管控预警",
-      count: 0,
-    },
-  ],
-});
-onMounted(() => {
-  _getYjxxTjYjlx(0);
-});
-//时间查询
-const timeType = ref(0);
-const timeNum = ref(0);
-function onSelectTime(val) {
-  timeType.value = val;
-  timeNum.value = val == 3 ? -90 : val == 1 ? -7 : val == 2 ? -30 : 0;
-  _getYjxxTjYjlx(timeNum.value);
-}
-//获取预警类型统计
-function _getYjxxTjYjlx(val) {
-  yjTotal.list.forEach((el) => {
-    el.count = 0;
-  });
-  getYjxxTjYjlx({
-    kssj: getRecentDay(val, "ymd"),
-    jssj: getRecentDay(0, "ymd"),
-  }).then((res) => {
-    res.forEach((item) => {
-      yjTotal.list[0].count += item.count;
-      switch (item.yj_lx) {
-        case "1":
-          yjTotal.list[1].count = item.count;
-          break;
-        case "2":
-          yjTotal.list[2].count += item.count;
-          break;
-        case "3":
-          yjTotal.list[2].count += item.count;
-          break;
-        case "4":
-          yjTotal.list[2].count += item.count;
-          break;
-        case "5":
-          yjTotal.list[3].count = item.count;
-          break;
-        case "6":
-          yjTotal.list[4].count = item.count;
-          break;
-      }
-    });
-  });
-}
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.gsdyj_box {
-  margin: 2vw 3vw 5vw 3vw;
-  padding: 2vw;
-}
-.other_type_title {
-  margin-left: 2vw;
-}
-::v-deep .van-tabs__nav--card {
-  margin: 0 3vw;
-}
-</style>
diff --git a/src/pages/yyzx/zbbb/addZbbb.vue b/src/pages/yyzx/zbbb/addZbbb.vue
deleted file mode 100644
index b770026..0000000
--- a/src/pages/yyzx/zbbb/addZbbb.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-  <div class="container" style="padding-top: 13vw">
-    <TopNav :navTitle="title" />
-    <normalReport @setTitle="onSetTitle" />
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import normalReport from "../components/normalReport.vue";
-import { computed, ref, reactive, watch, onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { Toast } from "vant";
-
-const router = useRouter();
-const route = useRoute();
-const title = ref("值班排班信息");
-const active = ref("a");
-//设置标题信息
-function onSetTitle(e) {
-  title.value = e;
-}
-</script>
-
-<style lang="scss" scoped>
-.container {
-  margin-top: 2vw;
-}
-.nav_tab {
-  padding: 2vw;
-  display: flex;
-  justify-content: space-around;
-  .tab {
-    background: #a4aec8;
-    color: #fff;
-    height: 32px;
-    line-height: 32px;
-    width: 40vw;
-    text-align: center;
-    border-radius: 16px 16px 16px 0;
-  }
-  .tab.active {
-    background: #517cea;
-  }
-}
-</style>
diff --git a/src/pages/yyzx/zbbb/zbbbCalendar.vue b/src/pages/yyzx/zbbb/zbbbCalendar.vue
deleted file mode 100644
index f3f2d0c..0000000
--- a/src/pages/yyzx/zbbb/zbbbCalendar.vue
+++ /dev/null
@@ -1,455 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="我的值班清单" :showLeft="true" />
-    <div class="calenderBox">
-      <div class="calender-head">
-        <div class="btn" @click="last">
-          <van-icon name="arrow-left" color="#fff" />
-        </div>
-        <div class="text">{{ Year }}年{{ month }}月</div>
-        <div class="btn" @click="next">
-          <van-icon name="arrow" color="#fff" />
-        </div>
-        <div class="change" @click="isChange = !isChange">
-          <van-icon name="exchange" size="16" color="#3e6ee8" />
-          {{ isChange ? "切换表格" : "切换列表" }}
-        </div>
-      </div>
-      <!-- 日历列表 -->
-      <div v-if="!isChange" class="list">
-        <ul class="week">
-          <li class="days" v-for="(item, index) in week" :key="index">
-            {{ item }}
-          </li>
-        </ul>
-        <div class="wrap">
-          <div class="item" v-for="(item, index) in calendarList" :key="index">
-            <div class="num">
-              {{ item.day }}<span v-show="item.list">日</span>
-            </div>
-            <div class="status" v-show="item.status">
-              <span
-                @click="routePush(evn, item)"
-                v-for="(evn, index) in item.status"
-                :key="index + 'evn'"
-                v-show="evn.text"
-                :style="{ background: evn.color }"
-                >{{ evn.text }}</span
-              >
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- 日历列表 -->
-      <div v-else class="list">
-        <CalendarList :listData="listData"></CalendarList>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import CalendarList from "../components/calendarListZb.vue";
-import router from "../../../router/index.js";
-import { getZbbbByMonth } from "@/api/calender";
-import { onMounted, reactive, ref } from "vue";
-import { Toast } from "vant";
-const isChange = ref(false);
-const week = ref(["周日", "周一", "周二", "周三", "周四", "周五", "周六"]);
-const Year = ref(new Date().getFullYear()); //日历上的年份
-const month = ref(new Date().getMonth() + 1); //日历上的月份
-const Day = ref(new Date().getDate()); //日历上的天份
-
-const nowYear = ref(new Date().getFullYear());
-const nowmonth = ref(new Date().getMonth() + 1);
-const nowDay = ref(new Date().getDate());
-
-const starttime = ref("");
-const endtime = ref("");
-const nowtime = ref("");
-
-const loading = ref(false);
-const listData = ref([]);
-
-//状态字典
-const ztDict = [
-  {
-    label: "待值班",
-    value: "01",
-    color: "#7b7b7b",
-  },
-  {
-    label: "值班中",
-    value: "02",
-    color: "",
-  },
-  {
-    label: "已值班",
-    value: "03",
-    color: "#0084ff",
-  },
-  {
-    label: "",
-    value: "04",
-    color: "",
-  },
-];
-const calendarList = ref([]);
-//状态数据处理
-function checkZt(list = []) {
-  var zt = [];
-  if (list.length > 0) {
-    zt = list.map((item) => {
-      return {
-        text: ztDict.filter((item2) => item2.value === item.zt)[0].label,
-        color: ztDict.filter((item2) => item2.value === item.zt)[0].color,
-        id: item.id,
-        zt: item.zt,
-        time: item.time,
-      };
-    });
-  }
-  return zt;
-}
-onMounted(() => {
-  Toast.loading({
-    message: "加载...",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  Promise.all([
-    getzbCalendar(Year.value, month.value),
-    Draw(nowYear.value, nowmonth.value),
-  ])
-    .then((res) => {
-      Toast.clear();
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-  let time_month = nowmonth.value; //现在的月份
-  let time_day = nowDay.value; //现在的天数
-  if (nowmonth.value < 10) {
-    time_month = 0 + "" + nowmonth.value;
-  }
-  if (nowDay.value < 10) {
-    time_day = 0 + "" + nowDay.value;
-  }
-  nowtime.value = nowYear.value + "" + time_month + "" + time_day;
-  starttime.value = nowtime.value;
-  endtime.value = nowtime.value;
-});
-//跳转报备
-function routePush(evn, item) {
-  // router.push("/yyzx/views/addZbbb");
-  let flag = 0;
-  let currentTi = "";
-  let y = Year.value; //现在的月份
-  let m = month.value; //现在的天数
-  if (y < 10) {
-    y = 0 + "" + y;
-  }
-  if (m < 10) {
-    m = 0 + "" + m;
-  }
-  currentTi = y + "" + m + "" + item.day;
-  if (nowtime.value === currentTi) {
-    flag = 1;
-  }
-  if (evn.zt !== "04") {
-    router.push({
-      path: "/yyzx/views/addZbbbInfo",
-      query: {
-        zt: evn.zt,
-        id: evn.id,
-        text: evn.text,
-        color: evn.color,
-        flag: flag,
-      },
-    });
-  }
-}
-//初始化日历数据
-function Draw(Year, Month) {
-  var calendar = [];
-  //用当月第一天在一周中的日期值作为当月离第一天的天数(获取当月第一天是周几)
-  for (
-    var i = 1, firstDay = new Date(Year, Month - 1, 1).getDay();
-    i <= firstDay;
-    i++
-  ) {
-    calendar.push("");
-  }
-  //用当月最后一天在一个月中的日期值作为当月的天数
-  for (
-    var i = 1, monthDay = new Date(Year, Month, 0).getDate();
-    i <= monthDay;
-    i++
-  ) {
-    let time_month = Month;
-    let time_day = i;
-    if (Month < 10) {
-      time_month = 0 + "" + Month;
-    }
-    if (i < 10) {
-      time_day = 0 + "" + i;
-    }
-    calendar.push({
-      value: i,
-      kssj: "20:00", //假数据
-      jssj: "23:59",
-      status: "值班", //假的状态
-      count: Year + "" + time_month + "" + time_day,
-    });
-  }
-  calendar[10].status = "未报备";
-  calendar[15].status = "未报备";
-  calendar[20].status = "请假";
-  calendar[21].status = "请假";
-  calendar[20].time = "";
-  calendar[21].time = "";
-  calendarList.value = calendar;
-}
-// 上个月
-function last() {
-  month.value--;
-  if (month.value == 0) {
-    month.value = 12;
-    Year.value--;
-  }
-  Draw(Year.value, month.value);
-  getzbCalendar(Year.value, month.value);
-}
-// 下个月
-function next() {
-  month.value++;
-  if (month.value == 13) {
-    month.value = 1;
-    Year.value++;
-  }
-  Draw(Year.value, month.value);
-  getzbCalendar(Year.value, month.value);
-}
-
-// 获取日历数据
-const getzbCalendar = (Year, Month) => {
-  getZbbbByMonth({
-    time: Year + "-" + Month,
-  }).then((res) => {
-    if (res && res.length > 0) {
-      listData.value = [];
-      res.map((item) => {
-        if (item.list.length === 0) {
-          listData.value.push({
-            time: Year + "-" + Month + "-" + item.day,
-            zqsj: "--",
-            zqzt: "--",
-            zt: "04",
-          });
-        } else {
-          item.list.map((env) => {
-            listData.value.push({
-              time: Year + "-" + Month + "-" + item.day,
-              zqsj: env.time,
-              zqzt: ztDict.filter((item2) => item2.value === env.zt)[0].label,
-              zt: env.zt,
-              id: env.id,
-            });
-          });
-        }
-      });
-
-      res.forEach((element) => {
-        if (element.list.length > 0) {
-          element.status = checkZt(element.list);
-        }
-      });
-    }
-
-    calendarList.value = res;
-    for (
-      var i = 1, firstDay = new Date(Year, Month - 1, 1).getDay();
-      i <= firstDay;
-      i++
-    ) {
-      calendarList.value.unshift("");
-    }
-  });
-};
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-.calenderBox {
-  width: 100%;
-  padding: 1vw;
-  box-sizing: border-box;
-  .calender-head {
-    width: 100%;
-    height: 15vw;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-    font-weight: bold;
-    line-height: 40px;
-    position: relative;
-    .change {
-      position: absolute;
-      right: 1vw;
-      bottom: 2vw;
-      cursor: pointer;
-      color: #3e6ee8;
-      @include font_size($font_medium_s);
-    }
-    .btn {
-      width: 7vw;
-      height: 7vw;
-      line-height: 7vw;
-      text-align: center;
-      border-radius: 1vw;
-      background: #3e6ee8;
-      color: #fff;
-    }
-    .text {
-      margin: 0 4vw;
-      @include font_color($font-color-theme);
-    }
-  }
-  .week {
-    width: 100%;
-    display: flex;
-    flex-wrap: nowrap;
-    text-align: center;
-    height: 10vw;
-    line-height: 10vw;
-    @include font_size($font_medium_s);
-    background: #164acc;
-    color: #fff;
-    .days {
-      flex: 1;
-    }
-  }
-  .wrap {
-    width: 100%;
-    // height: auto;
-    // overflow: hidden;
-    display: flex;
-    flex-wrap: wrap;
-    .item {
-      width: calc((100% / 7) - 1.3px);
-      border: 1px solid #3e6ee8;
-      border-top: none;
-      font-size: 10px;
-      min-height: 17vw;
-      .num {
-        @include font_color($font-color-theme);
-        text-align: right;
-        height: 5vw;
-        line-height: 5vw;
-        padding-right: 1vw;
-        box-sizing: border-box;
-      }
-      .status {
-        text-align: center;
-        // height: 5vw;
-        line-height: 5vw;
-        margin: 1vw 0;
-        span {
-          background: #3e6ee8;
-          display: inline-block;
-          padding: 1px 1vw;
-          margin: 4px 0;
-          color: #fff;
-          border-radius: 1vw;
-        }
-        .green {
-          background: #1adb10;
-        }
-        .gray {
-          background: #83868f;
-        }
-      }
-      .time {
-        font-size: 10px;
-        height: 5vw;
-        // line-height: 7vw;
-        color: #3e6ee8;
-        text-align: center;
-      }
-      .greenColor {
-        color: #1adb10;
-      }
-      .grayColr {
-        color: #83868f;
-      }
-      .BlueColor {
-        color: #3e6ee8;
-      }
-    }
-    .item:nth-child(7n + 2) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 3) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 4) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 5) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 6) {
-      border-left: none;
-    }
-    .item:nth-child(7n + 7) {
-      border-left: none;
-    }
-  }
-}
-.list {
-  max-height: calc(100vh - 35vw);
-  // overflow: hidden;
-  // overflow-y: auto;
-}
-
-@import "../../../assets/styles/mixin.scss";
-.box-rank {
-  width: 100%;
-  height: 100%;
-  .item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 8vw;
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-    .text {
-      flex: 1;
-      text-align: center;
-    }
-    .mc {
-      color: #3e6ee8;
-    }
-  }
-  .item:nth-child(2n + 1) {
-    @include table_item_color($table-item-theme);
-  }
-  .item:nth-child(1) {
-    background: #3e6ee8 !important;
-    color: #fff;
-  }
-  .red {
-    color: red !important;
-  }
-  .green {
-    color: #88e9af;
-  }
-  .blue {
-    color: #3e6ee8;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/zlzx/addzl.vue b/src/pages/yyzx/zlzx/addzl.vue
deleted file mode 100644
index 6cc7905..0000000
--- a/src/pages/yyzx/zlzx/addzl.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="指令" :showRight="false" :showLeft="true" />
-    <div class="main_box">
-      <van-form @submit="onSubmit" class="form" :disabled="isSeeInfo ? false : true">
-        <van-field v-model="params.zlbt" name="zlbt" label="指令标题" placeholder="请输入指令标题"
-          :rules="[{ required: true, message: '请输入指令标题' }]" />
-        <van-field v-model="params.zlnr" name="zlnr" type="textarea" label="指令内容" placeholder="请输入指令内容"
-          :rules="[{ required: true, message: '请输入指令内容' }]" />
-        <van-field name="uploader" label="图片">
-          <template #input>
-            <van-uploader :max-count="1" :disabled="isSeeInfo ? false : true" v-model="wpTpIdList" multiple
-              :after-read="upLoadImg" />
-          </template>
-        </van-field>
-        <div style="margin: 16px" v-show="isSeeInfo">
-          <van-button round block type="primary" native-type="submit" :loading="isLoading" loading-type="spinner"
-            loading-text="提交中...">提交</van-button>
-        </div>
-      </van-form>
-    </div>
-  </div>
-</template>
-<script setup>
-import TopNav from "../../../components/topNav.vue";
-import { qcckGet, qcckPost } from "../../../api/qcckApi.js";
-import ImageCompressor from "image-compressor.js";
-import {
-  timeValidate
-} from "../../../utils/tools.js";
-import { ImagePreview } from "vant";
-import { getMybbTodayNew } from "../../../api/common";
-import { useRoute } from "vue-router";
-import { onMounted, ref } from 'vue';
-import { upImage } from "@/api/common";
-import { hintToast } from "@/utils/tools";
-import router from "@/router";
-import { getDictList, setDict } from "../../../utils/dict";
-const { D_QW_CJSBLX } = getDictList(
-  "D_QW_CJSBLX"
-);
-const route = useRoute();
-const wpTpIdList = ref([]);
-const isSeeInfo = ref(true);
-const fileList = ref([])
-const params = ref({
-  cjsbTpid: '',//图片
-  zllx: '10',
-  zlbt:'请求协助'
-})
-const baseUrl = ref("");
-const workTips = ref();
-// 上传图片
-async function upLoadImg(file) {
-  file.message = "上传中...";
-  let fileBlob = await _compressImage(file.file);
-  let fileData = new File([fileBlob], fileBlob.name, { type: fileBlob.type });
-  const data = new FormData();
-  data.append("file", fileData);
-  upImage(data).then((res) => {
-    console.log(res, 'res');
-    file.status = "done";
-    file.message = "上传成功";
-    if (!fileList.value.includes(res)) fileList.value.push(res);
-  });
-}
-
-//压缩图片
-const _compressImage = (file) => {
-  return new Promise((resolve, reject) => {
-    new ImageCompressor(file, {
-      quality: 0.6, //压缩质量
-      success(res) {
-        resolve(res);
-      },
-      error(e) {
-        reject(e);
-      },
-    });
-  });
-};
-const onSubmit = () => {
-  let { lng, lat, zbly } = getLocation();
-  params.value.jd = lng;
-  params.value.wd = lat;
-  if (fileList.value.length > 0) params.value.fjId = fileList.value.join(',');
-  qcckPost(params.value, "/mosty-yjzl/tbZl/addZl").then(res => {
-    hintToast('添加成功')
-    router.back()
-  })
-}
-const getImageUrl = (item) => {
-  return new Promise((ok) => {
-    qcckGet({}, `/mosty-base/minio/file/download/${item}`).then(res => {
-      ok(res.url);
-    })
-  });
-}
-onMounted(async () => {
-  if (route.query.item) {
-    isSeeInfo.value = false;
-    params.value = JSON.parse(route.query.item);
-    let imgId = params.value.cjsbTpid.split(',');
-    for (let i = 0; i < imgId.length; i++) {
-      const el = imgId[i];
-      fileList.value.push({ url: await getImageUrl(el) });
-    }
-  }
-
-})
-</script>
-<style lang="scss" scoped>
-.main_box {
-  padding: 10px;
-  box-sizing: border-box;
-}
-
-::v-deep .van-radio {
-  margin-bottom: 4px;
-}
-
-::v-deep .van-radio__label--disabled {
-  color: #000 !important;
-}
-
-::v-deep .van-field__label {
-  color: #000 !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/zlzx/components/messsageList.vue b/src/pages/yyzx/zlzx/components/messsageList.vue
deleted file mode 100644
index be9410b..0000000
--- a/src/pages/yyzx/zlzx/components/messsageList.vue
+++ /dev/null
@@ -1,560 +0,0 @@
-<template>
-  <div id="scrollDIV" class="message_list_box" style="height: 100%">
-    <div v-for="(item, index) in list" :key="index" id="message_item_box" class="message_item">
-      <!-- 对方的消息 -->
-      <div class="item_left" v-if="item.type == 1">
-        <div class="df_avator">{{ item.name.substring(0, 1) }}</div>
-        &nbsp;
-        <div>
-          <div style="margin-bottom: 2vw">
-            <span>{{ item.time }}</span>&emsp;<span>{{ item.name }}</span>
-          </div>
-          <!-- 图片文件 -->
-          <van-image width="100px" height="100px" fit="cover" :src="baseUrl + item.fjid"
-            v-if="item.fjid && item.fileFormat == 'png'" @click="onClickImg(item.fjid)">
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-          </van-image>
-          <!-- 文档文件 -->
-          <div class="left_message" v-if="item.fileFormat == 'file'">
-            <a style="text-decoration: underline" :href="baseUrl + item.fjid">{{
-                          item.text
-                          }}</a>
-          </div>
-          <!-- 消息 -->
-          <div class="left_message" v-if="item.text && !item.fjid">
-            {{ item.text }}
-          </div>
-          <!-- 语音消息  -->
-          <div class="audio-detail-msg" v-if="item.fileFormat == 'mp3'">
-            <div class="audio-style" style="margin-right: 8px"
-              :class="{ 'add-animation': isPlay && audioId == item.fjid }" :style="{
-                              width: handleAudioStyleWidth(item.yysc ? item.yysc : 1),
-                            }" @click="playAudio(item.fjid, item.yysc ? item.yysc : 1)">
-              <div class="small"></div>
-              <div class="middle"></div>
-              <div class="large"></div>
-            </div>
-            <div class="duration-seconds">{{ item.yysc ? item.yysc : 1 }}s</div>
-            <audio :id="item.fjid" style="display: none"></audio>
-          </div>
-          <!-- 视频 -->
-          <div class="videos_box" v-if="item.fileFormat == 'mp4'">
-            <video :src="item.videoUrl" class="video_image"></video>
-            <!-- <img :src="`${baseUrl}${item.sptpid}`" alt="" class="video_image" /> -->
-            <!-- <div class="yysc left_video_time">{{ item.yysc }}s</div> -->
-            <img class="play_box left_video_play" src="../../../../assets/images/play.png" alt=""
-              @click="onClickVideo(item.videoUrl)" />
-          </div>
-        </div>
-      </div>
-      <!-- 自己的消息 -->
-      <div class="item_right" v-if="item.type == 2">
-        <!-- 图片文件 -->
-        <div>
-          <div style="margin-bottom: 2vw">{{ item.time }}</div>
-          <van-image width="100px" height="100px" fit="cover" :src="baseUrl + item.fjid"
-            v-if="item.fjid && item.fileFormat == 'png'" @click="onClickImg(item.fjid)">
-            <template v-slot:loading>
-              <van-loading type="spinner" size="20" />
-            </template>
-          </van-image>
-          <!-- 文档文件 -->
-          <div class="right_message" v-if="item.fileFormat == 'file'">
-            <a style="text-decoration: underline" @click="getPreviewText(item)">{{ item.text }}</a>
-          </div>
-          <!-- 消息 -->
-          <div class="right_message" v-if="item.text && !item.fjid">
-            {{ item.text }}
-          </div>
-          <!-- 语音消息  -->
-          <div class="audio-detail-msg msgRight_box" v-if="item.fileFormat == 'mp3'">
-            <div class="duration-seconds">{{ item.yysc ? item.yysc : 1 }}s</div>
-            <div style="margin-left: 8px" class="audio-style msgRight"
-              :class="{ 'add-animation': isPlay && audioId == item.fjid }" :style="{
-                              width: handleAudioStyleWidth(item.yysc ? item.yysc : 1),
-                            }" @click="playAudio(item.fjid, item.yysc ? item.yysc : 1)">
-              <div class="small"></div>
-              <div class="middle"></div>
-              <div class="large"></div>
-            </div>
-            <audio :id="item.fjid" style="display: none"></audio>
-          </div>
-          <!-- 视频 -->
-          <div class="videos_box" v-if="item.fileFormat == 'mp4'">
-            <video :src="item.videoUrl" class="video_image"></video>
-            <!-- <img :src="`${baseUrl}${item.sptpid}`" alt="" class="video_image" /> -->
-            <!-- <div class="yysc right_video_time">{{ item.yysc }}s</div> -->
-            <img class="play_box right_video_play" src="../../../../assets/images/play.png" alt=""
-              @click="onClickVideo(item.videoUrl)" />
-          </div>
-        </div>
-        &nbsp;
-        <div class="df_avator">{{ item.name.substring(0, 1) }}</div>
-      </div>
-    </div>
-    <Iframe :url="fillFrams" :isPreviw="isPreviw" @closePre="isPreviw = false"></Iframe>
-  </div>
-</template>
-<script setup>
-import emitter from "@/utils/eventBus";
-import {
-  ref,
-  onMounted,
-  defineProps,
-  defineEmits,
-  watch,
-  onBeforeUnmount,
-} from "vue";
-import { baseUrl2 } from "../../../../utils/request.js";
-import { ImagePreview } from "vant";
-import { dataQc } from "../../../../utils/tools.js";
-import { getFjInfo } from "../../../../api/rwzx.js";
-import Iframe from "../../../../assets/html/filePreview.vue";
-import axios from "axios";
-const props = defineProps({
-  list: {
-    type: Boolean,
-    default: [],
-  }, //消息数据
-  mesHeight: Number, //盒子高度
-});
-const baseUrl = `${baseUrl2}/mosty-api/mosty-base/minio/image/download/`;
-const emits = defineEmits(["update:scroll", "click:video"]);
-const isPlay = ref(false); //开始语音播放动画
-const playAudioTimer = ref(null); //语音播放定时器
-const audioId = ref(""); //被选中播放的音频ID
-const divHeight = ref(0);
-const timeValue = ref(null);
-const fillFrams = ref(null);
-const isPreviw = ref(false);
-watch(
-  () => props.list,
-  (newVal) => {
-    newVal.forEach((item) => {
-      if (item.fileFormat == "mp3" || item.fileFormat == "mp4") {
-        axios
-          .get(
-            `${baseUrl2}/mosty-api/mosty-base/minio/file/download/${item.fjid}`,
-            {
-              params: {},
-            }
-          )
-          .then((res) => {
-            if (res) {
-              let url = res.data.data.url.replace(
-                "http://80.93.7.13:9009",
-                "/zyminio"
-              );
-              // let url = res.data.data.url;
-              if (item.fileFormat == "mp3") {
-                let au = document.getElementById(item.fjid);
-                au.src = `${baseUrl2 + url}`;
-              } else {
-                item.videoUrl = `${baseUrl2 + url}`;
-              }
-            }
-          });
-      }
-    });
-  },
-  { immediate: true, deep: true }
-);
-onMounted(() => {
-  dataQc(props.list, "id");
-  scrollDIV();
-  timeValue.value = setInterval(() => {
-    if (divHeight.value <= 50) scrollDIV();
-  }, 1.5e3);
-  scrollBotton();
-});
-onBeforeUnmount(() => {
-  clearTimeout(playAudioTimer.value);
-  playAudioTimer.value = null;
-  clearTimeout(timeValue.value);
-  timeValue.value = null;
-});
-//  获取预览文件
-function getPreviewText(item) {
-  getFjInfo(item.fjid).then((res) => {
-    let url = res.url; //要预览文件的访问地址
-    let Base64Url = Base64.encode(url);
-    fillFrams.value =
-      "http://10.64.201.126:8012/onlinePreview?url=" +
-      encodeURIComponent(Base64Url);
-    isPreviw.value = true;
-  });
-}
-//点击视频
-function onClickVideo(url) {
-  emits("click:video", url);
-}
-//播放语音
-function playAudio(id, yysc) {
-  let au = document.getElementById(id);
-  audioId.value = id;
-  if (isPlay.value) {
-    isPlay.value = false;
-    au.pause();
-    return;
-  }
-  isPlay.value = true;
-  playAudioTimer.value = setTimeout(() => {
-    isPlay.value = false;
-  }, parseInt(yysc * 1000));
-  au.play();
-}
-// 设置语音条宽度样式
-function handleAudioStyleWidth(yycs) {
-  if (yycs === 1) {
-    return "38px";
-  } else if (yycs > 1 && yycs < 20) {
-    return `${38 + (yycs / 10) * 36}px`;
-  } else if (yycs >= 20) {
-    return `${106.39 + (yycs / 10) * 18.935}px`;
-  }
-}
-//预览图片
-function onClickImg(fjid) {
-  let url = baseUrl + fjid;
-  ImagePreview([url]);
-}
-//滚动到元素底部
-function scrollDIV() {
-  try {
-    const div = document.getElementById("scrollDIV");
-    div.scrollTop = div.scrollHeight;
-  } catch (error) {}
-}
-//监听是否到达底部
-function scrollBotton() {
-  const div = document.getElementById("scrollDIV");
-  div.addEventListener("scroll", () => {
-    const clientHeight = div.clientHeight;
-    const scrollTop = div.scrollTop;
-    const scrollHeight = div.scrollHeight;
-    const dist = scrollHeight - scrollTop - clientHeight;
-    divHeight.value = dist;
-    // emits("update:scroll", dist);
-  });
-}
-</script>
-<style lang="scss" scoped>
-@import "../../../../assets/styles/mixin.scss";
-
-.message_list_box {
-  // padding: 2.5vw;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-  overflow: auto;
-
-  .message_item {
-
-    .item_left,
-    .item_right {
-      display: flex;
-      margin-bottom: 4vw;
-
-      .left_message {
-        background: #fff;
-        box-shadow: -1px 1px 1px 1px rgba(0, 0, 0, 0.1);
-      }
-    }
-
-    .item_left {
-      justify-content: flex-start;
-      text-align: left;
-    }
-
-    .item_right {
-      text-align: right;
-      justify-content: flex-end;
-
-      .right_message {
-        background: rgba(149, 236, 105, 0.5);
-        box-shadow: 1px 1px 1px 1px rgba(0, 0, 0, 0.1);
-        text-align: left;
-      }
-    }
-  }
-}
-
-.left_message,
-.right_message {
-  padding: 1.5vw;
-  display: inline-block;
-  border-radius: 3px;
-  color: #333;
-  word-break: break-all;
-}
-
-img {
-  width: 25vw;
-  height: 25vw;
-}
-
-.df_avator {
-  @include font_size($font_medium_s);
-  display: inline-block;
-  height: 35px;
-  min-width: 35px;
-  border-radius: 50%;
-  background-color: #0078e0;
-  text-align: center;
-  line-height: 35px;
-  color: #fff;
-  overflow: hidden;
-  overflow-x: auto;
-}
-
-// 语音条
-.audio-detail-msg {
-  display: flex;
-  align-items: center;
-
-  .msgRight {
-    transform: rotate(180deg);
-  }
-
-  .audio-style {
-    display: flex;
-    align-items: center;
-    height: 32px;
-
-    padding: 0 10px;
-    border-radius: 4px;
-    background: rgba(149, 236, 105, 0.5);
-
-    .small {
-      border: 4px solid #4c4c4c;
-      border-top-color: transparent;
-      border-left-color: transparent;
-      border-bottom-color: transparent;
-    }
-
-    .middle {
-      width: 16px;
-      height: 16px;
-      margin-left: -11px;
-      opacity: 1;
-    }
-
-    .large {
-      width: 24px;
-      height: 24px;
-      margin-left: -19px;
-      opacity: 1;
-    }
-
-    &>div {
-      border: 2px solid #4c4c4c;
-      border-top-color: transparent;
-      border-left-color: transparent;
-      border-bottom-color: transparent;
-      border-radius: 50%;
-      box-sizing: border-box;
-    }
-
-    &.add-animation {
-      .middle {
-        animation: show2 1.2s ease-in-out infinite;
-      }
-
-      .large {
-        animation: show3 1.2s ease-in-out infinite;
-      }
-    }
-  }
-
-  // 语音播放动画
-  @keyframes show2 {
-    0% {
-      opacity: 0;
-    }
-
-    10% {
-      opacity: 1;
-    }
-
-    100% {
-      opacity: 0;
-    }
-  }
-
-  @keyframes show3 {
-    0% {
-      opacity: 0;
-    }
-
-    50% {
-      opacity: 1;
-    }
-
-    60% {
-      opacity: 0;
-    }
-
-    100% {
-      opacity: 0;
-    }
-  }
-
-  // 语音录制动画
-  @keyframes backgroundInfinite2 {
-    0% {
-      background: #666;
-    }
-
-    20% {
-      background: #f5f5f5;
-    }
-
-    95% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite3 {
-    0% {
-      background: #666;
-    }
-
-    30% {
-      background: #f5f5f5;
-    }
-
-    85% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite4 {
-    0% {
-      background: #666;
-    }
-
-    55% {
-      background: #f5f5f5;
-    }
-
-    75% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite5 {
-    0% {
-      background: #666;
-    }
-
-    45% {
-      background: #666;
-    }
-
-    60% {
-      background: #f5f5f5;
-    }
-
-    75% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite6 {
-    0% {
-      background: #666;
-    }
-
-    65% {
-      background: #666;
-    }
-
-    85% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite7 {
-    0% {
-      background: #666;
-    }
-
-    75% {
-      background: #666;
-    }
-
-    95% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-}
-
-.msgRight_box {
-  justify-content: flex-end;
-}
-
-.videos_box {
-  position: relative;
-
-  .yysc {
-    position: absolute;
-    bottom: 1.5vw;
-    color: #fff;
-  }
-
-  .play_box {
-    position: absolute;
-    width: 10vw;
-    height: 10vw;
-    top: 50%;
-    margin-top: -5vw;
-  }
-
-  .right_video_time {
-    right: 1vw;
-  }
-
-  .left_video_time {
-    left: 1vw;
-  }
-
-  .right_video_play {
-    right: 11vw;
-    margin-right: -5vw;
-  }
-
-  .left_video_play {
-    left: 11vw;
-    margin-left: -5vw;
-  }
-}
-
-.video_image {
-  height: 40vw;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/zlzx/components/taskRank.vue b/src/pages/yyzx/zlzx/components/taskRank.vue
deleted file mode 100644
index 6dc2f44..0000000
--- a/src/pages/yyzx/zlzx/components/taskRank.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <div class="zl">
-    <div class="zl_title">
-      <span v-for="(item, index) in list" :key="index">{{ item.label }}</span>
-    </div>
-    <div class="zl_table">
-      <div
-        class="zl_table_item"
-        v-for="(item, index) in tableList"
-        :key="index"
-      >
-        <div class="tab_item">
-          <img
-            v-if="index === 0"
-            :src="require('../../../../assets/gxapp/j.png')"
-            alt=""
-            width="18"
-            height="22"
-          />
-          <img
-            v-else-if="index === 1"
-            :src="require('../../../../assets/gxapp/y.png')"
-            alt=""
-            width="18"
-            height="22"
-          />
-          <img
-            v-else-if="index === 2"
-            :src="require('../../../../assets/gxapp/t.png')"
-            alt=""
-            width="18"
-            height="22"
-          />
-          <span v-else>{{ index + 1 }}</span>
-        </div>
-        <div class="tab_item">{{ item.name }}</div>
-        <div class="tab_item">
-          {{ Number(item.ytotal) + Number(item.ntotal) }}
-        </div>
-        <div class="tab_item">{{ item.ytotal }}</div>
-        <div class="tab_item">{{ item.ntotal }}</div>
-        <div class="tab_item">
-          {{ item.wcl ? (item.wcl * 100).toFixed(2) + "%" : "--" }}
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, defineProps, watch } from "vue";
-import { zlPhTjxx } from "../../../..//api/zlzx.js";
-const props = defineProps({
-  timeType: {
-    type: String,
-    default: "1",
-  },
-});
-watch(
-  () => props.timeType,
-  () => {
-    getList();
-  },{deep:true}
-);
-const list = ref([
-  { label: "排名" },
-  { label: "部门名称" },
-  { label: "总数" },
-  { label: "已完成" },
-  { label: "未完成" },
-  { label: "完成率" },
-]);
-const tableList = ref([]);
-function getList() {
-  tableList.value = []
-  zlPhTjxx({ type: props.timeType }).then((res) => {
-    for (let i = 0; i < res.length; i++) {
-      if (res[i].name == "高新区分局") {
-        res[i].name = "高新分局";
-      } else {
-        res[i].name = res[i].name
-          .replace(/高新区分局/g, "")
-          .replace(/派出所/g, "");
-      }
-    }
-    tableList.value = res;
-    const total = res.length;
-  });
-}
-onMounted(() => {
-  getList();
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../../../../assets/styles/mixin.scss";
-.zl {
-  margin: 5px 0;
-  @include font_color($font-color-theme);
-  @include font_size($font_medium_s);
-  .zl_title {
-    margin: 0 5px;
-    padding: 0 7px;
-    height: 40px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  .zl_table {
-    margin-top: 5px;
-    .zl_table_item {
-      min-height: 26px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .tab_item {
-        flex: 1;
-        text-align: center;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/zlzx/components/voice.vue b/src/pages/yyzx/zlzx/components/voice.vue
deleted file mode 100644
index 1f0e017..0000000
--- a/src/pages/yyzx/zlzx/components/voice.vue
+++ /dev/null
@@ -1,558 +0,0 @@
-<template>
-  <div>
-    <!-- 音频录制 -->
-    <div class="audio-record">
-      <p class="duration-seconds-style">
-        <span v-show="countDownRecord"
-          >{{ countDownSecond }}″&nbsp;后停止录制</span
-        >
-      </p>
-      <div class="icon">
-        <img src="../../../../assets/images/audio.png" width="45" />
-        <div class="voice-animation" ref="voiceAnimation">
-          <p v-for="item in 7" :key="item"></p>
-        </div>
-      </div>
-    </div>
-    <div class="btn_crossAndbtn_succes">
-      <div class="cross_box" :class="{ voiceCanael: isCancel }">
-        <van-icon name="cross" />
-      </div>
-      <!-- <div><van-icon name="success" /></div> -->
-    </div>
-  </div>
-</template>
-<script setup>
-// import TitleTab from "../components/TitleTab.vue";
-import {
-  reactive,
-  onMounted,
-  ref,
-  watch,
-  defineExpose,
-  defineProps,
-} from "vue";
-import { uploadImg } from "../../../../api/yyzxApi.js";
-import emitter from "../../../../utils/eventBus.js";
-import { Toast } from "vant";
-const recordStatus = ref(false); //是否显示录音
-const showDurationSeconds = ref(0); // 语音时长
-const durationSeconds = ref(0); // 语音时长
-const isDurationSeconds = ref(false); // 开始录制时间状态
-const playAudioTimer = ref(null); // 语音播放定时器
-const confTime = ref(null); //录音动画 定时函数
-const startRecord = ref(false); // 开始录制按钮状态
-const isShowAudio = ref(true); //是否显示语音条
-const countDownRecord = ref(false); // 倒计时录制状态
-const countDownSecond = ref(60); // 倒计时录制时间
-const isPlay = ref(false); //是否可以播放
-const voiceAnimation = ref(); //录音动画demo
-//webkitURL is deprecated but nevertheless
-const URL = window.URL || window.webkitURL;
-const fileName = ref(""); //文件名
-var gumStream; //语音
-var rec; //Recorder.js 对象
-var input; //MediaStreamAudioSourceNode we'll be recording //文件
-
-// shim for AudioContext when it's not avb.
-var AudioContext = window.AudioContext || window.webkitAudioContext;
-var audioContext; //audio context to help us record
-const props = defineProps({
-  isCancel: Boolean, //是否取消
-});
-onMounted(() => {});
-// 完成录制并发送
-function sendRecord() {
-  stopRecording();
-  // isShowAudio.value = true;
-}
-
-// 取消语音录制
-function cancelRecord() {
-  showDurationSeconds.value = durationSeconds.value;
-  recordStatus.value = false;
-  startRecord.value = false;
-  isDurationSeconds.value = false;
-  countDownRecord.value = false;
-  voiceAnimation.value.classList.add("start");
-  clearInterval(confTime.value);
-  confTime.value = null;
-  durationSeconds.value = 0;
-  rec.stop();
-  countDownSecond.value = 60;
-}
-
-// 开始录制语音消息开始动画效果
-function startAudioRecord() {
-  startRecord.value = true;
-  isDurationSeconds.value = true;
-  voiceAnimation.value.classList.add("start");
-  confTime.value = setInterval(() => {
-    durationSeconds.value++;
-    countDownSecond.value--;
-    //开启录音倒计时
-    if (durationSeconds.value === 10) {
-      countDownRecord.value = true;
-    }
-    //自动结束录音并发送
-    if (countDownSecond.value === 0) {
-      clearInterval(confTime.value);
-      confTime.value = null;
-      stopRecording();
-      emitter.emit("hideAudio", {});
-    }
-  }, 1000);
-  startRecording();
-}
-//开始录音
-function startRecording() {
-  var constraints = {
-    audio: true,
-    video: false,
-  };
-  //调用录音
-  navigator.mediaDevices.getUserMedia(constraints).then(function (stream) {
-    audioContext = new AudioContext();
-    gumStream = stream;
-    /* use the stream */
-    input = audioContext.createMediaStreamSource(stream);
-    rec = new Recorder(input, {
-      numChannels: 1,
-    });
-    rec.record();
-  });
-}
-//点击暂停 | 恢复录音
-function pauseRecording() {
-  if (rec.recording) {
-    //pause
-    rec.stop();
-  } else {
-    //resume
-    rec.record();
-  }
-}
-//停止录音
-function stopRecording() {
-  //停止录音
-  rec.stop();
-  gumStream.getAudioTracks()[0].stop();
-  rec.exportWAV(createDownloadLink);
-  clearInterval(confTime.value);
-  confTime.value = null;
-}
-//添加语音内容
-function createDownloadLink(blob) {
-  uploadMav(blob);
-  // var url = URL.createObjectURL(blob);
-  // var au = document.getElementById("audio");
-  // //添加语音标签
-  // au.controls = true;
-  // au.src = url;
-  // //文件名称
-  // var filename = new Date().toISOString();
-  // fileName.value = filename + ".wav"
-}
-//上传语音文件
-function uploadMav(blob) {
-  Toast({
-    message: "图片发送中。。。",
-    forbidClick: true,
-    duration: 0,
-  });
-  const data = new FormData();
-  const filename = new Date().toISOString();
-  const files = new File([blob], filename + ".wav");
-  data.append("file", files);
-  uploadImg(data)
-    .then((res) => {
-      if (res) {
-        emitter.emit("getAudio", {
-          durationSeconds: durationSeconds.value,
-          fjid: res,
-        });
-        Toast.clear();
-      }
-    })
-    .catch((err) => {
-      Toast.clear();
-    });
-}
-
-defineExpose({
-  cancelRecord,
-  stopRecording,
-  startAudioRecord,
-});
-</script>
-<style lang="scss" scoped>
-p {
-  margin: 0;
-}
-
-// 音频录制
-.audio-record {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 150px;
-  // height: 160px;
-  background: rgba(0, 0, 0, 0.8);
-  padding: 15px;
-  border-radius: 15px;
-  color: #ccc;
-  font-size: 15px;
-  text-align: center;
-
-  .cancel-img {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    cursor: pointer;
-  }
-
-  .duration-seconds-style {
-    height: 20px;
-  }
-
-  .icon {
-    display: flex;
-    justify-content: center;
-    align-items: flex-end;
-    margin: 18px 0 30px;
-  }
-
-  .voice-animation {
-    margin-left: 15px;
-
-    p {
-      height: 3px;
-      margin-top: 4px;
-      background: #666;
-    }
-
-    p:nth-of-type(1) {
-      width: 28px;
-    }
-
-    p:nth-of-type(2) {
-      width: 24px;
-    }
-
-    p:nth-of-type(3) {
-      width: 20px;
-    }
-
-    p:nth-of-type(4) {
-      width: 16px;
-    }
-
-    p:nth-of-type(5) {
-      width: 12px;
-    }
-
-    p:nth-of-type(6) {
-      width: 8px;
-    }
-
-    p:nth-of-type(7) {
-      width: 5px;
-    }
-
-    &.start {
-      p:nth-of-type(1) {
-        animation: backgroundInfinite7 1.5s ease-in-out infinite;
-      }
-
-      p:nth-of-type(2) {
-        animation: backgroundInfinite6 1.5s ease-in-out infinite;
-      }
-
-      p:nth-of-type(3) {
-        animation: backgroundInfinite5 1.5s ease-in-out infinite;
-      }
-
-      p:nth-of-type(4) {
-        animation: backgroundInfinite4 1.5s ease-in-out infinite;
-      }
-
-      p:nth-of-type(5) {
-        animation: backgroundInfinite3 1.5s ease-in-out infinite;
-      }
-
-      p:nth-of-type(6) {
-        animation: backgroundInfinite2 1.5s ease-in-out infinite;
-      }
-
-      p:nth-of-type(7) {
-        background: #f5f5f5;
-      }
-    }
-  }
-
-  .record-status {
-    width: 100px;
-    height: 28px;
-    margin: 0 auto;
-    line-height: 28px;
-    color: #888;
-    border-radius: 2px;
-
-    &:hover {
-      color: #04113d;
-      background: #e1e1e1;
-    }
-
-    p {
-      cursor: pointer;
-    }
-  }
-
-  .ly_btn {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 4vw;
-
-    div {
-      width: 60px;
-      height: 30px;
-      color: #888;
-      cursor: pointer;
-      line-height: 30px;
-      border-radius: 4px;
-    }
-
-    .cancel {
-      color: #cbcbcb;
-      background: #830808;
-    }
-
-    .send {
-      color: #cbcbcb;
-      background: #4a8b2a;
-    }
-  }
-}
-// 语音条
-.audio-detail-msg {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  .audio-style {
-    display: flex;
-    align-items: center;
-    height: 32px;
-    margin-left: 8px;
-    padding: 0 10px;
-    border-radius: 4px;
-    background: #fff;
-    transform: rotate(180deg);
-    .small {
-      border: 4px solid #4c4c4c;
-      border-top-color: transparent;
-      border-left-color: transparent;
-      border-bottom-color: transparent;
-    }
-
-    .middle {
-      width: 16px;
-      height: 16px;
-      margin-left: -11px;
-      opacity: 1;
-    }
-
-    .large {
-      width: 24px;
-      height: 24px;
-      margin-left: -19px;
-      opacity: 1;
-    }
-
-    & > div {
-      border: 2px solid #4c4c4c;
-      border-top-color: transparent;
-      border-left-color: transparent;
-      border-bottom-color: transparent;
-      border-radius: 50%;
-      box-sizing: border-box;
-    }
-
-    &.add-animation {
-      .middle {
-        animation: show2 1.2s ease-in-out infinite;
-      }
-
-      .large {
-        animation: show3 1.2s ease-in-out infinite;
-      }
-    }
-  }
-
-  // 语音播放动画
-  @keyframes show2 {
-    0% {
-      opacity: 0;
-    }
-
-    10% {
-      opacity: 1;
-    }
-
-    100% {
-      opacity: 0;
-    }
-  }
-
-  @keyframes show3 {
-    0% {
-      opacity: 0;
-    }
-
-    50% {
-      opacity: 1;
-    }
-
-    60% {
-      opacity: 0;
-    }
-
-    100% {
-      opacity: 0;
-    }
-  }
-
-  // 语音录制动画
-  @keyframes backgroundInfinite2 {
-    0% {
-      background: #666;
-    }
-
-    20% {
-      background: #f5f5f5;
-    }
-
-    95% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite3 {
-    0% {
-      background: #666;
-    }
-
-    30% {
-      background: #f5f5f5;
-    }
-
-    85% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite4 {
-    0% {
-      background: #666;
-    }
-
-    55% {
-      background: #f5f5f5;
-    }
-
-    75% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite5 {
-    0% {
-      background: #666;
-    }
-
-    45% {
-      background: #666;
-    }
-
-    60% {
-      background: #f5f5f5;
-    }
-
-    75% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite6 {
-    0% {
-      background: #666;
-    }
-
-    65% {
-      background: #666;
-    }
-
-    85% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-
-  @keyframes backgroundInfinite7 {
-    0% {
-      background: #666;
-    }
-
-    75% {
-      background: #666;
-    }
-
-    95% {
-      background: #f5f5f5;
-    }
-
-    100% {
-      background: #666;
-    }
-  }
-}
-.btn_crossAndbtn_succes {
-  display: flex;
-  justify-content: space-between;
-  position: absolute;
-  bottom: 20vw;
-  width: 100%;
-  padding: 13vw;
-  .cross_box {
-    width: 15vw;
-    height: 15vw;
-    border-radius: 50%;
-    text-align: center;
-    line-height: 15vw;
-  }
-  .voiceCanael {
-    color: #fff;
-    background: rgba(230, 23, 24, 0.6);
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/zlzx/components/weekTrendBar.vue b/src/pages/yyzx/zlzx/components/weekTrendBar.vue
deleted file mode 100644
index 6100175..0000000
--- a/src/pages/yyzx/zlzx/components/weekTrendBar.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <div class="zl">
-    <div id="pie" style="width: 100%; height: 55vw"></div>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, watch,defineProps } from "vue";
-import * as echarts from "echarts";
-import { zlZqtjxx } from "../../../../api/zlzx.js";
-const props = defineProps({
-  timeType: {
-    type: String,
-    default: "1",
-  },
-})
-watch(
-  () => props.timeType,
-  () => {
-    getData();
-  },{deep:true}
-);
-const D_BZ_ZLLY = [
-  { label: "巡逻方案", value: "01" },
-  { label: "人员预警", value: "02" },
-  { label: "车辆预警", value: "03" },
-  { label: "事件预警", value: "04" },
-  { label: "警情", value: "05" },
-  { label: "人员", value: "06" },
-  { label: "事务", value: "08" },
-];
-const data = reactive({
-  data1: [0, 0, 0, 0, 0, 0, 0],
-  data2: [0, 0, 0, 0, 0, 0, 0],
-  data3: [0, 0, 0, 0, 0, 0, 0],
-  data4: [0, 0, 0, 0, 0, 0, 0],
-  data5: [0, 0, 0, 0, 0, 0, 0],
-  data6: [0, 0, 0, 0, 0, 0, 0],
-  data7: [0, 0, 0, 0, 0, 0, 0],
-  data8: [0, 0, 0, 0, 0, 0, 0],
-  time:[1,2,3,4,5,6,7]
-});
-function lineChartFn() {
-  var chartDom = document.getElementById("pie");
-  var myChart = echarts.init(chartDom);
-  var option;
-  option = {
-    grid: {
-      left: "3%",
-      right: "5%",
-      bottom: "3%",
-      top: "40%",
-      containLabel: true,
-    },
-    legend: {
-      show: true,
-      textStyle: {
-        color: "#333",
-      },
-    },
-    tooltip: {},
-    xAxis: {
-      type: "category",
-      data: data.time,
-      axisLine: {
-        show: true,
-        axisTick: {
-          show: false,
-        },
-      },
-      axisLabel: {
-        color: "#333",
-      },
-      axisLabel: {
-        interval: 0,
-        rotate: 30, // 主要是这个 设置角度即可 - 90 ~ 90 旋转方向也不同
-      },
-    },
-    yAxis: {
-      show: true,
-      minInterval: 1,
-      axisLine: {
-        show: true,
-      },
-      splitLine: {
-        show: false,
-      },
-      axisLabel: {
-        color: "#333",
-      },
-    },
-    series: [
-      {
-        name: "巡逻方案",
-        type: "bar",
-        barWidth: 4,
-        itemStyle: {
-          normal: {
-            color: "#ffcc40",
-            barBorderRadius: [15, 15, 15, 15],
-          },
-        },
-        data: data.data1,
-      },
-      {
-        name: "人员预警",
-        type: "bar",
-        barWidth: 4,
-        itemStyle: {
-          normal: {
-            color: "#F6426C",
-            barBorderRadius: [15, 15, 15, 15],
-          },
-        },
-        data: data.data2,
-      },
-      {
-        name: "车辆预警",
-        type: "bar",
-        barWidth: 4,
-        itemStyle: {
-          normal: {
-            color: "#177FFF",
-            barBorderRadius: [15, 15, 15, 15],
-          },
-        },
-        data: data.data3,
-      },
-      {
-        name: "事件预警",
-        type: "bar",
-        barWidth: 4,
-        itemStyle: {
-          normal: {
-            color: "#FF18F1",
-            barBorderRadius: [15, 15, 15, 15],
-          },
-        },
-        data: data.data4,
-      },
-      {
-        name: "警情",
-        type: "bar",
-        barWidth: 4,
-        itemStyle: {
-          normal: {
-            color: "#45E3FF",
-            barBorderRadius: [15, 15, 15, 15],
-          },
-        },
-        data: data.data5,
-      },
-      {
-        name: "人工",
-        type: "bar",
-        barWidth: 4,
-        itemStyle: {
-          normal: {
-            color: "#45E30F",
-            barBorderRadius: [15, 15, 15, 15],
-          },
-        },
-        data: data.data6,
-      },
-      {
-        name: "人员管控",
-        type: "bar",
-        barWidth: 4,
-        itemStyle: {
-          normal: {
-            color: "#fff981",
-            barBorderRadius: [15, 15, 15, 15],
-          },
-        },
-        data: data.data7,
-      },
-      {
-        name: "事务",
-        type: "bar",
-        barWidth: 4,
-        itemStyle: {
-          normal: {
-            color: "#f56925",
-            barBorderRadius: [15, 15, 15, 15],
-          },
-        },
-        data: data.data8,
-      },
-    ],
-  };
-  option && myChart.setOption(option);
-  document.getElementById("pie").setAttribute("_echarts_instance_", "");
-}
-//获取近一周日期集合
-function getWeek() {
-  const time = new Date().getTime();
-  var timeArr = [];
-  for (let i = 0; i < 7; i++) {
-    const timen = new Date(time - i * 60 * 60 * 24 * 1000);
-    var y = timen.getFullYear();
-    var m =
-      timen.getMonth() < 9 ? "0" + timen.getMonth() + 1 : timen.getMonth() + 1;
-    var d = timen.getDate() < 10 ? "0" + timen.getDate() : timen.getDate();
-    timeArr.unshift(y + "-" + m + "-" + d);
-  }
-  return timeArr;
-}
-function getData() {
-  zlZqtjxx({ type: props.timeType }).then((res) => {
-    ({
-      data1: data.data1,
-      data2: data.data2,
-      data3: data.data3,
-      data4: data.data4,
-      data5: data.data5,
-      data6: data.data6,
-      data7: data.data7,
-      data8: data.data8,
-    } = res);
-    data.time = res.time
-    lineChartFn();
-  });
-}
-onMounted(() => {
-  getData();
-});
-</script>
-
-<style lang="scss" scoped>
-.zl {
-  margin: 5px 0;
-  padding-top: 8px;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/zlzx/components/weekTrendPie.vue b/src/pages/yyzx/zlzx/components/weekTrendPie.vue
deleted file mode 100644
index 1ed8887..0000000
--- a/src/pages/yyzx/zlzx/components/weekTrendPie.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-  <div class="zl">
-    <div id="bar" style="width: 100%; height: 55vw"></div>
-  </div>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted,defineProps,watch } from "vue";
-import * as echarts from "echarts";
-import { zlDjtjxx } from "../../../../api/zlzx.js";
-const props = defineProps({
-  timeType: {
-    type: String,
-    default: "1",
-  },
-})
-watch(
-  () => props.timeType,
-  () => {
-    getData();
-  },{deep:true}
-);
-const data = ref([
-  {
-    name: "蓝色",
-    value: 0,
-    dict: "40",
-  },
-  {
-    name: "橙色",
-    value: 0,
-    dict: "20",
-  },
-  {
-    name: "黄色",
-    value: 0,
-    dict: "30",
-  },
-  {
-    name: "红色",
-    value: 0,
-    dict: "10",
-  },
-]);
-function lineChartFn() {
-  var chartDom = document.getElementById("bar");
-  var myChart = echarts.init(chartDom);
-  let bgColor = "#fff";
-  let title = "总量";
-
-  let formatNumber = function (num) {
-    let reg = /(?=(\B)(\d{3})+$)/g;
-    return num.toString().replace(reg, ",");
-  };
-  let total = data.value.reduce((a, b) => {
-    return a + b.value * 1;
-  }, 0);
-  var option;
-  const color = ["#177FFF", "orange", "#ffcc40", "#F6426C"];
-  option = {
-    color,
-    tooltip: {
-      trigger: "item",
-    },
-    legend: {
-      bottom: "0",
-      left: "center",
-      textStyle: {
-        color: "#333",
-      },
-    },
-    //   legend: {},
-    series: [
-      {
-        type: "pie",
-        radius: ["45%", "70%"],
-        center: ["50%", "50%"],
-        data: data.value,
-        hoverAnimation: false,
-        labelLine: {
-          normal: {
-            length: 20,
-            length2: 30,
-          },
-        },
-        label: {
-          normal: {
-            formatter: function(val){
-              if(val.percent === undefined){
-                return val.name +'('+ val.value +')'+ '\n' +  0 +'%'
-              }else{
-                return val.name +'('+ val.value +')'+'\n' +  val.percent +'%'
-              }
-              
-            }
-
-          },
-        },
-      },
-    ],
-  };
-  option && myChart.setOption(option);
-  document.getElementById("bar").setAttribute("_echarts_instance_", "");
-}
-function getData() {
-  zlDjtjxx({type:props.timeType}).then((res) => {
-    res.forEach((v) => {
-      data.value.filter((item) => item.dict === v.zldj).map((item) => {
-          item.value = v.total;
-        });
-    });
-    lineChartFn();
-  });
-}
-onMounted(() => {
-  getData();
-});
-</script>
-
-<style lang="scss" scoped>
-.zl {
-  margin: 5px 0;
-  padding-top: 8px;
-  background-size: 100% 100%;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/zlzx/zlDetail.vue b/src/pages/yyzx/zlzx/zlDetail.vue
deleted file mode 100644
index 4874717..0000000
--- a/src/pages/yyzx/zlzx/zlDetail.vue
+++ /dev/null
@@ -1,970 +0,0 @@
-<template>
-  <div style="padding-top: 13vw">
-    <TopNav navTitle="指令详情" :showRight="false" :showLeft="true" />
-    <div class="people_detail" ref="zlxq">
-      <div class="p_qb_info" v-if="zlDetail">
-        <div class="p_title">{{ zlDetail.zlbt }}</div>
-        <div class="p_info">
-          <div class="p_img_box" v-if="zlDetail.zltp">
-            <van-image width="75px" height="82px" fit="fill" :class="_getBase64(zlDetail)" :src="zlDetail.baseUrl"
-              @click="onClickImg(zlDetail.baseUrl)">
-              <template v-slot:loading>
-                <van-loading type="spinner" size="20" />
-              </template>
-            </van-image>
-          </div>
-          <div class="p_text_info">
-            <div class="first_line">
-              <div class="first_line_text">
-                <span>指令等级</span> &emsp;
-                <span :class="{
-                  text_red: zlDetail.zldj == '10',
-                  text_orange: zlDetail.zldj == '20',
-                  text_yellow: zlDetail.zldj == '30',
-                  text_bule: zlDetail.zldj == '40',
-                }">{{
-                  zlDetail.zldj == "10"
-                    ? "红"
-                    : zlDetail.zldj == "20"
-                      ? "橙"
-                      : zlDetail.zldj == "30"
-                        ? "黄"
-                        : "蓝"
-                }}</span>
-              </div>
-              <template style="display: flex" v-if="!['92', '93', '94'].includes(dqzt)">
-                <van-button round type="primary" style="padding: 0 5vw" size="mini" color="#009944" v-if="dqzt == '01'"
-                  @click="onClickQs('签收')">
-                  签收
-                </van-button>
-                <van-button round type="primary" style="padding: 0 5vw" size="mini" color="#009944"
-                  v-if="(dqzt == '02' || dqzt == '03') && zlDetail.zllx != '07'" @click="onClickQs('到达现场')">
-                  到达现场
-                </van-button>
-                <!-- trs研判 -->
-                <van-button round type="primary" color="#009944" style="padding: 0 5vw" size="mini" v-if="
-                  dqzt == '11' ||
-                  dqzt == '21' ||
-                  dqzt == '22' ||
-                  dqzt == '23' ||
-                  dqzt == '24' ||
-                  dqzt == '25' ||
-                  (dqzt == '31' && zlDetail.zllx != '07')
-                " @click="onClickQs('处置完成')">
-                  处置完成
-                </van-button>
-                <van-button round type="primary" color="#009944" style="padding: 0 5vw" size="mini" v-if="dqzt == '32'"
-                  @click="onClickQs('完结')">
-                  完结
-                </van-button>
-              </template>
-            </div>
-            <div class="other_line">
-              来源: {{ setDict(zlDetail.zlly, D_BZ_ZLLY) }} &emsp; &emsp; 类型:
-              {{ setDict(zlDetail.zllx, D_BZ_ZLLX) }}
-            </div>
-            <div class="other_line">时间: {{ zlDetail.zlfqsj }}</div>
-            <div class="other_line" v-if="fjList.length > 0">
-              附件:
-              <span style="color:blue;margin-right：2px;" v-for="(item, index) in fjList" :key="index + 'file'">
-                <a @click="getPreviewText(item)" style="text-decoration: underline;margin-right：2px;">附件{{ index +
-                  1}}</a>
-              </span>
-            </div>
-            <div class="video_line"></div>
-          </div>
-        </div>
-        <div class="nr_text">内容: {{ zlDetail.zlnr }}</div>
-        <div class="check_box">
-          <div class="check_btn" @click="onClickPr">盘查人员</div>
-          <div class="check_btn" @click="onClickPc">盘查车辆</div>
-        </div>
-      </div>
-      <div class="chat_box">
-        <MesssageList :list="zlMessage.messageList" :mesHeight="mesHeight" :audioSc="audioSc"
-          @click:video="onClickVideoUrl" />
-      </div>
-    </div>
-    <div class="bottom_box" :style="{ background: themeType == 'light' ? '' : '#092556' }"
-      v-if="dqzt != '92' && dqzt != '93' && dqzt != '94'">
-      &nbsp;<van-icon :name="require('../../../assets/images/audio_h.png')" size="35"
-        @click="(showAudio = !showAudio), (voiceCanael = false)"></van-icon>
-
-      <div class="message_box">
-        <van-config-provider :theme-vars="themeVars" v-if="!showAudio">
-          <van-field v-model="message" label-width="60px" placeholder="请输入你描述的内容..." type="textarea" autosize>
-            <template #button>
-              <van-button size="small" type="primary" @click="onClickSend">发送</van-button>
-            </template>
-          </van-field>
-        </van-config-provider>
-        <div class="azsh_btn" @touchstart="onTouchstart" @touchmove="onTouchmove" @touchend="onTouchchend" v-else>
-          <van-button type="default" block>按住说话</van-button>
-        </div>
-      </div>
-      &nbsp;<van-icon name="add-o" size="35" @click="showShare = true"></van-icon>
-      &nbsp;
-    </div>
-    <!-- 附件弹窗 -->
-    <van-popup v-model:show="showShare" position="bottom" round>
-      <div class="addfj_box">
-        <van-uploader :after-read="afterRead">
-          <div class="fj_item">
-            <img src="../../../assets/images/images.png" alt="" />
-            <div>图片</div>
-          </div>
-        </van-uploader>
-        <div class="fj_item" @click="onSelectShare">
-          <img src="../../../assets/images/videos.png" alt="" />
-          <div>视频</div>
-        </div>
-      </div>
-      <div class="fj_cancel" @click="(showShare = false), Toast.clear()">
-        取消
-      </div>
-    </van-popup>
-    <!-- 盘人 -->
-    <checkedPeople ref="peo" :zlId="zlDetail.id" />
-    <!-- 盘车 -->
-    <checkedCar ref="car" :zlId="zlDetail.id" />
-    <van-dialog v-model:show="isWjShow" title="完结说明" show-cancel-button confirm-button-color="#3e6ee8"
-      @cancel="isWjShow = false" @confirm="onConfirmWjsm">
-      <van-field v-model="wjsmVal" type="textarea" placeholder="请输入完结说明"></van-field>
-    </van-dialog>
-    <van-overlay :show="showAudio">
-      <Voice ref="voices" :key="voiceIndex" :isCancel="voiceCanael" />
-    </van-overlay>
-    <input type="file" accept="video/*" capture="camcorder" style="display: none" id="getVideo" @change="changeVideo" />
-    <div class="video_play_box" v-show="showLangVideoUrl">
-      <video style="width: 100%; height: 100vh" controls id="langVideo"></video>
-      <div class="cross_box" @click="onCloseVideo">
-        <van-icon name="cross" size="15" color="#fff"></van-icon>
-      </div>
-    </div>
-    <Iframe :url="fillFrams" :isPreviw="isPreviw" @closePre="isPreviw = false"></Iframe>
-  </div>
-</template>
-<script setup>
-import axios from "axios";
-import Base64 from "base-64";
-import { getMyTaskDetail, getFjInfo } from "../../../api/rwzx.js";
-import {
-  trsGetRequest,
-  trsPostRequest,
-  trs2PostRequest,
-  timeValidate,
-} from "../../../utils/tools";
-import Voice from "./components/voice.vue";
-import { ImagePreview } from "vant";
-import { baseUrl2 } from "../../../utils/request.js";
-import TopNav from "../../../components/topNav.vue";
-import checkedCar from "../../spsHome/components/checkCar.vue";
-import checkedPeople from "../../spsHome/components/checkPeople.vue";
-import { ref, reactive, onMounted, onUnmounted, onBeforeUnmount } from "vue";
-import MesssageList from "./components/messsageList.vue";
-import upVideo from "../../../utils/fpsc.js";
-import Iframe from "../../../assets/html/filePreview.vue";
-import {
-  dateFormat,
-  getDistance,
-  IS_PNG,
-  IS_MP3,
-  IS_MP4,
-  getBase64,
-  hintToast,
-  dataQc,
-} from "../../../utils/tools.js";
-import emitter from "../../../utils/eventBus.js";
-import { Dialog, Toast } from "vant";
-import { useRoute } from "vue-router";
-import {
-  getZlczData,
-  getZlDetail,
-  addZxjl,
-  updateZlStatus,
-  zlHandleRygk,
-  getToken,
-} from "../../../api/zlzx.js";
-import { endTaskStatus } from "../../../api/yyzxApi.js";
-import { upImage, bigDataUpload } from "../../../api/common.js";
-import { getDictList, setDict } from "../../../utils/dict";
-const { D_BZ_ZLLY, D_BZ_ZLLX, D_BZ_ZXZTAI } = getDictList(
-  "D_BZ_ZLLY",
-  "D_BZ_ZLLX",
-  "D_BZ_ZXZTAI"
-); //字典信息
-const baseUrl = `${baseUrl2}/mosty-api/mosty-base/minio/image/download/`;
-const themeType = ref(getStorage("themeSetting"));
-const themeVars = {
-  cellBackgroundColor: themeType.value == "light" ? "#ffffff" : "#092556",
-  cellHorizontalPadding: "8px",
-  cellVerticalPadding: "8px",
-  fieldRightIconColor: themeType.value == "light" ? "#333" : "#fff",
-  FieldIconSize: "28px",
-};
-const URL = window.URL || window.webkitURL;
-const audioSc = ref("");
-const voiceIndex = ref(1);
-const caEnevt = ref(null); //按住说话事件
-const showAudio = ref(false); //是否显示录音弹窗
-const peo = ref(); //盘查人员组件对象
-const car = ref(); //盘查车辆组件对象
-const zlxq = ref(""); //指令详情dom
-const message = ref(""); //消息类容
-const mesHeight = ref(47); //聊天盒子高度
-const mesIndex = ref(1); //消息盒子组件KEY
-const id = ref(""); //指令ID
-const lastTime = ref(""); //最后一条流程时间
-const zlDetail = ref({}); //指令详情
-const userInfo = JSON.parse(getStorage("userInfo"));
-// const token = getStorage("TRS") && JSON.parse(getStorage("TRS"));
-const mesTime = ref(null); // 消息记录轮询时间函数
-const isArriveTime = ref(null); //是否到达时间函数
-const isWjShow = ref(false); //是否显示完结说明弹窗
-const wjsmVal = ref(""); //完结说明内容
-const fjid = ref(""); //上传成功的附件ID
-const yp = ref(false); // 研判弹框
-const ypText = ref("");
-const voices = ref(); //语音组件
-const showShare = ref(false); //显示附件弹窗
-const showLangVideoUrl = ref(false); //是否显示大视频
-const isPreviw = ref(false);
-const fillFrams = ref(null);
-//手指触摸开始位置
-const startBtn = ref({
-  s_x: 0,
-  s_y: 0,
-});
-//手指触摸结束位置
-const endBtn = ref({
-  e_x: 0,
-  e_y: 0,
-});
-const voiceCanael = ref(false); //是否取消发送语音
-const zlMessage = reactive({
-  //消息数据
-  messageList: [], //消息记录
-});
-const sptpid = ref(""); //视频第一帧图片ID
-const toast3 = ref(""); //视频上传时间提示
-const toast4 = ref(""); //消息发送提示
-Toast.allowMultiple();
-onMounted(() => {
-  id.value = useRoute().query.id;
-  //点击盘查功能
-  emitter.on("onClickPc", (res) => {
-    if (res == "pr") {
-      checkPeople();
-    } else {
-      checkCar();
-    }
-  });
-  Promise.all([_getZlczData(true), _getZlDetail(id.value)]).then((res) => {
-    mesTime.value = setInterval(() => {
-      //获取做最后一条数据的时间
-      if (zlMessage.messageList.length > 0) {
-        lastTime.value =
-          zlMessage.messageList[zlMessage.messageList.length - 1].time;
-        _getZlczData();
-      }
-    }, 1500);
-    //获取语音时长
-    emitter.on("getAudio", (res) => {
-      audioSc.value = res.durationSeconds;
-      message.value = `${res.fjid}.wav`;
-      fjid.value = res.fjid;
-      submitMessage("audio");
-    });
-    //自动结束关闭语音窗口
-    emitter.on("hideAudio", (res) => {
-      showAudio.value = false;
-      voiceIndex.value++;
-      message.value = "";
-    });
-  });
-  scrollToBottom();
-});
-onBeforeUnmount(() => {
-  clearInterval(mesTime.value);
-  mesTime.value = null;
-  clearInterval(isArriveTime.value);
-  isArriveTime.value = null;
-});
-onUnmounted(() => {
-  emitter.off("onClickPc");
-  emitter.off("getAudio");
-});
-//  获取预览文件
-function getPreviewText(item) {
-  let url = item.url; //要预览文件的访问地址
-  let Base64Url = Base64.encode(url);
-  fillFrams.value =
-    "http://10.64.201.126:8012/onlinePreview?url=" +
-    encodeURIComponent(Base64Url);
-  isPreviw.value = true;
-}
-//关闭大视频
-function onCloseVideo() {
-  let videos = document.getElementById("langVideo");
-  videos.pause();
-  showLangVideoUrl.value = false;
-}
-//获取放大视频地址
-function onClickVideoUrl(url) {
-  if (url) {
-    let videos = document.getElementById("langVideo");
-    videos.src = url;
-    videos.play();
-    showLangVideoUrl.value = true;
-  }
-}
-//调用
-function onSelectShare() {
-  window.addEventListener("message", receivePost);
-  // let videos = document.getElementById("getVideo");
-  // videos.click();
-  // toast3.value = Toast({
-  //   message: "拍摄视频请不要超过20s",
-  //   position: "bottom",
-  //   duration: 6000,
-  // });
-  try {
-    bridge.recordVideo(
-      `${baseUrl2}/mosty-api/mosty-base/minio/image/upload/id`,
-      30
-    );
-  } catch (error) { }
-}
-//接收postMessage消息（由安卓上传的视频 返回ID）
-function receivePost(mes) {
-  try {
-    let str = mes.data.type;
-    switch (str) {
-      case "videoId":
-        fjid.value = mes.data.data;
-        message.value = `${new Date().getTime()}_video.mp4`;
-        showShare.value = false;
-        submitMessage("video");
-        window.removeEventListener("message", receivePost);
-        break;
-    }
-  } catch (error) { }
-}
-
-//长按事件
-function onTouchstart(item) {
-  //获取起点位置
-  startBtn.value.s_x = item.touches[0].pageX;
-  startBtn.value.s_y = item.touches[0].pageY;
-  item.stopPropagation();
-  //长按事件后执行录音
-  caEnevt.value = setTimeout(() => {
-    caEnevt.value = 0;
-    voices.value.startAudioRecord();
-  }, 800);
-  return false;
-}
-//手指移动
-function onTouchmove(item) {
-  //手指离开的位置
-  let e_x = item.changedTouches[0].pageX;
-  let e_y = item.changedTouches[0].pageY;
-  //计算出偏移度
-  let direction = getDirection(
-    startBtn.value.s_x,
-    startBtn.value.s_y,
-    e_x,
-    e_y
-  ).toFixed(0);
-  //手指滑动到取消范围内 取消高亮
-  if (direction < -110 && direction > -150) {
-    voiceCanael.value = true;
-  }
-}
-//释放事件
-function onTouchchend(item) {
-  //手指离开的位置
-  endBtn.value.e_x = item.changedTouches[0].pageX;
-  endBtn.value.e_y = item.changedTouches[0].pageY;
-  //计算出偏移度
-  let direction = getDirection(
-    startBtn.value.s_x,
-    startBtn.value.s_y,
-    endBtn.value.e_x,
-    endBtn.value.e_y
-  ).toFixed(0);
-  item.stopPropagation();
-  showAudio.value = false;
-  voiceIndex.value++;
-  //在取消范围取消语音发送
-  if (direction < -110 && direction > -150) {
-    clearTimeout(caEnevt.value);
-    voices.value.cancelRecord();
-  } else {
-    //松开手指或者不在取消范围 就发送语音
-    if (caEnevt.value != 0) {
-      hintToast("说话时间太短！！");
-      clearTimeout(caEnevt.value);
-    } else {
-      voices.value.stopRecording();
-    }
-  }
-
-  clearTimeout(caEnevt.value);
-  return false;
-}
-//获得角度
-function getAngle(angx, angy) {
-  return (Math.atan2(angx, angy) * 180) / Math.PI;
-}
-//计算偏移量
-function getDirection(startX, startY, endX, endY) {
-  let angx = endX - startX;
-  let angy = endY - startY;
-  let result = 0;
-  if (Math.abs(angx) < 2 && Math.abs(angy) < 2) {
-    return result;
-  }
-  let angle = getAngle(angx, angy);
-  result = angle;
-  return result;
-}
-
-//预览图片
-function onClickImg(fjid) {
-  ImagePreview([fjid]);
-}
-//结束任务
-function _endTaskStatus(rwxl, ywid, rwzt, rwxxlx) {
-  let data = { rwxl, ywid, rwzt, rwxxlx };
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    data.jd = location.app_x;
-    data.wd = location.app_y;
-  } catch (error) { }
-  endTaskStatus(data).then((res) => { });
-}
-//获取base64地址
-function _getBase64(item) {
-  getBase64((res) => {
-    item.baseUrl = res;
-  }, item.zltp);
-}
-// 滚动条始终在最底部
-function scrollToBottom() {
-  var container = document.getElementsByClassName("check_box")[0];
-  container.scrollTop = container.scrollHeight;
-}
-//获取指令详情
-const dqzt = ref();
-function _getZlDetail(id) {
-  getZlDetail(id).then((res) => {
-    zlDetail.value = res;
-    dqzt.value = res.zxrVo.dqzt;
-    _getFile(res.fjId);
-    if (res.zlzxzt == "02" || res.zlzxzt == "03") {
-      countJl();
-      isArriveTime.value = setInterval(() => {
-        countJl();
-      }, 30e3);
-    } else {
-      clearInterval(isArriveTime.value);
-      isArriveTime.value = null;
-    }
-  });
-}
-
-const fjList = ref([]);
-function _getFile(fjid) {
-  try {
-    const requestArr = fjid.split(",").map((item) => {
-      return getFjInfo(item);
-    });
-    Promise.all(requestArr).then((resArr) => {
-      resArr.forEach((res) => {
-        if (IS_PNG(res.suffix.substring(1, res.suffix.length))) {
-          res.fileFormat = "png";
-        } else {
-          res.fileFormat = "file";
-        }
-        fjList.value.push(res);
-      });
-    });
-  } catch (error) { }
-}
-
-//获取指令处置流程
-function _getZlczData(flag) {
-  let data = {
-    zlid: id.value,
-    time: lastTime.value,
-  };
-  getZlczData(data).then((res) => {
-    if (res && res.length > 0) {
-      res.forEach((item) => {
-        let fileFormat = "";
-        if (item.zxnr && item.fjid) {
-          //判断是那种文件类型.
-          let fjIndex = item.zxnr.lastIndexOf(".");
-          if (fjIndex != -1) {
-            let file_Format = item.zxnr.substring(
-              fjIndex + 1,
-              item.zxnr.length
-            );
-            if (IS_PNG(file_Format)) {
-              fileFormat = "png";
-            } else if (IS_MP3(file_Format)) {
-              fileFormat = "mp3";
-            } else if (IS_MP4(file_Format)) {
-              fileFormat = "mp4";
-            } else {
-              fileFormat = "file";
-            }
-          }
-        }
-        zlMessage.messageList.push({
-          time: item.zxsj,
-          type: userInfo.id == item.xtCjrId ? 2 : 1, //1为 对方的数据 2为自己的数据
-          text: item.zxnr,
-          yysc: item.yysc,
-          name: item.xtCjr || "系统",
-          fjid: item.fjid,
-          sptpid: item.sptpid,
-          fileFormat,
-        });
-        dataQc(zlMessage.messageList, "id");
-      });
-    }
-  });
-}
-//点击盘人
-function onClickPr() {
-  peo.value.handleOpen();
-}
-//点击盘车
-function onClickPc() {
-  car.value.handleOpen();
-}
-//确认完结说明
-function onConfirmWjsm() {
-  isWjShow.value = false;
-  _updateZlStatus("04");
-}
-//签收
-const ypflag = ref(true);
-const fkFlag = ref(true);
-
-// 处理状态
-function onClickQs(text) {
-  if (text == "完结") return isWjShow.value = true;
-  Dialog.confirm({ title: "提示", message: `是否${text}!`, }).then((res) => {
-    switch (text) {
-      case "签收":
-        _updateZlStatus("01");
-        break;
-      case "到达现场":
-        _updateZlStatus("02", 1);
-        break;
-      case "处置完成":
-        _updateZlStatus("03");
-        break;
-    }
-  }).catch((err) => { });
-}
-//计算用户与指令地址距离
-function countJl() {
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    let jl = getDistance(
-      zlDetail.value.jd,
-      zlDetail.value.wd,
-      location.app_x,
-      location.app_y
-    );
-    //小于100米 自动到达现场
-    if (jl < 100) {
-      _updateZlStatus("02", 0);
-    }
-  } catch (error) { }
-}
-//修改指令状态
-function _updateZlStatus(type, sfsddd) {
-  let { zxrVo, ssbmid, zlfsdd, zljsdx } = zlDetail.value;
-  let data = {
-    ssbmid: ssbmid,
-    zlzxdd: zlfsdd,
-    zljsdx: zljsdx,
-    zlzxrDh: zxrVo.zxrDh,
-    zlzxrId: zxrVo.zxrId,
-    zlzxrSfz: zxrVo.zxrSfz,
-    zlzxrXm: zxrVo.zxrXm,
-    zlzxrXzid: zxrVo.zxrXzid,
-    zlzxzt: type,
-    zlId: zxrVo.zlId,
-    zlwjsm: wjsmVal.value,
-    sfsddd,
-  };
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    data.jd = location.app_x;
-    data.wd = location.app_y;
-  } catch (error) {
-    data.jd = 104.065637;
-    data.wd = 30.592008;
-  }
-  updateZlStatus(data).then((res) => {
-    hintToast("成功");
-    _getZlDetail(id.value);
-    _getZlczData();
-    _endTaskStatus("05", zlDetail.value.id, "2", type);
-  });
-
-}
-//获取文件
-function afterRead(file) {
-  toast4.value = Toast({
-    message: "图片发送中。。。",
-    forbidClick: true,
-  });
-  showShare.value = false;
-  const data = new FormData();
-  data.append("file", file.file);
-  upImage(data).then((res) => {
-    if (res) {
-      fjid.value = res;
-      message.value = file.file.name;
-      submitMessage("img");
-    }
-  });
-}
-//发送消息
-function onClickSend() {
-  if (!message.value) return;
-  lastTime.value = zlMessage.messageList[zlMessage.messageList.length - 1].time;
-  submitMessage();
-}
-//提交聊天数据到后台
-function submitMessage(type) {
-  if (type == "audio") {
-    toast4.value = Toast({
-      message: "语音发送中。。。",
-      forbidClick: true,
-    });
-  }
-  let data = {
-    zlId: id.value,
-    zlzxdd: zlDetail.value.zlfsdd,
-    zxnr: message.value,
-    fjid: fjid.value,
-    yysc: audioSc.value,
-    sptpid: sptpid.value,
-  };
-  message.value = "";
-  try {
-    let location = JSON.parse(bridge.getLocation());
-    data.jd = location.app_x;
-    data.wd = location.app_y;
-  } catch (error) { }
-  addZxjl(data).then((res) => {
-    fjid.value = "";
-    message.value = "";
-    _getZlczData();
-  })
-}
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-::v-deep .van-field__control {
-  @include border_color($border-color-theme);
-  @include user_function_item_color($user-function-item-theme);
-  @include font_size($font_medium_s);
-  padding: 1vw;
-  height: 35px !important;
-  border-radius: 5px;
-}
-
-.top {
-  padding: 3vw;
-  margin: 2vw;
-}
-
-.basic-info {
-  color: #4d4d4d;
-  display: flex;
-  flex-direction: row;
-
-  .img-box {
-    flex: 1;
-  }
-
-  .IDcard-info {
-    flex: 3;
-    @include font_size($font_medium_s);
-
-    .text {
-      @include font_size($font_medium);
-      font-weight: bold;
-      color: #1f6cec;
-    }
-  }
-}
-
-.but_box {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 1vw;
-}
-
-.bottom_box {
-  position: fixed;
-  width: 100vw;
-  bottom: 0;
-  max-height: 21vw;
-  background-color: #eff0f2;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-top: 1px solid #cac9c9;
-  z-index: 1001;
-
-  .message_box {
-    flex: 1;
-  }
-}
-
-.zldj_item {
-  display: inline-block;
-  width: 3.5vw;
-  height: 3.5vw;
-  border-radius: 50%;
-}
-
-.contact-way {
-  margin-top: 3.5vw;
-  @include font_size($font_medium_s);
-
-  .zl_detail {
-    height: 14vw;
-    overflow: auto;
-    margin-bottom: 1vw;
-  }
-
-  .fjsp {
-    display: flex;
-    justify-content: space-between;
-
-    .fjsp_item {
-      display: flex;
-      align-items: center;
-    }
-  }
-}
-
-.preview-cover {
-  position: absolute;
-  bottom: 0;
-  box-sizing: border-box;
-  width: 100%;
-  padding: 4px;
-  color: #fff;
-  font-size: 12px;
-  text-align: center;
-  background: rgba(0, 0, 0, 0.3);
-}
-
-.fj_box {
-  padding: 20px;
-  font-size: 12px;
-}
-
-.yp_btn {
-  margin: 40px 10px 10px 10px;
-  display: flex;
-  justify-content: center;
-}
-
-.people_detail {
-  @include font_size($font_medium_s);
-  display: flex;
-  flex-direction: column;
-
-  .p_qb_info {
-    background-image: linear-gradient(to bottom,
-        #b7dafc 0%,
-        #ffffff 35%,
-        #ffffff 100%);
-    padding: 12px 17px 17px 17px;
-  }
-
-  .p_title {
-    @include font_size($font_medium);
-    font-weight: bold;
-    color: #004cab;
-    word-wrap: break-all;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    overflow: hidden;
-  }
-
-  .p_info {
-    display: flex;
-    margin-top: 1vh;
-
-    .p_text_info {
-      position: relative;
-      flex: 1;
-
-      .first_line {
-        display: flex;
-        justify-content: space-between;
-
-        .first_line_text {
-          @include font_size($font_medium);
-          font-weight: bold;
-
-          .text_red {
-            color: #e20000;
-          }
-
-          .text_orange {
-            color: #fa5200;
-          }
-
-          .text_yellow {
-            color: #f18608;
-          }
-
-          .text_bule {
-            color: #013791;
-          }
-        }
-      }
-
-      .other_line {
-        line-height: 3vh;
-      }
-
-      .video_line {
-        position: absolute;
-        right: 0;
-        bottom: 0.5vh;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-
-        .video_text {
-          color: #0289fe;
-          @include font_size($font_medium_s);
-        }
-      }
-    }
-  }
-
-  .nr_text {
-    color: #555;
-  }
-
-  .check_box {
-    display: flex;
-    justify-content: space-between;
-    overflow-anchor: none;
-
-    .check_btn {
-      width: 44vw;
-      height: 6vh;
-      text-align: center;
-      line-height: 6vh;
-      background-color: #f7e4e0;
-      @include font_size($font_medium);
-      font-weight: bold;
-      border-radius: 3px;
-      margin-top: 2vh;
-    }
-  }
-
-  .chat_box {
-    padding: 17px;
-    box-sizing: border-box;
-    height: 61vh;
-    overflow: hidden;
-    overflow-y: auto;
-    background-color: #eff0f2;
-  }
-}
-
-::v-deep .van-divider {
-  border-color: #cac9c9;
-}
-
-::v-deep .van-cell {
-  background-color: #eff0f2;
-}
-
-::v-deep .trs.van-button--block {
-  width: unset;
-}
-
-::v-deep .van-field__right-icon {
-  padding-top: 2vw;
-}
-
-::v-deep .van-overlay {
-  z-index: 1000;
-}
-
-.azsh_btn {
-  background: #e1e1e1;
-  text-align: center;
-  -webkit-touch-callout: none !important;
-  -webkit-user-select: none;
-}
-
-.addfj_box {
-  display: flex;
-  @include font_size($font_medium);
-
-  .fj_item {
-    text-align: center;
-    padding: 7vw;
-
-    &>img {
-      width: 12vw;
-      height: 11.8vw;
-    }
-  }
-}
-
-.fj_cancel {
-  border-top: 3vw solid #eff0f2;
-  text-align: center;
-  padding: 4vw;
-}
-
-.video_play_box {
-  position: fixed;
-  z-index: 9999999999;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 1);
-
-  .cross_box {
-    position: fixed;
-    z-index: 999999999912;
-    top: 5vw;
-    right: 5vw;
-    width: 7vw;
-    height: 7vw;
-    background: gray;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 50%;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/yyzx/zlzx/zlTotal.vue b/src/pages/yyzx/zlzx/zlTotal.vue
deleted file mode 100644
index d0281c9..0000000
--- a/src/pages/yyzx/zlzx/zlTotal.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <div style="padding-top: 15vw">
-    <TopNav navTitle="指令统计" :showRight="false" :showLeft="true" />
-    <TopSelectTime @chenge:time="onSelectTime" />
-    <TopTotal :list="zlTotal.list" />
-    <!-- 任务完成情况 -->
-    <div class="item_box gsdyj_box">
-      <div class="other_type_title">完成率排名</div>
-      <TaskRank :timeType="timeType" />
-    </div>
-    <div class="item_box gsdyj_box">
-      <div class="other_type_title">指令趋势</div>
-      <WeekTrendBar :timeType="timeType" />
-    </div>
-    <div class="item_box gsdyj_box">
-      <div class="other_type_title">指令等级统计</div>
-      <WeekTrendPie :timeType="timeType" />
-    </div>
-  </div>
-</template>
-<script setup>
-import { ref, onMounted, reactive } from "vue";
-import TopSelectTime from "../../../components/topSelectTime.vue";
-import TopNav from "../../../components/topNav.vue";
-import TopTotal from "../../../components/topTotal";
-import TaskRank from "./components/taskRank";
-import WeekTrendBar from "./components/weekTrendBar";
-import WeekTrendPie from "./components/weekTrendPie";
-import { getTjOfZllx } from "../../../api/zlzx.js";
-import { Toast } from "vant";
-const timeType = ref("1"); // 统计条件
-const zlTotal = reactive({
-  list: [
-    {
-      title: "全部",
-      count: 0,
-      zllx: "",
-    },
-    {
-      title: "巡逻指令",
-      count: 0,
-      zllx: "01",
-    },
-    {
-      title: "感知预警指令",
-      count: 0,
-      zllx: "02",
-    },
-    {
-      title: "警情处置指令",
-      count: 0,
-      zllx: "05",
-    },
-    {
-      title: "人工指令",
-      count: 0,
-      zllx: "06",
-    },
-    {
-      title: "人员管控指令",
-      count: 0,
-      zllx: "07",
-    },
-  ],
-});
-function onSelectTime(val) {
-  const copyTime = timeType.value;
-  timeType.value = val + 1 + "";
-  if (timeType.value !== copyTime) {
-    _getZlTotal();
-  }
-}
-onMounted(() => {
-  _getZlTotal();
-});
-//获取指令统计
-function _getZlTotal() {
-  Toast.loading({
-    message: "加载中",
-    forbidClick: true,
-    loadingType: "spinner",
-    duration: 0,
-  });
-  zlTotal.list = [
-    {
-      title: "全部",
-      count: 0,
-      zllx: "",
-    },
-    {
-      title: "巡逻指令",
-      count: 0,
-      zllx: "01",
-    },
-    {
-      title: "感知预警指令",
-      count: 0,
-      zllx: "02",
-    },
-    {
-      title: "警情处置指令",
-      count: 0,
-      zllx: "05",
-    },
-    {
-      title: "人工指令",
-      count: 0,
-      zllx: "06",
-    },
-    {
-      title: "人员管控指令",
-      count: 0,
-      zllx: "07",
-    },
-  ];
-  getTjOfZllx({ type: timeType.value }).then((res) => {
-    res.forEach((item) => {
-      zlTotal.list[0].count += item.count;
-      if (["02", "03", "04"].includes(item.zllx)) {
-        zlTotal.list[2].count += item.count;
-      } else {
-        zlTotal.list.forEach((el) => {
-          if (item.zllx == el.zllx) {
-            el.count = item.count;
-          }
-        });
-      }
-    });
-    Toast.clear();
-  });
-}
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.gsdyj_box {
-  margin: 2vw 3vw 5vw 3vw;
-  padding: 2vw;
-}
-
-.other_type_title {
-  margin-left: 2vw;
-}
-
-::v-deep .van-tabs__nav--card {
-  margin: 0 3vw;
-}
-</style>
diff --git a/src/pages/yyzx/zlzx/zlzxIndex.vue b/src/pages/yyzx/zlzx/zlzxIndex.vue
deleted file mode 100644
index 5a7b09d..0000000
--- a/src/pages/yyzx/zlzx/zlzxIndex.vue
+++ /dev/null
@@ -1,417 +0,0 @@
-<template>
-  <div>
-    <TopNav navTitle="信息交互" :showRight="true" :showLeft="true" rightIcon="add-o" @clickRight="onClickRight" />
-    <van-sticky>
-      <div class="sticky_box">
-        <van-tabs v-model:active="activeTabName" class="top_tabs" :class="activeTabName == '01' ? 'left_top_tabs' : ''"
-          @change="changeTab">
-          <van-tab :title="item.name" :name="item.type" v-for="item in toptabs" :key="item"></van-tab>
-        </van-tabs>
-        <Tabs v-if="activeTabName == '01'" :list="tabs" @onYjjb="onSelect" :key="tabsIndex"></Tabs>
-        <Search placeholder="请输入关键字" v-model="kwd" :isSx="true" @update:sx="showPopup = !showPopup"
-          @update:modelValue="onSearch"></Search>
-      </div>
-    </van-sticky>
-    <van-pull-refresh v-model="loadingPull" @refresh="onRefresh">
-      <van-list v-model:loading="loading" :finished="finished" finished-text=" " @load="onLoad" offset="1"
-        :immediate-check="false">
-        <ZlList v-for="(item, index) in zlList.list" :key="index" :item="item" :dict="{ D_BZ_ZXZTAI }"
-          :path="`/yyzx/zlzx/zlDetail?id=${item.zlId}`"></ZlList>
-        <van-empty description="暂无指令信息" image="default" v-if="zlList.list.length <= 0 && loadingPull == false" />
-      </van-list>
-    </van-pull-refresh>
-    <SxPopup :showPopup="showPopup" :list="zlList.sxTypeList" :p_top="145" @update:close="showPopup = false"
-      @update:onConfirm="onConfirm" />
-  </div>
-</template>
-<script setup>
-import { getTrsToken } from "@/api/common";
-import Tabs from "../../../components/tabs.vue";
-import TopNav from "../../../components/topNav.vue";
-import Search from "../../../components/search.vue";
-import ZlList from "../../../components/zlList.vue";
-import SxPopup from "../../../components/SxPopup.vue";
-import { dateFormat, setTimeQuantum } from "../../../utils/tools.js";
-import { getDictList, setDict } from "../../../utils/dict";
-import { ref, onMounted, reactive, watch } from "vue";
-import router from "@/router";
-import { Toast } from "vant";
-import { getZlList, getZlTotal } from "../../../api/zlzx.js";
-import store from "../../../store";
-const { D_BZ_ZXZTAI } = getDictList("D_BZ_ZXZTAI"); //字典信息
-const userInfo = JSON.parse(window.localStorage.getItem("userInfo"));
-const kwd = ref(""); //搜索关键字
-const showPopup = ref(false); //赛选条件窗口
-const zlztIndex = ref(-1); //选中的指令状态下标
-const timeShow = ref(false); //时间选择器
-const presentTime = ref(new Date()); //当前时间
-const timeType = ref(""); //选择的时间类型
-const startTime = ref(""); //开始时间
-const endTime = ref(""); //结束时间
-const loading = ref(false);
-const loadingPull = ref(false);
-const finished = ref(false);
-const pageSize = ref(10);
-const pageCurrent = ref(1);
-const zllx = ref(""); // 指令类型
-const zlTypeIndex = ref(""); //选中的查询类型下标
-const total = ref(0); //
-const tabsIndex = ref(1);
-const activeTabName = ref('01');
-const listQuery = ref({
-  zlly: '01,02,03,04,05,06,07,08,09'
-})
-const zlList = reactive({
-  list: [], //指令列表数据
-  sxTypeList: [], //筛选项数据
-});
-const toptabs = ref([
-  {
-    name: "任务下达",
-    type: "01",
-  },
-  {
-    name: "任务需求",
-    type: "02",
-  },
-])
-const tabs = ref([
-  {
-    name: "全部",
-    count: 0,
-    zllx: "",
-  },
-  {
-    name: "巡逻",
-    count: 0,
-    zllx: "01",
-  },
-  {
-    name: "人员",
-    count: 0,
-    zllx: "02",
-  },
-  {
-    name: "车辆",
-    count: 0,
-    zllx: "03",
-  },
-  {
-    name: "事件",
-    count: 0,
-    zllx: "04",
-  },
-  {
-    name: "警情",
-    count: 0,
-    zllx: "05",
-  },
-  {
-    name: "人工指令",
-    count: 0,
-    zllx: "06",
-  },
-  {
-    name: "人员管控",
-    count: 0,
-    zllx: "07",
-  },
-  {
-    name: "事务",
-    count: 0,
-    zllx: "08",
-  },
-]);
-watch(D_BZ_ZXZTAI, (newValue) => {
-  //设置筛选值
-  let array = [];
-  for (let i = 0; i < newValue.length; i++) {
-    array.push({
-      name: newValue[i].text,
-      key: newValue[i].dm,
-      isCheck: false,
-    });
-  }
-  zlList.sxTypeList = [
-    {
-      title: "指令进行状态",
-      isCheckBox: false,
-      array: array,
-    },
-  ];
-  zlList.sxTypeList[1] = setTimeQuantum();
-});
-onMounted(() => {
-  _getZlTotal();
-  _getZlList();
-});
-//下拉刷新
-function onRefresh() {
-  reset()
-  _getZlTotal();
-  _getZlList();
-}
-const reset = () => {
-  zlList.list = [];
-  pageCurrent.value = 1;
-  zlTypeIndex.value = "";
-  kwd.value = "";
-  startTime.value = "";
-  endTime.value = "";
-  loading.value = false;
-  loadingPull.value = false;
-  finished.value = false;
-  tabsIndex.value++;
-}
-// 切换tab
-const changeTab = (val) => {
-  console.log(val, 'val');
-  reset()
-  if (val == '01') {
-    listQuery.value.zlly = '01,02,03,04,05,06,07,08,09';
-  } else if (val == '02') {
-    listQuery.value.zlly = '10';
-  }
-  _getZlList();
-}
-//关键字查询
-function onSearch(e) {
-  kwd.value = e;
-  zlList.list = [];
-  pageCurrent.value = 1;
-  _getZlTotal();
-  _getZlList();
-}
-// //类型查询
-function onSelect(val) {
-  zlList.list = [];
-  pageCurrent.value = 1;
-  zllx.value = tabs.value[val].zllx;
-  loading.value = false;
-  loadingPull.value = false;
-  finished.value = false;
-  _getZlList();
-}
-//获取指令数据列表
-function _getZlList() {
-  loading.value = true;
-  let data = {
-    pageSize: pageSize.value,
-    pageCurrent: pageCurrent.value,
-    zlzxzt: zlTypeIndex.value,
-    zlnr: kwd.value,
-    kssj: startTime.value,
-    jssj: endTime.value,
-    zllx: zllx.value,
-    zlly: listQuery.value.zlly
-  };
-  getZlList(data)
-    .then((res) => {
-      loading.value = false;
-      loadingPull.value = false;
-      total.value = res.pages;
-      let arr = res.records ? res.records : [];
-      arr.forEach((item) => {
-        zlList.list.push(item);
-      });
-    })
-    .catch((err) => {
-      loading.value = false;
-    });
-}
-//获取指令统计数据
-function _getZlTotal() {
-  getZlTotal()
-    .then((res) => {
-      tabs.value[0].count = 0;
-      if (res.length > 0) {
-        res.forEach((item) => {
-          tabs.value[0].count += item.count;
-          switch (item.zllx) {
-            case "01":
-              tabs.value[1].count = item.count;
-              break;
-            case "02":
-              tabs.value[2].count = item.count;
-              break;
-            case "03":
-              tabs.value[3].count = item.count;
-              break;
-            case "04":
-              tabs.value[4].count = item.count;
-              break;
-            case "05":
-              tabs.value[5].count = item.count;
-              break;
-            case "06":
-              tabs.value[6].count = item.count;
-              break;
-            case "07":
-              tabs.value[7].count = item.count;
-              break;
-            case "08":
-              tabs.value[8].count = item.count;
-              break;
-          }
-        });
-      }
-    })
-    .catch((err) => { });
-}
-
-const onClickRight = () => {
-  router.push('/addZlInfo')
-}
-//选中时间
-function onTimeConfirm(val) {
-  if (timeType.value == "start") {
-    startTime.value = dateFormat("", val);
-  } else {
-    endTime.value = dateFormat("", val);
-  }
-  timeShow.value = false;
-}
-
-//选中指令状态
-function onClickZlzt(index, dm) {
-  zlTypeIndex.value = dm;
-  zlztIndex.value = index;
-}
-//确认筛选条件
-function onConfirm(val) {
-  zlList.list = [];
-  pageCurrent.value = 1;
-  startTime.value = val.startTime;
-  endTime.value = val.endTime;
-  zlTypeIndex.value = "";
-  for (let i = 0; i < val.list.length; i++) {
-    for (let j = 0; j < val.list[i].array.length; j++) {
-      if (val.list[i].array[j].isCheck) {
-        zlTypeIndex.value = val.list[i].array[j].key;
-        break;
-      }
-    }
-  }
-  _getZlList();
-  showPopup.value = false;
-}
-//重置筛选条件
-function onReset() {
-  startTime.value = "";
-  endTime.value = "";
-  zlztIndex.value = -1;
-}
-//触底加载
-function onLoad() {
-  if (pageCurrent.value >= total.value) {
-    finished.value = true;
-    return;
-  }
-  pageCurrent.value += 1;
-  _getZlList();
-}
-</script>
-<style lang="scss" scoped>
-@import "../../../assets/styles/mixin.scss";
-
-.sticky_box {
-  @include bg_color($background-color-theme);
-
-  .tabs_box {
-    @include font_size($font_medium_s);
-    @include font_color($font-color-theme);
-    display: flex;
-
-    .tabs_item {
-      width: 25%;
-      text-align: center;
-
-      .tabs_count {
-        margin-top: 2vw;
-      }
-    }
-  }
-}
-
-.zl_sx_box {
-  @include font_size($font_medium_s);
-  padding: 4vw 0;
-
-  .item_title {
-    padding: 0 3.5vw;
-    font-weight: 600;
-  }
-
-  .zlzt_box {
-    padding: 4vw;
-
-    .tag_item {
-      margin: 0 3vw 3vw 0;
-      padding: 1vw 3vw;
-    }
-  }
-}
-
-.but_box {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 5vw;
-}
-
-.item_box {
-  @include font_size($font_medium_s);
-  @include font_color($font-color-theme);
-  margin: 0 3.5vw 4vw 3.5vw;
-  padding: 2vw;
-
-  .time_box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .ststus {
-      font-size: 10px;
-      padding: 0 10px;
-      color: #fff;
-      border-radius: 10px;
-    }
-
-    .dfk {
-      background-color: rgb(242, 199, 6);
-    }
-
-    .yfk {
-      background-color: #3e6ee8;
-    }
-
-    .ywj {
-      background-color: #4fbe0d;
-    }
-
-    .ddc {
-      background-color: orangered;
-    }
-
-    .djc {
-      background-color: orange;
-    }
-  }
-
-  >div {
-    line-height: 20px;
-  }
-
-  .title {
-    @include font_size($font_medium);
-    font-weight: bold;
-  }
-}
-
-.top_tabs {
-  margin-top: 13vw;
-}
-
-.left_top_tabs {
-  margin-bottom: -10.5vw;
-}
-</style>
diff --git a/src/router/index.js b/src/router/index.js
index 9e92724..1588e99 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,504 +13,6 @@ const routes = [
     name: "Home",
     component: () => import("../pages/newHome/index"),
   },
-  {
-    path: "/xlmjHome",
-    name: "xlmjHome",
-    component: () => import("../pages/xlmjHome/index"),
-  },
-  {
-    path: "/checkPointList",
-    name: "checkPointList",
-    component: () => import("../pages/checkpointList/index"),
-  },
-  {
-    path: "/error",
-    name: "error",
-    component: () => import("../pages/error/index"),
-  },
-  {
-    path: "/rw",
-    name: "rw",
-    component: () => import("../pages/rw/index"),
-  },
-  {
-    path: "/rwlist",
-    name: "rwlist",
-    component: () => import("../pages/rw/rwlist"),
-  },
-  {
-    path: "/yyzx",
-    name: "yyzx",
-    component: () => import("../pages/yyzx/index"),
-  },
-  {
-    path: "/lmjHome/zlJcz",
-    name: "mjHome/zlJcz",
-    component: () => import("../pages/checkpointList/components/zlJczList"),
-  },
-  {
-    path: "/lmjHome/zlJczDetail",
-    name: "mjHome/zlJczDetail",
-    component: () => import("../pages/checkpointList/components/jczDetail"),
-  },
-  {
-    path: "/my",
-    name: "my",
-    component: () => import("../pages/my/index"),
-  },
-  {
-    path: "/collectPage",
-    name: "collectPage",
-    component: () => import("../pages/collectPage/index"),
-  },
-  {
-    path: "/collectAndAdd",
-    name: "collectAndAdd",
-    component: () => import("../pages/collectPage/collectAndAdd"),
-  },
-  {
-    path: "/clockInPage",
-    name: "clockInPage",
-    component: () => import("../pages/clockInPage/index"),
-  },
-  {
-    path: "/patrolList",
-    name: "patrolList",
-    component: () => import("../pages/patrolList/index"),
-  },
-	{
-    path: "/taskList",
-    name: "taskList",
-    component: () => import("../pages/taskList/index"),
-  },
-  {
-    path: "/taskHistoryDetail",
-    name: "taskHistoryDetail",
-    component: () => import("../pages/taskList/historyDetail.vue"),
-  },
-  {
-    path: "/dqLocation",
-    name: "dqLocation",
-    component: () => import("../pages/dqLocation/index"),
-  },
-  {
-    path: "/jqfx",
-    name: "jqfx",
-    component: () => import("../pages/views/jqfx/jqAnsisy"),
-  },
-  {
-    path: "/userInfo",
-    name: "userInfo",
-    component: () => import("../pages/my/views/userInfo"),
-  },
-  {
-    path: "/gzrz",
-    name: "gzrz",
-    component: () => import("../pages/my/views/gzrz"),
-  },
-  {
-    path: "/wdgj",
-    name: "wdgj",
-    component: () => import("../pages/my/views/wdgj"),
-  },
-  {
-    path: "/scyy",
-    name: "scyy",
-    component: () => import("../pages/my/views/scyy"),
-  },
-  {
-    path: "/txl",
-    name: "txl",
-    component: () => import("../pages/my/views/txl"),
-  },
-  {
-    path: "/yjsj",
-    name: "yjsj",
-    component: () => import("../pages/yyzx/views/yjsj"),
-  },
-  {
-    path: "/clock",
-    name: "clock",
-    component: () => import("../pages/yyzx/clock/index"),
-  },
-  {
-    path: "/clockList",
-    name: "clockList",
-    component: () => import("../pages/yyzx/clock/clockList.vue"),
-  },
-  {
-    path: "/cjbsPage",
-    name: "cjbsPage",
-    component: () => import("../pages/yyzx/cjbsPage/index"),
-  },
-  {
-    path: "/cjbsList",
-    name: "cjbsList",
-    component: () => import("../pages/yyzx/cjbsPage/cjbsList.vue"),
-  },
-  {
-    path: "/yyzx/views/clpc",
-    name: "clpc",
-    component: () => import("../pages/yyzx/views/clpc"),
-  },
-  {
-    path: "/xttj",
-    name: "xttj",
-    component: () => import("../pages/yyzx/views/xttj"),
-  },
-  {
-    path: "/tjyj",
-    name: "tjyj",
-    component: () => import("../pages/yyzx/views/tjyj"),
-  },
-  {
-    path: "/report",
-    name: "report",
-    component: () => import("../pages/views/report"),
-  },
-  {
-    path: "/TrackInventory",
-    name: "TrackInventory",
-    component: () => import("../pages/views/TrackInventory"),
-  },
-  {
-    path: "/canVehicle",
-    name: "canVehicle",
-    component: () => import("../pages/views/CanVehicle/index"),
-  },
-  {
-    path: "/quarantinePersonnel",
-    name: "quarantinePersonnel",
-    component: () => import("../pages/views/QuarantinePersonnel/index"),
-  },
-  {
-    path: "/drivinglicence",
-    name: "drivinglicence",
-    component: () =>
-      import("../pages/views/QuarantinePersonnel/drivinglicence"),
-  },
-  {
-    path: "/motorVehicle",
-    name: "motorVehicle",
-    component: () => import("../pages/views/QuarantinePersonnel/motorVehicle"),
-  },
-  {
-    path: "/featureInfo",
-    name: "featureInfo",
-    component: () => import("../pages/views/QuarantinePersonnel/featureInfo"),
-  },
-  {
-    path: "/pestilenceRelated",
-    name: "pestilenceRelated",
-    component: () =>
-      import("../pages/views/QuarantinePersonnel/pestilenceRelated"),
-  },
-  {
-    path: "/feedBack",
-    name: "feedBack",
-    component: () => import("../pages/yyzx/views/feedBack"),
-  },
-  {
-    path: "/qwCenter",
-    name: "qwCenter",
-    component: () => import("../pages/yyzx/views/qwCenter.vue"),
-  },
-
-  {
-    path: "/calendar",
-    name: "calendar",
-    component: () => import("../pages/yyzx/views/calendar"),
-  },
-  {
-    path: "/zbbbCalendar",
-    name: "zbbbCalendar",
-    component: () => import("../pages/yyzx/zbbb/zbbbCalendar"),
-  },
-  {
-    path: "/deptzbbbCalendar",
-    name: "deptzbbbCalendar",
-    component: () => import("../pages/yyzx/deptzbbbCalendar/index"),
-  },
-  {
-    path: "/deptxfbbCalendar",
-    name: "deptxfbbCalendar",
-    component: () => import("../pages/yyzx/deptxfbbCalendar/index"),
-  },
-  {
-    path: "/deptryxjCalendar",
-    name: "deptryxjCalendar",
-    component: () => import("../pages/yyzx/ryxj/index"),
-  },
-  {
-    path: "/deptryxjCalendar/addEdit",
-    name: "addEdit",
-    component: () => import("../pages/yyzx/ryxj/components/addEidt"),
-  },
-  {
-    path: "/xfbbInfo",
-    name: "xfbbInfo",
-    component: () => import("../pages/yyzx/views/xfbbInfo"),
-  },
-  {
-    path: "/hisQwCenter",
-    name: "hisQwCenter",
-    component: () => import("../pages/yyzx/views/hisQwCenter.vue"),
-  },
-  {
-    path: "/yyzx/rwzx",
-    name: "yyzx/rwzx",
-    component: () => import("../pages/yyzx/rwzx/index"),
-  },
-
-  {
-    path: "/yyzx/views/addZbbb",
-    name: "addZbbb",
-    component: () => import("../pages/yyzx/zbbb/addZbbb"),
-  },
-  {
-    path: "/yyzx/views/addZbbbInfo",
-    name: "addZbbbInfo",
-    component: () => import("../pages/yyzx/views/zbbbInfo"),
-  },
-  {
-    path: "/rw/views/rwDetail",
-    name: "rwDetail",
-    component: () => import("../pages/rw/views/rwDetail"),
-  },
-  {
-    path: "/yyzx/xfbb/addXfbb",
-    name: "addXfbb",
-    component: () => import("../pages/yyzx/xfbb/addXfbb"),
-  },
-  {
-    path: "/yyzx/xfbb/addtsXfbb",
-    name: "addtsXfbb",
-    component: () => import("../pages/yyzx/xfbb/addtsXfbb"),
-  },
-  {
-    path: "/yyzx/xfbb/tsXfbbList",
-    name: "tsXfbbList",
-    component: () => import("../pages/yyzx/xfbb/tsXfbbList"),
-  },
-  {
-    path: "/yyzx/zlzx/zlzxIndex",
-    name: "yyzx/zlzx/zlzxIndex",
-    component: () => import("../pages/yyzx/zlzx/zlzxIndex"),
-  },
-  {
-    path: "/addZlInfo",
-    name: "addZlInfo",
-    component: () => import("../pages/yyzx/zlzx/addzl"),
-  },
-  {
-    path: "/yyzx/zlzx/zlDetail",
-    name: "yyzx/zlzx/zlDetail",
-    component: () => import("../pages/yyzx/zlzx/zlDetail"),
-  },
-  {
-    path: "/yyzx/yjxx/index",
-    name: "yyzx/yjxx/index",
-    component: () => import("../pages/yyzx/yjxx/index"),
-  },
-  {
-    path: "/yyzx/yjxx/yjMapPoint",
-    name: "yyzx/yjxx/yjMapPoint",
-    component: () => import("../pages/yyzx/yjxx/yjMapPoint"),
-  },
-
-  {
-    path: "/yyzx/yjxx/yjDetail",
-    name: "yyzx/yjxx/yjDetail",
-    component: () => import("../pages/yyzx/yjxx/yjDetail"),
-  },
-  {
-    path: "/yyzx/jqxx/index",
-    name: "yyzx/jqxx/index",
-    component: () => import("../pages/yyzx/jqxx/index"),
-  },
-  {
-    path: "/yyzx/jqxx/gljqList",
-    name: "gljqList",
-    component: () => import("../pages/yyzx/jqxx/gljqList"),
-  },
-  {
-    path: "/yyzx/jqxx/jqDetail",
-    name: "yyzx/jqxx/jqDetail",
-    component: () => import("../pages/yyzx/jqxx/jqDetail"),
-  },
-
-  {
-    path: "/yyzx/yjxx/yjTotal",
-    name: "yyzx/yjxx/yjTotal",
-    component: () => import("../pages/yyzx/yjxx/yjTotal"),
-  },
-  {
-    path: "/yyzx/yjtjInfo/gzyInfo",
-    name: "/yyzx/yjtjInfo/gzyInfo",
-    component: () => import("../pages/yyzx/yjtjInfo/gzyInfo"),
-  },
-  {
-    path: "/yyzx/yjtjInfo/ryyjinfo",
-    name: "/yyzx/yjtjInfo/ryyjinfo",
-    component: () => import("../pages/yyzx/yjtjInfo/ryyjinfo"),
-  },
-  {
-    path: "/yyzx/yjtjInfo/pcsyjinfo",
-    name: "/yyzx/yjtjInfo/pcsyjinfo",
-    component: () => import("../pages/yyzx/yjtjInfo/pcsyjinfo"),
-  },
-  {
-    path: "/yyzx/zlzx/zlTotal",
-    name: "yyzx/zlzx/zlTotal",
-    component: () => import("../pages/yyzx/zlzx/zlTotal"),
-  },
-  {
-    path: "/yyzx/views/pcry",
-    name: "yyzx/views/pcry",
-    component: () => import("../pages/yyzx/views/pcry"),
-  },
-
-  {
-    path: "/scyy/xfq",
-    name: "scyy/xfq",
-    component: () => import("../pages/scyy/xfq"),
-  },
-  {
-    path: "/scyy/jwz",
-    name: "scyy/jwz",
-    component: () => import("../pages/scyy/jwz"),
-  },
-  {
-    path: "/scyy/kfd",
-    name: "scyy/kfd",
-    component: () => import("../pages/scyy/kfd"),
-  },
-  {
-    path: "/scyy/xfll",
-    name: "scyy/xfll",
-    component: () => import("../pages/scyy/xfll"),
-  },
-  {
-    path: "/scyy/cl",
-    name: "scyy/cl",
-    component: () => import("../pages/scyy/cl"),
-  },
-  {
-    path: "/scyy/zb",
-    name: "scyy/zb",
-    component: () => import("../pages/scyy/zb"),
-  },
-  {
-    path: "/rw/views/syrkRwDetail",
-    name: "rw/views/syrkRwDetail",
-    component: () => import("../pages/rw/views/syrkRwDetail"),
-  },
-  {
-    path: "/rw/views/txgj",
-    name: "rw/views/txgj",
-    component: () => import("../pages/rw/views/txgjList"),
-  },
-
-  {
-    path: "/filing",
-    name: "filing",
-    component: () => import("../pages/xlmjHome/components/filing"),
-  },
-  {
-    path: "/yyzx/jqxx/mryq",
-    name: "yyzx/jqxx/mryq",
-    component: () => import("../pages/yyzx/jqxx/mryq"),
-  },
-  // {
-  //   path: "/newTwoHome",
-  //   name: "newTwoHome",
-  //   component: () => import("../pages/newTwoHome/index"),
-  // },
-  // {
-  //   path: "/newTwoHome/ldjsc",
-  //   name: "newTwoHome/ldjsc",
-  //   component: () => import("../pages/newTwoHome/ldjsc"),
-  // },
-  // {
-  //   path: "/newTwoHome/xd",
-  //   name: "newTwoHome/xd",
-  //   component: () => import("../pages/newTwoHome/xd"),
-  // },
-  // {
-  //   path: "/newTwoHome/zjq",
-  //   name: "newTwoHome/zjq",
-  //   component: () => import("../pages/newTwoHome/zjq"),
-  // },
-  // {
-  //   path: "/newTwoHome/zbbbList",
-  //   name: "newTwoHome/zbbbList",
-  //   component: () => import("../pages/newTwoHome/zbbbList"),
-  // },
-  // {
-  //   path: "/newTwoHome/yclList",
-  //   name: "newTwoHome/yclList",
-  //   component: () => import("../pages/newTwoHome/yclList"),
-  // },
-  // {
-  //   path: "/newTwoHome/addZl",
-  //   name: "newTwoHome/addZl",
-  //   component: () => import("../pages/newTwoHome/addZl"),
-  // },
-  // {
-  //   path: "/newTwoHome/myZl",
-  //   name: "newTwoHome/myZl",
-  //   component: () => import("../pages/newTwoHome/myZl"),
-  // },
-  {
-    path: "/my/views/wdgjMapPoint",
-    name: "my/views/wdgjMapPoint",
-    component: () => import("../pages/my/views/wdgjMapPoint"),
-  },
-  {
-    path: "/newTwoHome/jq/xzjqlist",
-    name: "newTwoHome/jq/xzjqlist",
-    component: () => import("../pages/newTwoHome/jq/xzjqlist.vue"),
-  },
-  {
-    path: "/newTwoHome/jq/xzjqDetail",
-    name: "newTwoHome/jq/xzjqDetail",
-    component: () => import("../pages/newTwoHome/jq/xzjqDetail.vue"),
-  },
-  {
-    path: "/peopleList",
-    name: "peopleList",
-    component: () => import("../pages/spsHome/components/peopleList.vue"),
-  },
-  {
-    path: "/yyzx/dhcr",
-    name: "yyzx/dhcr",
-    component: () => import("../pages/yyzx/dhcr/index"),
-  },
-  {
-    path: "/Declaration",
-    name: "Declaration",
-    component: () => import("../pages/views/Declaration/index"),
-  },
-  {
-    path: "/Declaration/addEdit",
-    name: "Declaration/addEdit",
-    component: () => import("../pages/views/Declaration/addEdit.vue"),
-  },
-  {
-    path: "/Declaration/addEditRw",
-    name: "Declaration/addEditRw",
-    component: () => import("../pages/views/Declaration/addEditRw.vue"),
-  },
-  {
-    path: "/Declaration/addEditCyry",
-    name: "Declaration/addEditCyry",
-    component: () => import("../pages/views/Declaration/addEditCyry.vue"),
-  },
-  {
-    path: "/Declaration/addEditDw",
-    name: "Declaration/addEditDw",
-    component: () => import("../pages/views/Declaration/addEditDw.vue"),
-  },
   // 新增：Greeting message 转换页面
   {
     path: "/checkInPage",
@@ -594,6 +96,22 @@ const routes = [
     name: "ssp-report",
     component: () => import("../pages/sspReport/index.vue"),
   },
+  {
+    path: "/error",
+    name: "error",
+    component: () => import("../pages/error/index"),
+  },
+
+  {
+    path: "/my",
+    name: "my",
+    component: () => import("../pages/my/index"),
+  },
+  {
+    path: "/clockInPage",
+    name: "clockInPage",
+    component: () => import("../pages/clockInPage/index"),
+  },
 ];
 const router = createRouter({
   history: createWebHashHistory(),