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 0000000..e03b89e
Binary files /dev/null and b/images/icon-checked.png differ
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 @@
-
+
{{userInfo.chinaName}}
{{userInfo.postName}}
@@ -52,51 +52,6 @@
-
-
-
-
- {{item.lab}}
-
-
-
- 检查统计
-
- 全部
- 九小
- 其它
-
-
-
-
- {{checkInfo.inspectCount||5}}
- 检查次数
-
-
-
- {{checkInfo.dangerCount.dangerTotal||1}}
- 发现隐患数
-
-
-
-
- 隐患整改统计
-
-
-
-
-
-
-
-
- {{item.name}}
-
- {{item.num}}
-
-
-
-
-
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 @@
{{item.label}}
{{item.val}}
- 条记录
+ 条记录
+
-
- 标题
- {{item.factorcnt}}
- 时间:2024-01-26
+
+ 标题
+ {{item.factorcnt}}
+ 时间:2024-01-26
+
-
-
+
\ 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 @@
{{item.label}}
{{item.val}}
- 人
+ 人
+
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 @@
{{item.label}}
{{item.val}}
- 条记录
+ 条记录
+
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