diff --git a/app.js b/app.js
index f0a05eb..d10434d 100644
--- a/app.js
+++ b/app.js
@@ -63,27 +63,14 @@ App({
resumptionAcs: "WorkFile", // 履职附件
taskAcs: "TaskAttachment", // 任务附件
msgAcs: "MsgAcs", // 消息附件
- checkMethodPic: "checkMethodPic", //检查方法图片
- userSign: "UserSign", //用户签名
- entSign: "entSign", //企业签名
- buildImg: "buildImg", //建筑体图片
- buildDesignImg: "buildDesignImg", //建筑体总平图
- dangerBefore: "APPRectifyImgBefore", //整改前
- dangerAfter: "APPRectifyImgAfter", //整改后
+ eventAcs: "eventAcs", //突发事件上报
+
+ userSign: "UserSign", //用户签名
- entEmResourse: "entEmResourse", //应急物资台账
EmergencyImg: "Content", // 应急预案---一图一表
EmergencyFile: "EmergencyFile", // 应急预案---文件
EmergencyPlanFile: "EmergencyPlanFile", // 应急演练---文件
- checkEnclosure: "CheckEnclosure", // 检查附件
- },
-
- // 接口类型
- ApiFileType: {
- GET: "/getFile",
- POST: "/uploadFile",
- DELETE: "/delFile",
},
// 请求函数封装
@@ -120,16 +107,16 @@ App({
},
/** 上传文件 */
- uploadFile: function (OTCId, OTCType, filePath) {
+ uploadFile: function (otcid, otctype, filePath) {
let params = {
- OTCId,
- OTCType,
+ otcid,
+ otctype,
userId: this.globalData.userInfo.userId,
}
console.info(params)
return new Promise((resolve, reject) => {
wx.uploadFile({
- url: this.FILE_SERVER_UP_URL + this.ApiFileType.POST,
+ url: this.FILE_SERVER_UP_URL + 'common/upload/uploadFile',
filePath: filePath,
name: 'file',
formData: params,
diff --git a/app.json b/app.json
index cec3177..dfc8123 100644
--- a/app.json
+++ b/app.json
@@ -6,8 +6,6 @@
"pages/task/file/index/index",
"pages/task/index/index",
"pages/task/check/index/index",
- "pages/emergency/index/index",
- "pages/emergency/suddenly-up/up/index",
"pages/msg/index/index",
"pages/msg/push-index/index",
"pages/msg/push/index",
@@ -25,7 +23,7 @@
"pages/g-z-t/d-b-s-x/detail/index",
"pages/y-j/y-a/index/index",
- "pages/y-j/z-h/index/index",
+ "pages/y-j/s-b/index/index",
"pages/y-j/t-x/index/index"
],
"window": {
diff --git a/pages/emergency/index/index.js b/pages/emergency/index/index.js
deleted file mode 100644
index 2f567ca..0000000
--- a/pages/emergency/index/index.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// pages/emergency/index/index.js
-const app = getApp();
-
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- topBarH: app.globalData.CustomBar,
- curTab: 0,
- tabs: [{
- lab: '突发事件',
- val: 0
- }, {
- lab: '应急资源',
- val: 1
- }],
- },
-
- /**
- * 切换筛选
- */
- tabSelect: function (params) {
- const index = Number.parseInt(params.currentTarget.dataset.index) || Number.parseInt(params.detail.current);
- this.data.curTab = index;
- this.setData(this.data)
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/pages/emergency/index/index.json b/pages/emergency/index/index.json
deleted file mode 100644
index c6504da..0000000
--- a/pages/emergency/index/index.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "usingComponents": {
- "suddenly": "../suddenly-up/index/index",
- "resourse": "../resourse/index/index"
- },
- "navigationStyle": "custom"
-}
\ No newline at end of file
diff --git a/pages/emergency/index/index.wxml b/pages/emergency/index/index.wxml
deleted file mode 100644
index bf1e3af..0000000
--- a/pages/emergency/index/index.wxml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
- {{item.lab}}
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/emergency/index/index.wxss b/pages/emergency/index/index.wxss
deleted file mode 100644
index e41eb1a..0000000
--- a/pages/emergency/index/index.wxss
+++ /dev/null
@@ -1,9 +0,0 @@
-/* pages/emergency/index/index.wxss */
-page {
- background-color: #f5f5f5;
-}
-
-.cu-item {
- font-size: 30rpx;
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/pages/emergency/resourse/index/index.js b/pages/emergency/resourse/index/index.js
deleted file mode 100644
index 86adcf7..0000000
--- a/pages/emergency/resourse/index/index.js
+++ /dev/null
@@ -1,111 +0,0 @@
-// pages/emergency/resourse/index/index.js
-const app = getApp();
-
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
- condition: '',
- curTab: 0,
- tabs: [{
- lab: '应急物资',
- val: 0
- }, {
- lab: '应急专家',
- val: 0
- }, {
- lab: '救援队伍',
- val: 0
- }],
-
- canChange: false,
- freshIng: false,
- page: 1,
- pageSize: 10,
- list: []
- },
-
- pageLifetimes: {
- show: function () {
- this.getList();
- },
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- /**
- * 搜索
- */
- inputSearch: function (e) {
- this.data.condition = e.detail.value;
- this.refresh();
- },
-
- /**
- * 切换筛选
- */
- tabSelect: function (params) {
- if (!this.data.canChange) return
- this.data.canChange = false;
- const index = Number.parseInt(params.currentTarget.dataset.index);
- this.data.curTab = index;
- this.setData(this.data)
- this.refresh()
- },
-
- /**
- * 刷新
- * @param {*} params
- */
- refresh: function (params) {
- this.data.page = 1;
- this.data.list = [];
- this.setData(this.data)
- this.getList();
- },
-
- /**
- * 获取列表
- */
- getList: function () {
- let url = ""
- const params = {
- page: this.data.page,
- pageSize: this.data.pageSize,
- }
- switch (this.data.curTab) {
- case 0:
- url = "/OtheWareHouse/getOtheWareHousePage"
- params.houseName = this.data.condition;
- break;
- case 1:
- url = "/Othexpert/getOthexpertPage"
- params.othname = this.data.condition;
- break;
- case 2:
- url = "/Othteam/getOthteamPage"
- params.teamname = this.data.condition;
- break;
- }
- app.axios("GET", "app", url, params, true).then(res => {
- this.data.canChange = true;
- if (res.code == 1) {
- this.data.list = [...this.data.list, ...res.data.rows];
- if (res.data.rows.length != 0) this.data.page = res.data.pageNum + 1
- }
- this.setData(this.data)
- })
- }
- }
-})
\ No newline at end of file
diff --git a/pages/emergency/resourse/index/index.json b/pages/emergency/resourse/index/index.json
deleted file mode 100644
index e8cfaaf..0000000
--- a/pages/emergency/resourse/index/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "component": true,
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/emergency/resourse/index/index.wxml b/pages/emergency/resourse/index/index.wxml
deleted file mode 100644
index bf1e78a..0000000
--- a/pages/emergency/resourse/index/index.wxml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{item.lab}}
-
-
-
-
-
-
-
-
- {{item.houseName||''}}
-
- 导航
-
-
-
- 所属单位：
- {{item.possession||''}}
-
-
-
- 管理员：
- {{item.nameText||''}}
- {{item.telephone|''}}
-
-
-
- 物资数量：
- {{item.houseTotal}}
-
-
-
-
- 316m
- |
- {{item.address}}
-
-
-
-
-
- {{item.othname}}
- {{item.othage}}岁
-
- 导航
-
-
-
- 职称：
- {{item.othmajor}}
-
-
-
- 任职单位：
- {{item.othcompany||''}}
-
-
-
- 联系电话：
- {{item.othphone}}
-
-
-
- 专业领域：
- {{item.othmajortype}}
-
-
-
-
-
- {{item.teamname}}
-
- 导航
-
-
-
- 所属单位：
- {{item.unitname||''}}
-
-
-
- 联系人：
- {{item.principal}}
- {{item.principaltel}}
-
-
-
- 队伍人数：
- {{item.personnum||'0'}}
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/emergency/resourse/index/index.wxss b/pages/emergency/resourse/index/index.wxss
deleted file mode 100644
index 4c41db5..0000000
--- a/pages/emergency/resourse/index/index.wxss
+++ /dev/null
@@ -1,129 +0,0 @@
-/* pages/emergency/resourse/index/index.wxss */
-@import "../../../../colorui/main.wxss";
-@import "../../../../colorui/icon.wxss";
-
-page {
- background-color: #f5f5f5;
-}
-
-
-.v-div {
- display: flex;
- display: -webkit-flex;
- flex-direction: column;
-}
-
-.h-div {
- display: flex;
- display: -webkit-flex;
- flex-direction: row;
-}
-
-.v-center {
- align-items: center;
-}
-
-.h-center {
- justify-content: center;
-}
-
-.flex {
- flex: 1;
-}
-
-.space-between {
- justify-content: space-between;
-}
-
-.cu-item {
- font-size: 30rpx;
- font-weight: bold;
-}
-
-.filter {
- height: 60rpx;
- margin-bottom: 10rpx;
- min-width: 100%;
- white-space: nowrap;
-}
-
-.filter .tag {
- background: #CEDFFD;
- border-radius: 46rpx;
- padding: 2rpx 40rpx;
- margin-left: 20rpx;
- display: inline-block;
-}
-
-.filter .cur {
- background: #FFFFFF;
- border: 2rpx solid #417AFF;
-}
-
-.filter view {
- width: fit-content;
-}
-
-.search {
- background-color: #f5f5f5;
- position: sticky;
- top: 0;
- z-index: 10;
-}
-
-.cu-bar .search-form {
- background: #FFFFFF;
- box-shadow: 0rpx 0rpx 12rpx 2rpx #DDECF3;
- border-radius: 12rpx;
-}
-
-.item-bg {
- padding: 0 20rpx;
- /* background-color: #f5f5f5; */
-}
-
-.item {
- background-color: #ffffff;
- padding: 20rpx;
- position: relative;
- border-radius: 10rpx;
- z-index: 2;
- margin-bottom: 20rpx;
-}
-
-.item .lab {
- font-size: 32rpx;
- font-weight: bold;
- color: #222222;
-}
-
-.item .val {
- font-size: 32rpx;
- color: #222222;
-}
-
-.item .age {
- font-size: 32rpx;
- margin-left: 30rpx;
-}
-
-.item .phone {
- font-size: 32rpx;
- color: var(--blue);
-}
-
-.item .guide {
- width: 32rpx;
- height: 32rpx;
- margin-right: 10rpx;
-}
-
-.item .line {
- margin: 20rpx -20rpx;
- border-top: 2rpx dashed #f5f5f5;
-}
-
-.space {
- height: calc(constant(safe-area-inset-bottom) + 30rpx);
- height: calc(env(safe-area-inset-bottom) + 30rpx);
-}
\ No newline at end of file
diff --git a/pages/emergency/suddenly-up/index/index.js b/pages/emergency/suddenly-up/index/index.js
deleted file mode 100644
index b312c38..0000000
--- a/pages/emergency/suddenly-up/index/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// pages/emergency/suddenly-up/index/index.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
- list: [{}, {}, {}, {}, {}]
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
- /**
- * 上报事件
- */
- push: function (params) {
- wx.navigateTo({
- url: '/pages/emergency/suddenly-up/up/index',
- })
- }
- }
-})
\ No newline at end of file
diff --git a/pages/emergency/suddenly-up/index/index.json b/pages/emergency/suddenly-up/index/index.json
deleted file mode 100644
index e8cfaaf..0000000
--- a/pages/emergency/suddenly-up/index/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "component": true,
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/emergency/suddenly-up/index/index.wxml b/pages/emergency/suddenly-up/index/index.wxml
deleted file mode 100644
index 2be7544..0000000
--- a/pages/emergency/suddenly-up/index/index.wxml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 文件签批流转任务
-
- 关于某某某某某某某某某某某项工作的任务要求,关于某某某某某某某某工作的任务要求。
-
-
-
- 发布人：某某人
- 发布时间：2022-09-15
-
-
-
-
-
-
-
- 上报事件
-
\ No newline at end of file
diff --git a/pages/emergency/suddenly-up/index/index.wxss b/pages/emergency/suddenly-up/index/index.wxss
deleted file mode 100644
index 56ca5f5..0000000
--- a/pages/emergency/suddenly-up/index/index.wxss
+++ /dev/null
@@ -1,162 +0,0 @@
-/* pages/emergency/suddenly-up/index/index.wxss */
-@import "../../../../colorui/main.wxss";
-@import "../../../../colorui/icon.wxss";
-
-page {
- background-color: #f5f5f5;
-}
-
-
-.v-div {
- display: flex;
- display: -webkit-flex;
- flex-direction: column;
-}
-
-.h-div {
- display: flex;
- display: -webkit-flex;
- flex-direction: row;
-}
-
-.v-center {
- align-items: center;
-}
-
-.h-center {
- justify-content: center;
-}
-
-.flex {
- flex: 1;
-}
-
-.space-between {
- justify-content: space-between;
-}
-
-.cu-item {
- font-size: 30rpx;
- font-weight: bold;
-}
-
-.search {
- background-color: #f5f5f5;
- position: sticky;
- top: 0;
- z-index: 10;
-}
-
-.cu-bar .search-form {
- background: #FFFFFF;
- box-shadow: 0rpx 0rpx 12rpx 2rpx #DDECF3;
- border-radius: 12rpx;
-}
-
-.item-bg {
- padding: 0 32rpx 20rpx 32rpx;
- background-color: #f5f5f5;
-}
-
-.item {
- background-color: #ffffff;
- padding: 32rpx 20rpx 20rpx 20rpx;
- position: relative;
- border-radius: 10rpx;
- z-index: 2;
-}
-
-.item .head {
- margin: 0 -20rpx;
- margin-top: -32rpx;
- background-color: #CDE5FC;
- padding: 16rpx;
- border-radius: 10rpx 10rpx 0 0;
-}
-
-.item .head .single {
- width: 8rpx;
- height: 36rpx;
- background: #4882EE;
- border-radius: 4rpx;
-}
-
-.item .head .title {
- flex: 1;
- margin-left: 16rpx;
- font-size: 28rpx;
- font-weight: bold;
- color: #4882EE;
-}
-
-.item .head .status {
- font-weight: bold;
- font-size: 28rpx;
-}
-
-.item .tv {
- font-size: 28rpx;
- font-weight: 500;
- color: #222222;
- padding-top: 20rpx;
-}
-
-.item .bottom {
- font-size: 26rpx;
- font-weight: bold;
- color: #222222;
-}
-
-.item .val {
- font-size: 26rpx;
- font-weight: 500;
- color: #222222;
- margin-left: 20rpx;
-}
-
-.item .line {
- margin: 20rpx -20rpx;
- border-top: 2rpx dashed #f5f5f5;
-}
-
-.item .bottom-img {
- width: calc(100vw - 65rpx);
- max-width: calc(100vw - 65rpx);
- height: 40rpx;
- margin: 0 -20rpx;
- position: absolute;
- bottom: 0;
- z-index: -1;
-}
-
-.option {
- position: fixed;
- bottom: calc(constant(safe-area-inset-bottom) + 30rpx);
- bottom: calc(env(safe-area-inset-bottom) + 30rpx);
- left: 0;
- right: 0;
- margin-top: 30rpx;
- padding: 16rpx 32rpx;
- background: #FFFFFF;
- box-shadow: 0rpx 0rpx 12rpx 2rpx #DDECF3;
- z-index: 10;
-}
-
-.option .btn {
- padding: 14rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- background: #409CFF;
- color: #FFFFFF;
- border-radius: 12rpx;
-}
-
-.option .btn:active {
- opacity: 0.8;
-}
-
-.space {
- height: calc(constant(safe-area-inset-bottom) + 150rpx);
- height: calc(env(safe-area-inset-bottom) + 150rpx);
-}
\ No newline at end of file
diff --git a/pages/emergency/suddenly-up/up/index.js b/pages/emergency/suddenly-up/up/index.js
deleted file mode 100644
index 6dc7239..0000000
--- a/pages/emergency/suddenly-up/up/index.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// pages/emergency/suddenly-up/up/index.js
-const app = getApp();
-
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- topBarH: app.globalData.CustomBar,
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/pages/emergency/suddenly-up/up/index.json b/pages/emergency/suddenly-up/up/index.json
deleted file mode 100644
index 965b8e8..0000000
--- a/pages/emergency/suddenly-up/up/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "usingComponents": {},
- "navigationStyle": "custom"
-}
\ No newline at end of file
diff --git a/pages/emergency/suddenly-up/up/index.wxml b/pages/emergency/suddenly-up/up/index.wxml
deleted file mode 100644
index 6c93fc6..0000000
--- a/pages/emergency/suddenly-up/up/index.wxml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 成都市某某区某某街道某某详细的事件地址
-
-
-
-
-
-
- 某某人
-
-
-
-
-
-
- 上 报
-
\ No newline at end of file
diff --git a/pages/emergency/suddenly-up/up/index.wxss b/pages/emergency/suddenly-up/up/index.wxss
deleted file mode 100644
index dd5c62e..0000000
--- a/pages/emergency/suddenly-up/up/index.wxss
+++ /dev/null
@@ -1,111 +0,0 @@
-/* pages/emergency/suddenly-up/up/index.wxss */
-scroll-view {
- background-color: #f5f5f5;
- box-sizing: border-box;
-}
-
-.item {
- background-color: #ffffff;
- margin: 32rpx 20rpx 20rpx 20rpx;
- padding: 20rpx;
- position: relative;
- border-radius: 10rpx;
- z-index: 2;
-}
-
-.item .header {
- margin-top: 16rpx;
-}
-
-.item .header .single {
- width: 8rpx;
- height: 36rpx;
- background: #4882EE;
- border-radius: 4rpx;
- margin-right: 10rpx;
-}
-
-.item .header .title {
- font-size: 30rpx;
- font-weight: bold;
- color: #222222;
-}
-
-.item .put {
- width: 100%;
- background: #F5F7FC;
- border-radius: 12rpx;
- min-height: 72rpx;
- padding: 15rpx;
- margin-top: 16rpx;
- color: #999999;
- font-size: 28rpx;
-}
-
-.item .cloud {
- width: 40rpx;
- height: 40rpx;
- margin-left: 20rpx;
-}
-
-.item .file {
- padding: 15rpx 0;
- border-bottom: 1rpx dashed #f5f5f5;
-}
-
-.item .address {
- font-size: 28rpx;
- color: #222222;
- margin-left: 10rpx;
-}
-
-.item .people {
- display: inline-flex;
- width: calc((100vw - 100rpx) / 4);
- margin-top: 20rpx;
-}
-
-.item .people .avatar {
- width: 88rpx;
- height: 88rpx;
- border-radius: 50%;
- background-color: #f5f5f5;
-}
-
-.item .people .name {
- font-size: 28rpx;
- font-weight: bold;
- color: #222222;
-}
-
-.option {
- position: fixed;
- bottom: calc(constant(safe-area-inset-bottom) + 30rpx);
- bottom: calc(env(safe-area-inset-bottom) + 30rpx);
- left: 0;
- right: 0;
- margin-top: 30rpx;
- padding: 16rpx 32rpx;
- background: #FFFFFF;
- box-shadow: 0rpx 0rpx 12rpx 2rpx #DDECF3;
- z-index: 10;
-}
-
-.option .btn {
- padding: 14rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- background: #409CFF;
- color: #FFFFFF;
- border-radius: 12rpx;
-}
-
-.option .btn:active {
- opacity: 0.8;
-}
-
-.space {
- height: calc(constant(safe-area-inset-bottom) + 150rpx);
- height: calc(env(safe-area-inset-bottom) + 150rpx);
-}
\ No newline at end of file
diff --git a/pages/g-z-t/s-b/index/index.js b/pages/g-z-t/s-b/index/index.js
index 9bf3148..209f919 100644
--- a/pages/g-z-t/s-b/index/index.js
+++ b/pages/g-z-t/s-b/index/index.js
@@ -9,13 +9,34 @@ Page({
*/
data: {
topBarH: app.globalData.CustomBar,
+ baseUrl: app.FILE_SERVER_URL,
dateFilter: Utils.formatTime(new Date(), '-'),
showTypePop: false,
- TypeData: ['常规工作', '督办工作'],
+ showTaskPop: false,
+ TypeData: [],
postData: {}
},
+ /**
+ * 时间
+ */
+ bindDateChange: function (params) {
+ const name = params.currentTarget.dataset.name;
+ this.data.postData[name] = params.detail.value;
+ this.setData(this.data)
+ console.info(this.data.postData)
+ },
+
+ /**
+ * 显示/关闭任务弹窗
+ */
+ popTaskModal: function (params) {
+ const type = params.currentTarget.dataset.type;
+ this.data[type] = !this.data[type];
+ this.setData(this.data)
+ },
+
/**
* 显示/关闭弹窗
*/
@@ -31,30 +52,17 @@ Page({
typeChange: function (params) {
const index = params.currentTarget.dataset.index;
this.data.postData.type = index + 1;
+ this.data.postData.typeId = this.data.TypeData[index].typeId;
this.data.showTypePop = false;
this.setData(this.data)
},
/**
- * 通知内容
+ * 输入内容
*/
inputContent: function (e) {
- this.data.postData.content = e.detail.value;
- },
-
- /**
- * 获取接收人员
- */
- getWorker: function (params) {
- app.axios("GET", "app", "/notice/getNoticePerformList", {
- govNoticeId: this.data.uuid,
- userId: app.globalData.userInfo.userId
- }).then(res => {
- if (res.code == 1) {
- this.data.workers = res.data;
- this.setData(this.data)
- }
- })
+ const name = e.currentTarget.dataset.name;
+ this.data.postData[name] = e.detail.value;
},
/**
@@ -72,6 +80,20 @@ Page({
})
},
+ /**
+ * 获取工作类型
+ */
+ getType: function () {
+ app.axios("GET", "app", "/work/wkTypes", {
+ classify: 1
+ }).then(res => {
+ if (res.code == 1) {
+ this.data.TypeData = res.data;
+ this.setData(this.data)
+ }
+ })
+ },
+
/**
* 上传图片
*/
@@ -79,19 +101,19 @@ Page({
wx.showLoading({
title: '文件上传中...',
})
- app.uploadFile(this.data.uuid, app.FileType.msgAcs, filePath).then(res => {
+ app.uploadFile(this.data.uuid, app.FileType.resumptionAcs, filePath).then(res => {
wx.hideLoading();
this.getFiles();
})
},
/**
- * 获取整改前图片
+ * 获取图片
*/
getFiles: function () {
app.axios("GET", "common", "/upload/getFile", {
- OTCId: this.data.uuid,
- OTCType: app.FileType.msgAcs
+ otcid: this.data.uuid,
+ otctype: app.FileType.resumptionAcs
}).then(res => {
if (res.code == 1) {
this.data.files = res.data;
@@ -111,8 +133,8 @@ Page({
content: '是否要删除该附件？',
success: (res) => {
if (res.confirm) {
- app.axios("GET", '', "/delFile", {
- deletedId: id,
+ app.axios("GET", 'common', "/upload/delFile", {
+ documentId: id,
}).then(res => {
if (res.code == 1) {
this.getFiles();
@@ -124,35 +146,41 @@ Page({
},
/**
- * 发布通知
+ * 发布
*/
- pushMsg: function (params) {
- const childComponent = this.selectComponent('#tree');
+ push: function () {
this.data.postData.userId = app.globalData.userInfo.userId;
- this.data.postData.govNoticeId = this.data.uuid;
- this.data.postData.listperformids = childComponent.data.allChoiceIdList;
- if (!this.data.postData.type) {
+ this.data.postData.workId = this.data.uuid;
+ this.data.postData.listperformid = '';
+ if (!this.data.postData.title) {
wx.showToast({
- title: '请选择通知类型',
+ title: '请输入工作标题',
+ icon: 'none'
+ })
+ return
+ }
+ if (!this.data.postData.typeId) {
+ wx.showToast({
+ title: '请选择工作类型',
icon: 'none'
})
return
}
if (!this.data.postData.content) {
wx.showToast({
- title: '请选择通知内容',
+ title: '请输入内容',
icon: 'none'
})
return
}
- if (!this.data.postData.listperformids) {
+ if (!this.data.postData.startTime || !this.data.postData.endTime) {
wx.showToast({
- title: '请选择接收对象',
+ title: '请设置时间',
icon: 'none'
})
return
}
- app.axios("POST", "app", "/notice/addGovNotice", this.data.postData).then(res => {
+ app.axios("POST", "app", "/work/workAdd", this.data.postData).then(res => {
if (res.code == 1) {
wx.showToast({
title: '发布成功',
@@ -170,33 +198,18 @@ Page({
})
},
- /**
- * 获取通知详情
- */
- getDetail: function () {
- app.axios('GET', 'admin', `/notice/getGovNotice/${this.data.uuid}`, {}, false).then(res => {
- if (res.code == 1) {
- this.data.postData = res.data;
- this.setData(this.data);
- this.getFiles();
- }
- })
- },
-
/**
* 预览文件
*/
filePre: function (params) {
const url = params.currentTarget.dataset.url;
- wx.downloadFile({
- url: this.data.baseUrl + url,
- success: res => {
- const filePath = res.tempFilePath
- wx.openDocument({
- filePath: filePath,
- success: function (res) {}
- })
- }
+ const imgs = [];
+ this.data.files.forEach(item => {
+ imgs.push(this.data.baseUrl + item.filepath)
+ })
+ wx.previewImage({
+ urls: imgs,
+ current: this.data.baseUrl + url
})
},
@@ -205,13 +218,9 @@ Page({
*/
onLoad(options) {
this.data.isUserDetail = options.user;
- this.data.uuid = options.uuid || utils.uuid();
- this.data.isDetail = options.uuid || false;
- this.getWorker();
- if (this.data.isDetail) {
- this.getDetail();
- }
+ this.data.uuid = Utils.uuid();
this.setData(this.data)
+ this.getType();
},
/**
diff --git a/pages/g-z-t/s-b/index/index.wxml b/pages/g-z-t/s-b/index/index.wxml
index bec0139..fbfeadd 100644
--- a/pages/g-z-t/s-b/index/index.wxml
+++ b/pages/g-z-t/s-b/index/index.wxml
@@ -7,46 +7,59 @@
工作标题
-
+
-
+
-
+
-
+
- 选择时间: {{dateFilter}}
+ 开始时间: {{postData.startTime||'-'}}
+
+
+
+
+ 结束时间: {{postData.endTime||'-'}}
+
+
+
-
+
+
+
+
+
+
diff --git a/pages/g-z-t/s-b/index/index.wxss b/pages/g-z-t/s-b/index/index.wxss
index a228e77..6ccb7fa 100644
--- a/pages/g-z-t/s-b/index/index.wxss
+++ b/pages/g-z-t/s-b/index/index.wxss
@@ -58,44 +58,26 @@ scroll-view {
font-size: 28rpx;
}
-.item .cloud {
- width: 40rpx;
- height: 40rpx;
- margin-left: 20rpx;
-}
-
-.item .file::before {
- display: block;
- content: ' ';
- width: 20rpx;
- height: 20rpx;
- margin-right: 20rpx;
- border-radius: 50%;
- background-color: var(--blue);
-}
-
-.item .file {
- padding: 15rpx 0;
- border-bottom: 1rpx dashed #f5f5f5;
-}
-
-.item .people {
- display: inline-flex;
- width: calc((100vw - 100rpx) / 4);
+.grid {
margin-top: 20rpx;
+ display: grid;
+ grid-gap: 20rpx 20rpx;
+ grid-template-columns: calc((100vw - 140rpx)/3) auto auto;
}
-.item .people .avatar {
- width: 88rpx;
- height: 88rpx;
- border-radius: 50%;
+.grid .img {
+ width: calc((100vw - 140rpx)/3);
+ height: calc((100vw - 140rpx)/3);
background-color: #f5f5f5;
+ border-radius: 10rpx;
}
-.item .people .name {
- font-size: 28rpx;
- font-weight: bold;
- color: #222222;
+.grid .del {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ z-index: 1;
+ font-size: 40rpx;
}
.option {
diff --git a/pages/index/index.js b/pages/index/index.js
index 963e53e..2112404 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -221,7 +221,7 @@ Page({
{
icon: "icon_tab5",
name: "事件上报",
- href: "/pages/y-j/z-h/index/index"
+ href: "/pages/y-j/s-b/index/index"
},
{
icon: "icon_tab5",
@@ -259,113 +259,24 @@ Page({
},
/**
- * 跳转学习专栏
+ * 获取banner
*/
- studyMore: function (prams) {
- wx.navigateTo({
- url: '/pages/study/index/index',
- })
- },
-
- /**
- * 统计数据类型筛选
- */
- changeType: function (params) {
- const type = params.currentTarget.dataset.type;
- this.data.nineType = type;
- this.setData(this.data)
- this.getStatic();
- },
-
- /**
- * 获取消息列表
- */
- getMsgList: function () {
- const params = {
- userId: app.globalData.userInfo.userId,
+ getBanner: function () {
+ app.axios("GET", "app", "/work/wkDynamicsPage", {
page: 1,
- pageSize: 1
- }
- app.axios('GET', 'app', '/notice/getGovNoticeUserPage', params, false).then(res => {
+ limit: 4,
+ userId: app.globalData.userInfo.userId
+ }, false).then(res => {
if (res.code == 1) {
- const list = res.data.rows;
- if (list.length > 0) {
- const item = list[0];
- if (item.isRead == 0) {
- this.data.msgData = item;
- this.data.showPop = true;
- this.handleRead();
- }
- }
- this.setData(this.data)
+ // this.data.notice = res.data.list;
+ // this.setData(this.data)
}
})
},
- /**
- * 获取通知详情
- */
- handleRead: function (id) {
- app.axios('GET', 'admin', `/notice/getGovNotice/${id}`, {}, false);
- },
-
-
- handldePop: function () {
- this.data.showPop = !this.data.showPop;
- this.data.msgData = null;
- this.setData(this.data)
- },
-
- /**
- * 获取统计数据
- */
- getStatic: function () {
- setTimeout(() => {
- initChart({
- resolving: 1,
- unresolved: 1,
- resolved: 1,
- dangerTotal: 3
- })
- }, 500);
- this.data.dLegend[0].num = 1;
- this.data.dLegend[1].num = 1;
- this.data.dLegend[2].num = 1;
- return
- const timeDate = getMonthStartEnd(new Date());
- const params = {
- userId: app.globalData.userInfo.userId,
- startTime: this.data.filterIndex == 0 ? formatTime(new Date(), '-') : formatTime(timeDate.startTime, '-'),
- endTime: this.data.filterIndex == 0 ? formatTime(new Date(), '-') : formatTime(timeDate.endTime, '-'),
- smallType: this.data.nineType
- }
- app.axios('GET', 'app', `/Danger/dangerNumber`, params, false).then(res => {
- if (res.code == 1) {
- this.data.checkInfo = res.data;
-
- this.data.dLegend[0].num = res.data.dangerCount.resolved;
- this.data.dLegend[1].num = res.data.dangerCount.resolving;
- this.data.dLegend[2].num = res.data.dangerCount.unresolved;
- this.setData(this.data)
- initChart(this.data.checkInfo.dangerCount)
- }
- });
- },
-
- /**
- * 统计数据筛选
- */
- changeFilter: function (params) {
- const index = params.currentTarget.dataset.index;
- this.data.filterIndex = index;
- this.setData(this.data)
- this.getStatic();
- },
-
onLoad(option) {
this.data.userInfo = app.globalData.userInfo;
- this.getMsgList();
- this.getStatic();
+ this.getBanner();
},
onReady() {
diff --git a/pages/login/index.js b/pages/login/index.js
index 79f3fd0..80da46c 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -71,11 +71,11 @@ Page({
key: 'userInfo',
data: res.data,
})
- // if (!res.data.openid) {
- // this.data.showPop = true;
- // this.setData(this.data)
- // return
- // }
+ if (!res.data.openid) {
+ this.data.showPop = true;
+ this.setData(this.data)
+ return
+ }
wx.reLaunch({
url: '/pages/index/index',
})
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index ff64fa0..59c8444 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -13,8 +13,8 @@
登录
-
+ 或
+ 微信登录
diff --git a/pages/login/index.wxss b/pages/login/index.wxss
index fb0bbc3..7b8e887 100644
--- a/pages/login/index.wxss
+++ b/pages/login/index.wxss
@@ -22,7 +22,7 @@ page {
margin: 0 5%;
width: 90%;
padding: 30rpx 16rpx;
- background: rgba(255, 255, 255, 0.8);
+ background: rgba(255, 255, 255, 0.7);
box-shadow: 0px 0px 12rpx 1rpx #b6c7e4;
border-radius: 20rpx;
margin-top: 30rpx;
diff --git a/pages/msg/push/index.js b/pages/msg/push/index.js
index fa209fd..40f5738 100644
--- a/pages/msg/push/index.js
+++ b/pages/msg/push/index.js
@@ -103,8 +103,8 @@ Page({
*/
getFiles: function () {
app.axios("GET", "common", "/upload/getFile", {
- OTCId: this.data.uuid,
- OTCType: app.FileType.msgAcs
+ otcid: this.data.uuid,
+ otctype: app.FileType.msgAcs
}).then(res => {
if (res.code == 1) {
this.data.files = res.data;
diff --git a/pages/msg/push/index.wxml b/pages/msg/push/index.wxml
index 983613c..d08999e 100644
--- a/pages/msg/push/index.wxml
+++ b/pages/msg/push/index.wxml
@@ -21,9 +21,9 @@
附件
添加附件
-
+
{{item.realfilename}}
-
+
-
+
选择时间: {{dateFilter}}
@@ -16,10 +16,11 @@
- 标题
- {{item.factorcnt}}
- 时间：2024-01-26
+ {{item.title}}
+ {{item.detail}}
+ 时间：{{item.createTime}}
+
\ No newline at end of file
diff --git a/pages/y-j/s-b/index/index.js b/pages/y-j/s-b/index/index.js
new file mode 100644
index 0000000..a37b8dd
--- /dev/null
+++ b/pages/y-j/s-b/index/index.js
@@ -0,0 +1,214 @@
+// 上报动态
+import Utils from "../../../../utils/util"
+const app = getApp();
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ topBarH: app.globalData.CustomBar,
+ baseUrl: app.FILE_SERVER_URL,
+
+ dateFilter: Utils.formatTime(new Date(), '-'),
+ showTypePop: false,
+ showAdvicePop: false,
+ TypeData: ['火灾', '洪涝', '民事纠纷'],
+ postData: {},
+ files: []
+ },
+
+ /**
+ * 显示/关闭弹窗
+ */
+ popModal: function (params) {
+ const type = params.currentTarget.dataset.type;
+ this.data[type] = !this.data[type];
+ this.setData(this.data)
+ },
+
+ /**
+ * 事件类型
+ */
+ typeChange: function (params) {
+ const index = params.currentTarget.dataset.index;
+ this.data.postData.type = index + 1;
+ this.data.showTypePop = false;
+ this.setData(this.data)
+ },
+
+ /**
+ * 事件描述
+ */
+ inputContent: function (e) {
+ this.data.postData.content = e.detail.value;
+ },
+
+ /**
+ * 发布
+ */
+ push: function (params) {
+
+ },
+
+ /**
+ * 选择文件
+ */
+ chooseFile: function () {
+ wx.chooseImage({
+ count: 1,
+ type: 'all',
+ success: (res) => {
+ const tempFilePaths = res.tempFiles;
+ const path = tempFilePaths[0].path;
+ this.postImg(path)
+ }
+ })
+ },
+
+ /**
+ * 上传图片
+ */
+ postImg(filePath) {
+ wx.showLoading({
+ title: '文件上传中...',
+ })
+ app.uploadFile(this.data.uuid, app.FileType.eventAcs, filePath).then(res => {
+ wx.hideLoading();
+ this.getFiles();
+ })
+ },
+
+ /**
+ * 获取图片
+ */
+ getFiles: function () {
+ app.axios("GET", "common", "/upload/getFile", {
+ otcid: this.data.uuid,
+ otctype: app.FileType.eventAcs
+ }).then(res => {
+ if (res.code == 1) {
+ this.data.files = res.data;
+ this.setData(this.data)
+ }
+ })
+ },
+
+ /**
+ * 删除图片
+ * @param {*} params
+ */
+ deleteFile: function (e) {
+ var id = e.currentTarget.dataset.id;
+ wx.showModal({
+ title: '删除提示',
+ content: '是否要删除该附件？',
+ success: (res) => {
+ if (res.confirm) {
+ app.axios("GET", 'common', "/upload/delFile", {
+ documentId: id,
+ }).then(res => {
+ if (res.code == 1) {
+ this.getFiles();
+ }
+ })
+ }
+ }
+ })
+ },
+
+ /**
+ * 预览文件
+ */
+ filePre: function (params) {
+ const url = params.currentTarget.dataset.url;
+ const imgs = [];
+ this.data.files.forEach(item => {
+ imgs.push(this.data.baseUrl + item.filepath)
+ })
+ wx.previewImage({
+ urls: imgs,
+ current: this.data.baseUrl + url
+ })
+ },
+
+ /**
+ * 时间
+ */
+ bindDateChange: function (params) {
+ this.data.postData.time = params.detail.value;
+ this.setData(this.data)
+ },
+
+ /**
+ * 选择位置
+ */
+ chooseAddress: function (params) {
+ wx.chooseLocation({
+ success: (res) => {
+ this.data.postData.lat = res.latitude;
+ this.data.postData.lng = res.longitude;
+ this.data.postData.address = res.address;
+ this.setData(this.data)
+ }
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ this.data.uuid = Utils.uuid();
+ this.setData(this.data)
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/y-j/z-h/index/index.json b/pages/y-j/s-b/index/index.json
similarity index 100%
rename from pages/y-j/z-h/index/index.json
rename to pages/y-j/s-b/index/index.json
diff --git a/pages/y-j/z-h/index/index.wxml b/pages/y-j/s-b/index/index.wxml
similarity index 62%
rename from pages/y-j/z-h/index/index.wxml
rename to pages/y-j/s-b/index/index.wxml
index 2a4ecde..d5839d7 100644
--- a/pages/y-j/z-h/index/index.wxml
+++ b/pages/y-j/s-b/index/index.wxml
@@ -2,12 +2,20 @@
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -46,24 +66,4 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/y-j/z-h/index/index.wxss b/pages/y-j/s-b/index/index.wxss
similarity index 74%
rename from pages/y-j/z-h/index/index.wxss
rename to pages/y-j/s-b/index/index.wxss
index a228e77..6ccb7fa 100644
--- a/pages/y-j/z-h/index/index.wxss
+++ b/pages/y-j/s-b/index/index.wxss
@@ -58,44 +58,26 @@ scroll-view {
font-size: 28rpx;
}
-.item .cloud {
- width: 40rpx;
- height: 40rpx;
- margin-left: 20rpx;
-}
-
-.item .file::before {
- display: block;
- content: ' ';
- width: 20rpx;
- height: 20rpx;
- margin-right: 20rpx;
- border-radius: 50%;
- background-color: var(--blue);
-}
-
-.item .file {
- padding: 15rpx 0;
- border-bottom: 1rpx dashed #f5f5f5;
-}
-
-.item .people {
- display: inline-flex;
- width: calc((100vw - 100rpx) / 4);
+.grid {
margin-top: 20rpx;
+ display: grid;
+ grid-gap: 20rpx 20rpx;
+ grid-template-columns: calc((100vw - 140rpx)/3) auto auto;
}
-.item .people .avatar {
- width: 88rpx;
- height: 88rpx;
- border-radius: 50%;
+.grid .img {
+ width: calc((100vw - 140rpx)/3);
+ height: calc((100vw - 140rpx)/3);
background-color: #f5f5f5;
+ border-radius: 10rpx;
}
-.item .people .name {
- font-size: 28rpx;
- font-weight: bold;
- color: #222222;
+.grid .del {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ z-index: 1;
+ font-size: 40rpx;
}
.option {
diff --git a/pages/y-j/t-x/index/index.js b/pages/y-j/t-x/index/index.js
index 2e73690..ea8bb5a 100644
--- a/pages/y-j/t-x/index/index.js
+++ b/pages/y-j/t-x/index/index.js
@@ -14,16 +14,18 @@ Component({
*/
data: {
condition: '',
+
canChange: false,
freshIng: false,
+ latlng: {},
page: 1,
pageSize: 10,
- list: [{}]
+ list: []
},
pageLifetimes: {
show: function () {
- this.getList();
+ this.getLoc();
},
},
@@ -58,14 +60,71 @@ Component({
*/
refresh: function (params) {
this.data.page = 1;
- // this.data.list = [];
+ this.data.list = [];
this.setData(this.data)
this.getList();
},
+ /**
+ * 获取定位
+ */
+ getLoc: function () {
+ wx.getLocation({
+ altitude: true,
+ highAccuracyExpireTime: 0,
+ isHighAccuracy: true,
+ type: 'type',
+ success: (result) => {
+ this.data.latlng = result;
+ },
+ complete: () => {
+ this.getList();
+ }
+ })
+ },
+
+ toGuid: function (params) {
+ const item = params.currentTarget.dataset.item;
+ if (!item.latitude || !item.longitude) {
+ wx.showToast({
+ title: '未采集位置',
+ icon: 'none',
+ duration: 2000
+ })
+ return
+ }
+ wx.openLocation({
+ latitude: item.latitude,
+ longitude: item.longitude,
+ scale: 18,
+ });
+ },
+
/**
* 获取列表
*/
- getList: function () {}
+ getList: function () {
+ const params = {
+ page: this.data.page,
+ limit: this.data.pageSize,
+ lat: this.data.latlng.latitude,
+ lon: this.data.latlng.longitude,
+ teamname: this.data.condition
+ }
+ app.axios("GET", "app", "/Othteam/getOthteamPage", params, false).then(res => {
+ this.data.freshIng = false;
+ if (res.code == 1) {
+ let page = Number.parseInt(res.data.pageNum);
+ if (this.data.page == 1) {
+ this.data.list = res.data.list;
+ } else {
+ var list = this.data.list;
+ if (this.data.page == page) this.data.list = [...list, ...res.data.list]
+ }
+ if (res.data.list?.length > 0) this.data.page = page + 1
+ }
+ this.setData(this.data)
+ })
+ },
}
})
\ No newline at end of file
diff --git a/pages/y-j/t-x/index/index.wxml b/pages/y-j/t-x/index/index.wxml
index f7bef59..d6c7e09 100644
--- a/pages/y-j/t-x/index/index.wxml
+++ b/pages/y-j/t-x/index/index.wxml
@@ -7,30 +7,30 @@
-
+
- 应急队伍名称
+ {{item.teamname}}
- 导航 3km
+ 导航 {{item.distance}}
联系人：
- 张三
- 18325456264
+ {{item.principal}}
+ {{item.principaltel}}
队伍人数：
- 20
+ {{item.personnum}}
- 职责范围：
- -
+ 队伍介绍：
+ {{item.introduction}}
diff --git a/pages/y-j/y-a/index/index.js b/pages/y-j/y-a/index/index.js
index 722a0b6..cc78ee8 100644
--- a/pages/y-j/y-a/index/index.js
+++ b/pages/y-j/y-a/index/index.js
@@ -15,42 +15,18 @@ Component({
data: {
condition: '',
curTab: 0,
- tabs: [{
- lab: '全部',
- val: 0
- }, {
- lab: '火灾',
- val: 0
- }, {
- lab: '地震',
- val: 0
- }, {
- lab: '暴雨',
- val: 0
- }],
+ tabs: [],
canChange: false,
freshIng: false,
page: 1,
pageSize: 10,
- list: [{
- name: 'xxxxxx预案名称',
- type: '火灾',
- val: ''
- }, {
- name: 'xxxxxx预案名称',
- type: '地震',
- val: ''
- }, {
- name: 'xxxxxx预案名称',
- type: '暴雨',
- val: ''
- }]
+ list: []
},
pageLifetimes: {
show: function () {
- this.getList();
+ this.getType();
},
},
@@ -74,6 +50,7 @@ Component({
const index = Number.parseInt(params.currentTarget.dataset.index);
this.data.curTab = index;
this.setData(this.data)
+ this.refresh();
},
/**
@@ -82,7 +59,7 @@ Component({
*/
refresh: function (params) {
this.data.page = 1;
- // this.data.list = [];
+ this.data.list = [];
this.setData(this.data)
this.getList();
},
@@ -91,11 +68,39 @@ Component({
* 获取列表
*/
getList: function () {
- let url = ""
const params = {
page: this.data.page,
- pageSize: this.data.pageSize,
+ limit: this.data.pageSize,
+ othtypeid: this.data.tabs[this.data.curTab].othtypeid,
+ planname: this.data.condition
}
+ app.axios("GET", "app", "/Othplan/getOthplanPage", params, false).then(res => {
+ this.data.freshIng = false;
+ if (res.code == 1) {
+ let page = Number.parseInt(res.data.pageNum);
+ if (this.data.page == 1) {
+ this.data.list = res.data.list;
+ } else {
+ var list = this.data.list;
+ if (this.data.page == page) this.data.list = [...list, ...res.data.list]
+ }
+ if (res.data.list?.length > 0) this.data.page = page + 1
+ }
+ this.setData(this.data)
+ })
+ },
+
+ /**
+ * 获取预案类型
+ */
+ getType: function () {
+ app.axios("GET", "app", "/Othplan/getOthtypeList", {}, false).then(res => {
+ if (res.code == 1) {
+ this.data.tabs = res.data;
+ this.setData(this.data)
+ }
+ this.setData(this.data)
+ })
}
}
})
\ No newline at end of file
diff --git a/pages/y-j/y-a/index/index.wxml b/pages/y-j/y-a/index/index.wxml
index cdecdb4..de2a09d 100644
--- a/pages/y-j/y-a/index/index.wxml
+++ b/pages/y-j/y-a/index/index.wxml
@@ -1,9 +1,9 @@
-
+
- {{item.lab}}
+ {{item.othtypename}}
@@ -16,17 +16,17 @@
预案名称：
- {{item.name}}
+ {{item.planname}}
预案类型：
- {{item.type}}
+ {{item.othtypename}}
- 备注：
- -
+ 简介：
+ {{item.introduction}}
@@ -34,5 +34,6 @@
+
\ No newline at end of file
diff --git a/pages/y-j/y-a/index/index.wxss b/pages/y-j/y-a/index/index.wxss
index f0947d8..281a32e 100644
--- a/pages/y-j/y-a/index/index.wxss
+++ b/pages/y-j/y-a/index/index.wxss
@@ -60,6 +60,7 @@ page {
padding: 2rpx 40rpx;
margin-left: 20rpx;
display: inline-block;
+ border: 2rpx solid transparent;
}
.filter .cur {
diff --git a/pages/y-j/z-h/index/index.js b/pages/y-j/z-h/index/index.js
deleted file mode 100644
index e3981bd..0000000
--- a/pages/y-j/z-h/index/index.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// 上报动态
-import Utils from "../../../../utils/util"
-const app = getApp();
-
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- topBarH: app.globalData.CustomBar,
-
- dateFilter: Utils.formatTime(new Date(), '-'),
- showTypePop: false,
- showAdvicePop: false,
- TypeData: ['常规工作', '督办工作'],
- AdviceData: ['处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议处理建议'],
- postData: {}
- },
-
- /**
- * 显示/关闭弹窗
- */
- popModal: function (params) {
- const type = params.currentTarget.dataset.type;
- this.data[type] = !this.data[type];
- this.setData(this.data)
- },
-
- /**
- * 通知类型
- */
- typeChange: function (params) {
- const index = params.currentTarget.dataset.index;
- this.data.postData.type = index + 1;
- this.data.showTypePop = false;
- this.setData(this.data)
- },
-
- /**
- * 通知内容
- */
- inputContent: function (e) {
- this.data.postData.content = e.detail.value;
- },
-
- /**
- * 发布
- */
- push: function (params) {
- this.data.showAdvicePop = !this.data.showAdvicePop;
- this.setData(this.data)
- },
-
- /**
- * 获取通知详情
- */
- getDetail: function () {
- app.axios('GET', 'admin', `/notice/getGovNotice/${this.data.uuid}`, {}, false).then(res => {
- if (res.code == 1) {
- this.data.postData = res.data;
- this.setData(this.data);
- this.getFiles();
- }
- })
- },
-
- /**
- * 预览文件
- */
- filePre: function (params) {
- const url = params.currentTarget.dataset.url;
- wx.downloadFile({
- url: this.data.baseUrl + url,
- success: res => {
- const filePath = res.tempFilePath
- wx.openDocument({
- filePath: filePath,
- success: function (res) {}
- })
- }
- })
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
- this.data.isUserDetail = options.user;
- this.data.uuid = options.uuid || utils.uuid();
- this.data.isDetail = options.uuid || false;
- this.getWorker();
- if (this.data.isDetail) {
- this.getDetail();
- }
- this.setData(this.data)
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file