diff --git a/app.json b/app.json
index 5c8b499..fbb4dd7 100644
--- a/app.json
+++ b/app.json
@@ -22,6 +22,21 @@
"pages/addhouse/addhouse"
]
},
+
+ {
+ "root": "subpages/safetyinspection",
+ "name": "safetyinspection",
+ "pages": [
+ "pages/safetyinspection/safetyinspection"
+ ]
+ },
+ {
+ "root": "subpages/InspectionReport",
+ "name": "InspectionReport",
+ "pages": [
+ "pages/InspectionReport/InspectionReport"
+ ]
+ },
{
"root": "subpages/morenews",
"name": "morenews",
diff --git a/images/add.png b/images/add.png
new file mode 100644
index 0000000..ed3cd40
Binary files /dev/null and b/images/add.png differ
diff --git a/images/location.png b/images/location.png
new file mode 100644
index 0000000..05a6c61
Binary files /dev/null and b/images/location.png differ
diff --git a/project.private.config.json b/project.private.config.json
index c4a9662..7f69793 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -9,6 +9,24 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "巡查上报",
+ "pathName": "subpages/InspectionReport/pages/InspectionReport/InspectionReport",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "subpages/safetyinspection/pages/safetyinspection/safetyinspection",
+ "pathName": "subpages/safetyinspection/pages/safetyinspection/safetyinspection",
+ "query": "",
+ "launchMode": "default",
+ "scene": null,
+ "partialCompile": {
+ "enabled": true,
+ "pages": []
+ }
+ },
{
"name": "subpages/communitySelfInsp/pages/historyQuery/historyQuery",
"pathName": "subpages/communitySelfInsp/pages/historyQuery/historyQuery",
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
new file mode 100644
index 0000000..17a8726
--- /dev/null
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -0,0 +1,66 @@
+// subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json
new file mode 100644
index 0000000..047ca3b
--- /dev/null
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.json
@@ -0,0 +1,6 @@
+{
+ "navigationBarTitleText": "安检巡查",
+ "usingComponents": {
+ "van-uploader": "@vant/weapp/uploader/index"
+ }
+}
\ No newline at end of file
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
new file mode 100644
index 0000000..557694b
--- /dev/null
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
@@ -0,0 +1,94 @@
+
+
+
+
+
+ *
+ 企业名称
+ 张玉斌
+
+
+
+
+
+
+
+
+ *
+ 检察人员
+ 请选择
+
+
+
+
+
+
+
+
+ *
+ 检查结论
+ 请选择
+
+
+
+
+
+
+
+
+ *
+ 隐患明细
+
+
+
+
+
+
+
+
+
+
+
+ 在添加一条
+
+
+
+ 整改要求
+
+
+
+
+
+
+
+ *
+ 拟复查时间
+
+
+
+
+
+
+
+ 附件
+
+ 备注
+
+
+
+
+
+
+ 提交
+
\ No newline at end of file
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
new file mode 100644
index 0000000..2c0d195
--- /dev/null
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss
@@ -0,0 +1,234 @@
+page {
+ width: 100%;
+ height: auto;
+ overflow-y: auto;
+ background: #f7f7f7;
+ padding-bottom: 20rpx;
+ box-sizing: border-box;
+}
+.header{
+ height: 80rpx;
+ display: flex;
+ background-color: white;
+ flex-direction: row;
+ justify-content: space-between;
+}
+.header_left{
+ display:flex;
+ flex-direction: row;
+ margin-left: 20rpx;
+}
+.header_img{
+ width: 36rpx;
+ height: 36rpx;
+ margin-top: 10rpx;
+}
+.inside{
+ display: flex;
+ flex-direction: column;
+ margin-left: 10rpx;
+}
+.text1{
+ width: 374rpx;
+ height: 30rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 32rpx;
+ font-family: PingFang-SC-Regular;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-left: 1rpx;
+}
+.text2{
+ width: 382rpx;
+ height: 24rpx;
+ overflow-wrap: break-word;
+ color: rgba(172,172,172,1);
+ font-size: 24rpx;
+ font-family: PingFang-SC-Regular;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-top: 10rpx;
+}
+.header_right{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-right: 30rpx;
+}
+.text3{
+ width: 118rpx;
+ height: 28rpx;
+ overflow-wrap: break-word;
+ color: rgba(56,135,248,1);
+ font-size: 30rpx;
+ font-family: PingFang-SC-Regular;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+}
+.from{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ border-radius: 15rpx;
+ background-color: rgb(255, 255, 255);
+ margin: 30rpx;
+}
+.prosecutors{
+ display: flex;
+ flex-direction:row;
+ align-items: center;
+ margin: 20rpx;
+ justify-content: space-between;
+ height: 70rpx;
+ border-bottom: 1px solid #EAEAEA;
+ align-items: center;
+}
+.hidden_top{
+ display: flex;
+ flex-direction:row;
+ align-items: center;
+ margin: 20rpx;
+ justify-content: space-between;
+ height: 50rpx;
+}
+.prosecutors_req{
+ color: red;
+ margin: 5rpx
+}
+.prosecutors_pre{
+ width: 125rpx;
+ height: 30rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size:32rpx;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-left: 6rpx;
+ margin-bottom: 10rpx;
+}
+.prosecutors_pre1{
+ width: 125rpx;
+ height: 30rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size:32rpx;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-left: 30rpx;
+ margin-bottom: 10rpx;
+}
+.prosecutors_name{
+ width: 93rpx;
+ height: 30rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 32rpx;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-left: 60rpx;
+}
+.prosecutors_img{
+ width: 40rpx;
+ height: 30rpx;
+ margin-right: 30rpx;
+}
+.hidden{
+ display: flex;
+ flex-direction: column;
+}
+.hidden_button{
+ display: flex;
+ flex-direction: column;
+}
+.input{
+ background-color: rgba(247,247,247,1.000000);
+ border-radius: 10rpx;
+ height: 100rpx;
+ display: flex;
+ flex-direction: column;
+ width: 650rpx;
+ margin-left: 40rpx;
+}
+.add{
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ margin: 20rpx;
+}
+.add_img{
+ width: 40rpx;
+ height: 40rpx;
+}
+.add_text{
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 32rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 48rpx;
+}
+.input1{
+ margin-left: 60rpx;
+}
+.date{
+ display: flex;
+ flex-direction:row;
+ align-items: center;
+ margin: 20rpx;
+ height: 70rpx;
+ border-bottom: 1px solid #EAEAEA;
+ align-items: center;
+}
+.attachment{
+ display: flex;
+ flex-direction: column;
+ margin: 20rpx;
+}
+.shangchuan{
+ margin: 20rpx;
+}
+.textarea1{
+ margin-top: 20rpx;
+ background-color:#f7f7f7 ;
+ width: 100%;
+ height: 200rpx;
+}
+.text-wrapper_11 {
+ background-color: rgba(57,116,246,1.000000);
+ border-radius: 43rpx;
+ height: 86rpx;
+ display: flex;
+ flex-direction: column;
+ width: 630rpx;
+ margin: 60rpx 0 57rpx 60rpx;
+}
+.text_29 {
+ width: 62rpx;
+ height: 31rpx;
+ overflow-wrap: break-word;
+ color: rgba(255,255,255,1);
+ font-size: 32rpx;
+ font-family: PingFang-SC-Bold;
+ font-weight: 700;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 60rpx;
+ margin: 25rpx 0 0 284rpx;
+}
\ No newline at end of file
diff --git a/subpages/communitySelfInsp/pages/followUpList/followUpList.json b/subpages/communitySelfInsp/pages/followUpList/followUpList.json
index e7f7937..81507b2 100644
--- a/subpages/communitySelfInsp/pages/followUpList/followUpList.json
+++ b/subpages/communitySelfInsp/pages/followUpList/followUpList.json
@@ -2,8 +2,8 @@
"usingComponents": {
"load-more": "../../../../components/loadMore/loadMore",
"no-data": "../../../../components/noData/nodata",
- "wux-calendar":"../../../../components/dist/calendar",
- "wux-picker":"../../../../components/dist/picker/index"
+ "wux-calendar":"../../../../components/dist/calendar",
+ "wux-picker":"../../../../components/dist/picker/index"
}
}
\ No newline at end of file
diff --git a/subpages/house/pages/housePortrait/housePortrait.wxml b/subpages/house/pages/housePortrait/housePortrait.wxml
index 02e81ea..03cb3c4 100644
--- a/subpages/house/pages/housePortrait/housePortrait.wxml
+++ b/subpages/house/pages/housePortrait/housePortrait.wxml
@@ -44,7 +44,7 @@
更新记录
-
+
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
new file mode 100644
index 0000000..2ef2d0f
--- /dev/null
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
@@ -0,0 +1,95 @@
+// subpages/safetyinspection/pages/safetyinspection/safetyinspection.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ result: ['a', 'b'],
+ value: '',
+ fileList: [
+ ],
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ },
+ onChex(event) {
+ this.setData({
+ result: event.detail,
+ });
+ },
+ onChange(event) {
+ // event.detail 为当前输入的值
+ console.log(event.detail);
+ },
+ afterRead(event) {
+ const { file } = event.detail;
+ console.log(file)
+ // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+ wx.uploadFile({
+ url: 'https://example.weixin.qq.com/upload', // 仅为示例，非真实的接口地址
+ filePath: file.url,
+ name: 'file',
+ formData: { user: 'test' },
+ success(res) {
+ // 上传完成需要更新 fileList
+ const { fileList = [] } = this.data;
+ fileList.push({ ...file, url: res.data });
+ this.setData({ fileList });
+ },
+ });
+ },
+})
\ No newline at end of file
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json
new file mode 100644
index 0000000..bcaed8f
--- /dev/null
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.json
@@ -0,0 +1,12 @@
+{
+ "navigationBarTitleText": "安全巡检",
+ "backgroundTextStyle":"dark",
+ "usingComponents": {
+ "load-more": "../../../../components/loadMore/loadMore",
+ "no-data": "../../../../components/noData/nodata",
+ "van-checkbox": "@vant/weapp/checkbox/index",
+ "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+ "van-field": "@vant/weapp/field/index",
+ "van-uploader": "@vant/weapp/uploader/index"
+ }
+}
\ No newline at end of file
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
new file mode 100644
index 0000000..957fe57
--- /dev/null
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml
@@ -0,0 +1,117 @@
+
+
+
+
+ *
+ 检查人员
+ 张玉斌
+
+
+
+
+
+
+
+
+ *
+ 已整改隐患
+
+
+
+
+
+
+
+ 1.车间一些软件设备出现生锈断裂情况严重。
+ 2.还有部分货运车辆已过年检。
+
+
+
+
+
+
+
+ 在添加一条
+
+
+
+
+ *
+ 检查结论
+ 请选择
+
+
+
+
+
+
+
+ *
+ 拟复查时间
+
+
+
+
+
+
+
+
+
+ 附件
+
+ 备注
+
+
+
+
+
+
+
+巡检记录
+
+
+
+
+
+
+ 时间
+
+
+
+
+ 检察人员：
+ 123
+
+
+ 检查结论：
+ 123
+
+
+ 隐患明细：
+ 123
+
+
+ 整改要求：
+ 123
+
+
+ 附件：
+ 123
+
+
+ 备注：
+ 123
+
+
+ 整改要求：
+ 123
+
+
+
+
+
+
+
+
+
+
diff --git a/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
new file mode 100644
index 0000000..c9dd41e
--- /dev/null
+++ b/subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss
@@ -0,0 +1,224 @@
+page {
+ width: 100%;
+ min-height: 100vh;
+ overflow-y: auto;
+ background-color: #f7f7f7;
+}
+.from{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ border-radius: 15rpx;
+ background-color: rgb(255, 255, 255);
+ margin: 30rpx;
+}
+.prosecutors{
+ display: flex;
+ flex-direction:row;
+ align-items: center;
+ margin: 20rpx;
+ justify-content: space-between;
+ height: 50rpx;
+ border-bottom: 1px solid #EAEAEA;
+}
+.prosecutors_req{
+ color: red;
+ margin: 5rpx
+}
+.prosecutors_pre{
+ width: 125rpx;
+ height: 30rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size:32rpx;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-left: 6rpx;
+}
+.prosecutors_name{
+ width: 93rpx;
+ height: 30rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 32rpx;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-left: 60rpx;
+}
+.prosecutors_img{
+ width: 40rpx;
+ height: 30rpx;
+ margin-right: 30rpx;
+}
+.prosecutors_top{
+ display: flex;
+ flex-direction: column;
+}
+.prosecutors_but{
+ display: flex;
+ flex-direction: column;
+ margin: 15rpx;
+}
+.prosecutors_chex{
+ margin: 20rpx;
+}
+.checkbox{
+ font-size: 32rpx;
+
+}
+.prosecutors_group{
+ margin: 20rpx;
+}
+.prosecutors_add{
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+}
+.prosecutors_data{
+ display: flex;
+ flex-direction: row;
+}
+.input{
+ margin-left: 100rpx;
+ font-size: 32rpx;
+}
+.attachment{
+ display: flex;
+ flex-direction: column;
+ margin: 20rpx;
+}
+.image1{
+ margin-top: 20rpx;
+ margin-bottom: 20rpx;
+ width: 200rpx;
+ height: 200rpx;
+}
+.text1{
+ width: 62rpx;
+ height: 30rpx;
+ overflow-wrap: break-word;
+ color: rgba(102,102,102,1);
+ font-size: 32rpx;
+ font-family: PingFang-SC-Regular;
+ font-weight: normal;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 42rpx;
+ margin-bottom: 30rpx;
+}
+.textarea1{
+ margin-top: 20rpx;
+ background-color:#f7f7f7 ;
+ width: 100%;
+ height: 200rpx;
+}
+.text2{
+ width: 133rpx;
+ height: 32rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 34rpx;
+ font-family: PingFang-SC-Bold;
+ font-weight: 700;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 52rpx;
+ margin: 31rpx 0 0 29rpx;
+}
+.logsBox {
+ border-left: 3rpx solid #DADEE5;
+ margin-left: -18rpx;
+ padding-left: 12rpx;
+}
+
+.logs-top {
+ display: flex;
+ justify-content: space-between;
+ position: relative;
+ top: -32rpx;
+ padding-left: 12rpx;
+}
+
+.logs-top-title {
+ height: 31rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #333333;
+ line-height: 41rpx;
+}
+
+.logs-top-time {
+ height: 20rpx;
+ font-family: PingFang SC;
+ font-weight: 500;
+ font-size: 26rpx;
+ color: #BDBDBD;
+ line-height: 40rpx;
+}
+
+.logs-content {
+ position: relative;
+ top: -24rpx;
+ padding-top: 12rpx;
+ padding-bottom: 24rpx;
+ display: flex;
+ justify-content: space-between;
+ font-family: PingFang SC;
+ font-weight: 500;
+ font-size: 30rpx;
+ color: #999999;
+ line-height: 52rpx;
+}
+
+.logs-content-left {
+ width: 48%;
+}
+
+.logs-content-right {
+ width: 48%;
+}
+
+.logs-content-txt {
+ color: #333333;
+}
+
+.item-dian {
+ position: relative;
+ left: -28rpx;
+ width: 32rpx;
+ height: 32rpx;
+ box-sizing: border-box;
+ background: #FFFFFF;
+ border-radius: 50%;
+ border: 1px solid #3A80E7;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.neidian {
+ width: 18rpx;
+ height: 18rpx;
+ background: #3A80E7;
+ border-radius: 50%;
+}
+.text3{
+ width: 138rpx;
+ height: 27rpx;
+ overflow-wrap: break-word;
+ color: rgba(51,51,51,1);
+ font-size: 28rpx;
+ font-family: PingFang-SC-Medium;
+ font-weight: 500;
+ text-align: left;
+ white-space: nowrap;
+ line-height: 48rpx;
+ margin-bottom: 20rpx;
+}
\ No newline at end of file