From 87c47b72463669512c1d2e1c2b668856d0687104 Mon Sep 17 00:00:00 2001
From: lijianzhong <m18328725261@163.com>
Date: Tue, 30 Jan 2024 17:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=AD=9B=E9=80=89=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                      |  23 ++++-----
 images/icon-checked.png                       | Bin 0 -> 819 bytes
 pages/{y-j => emergency}/s-b/index/index.js   |   0
 .../{g-z-t => emergency}/s-b/index/index.json |   0
 pages/{y-j => emergency}/s-b/index/index.wxml |   0
 .../{g-z-t => emergency}/s-b/index/index.wxss |   0
 pages/{y-j => emergency}/t-x/index/index.js   |   0
 .../detail => emergency/t-x/index}/index.json |   0
 pages/{y-j => emergency}/t-x/index/index.wxml |   0
 pages/{y-j => emergency}/t-x/index/index.wxss |   0
 pages/{y-j => emergency}/y-a/index/index.js   |   0
 .../y-a}/index/index.json                     |   0
 pages/{y-j => emergency}/y-a/index/index.wxml |   0
 pages/{y-j => emergency}/y-a/index/index.wxss |   0
 pages/index/index.js                          |  20 ++++----
 pages/index/index.wxml                        |  47 +-----------------
 .../g-z-r-z/detail/index.js                   |   0
 .../g-z-r-z/detail/index.json                 |   0
 .../g-z-r-z/detail/index.wxml                 |   0
 .../g-z-r-z/detail/index.wxss                 |   0
 .../{t-j => statistic}/g-z-r-z/index/index.js |   2 +-
 .../g-z-r-z/index/index.json                  |   0
 .../g-z-r-z/index/index.wxml                  |   0
 .../g-z-r-z/index/index.wxss                  |   0
 .../{t-j => statistic}/g-z-t-j/index/index.js |   0
 .../g-z-t-j/index/index.json                  |   0
 .../g-z-t-j/index/index.wxml                  |  15 +++---
 .../g-z-t-j/index/index.wxss                  |   3 +-
 .../{t-j => statistic}/j-b-x-x/index/index.js |   0
 .../j-b-x-x/index/index.json                  |   0
 .../j-b-x-x/index/index.wxml                  |   3 +-
 .../j-b-x-x/index/index.wxss                  |   3 +-
 pages/{t-j => statistic}/y-j/index/index.js   |   9 ++++
 pages/{t-j => statistic}/y-j/index/index.json |   0
 pages/{t-j => statistic}/y-j/index/index.wxml |   3 +-
 pages/{t-j => statistic}/y-j/index/index.wxss |   3 +-
 pages/{g-z-t => work}/d-b-s-x/detail/index.js |   0
 .../index => work/d-b-s-x/detail}/index.json  |   0
 .../{g-z-t => work}/d-b-s-x/detail/index.wxml |   0
 .../{g-z-t => work}/d-b-s-x/detail/index.wxss |   0
 pages/{g-z-t => work}/d-b-s-x/index/index.js  |   0
 .../y-a => work/d-b-s-x}/index/index.json     |   0
 .../{g-z-t => work}/d-b-s-x/index/index.wxml  |   0
 .../{g-z-t => work}/d-b-s-x/index/index.wxss  |   0
 pages/{g-z-t => work}/s-b/index/index.js      |   0
 pages/{y-j => work}/s-b/index/index.json      |   0
 pages/{g-z-t => work}/s-b/index/index.wxml    |   0
 pages/{y-j => work}/s-b/index/index.wxss      |   0
 48 files changed, 47 insertions(+), 84 deletions(-)
 create mode 100644 images/icon-checked.png
 rename pages/{y-j => emergency}/s-b/index/index.js (100%)
 rename pages/{g-z-t => emergency}/s-b/index/index.json (100%)
 rename pages/{y-j => emergency}/s-b/index/index.wxml (100%)
 rename pages/{g-z-t => emergency}/s-b/index/index.wxss (100%)
 rename pages/{y-j => emergency}/t-x/index/index.js (100%)
 rename pages/{g-z-t/d-b-s-x/detail => emergency/t-x/index}/index.json (100%)
 rename pages/{y-j => emergency}/t-x/index/index.wxml (100%)
 rename pages/{y-j => emergency}/t-x/index/index.wxss (100%)
 rename pages/{y-j => emergency}/y-a/index/index.js (100%)
 rename pages/{g-z-t/d-b-s-x => emergency/y-a}/index/index.json (100%)
 rename pages/{y-j => emergency}/y-a/index/index.wxml (100%)
 rename pages/{y-j => emergency}/y-a/index/index.wxss (100%)
 rename pages/{t-j => statistic}/g-z-r-z/detail/index.js (100%)
 rename pages/{t-j => statistic}/g-z-r-z/detail/index.json (100%)
 rename pages/{t-j => statistic}/g-z-r-z/detail/index.wxml (100%)
 rename pages/{t-j => statistic}/g-z-r-z/detail/index.wxss (100%)
 rename pages/{t-j => statistic}/g-z-r-z/index/index.js (97%)
 rename pages/{t-j => statistic}/g-z-r-z/index/index.json (100%)
 rename pages/{t-j => statistic}/g-z-r-z/index/index.wxml (100%)
 rename pages/{t-j => statistic}/g-z-r-z/index/index.wxss (100%)
 rename pages/{t-j => statistic}/g-z-t-j/index/index.js (100%)
 rename pages/{t-j => statistic}/g-z-t-j/index/index.json (100%)
 rename pages/{t-j => statistic}/g-z-t-j/index/index.wxml (75%)
 rename pages/{t-j => statistic}/g-z-t-j/index/index.wxss (98%)
 rename pages/{t-j => statistic}/j-b-x-x/index/index.js (100%)
 rename pages/{t-j => statistic}/j-b-x-x/index/index.json (100%)
 rename pages/{t-j => statistic}/j-b-x-x/index/index.wxml (93%)
 rename pages/{t-j => statistic}/j-b-x-x/index/index.wxss (97%)
 rename pages/{t-j => statistic}/y-j/index/index.js (94%)
 rename pages/{t-j => statistic}/y-j/index/index.json (100%)
 rename pages/{t-j => statistic}/y-j/index/index.wxml (88%)
 rename pages/{t-j => statistic}/y-j/index/index.wxss (95%)
 rename pages/{g-z-t => work}/d-b-s-x/detail/index.js (100%)
 rename pages/{y-j/t-x/index => work/d-b-s-x/detail}/index.json (100%)
 rename pages/{g-z-t => work}/d-b-s-x/detail/index.wxml (100%)
 rename pages/{g-z-t => work}/d-b-s-x/detail/index.wxss (100%)
 rename pages/{g-z-t => work}/d-b-s-x/index/index.js (100%)
 rename pages/{y-j/y-a => work/d-b-s-x}/index/index.json (100%)
 rename pages/{g-z-t => work}/d-b-s-x/index/index.wxml (100%)
 rename pages/{g-z-t => work}/d-b-s-x/index/index.wxss (100%)
 rename pages/{g-z-t => work}/s-b/index/index.js (100%)
 rename pages/{y-j => work}/s-b/index/index.json (100%)
 rename pages/{g-z-t => work}/s-b/index/index.wxml (100%)
 rename pages/{y-j => work}/s-b/index/index.wxss (100%)

diff --git a/app.json b/app.json
index dfc8123..507a949 100644
--- a/app.json
+++ b/app.json
@@ -9,22 +9,21 @@
     "pages/msg/index/index",
     "pages/msg/push-index/index",
     "pages/msg/push/index",
-    
     "pages/web/index",
 
-    "pages/t-j/y-j/index/index",
-    "pages/t-j/j-b-x-x/index/index",
-    "pages/t-j/g-z-t-j/index/index",
-    "pages/t-j/g-z-r-z/index/index",
-    "pages/t-j/g-z-r-z/detail/index",
+    "pages/statistic/y-j/index/index",
+    "pages/statistic/j-b-x-x/index/index",
+    "pages/statistic/g-z-t-j/index/index",
+    "pages/statistic/g-z-r-z/index/index",
+    "pages/statistic/g-z-r-z/detail/index",
 
-    "pages/g-z-t/s-b/index/index",
-    "pages/g-z-t/d-b-s-x/index/index",
-    "pages/g-z-t/d-b-s-x/detail/index",
+    "pages/work/s-b/index/index",
+    "pages/work/d-b-s-x/index/index",
+    "pages/work/d-b-s-x/detail/index",
 
-    "pages/y-j/y-a/index/index",
-    "pages/y-j/s-b/index/index",
-    "pages/y-j/t-x/index/index"
+    "pages/emergency/y-a/index/index",
+    "pages/emergency/s-b/index/index",
+    "pages/emergency/t-x/index/index"
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/images/icon-checked.png b/images/icon-checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..e03b89ec49718d665c2196c379c27c2003ef1573
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%?MXyIRCr$PSy58LFc96K2T;6#&WJPKLT)0T;32?62%q3d;1<q^GjajZf1#@>
z7CN;_HZiG58-8iG``*5NyJ;CT{Kp!OA0h!!0S#v$wm`!L5KS<)Kx~1AGZ0&#&H^}l
zc)sQM-tMkuBAm5U00)i?h5+oG15eoI;-i1PDkGs*1nhvbX%T3`p!?D9ENV+YvEoIb
z>p@3Y=%5vFGFjd*gdqdC5qcS8vvvQnS1S)VnLM2{Jf2E{1FjOrdLrp(gaoI6_GCE(
zgpqW5DXN~oHy8p)a!(y!Y<R(%V0-d11;liwi+%{OK(^_L#$Avez^mRuoM!V}Y;-VM
z_dE9{OP#kZK<ae^$rnlTjsR+}1JUJGs_=>cYSnqazYjWH6*$WOUJyW=>pM6$!Si_k
zPQcFSU{0ylceci6_opeqlLXkTbVrN|6jkzRr4W0vW3B30Mg(waw($6Me=}pV1U~O=
z5OF$Q&gHA@A!Xg=Mu!Y(3y2mFUX5*QyD%YwJllUzxCF2CfcAKaHa9P=ez!2=DM}D3
z;FtVMqtQ-W{8pWQ=hwTgd<I8CfIWBC>GvwZOIu*4fTOu`4?j>jN?`Mt_XVB#o`tEZ
z@=66{7qrLEuXGX)Q$m}-3T2<~X3`?0LjvE_T8NKjFDGTD<Z8~VjF3b?YGOJ{P(8Ky
zzk>~rngW>sXC!F6zM_KCxlW4!lfITEWBXvE1DtGv#h~^`z}0$ibzzdU&3m*IkUiK2
z3003f5otyQ@L;+-eLewSz)Ke)ip+G^+cf4sI(``@V+HINCCZ12pNoAkz26g<QfkFD
zG$rtZ)3$4Jgtm~PFvOn~uvda&QSzzp^K4inKsFhCl)mvEAd_SHcX~hOz4b9D3Rv_5
zU#0Iv0YyLXS^7>1$X<ll`g#+@6ev40_%`yKEJ7};Q$=iRW3Y;3T|6Ta;DXhVVnzjo
xR4o^|Mg_QFHKdqP0U=e(MXpf+E?5mI<`)AvTTo&}M<f6M002ovPDHLkV1hKQYd8P^

literal 0
HcmV?d00001

diff --git a/pages/y-j/s-b/index/index.js b/pages/emergency/s-b/index/index.js
similarity index 100%
rename from pages/y-j/s-b/index/index.js
rename to pages/emergency/s-b/index/index.js
diff --git a/pages/g-z-t/s-b/index/index.json b/pages/emergency/s-b/index/index.json
similarity index 100%
rename from pages/g-z-t/s-b/index/index.json
rename to pages/emergency/s-b/index/index.json
diff --git a/pages/y-j/s-b/index/index.wxml b/pages/emergency/s-b/index/index.wxml
similarity index 100%
rename from pages/y-j/s-b/index/index.wxml
rename to pages/emergency/s-b/index/index.wxml
diff --git a/pages/g-z-t/s-b/index/index.wxss b/pages/emergency/s-b/index/index.wxss
similarity index 100%
rename from pages/g-z-t/s-b/index/index.wxss
rename to pages/emergency/s-b/index/index.wxss
diff --git a/pages/y-j/t-x/index/index.js b/pages/emergency/t-x/index/index.js
similarity index 100%
rename from pages/y-j/t-x/index/index.js
rename to pages/emergency/t-x/index/index.js
diff --git a/pages/g-z-t/d-b-s-x/detail/index.json b/pages/emergency/t-x/index/index.json
similarity index 100%
rename from pages/g-z-t/d-b-s-x/detail/index.json
rename to pages/emergency/t-x/index/index.json
diff --git a/pages/y-j/t-x/index/index.wxml b/pages/emergency/t-x/index/index.wxml
similarity index 100%
rename from pages/y-j/t-x/index/index.wxml
rename to pages/emergency/t-x/index/index.wxml
diff --git a/pages/y-j/t-x/index/index.wxss b/pages/emergency/t-x/index/index.wxss
similarity index 100%
rename from pages/y-j/t-x/index/index.wxss
rename to pages/emergency/t-x/index/index.wxss
diff --git a/pages/y-j/y-a/index/index.js b/pages/emergency/y-a/index/index.js
similarity index 100%
rename from pages/y-j/y-a/index/index.js
rename to pages/emergency/y-a/index/index.js
diff --git a/pages/g-z-t/d-b-s-x/index/index.json b/pages/emergency/y-a/index/index.json
similarity index 100%
rename from pages/g-z-t/d-b-s-x/index/index.json
rename to pages/emergency/y-a/index/index.json
diff --git a/pages/y-j/y-a/index/index.wxml b/pages/emergency/y-a/index/index.wxml
similarity index 100%
rename from pages/y-j/y-a/index/index.wxml
rename to pages/emergency/y-a/index/index.wxml
diff --git a/pages/y-j/y-a/index/index.wxss b/pages/emergency/y-a/index/index.wxss
similarity index 100%
rename from pages/y-j/y-a/index/index.wxss
rename to pages/emergency/y-a/index/index.wxss
diff --git a/pages/index/index.js b/pages/index/index.js
index 2112404..8f3bccc 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -181,52 +181,52 @@ Page({
     tab1: [{
       icon: "icon_tab1",
       name: "工作日志",
-      href: "/pages/t-j/g-z-r-z/index/index"
+      href: "/pages/statistic/g-z-r-z/index/index"
     }, {
       icon: "icon_tab1",
       name: "工作统计",
-      href: "/pages/t-j/g-z-t-j/index/index"
+      href: "/pages/statistic/g-z-t-j/index/index"
     }, {
       icon: "icon_tab1",
       name: "应急统计",
-      href: "/pages/t-j/y-j/index/index"
+      href: "/pages/statistic/y-j/index/index"
     }, {
       icon: "icon_tab1",
       name: "基本信息",
-      href: "/pages/t-j/j-b-x-x/index/index"
+      href: "/pages/statistic/j-b-x-x/index/index"
     }],
     // 工作台
     tab2: [{
         icon: "icon_tab6",
         name: "上报动态",
-        href: "/pages/g-z-t/s-b/index/index",
+        href: "/pages/work/s-b/index/index",
       },
       {
         icon: "icon_tab2",
         name: "待办事项",
-        href: "/pages/g-z-t/d-b-s-x/index/index?id=0"
+        href: "/pages/work/d-b-s-x/index/index?id=0"
       },
       {
         icon: "icon_tab4",
         name: "已办事项",
-        href: "/pages/g-z-t/d-b-s-x/index/index?id=1"
+        href: "/pages/work/d-b-s-x/index/index?id=1"
       },
     ],
     // 应急指挥
     tab3: [{
         icon: "icon_tab5",
         name: "应急预案",
-        href: "/pages/y-j/y-a/index/index",
+        href: "/pages/emergency/y-a/index/index",
       },
       {
         icon: "icon_tab5",
         name: "事件上报",
-        href: "/pages/y-j/s-b/index/index"
+        href: "/pages/emergency/s-b/index/index"
       },
       {
         icon: "icon_tab5",
         name: "应急通讯录",
-        href: "/pages/y-j/t-x/index/index"
+        href: "/pages/emergency/t-x/index/index"
       },
     ],
 
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e1362b6..b6749c0 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,7 +1,7 @@
 <!--index.wxml-->
 <view class="h-div v-center top">
   <image class="img" src="/images/home/icon_top-bg.png" mode="aspectFill" />
-  <image class="avatar" src="/images/home/avatar.png" mode="aspectFit" />
+  <image class="avatar" catchtap="toSkip" data-url="/pages/account/info/index" src="/images/home/avatar.png" mode="aspectFit" />
   <view class="v-div" catchtap="toSkip" data-url="/pages/account/info/index">
     <text class="name">{{userInfo.chinaName}}</text>
     <text class="point">{{userInfo.postName}}</text>
@@ -52,51 +52,6 @@
     </view>
   </view>
 </view>
-<!-- 统计 -->
-<view class="item-bg" wx:if="{{false}}">
-  <view class="h-div filter">
-    <image style="right: {{filterIndex==1?'0':''}};" class="filter-img {{filterIndex==1?'filter-checked':''}}" src="/images/home/icon_filter-bg.png" mode="aspectFill" />
-    <text catchtap="changeFilter" data-index="{{index}}" class="lab {{filterIndex==index?'lab-checked':''}}" wx:for="{{filter}}">{{item.lab}}</text>
-  </view>
-  <view class="h-div v-center title">
-    <image class="icon" src="/images/home/icon_static.png" />
-    <text class="txt flex">检查统计</text>
-    <view wx:if="{{false}}" class="h-div h-center tab">
-      <text catchtap="changeType" data-type="{{0}}" class="left {{nineType == 0?'checked':''}}">全部</text>
-      <text catchtap="changeType" data-type="{{1}}" class="center {{nineType == 1?'checked':''}}">九小</text>
-      <text catchtap="changeType" data-type="{{2}}" class="right {{nineType == 2?'checked':''}}">其它</text>
-    </view>
-  </view>
-  <view class="h-div check-static">
-    <view catchtap="toSkip" data-url="/pages/check/record/index/index" class="v-div v-center flex">
-      <text class="val">{{checkInfo.inspectCount||5}}</text>
-      <text class="tips">检查次数</text>
-    </view>
-    <view class="line-static"></view>
-    <view catchtap="toSkip" data-url="/pages/danger/list/index" class="v-div v-center flex">
-      <text class="val" style="color: #FF5050;">{{checkInfo.dangerCount.dangerTotal||1}}</text>
-      <text class="tips">发现隐患数</text>
-    </view>
-  </view>
-  <view class="h-div v-center title">
-    <image class="icon" src="/images/home/icon_static.png" />
-    <text class="txt">隐患整改统计</text>
-  </view>
-  <view catchtap="toSkip" data-url="/pages/danger/list/index" class="h-div">
-    <ec-canvas id="d-chart" canvas-id="d-chart" ec="{{ ec }}" class="charts flex"></ec-canvas>
-    <view class="v-div flex">
-      <view style="flex:1;"></view>
-      <view class="h-div v-center legend flex" wx:for="{{dLegend}}" wx:key="*this">
-        <view class="v-div flex">
-          <view style="background:{{item.color}}" wx:if="{{item.color}}" class="single"></view>
-          <text class="flex label">{{item.name}}</text>
-        </view>
-        <text class="value">{{item.num}}</text>
-      </view>
-      <view style="flex:0.5;"></view>
-    </view>
-  </view>
-</view>
 <view class="space"></view>
 
 <!-- 消息详情 -->
diff --git a/pages/t-j/g-z-r-z/detail/index.js b/pages/statistic/g-z-r-z/detail/index.js
similarity index 100%
rename from pages/t-j/g-z-r-z/detail/index.js
rename to pages/statistic/g-z-r-z/detail/index.js
diff --git a/pages/t-j/g-z-r-z/detail/index.json b/pages/statistic/g-z-r-z/detail/index.json
similarity index 100%
rename from pages/t-j/g-z-r-z/detail/index.json
rename to pages/statistic/g-z-r-z/detail/index.json
diff --git a/pages/t-j/g-z-r-z/detail/index.wxml b/pages/statistic/g-z-r-z/detail/index.wxml
similarity index 100%
rename from pages/t-j/g-z-r-z/detail/index.wxml
rename to pages/statistic/g-z-r-z/detail/index.wxml
diff --git a/pages/t-j/g-z-r-z/detail/index.wxss b/pages/statistic/g-z-r-z/detail/index.wxss
similarity index 100%
rename from pages/t-j/g-z-r-z/detail/index.wxss
rename to pages/statistic/g-z-r-z/detail/index.wxss
diff --git a/pages/t-j/g-z-r-z/index/index.js b/pages/statistic/g-z-r-z/index/index.js
similarity index 97%
rename from pages/t-j/g-z-r-z/index/index.js
rename to pages/statistic/g-z-r-z/index/index.js
index a1b9718..f66b7f2 100644
--- a/pages/t-j/g-z-r-z/index/index.js
+++ b/pages/statistic/g-z-r-z/index/index.js
@@ -84,7 +84,7 @@ Page({
   toDetail: function (params) {
     const item = params.currentTarget.dataset.item;
     wx.navigateTo({
-      url: '/pages/t-j/g-z-r-z/detail/index',
+      url: '/pages/statistic/g-z-r-z/detail/index',
       success: res => {
         res.eventChannel.emit('getItem', item)
       }
diff --git a/pages/t-j/g-z-r-z/index/index.json b/pages/statistic/g-z-r-z/index/index.json
similarity index 100%
rename from pages/t-j/g-z-r-z/index/index.json
rename to pages/statistic/g-z-r-z/index/index.json
diff --git a/pages/t-j/g-z-r-z/index/index.wxml b/pages/statistic/g-z-r-z/index/index.wxml
similarity index 100%
rename from pages/t-j/g-z-r-z/index/index.wxml
rename to pages/statistic/g-z-r-z/index/index.wxml
diff --git a/pages/t-j/g-z-r-z/index/index.wxss b/pages/statistic/g-z-r-z/index/index.wxss
similarity index 100%
rename from pages/t-j/g-z-r-z/index/index.wxss
rename to pages/statistic/g-z-r-z/index/index.wxss
diff --git a/pages/t-j/g-z-t-j/index/index.js b/pages/statistic/g-z-t-j/index/index.js
similarity index 100%
rename from pages/t-j/g-z-t-j/index/index.js
rename to pages/statistic/g-z-t-j/index/index.js
diff --git a/pages/t-j/g-z-t-j/index/index.json b/pages/statistic/g-z-t-j/index/index.json
similarity index 100%
rename from pages/t-j/g-z-t-j/index/index.json
rename to pages/statistic/g-z-t-j/index/index.json
diff --git a/pages/t-j/g-z-t-j/index/index.wxml b/pages/statistic/g-z-t-j/index/index.wxml
similarity index 75%
rename from pages/t-j/g-z-t-j/index/index.wxml
rename to pages/statistic/g-z-t-j/index/index.wxml
index 0e1e68f..6c78a69 100644
--- a/pages/t-j/g-z-t-j/index/index.wxml
+++ b/pages/statistic/g-z-t-j/index/index.wxml
@@ -19,17 +19,18 @@
       <view catchtap="changeItem" data-item="{{item}}" data-index="{{index}}" class="tab-item {{currentIndex==index?'tab-item-checked':''}}" wx:for="{{tab}}" wx:key="{{item.label}}">
         <text class="lab">{{item.label}}</text>
         <text class="val">{{item.val}}</text>
-        <text>条记录</text>
+        <text class="flex">条记录</text>
+        <image wx:if="{{currentIndex==index}}" class="arrow" src="/images/icon-checked.png" />
       </view>
     </view>
     <!-- 列表 -->
     <view catchtap="toDetail" data-item="{{item}}" class="item h-div" wx:for="{{list}}">
-    <view class="content">
-      <view class="title">标题</view>
-      <view class="des">{{item.factorcnt}}</view>
-      <view class="time">时间：2024-01-26</view>
+      <view class="content">
+        <view class="title">标题</view>
+        <view class="des">{{item.factorcnt}}</view>
+        <view class="time">时间：2024-01-26</view>
+      </view>
     </view>
-  </view>
-  <view class="space"></view>
+    <view class="space"></view>
   </view>
 </scroll-view>
\ No newline at end of file
diff --git a/pages/t-j/g-z-t-j/index/index.wxss b/pages/statistic/g-z-t-j/index/index.wxss
similarity index 98%
rename from pages/t-j/g-z-t-j/index/index.wxss
rename to pages/statistic/g-z-t-j/index/index.wxss
index 867d685..07d7f5b 100644
--- a/pages/t-j/g-z-t-j/index/index.wxss
+++ b/pages/statistic/g-z-t-j/index/index.wxss
@@ -18,8 +18,7 @@
 }
 
 .table .tab-item-checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
+  background-color: rgba(0, 0, 0, 0.1);
 }
 
 .table .tab-item .lab {
diff --git a/pages/t-j/j-b-x-x/index/index.js b/pages/statistic/j-b-x-x/index/index.js
similarity index 100%
rename from pages/t-j/j-b-x-x/index/index.js
rename to pages/statistic/j-b-x-x/index/index.js
diff --git a/pages/t-j/j-b-x-x/index/index.json b/pages/statistic/j-b-x-x/index/index.json
similarity index 100%
rename from pages/t-j/j-b-x-x/index/index.json
rename to pages/statistic/j-b-x-x/index/index.json
diff --git a/pages/t-j/j-b-x-x/index/index.wxml b/pages/statistic/j-b-x-x/index/index.wxml
similarity index 93%
rename from pages/t-j/j-b-x-x/index/index.wxml
rename to pages/statistic/j-b-x-x/index/index.wxml
index b0a6ac9..e001d3f 100644
--- a/pages/t-j/j-b-x-x/index/index.wxml
+++ b/pages/statistic/j-b-x-x/index/index.wxml
@@ -20,7 +20,8 @@
       <view catchtap="changeItem" data-item="{{item}}" data-index="{{index}}" class="tab-item {{currentIndex==index?'tab-item-checked':''}}" wx:for="{{tab}}" wx:key="{{item.label}}">
         <text class="lab">{{item.label}}</text>
         <text class="val">{{item.val}}</text>
-        <text>人</text>
+        <text class="flex">人</text>
+        <image wx:if="{{currentIndex==index}}" class="arrow" src="/images/icon-checked.png" />
       </view>
     </view>
     <!-- 列表 -->
diff --git a/pages/t-j/j-b-x-x/index/index.wxss b/pages/statistic/j-b-x-x/index/index.wxss
similarity index 97%
rename from pages/t-j/j-b-x-x/index/index.wxss
rename to pages/statistic/j-b-x-x/index/index.wxss
index b4433e2..4394ffe 100644
--- a/pages/t-j/j-b-x-x/index/index.wxss
+++ b/pages/statistic/j-b-x-x/index/index.wxss
@@ -18,8 +18,7 @@
 }
 
 .table .tab-item-checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
+  background-color: rgba(0, 0, 0, 0.1);
 }
 
 .table .tab-item .lab {
diff --git a/pages/t-j/y-j/index/index.js b/pages/statistic/y-j/index/index.js
similarity index 94%
rename from pages/t-j/y-j/index/index.js
rename to pages/statistic/y-j/index/index.js
index 0523201..5925536 100644
--- a/pages/t-j/y-j/index/index.js
+++ b/pages/statistic/y-j/index/index.js
@@ -119,6 +119,7 @@ Page({
     ec: {
       lazyLoad: true
     },
+    currentIndex: 0,
     tab: [{
       label: '已办事项',
       val: 8
@@ -128,6 +129,14 @@ Page({
     }],
   },
 
+  /**
+   * 切换tab
+   */
+  changeItem: function (params) {
+    this.data.currentIndex = params.currentTarget.dataset.index;
+    this.setData(this.data)
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
diff --git a/pages/t-j/y-j/index/index.json b/pages/statistic/y-j/index/index.json
similarity index 100%
rename from pages/t-j/y-j/index/index.json
rename to pages/statistic/y-j/index/index.json
diff --git a/pages/t-j/y-j/index/index.wxml b/pages/statistic/y-j/index/index.wxml
similarity index 88%
rename from pages/t-j/y-j/index/index.wxml
rename to pages/statistic/y-j/index/index.wxml
index 3744752..5ffff04 100644
--- a/pages/t-j/y-j/index/index.wxml
+++ b/pages/statistic/y-j/index/index.wxml
@@ -19,7 +19,8 @@
       <view catchtap="changeItem" data-item="{{item}}" data-index="{{index}}" class="tab-item {{currentIndex==index?'tab-item-checked':''}}" wx:for="{{tab}}" wx:key="{{item.label}}">
         <text class="lab">{{item.label}}</text>
         <text class="val">{{item.val}}</text>
-        <text>条记录</text>
+        <text class="flex">条记录</text>
+        <image wx:if="{{currentIndex==index}}" class="arrow" src="/images/icon-checked.png" />
       </view>
     </view>
     <!-- 图表 -->
diff --git a/pages/t-j/y-j/index/index.wxss b/pages/statistic/y-j/index/index.wxss
similarity index 95%
rename from pages/t-j/y-j/index/index.wxss
rename to pages/statistic/y-j/index/index.wxss
index 8a2da5c..118c009 100644
--- a/pages/t-j/y-j/index/index.wxss
+++ b/pages/statistic/y-j/index/index.wxss
@@ -18,8 +18,7 @@
 }
 
 .table .tab-item-checked {
-  color: white;
-  background-color: rgba(0, 0, 0, 0.5);
+  background-color: rgba(0, 0, 0, 0.1);
 }
 
 .table .tab-item .lab {
diff --git a/pages/g-z-t/d-b-s-x/detail/index.js b/pages/work/d-b-s-x/detail/index.js
similarity index 100%
rename from pages/g-z-t/d-b-s-x/detail/index.js
rename to pages/work/d-b-s-x/detail/index.js
diff --git a/pages/y-j/t-x/index/index.json b/pages/work/d-b-s-x/detail/index.json
similarity index 100%
rename from pages/y-j/t-x/index/index.json
rename to pages/work/d-b-s-x/detail/index.json
diff --git a/pages/g-z-t/d-b-s-x/detail/index.wxml b/pages/work/d-b-s-x/detail/index.wxml
similarity index 100%
rename from pages/g-z-t/d-b-s-x/detail/index.wxml
rename to pages/work/d-b-s-x/detail/index.wxml
diff --git a/pages/g-z-t/d-b-s-x/detail/index.wxss b/pages/work/d-b-s-x/detail/index.wxss
similarity index 100%
rename from pages/g-z-t/d-b-s-x/detail/index.wxss
rename to pages/work/d-b-s-x/detail/index.wxss
diff --git a/pages/g-z-t/d-b-s-x/index/index.js b/pages/work/d-b-s-x/index/index.js
similarity index 100%
rename from pages/g-z-t/d-b-s-x/index/index.js
rename to pages/work/d-b-s-x/index/index.js
diff --git a/pages/y-j/y-a/index/index.json b/pages/work/d-b-s-x/index/index.json
similarity index 100%
rename from pages/y-j/y-a/index/index.json
rename to pages/work/d-b-s-x/index/index.json
diff --git a/pages/g-z-t/d-b-s-x/index/index.wxml b/pages/work/d-b-s-x/index/index.wxml
similarity index 100%
rename from pages/g-z-t/d-b-s-x/index/index.wxml
rename to pages/work/d-b-s-x/index/index.wxml
diff --git a/pages/g-z-t/d-b-s-x/index/index.wxss b/pages/work/d-b-s-x/index/index.wxss
similarity index 100%
rename from pages/g-z-t/d-b-s-x/index/index.wxss
rename to pages/work/d-b-s-x/index/index.wxss
diff --git a/pages/g-z-t/s-b/index/index.js b/pages/work/s-b/index/index.js
similarity index 100%
rename from pages/g-z-t/s-b/index/index.js
rename to pages/work/s-b/index/index.js
diff --git a/pages/y-j/s-b/index/index.json b/pages/work/s-b/index/index.json
similarity index 100%
rename from pages/y-j/s-b/index/index.json
rename to pages/work/s-b/index/index.json
diff --git a/pages/g-z-t/s-b/index/index.wxml b/pages/work/s-b/index/index.wxml
similarity index 100%
rename from pages/g-z-t/s-b/index/index.wxml
rename to pages/work/s-b/index/index.wxml
diff --git a/pages/y-j/s-b/index/index.wxss b/pages/work/s-b/index/index.wxss
similarity index 100%
rename from pages/y-j/s-b/index/index.wxss
rename to pages/work/s-b/index/index.wxss