统计筛选调整

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",

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"
       },
     ],
 

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>
 
 <!-- 消息详情 -->

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)
       }

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>

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 {

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>
     <!-- 列表 -->

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 {

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)
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */

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>
     <!-- 图表 -->

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 {