diff --git a/common/tool.js b/common/tool.js
index 5bf74d7..915f9dd 100644
--- a/common/tool.js
+++ b/common/tool.js
@@ -1,4 +1,4 @@
-export var basePath = "http://192.168.0.42:8099/";
+export var basePath = "http://192.168.0.69:8091/";
// export var basePath = "https://gateway.qhdsafety.com/";
export const baseImgPath = "https://file.zcloudchina.com/YTHFile";
export const adminPath = "http://192.168.0.18:8085";
diff --git a/pages.json b/pages.json
index 8d632bd..da0d574 100644
--- a/pages.json
+++ b/pages.json
@@ -272,6 +272,44 @@
"path": "pages/application/check-record/imgs_details",
"style": {}
},
+ // 隐患排查清单 Begin
+ {
+ "path": "pages/application/hidden-danger-check-standard/custom/list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hidden-danger-check-standard/custom/list-item",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-imgs",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hidden-danger-check-standard/custom/list-item-check-next",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hidden-danger-check-standard/record/custom-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hidden-danger-check-standard/record/record-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hidden-danger-check-standard/record/record-info",
+ "style": {}
+ },
+ // 隐患排查清单 End
{
"path": "pages/my/offduty/index",
"style": {}
diff --git a/pages/application/check-record/check_listmanager.vue b/pages/application/check-record/check_listmanager.vue
index 7f94d07..0eff450 100644
--- a/pages/application/check-record/check_listmanager.vue
+++ b/pages/application/check-record/check_listmanager.vue
@@ -2,7 +2,7 @@
返回
- 清单检查记录
+ 风险检查记录
查询
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
new file mode 100644
index 0000000..cf902c2
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue
@@ -0,0 +1,1126 @@
+
+
+
+ 返回
+ 隐患登记
+
+
+
+
+ 检查内容
+
+ {{ pd.CHECK_CONTENT }}
+
+
+
+
+ 隐患照片
+
+
+ {{imgList.length}}/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 隐患视频
+
+
+ {{videoList.length}}/1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 隐患描述
+
+
+
+ 隐患级别
+
+
+ {{pd.HIDDENLEVELNAME?pd.HIDDENLEVELNAME:'请选择'}}
+
+
+
+
+ 隐患类别
+
+
+ {{pd.HIDDEN_CATEGORY_NAME?pd.HIDDEN_CATEGORY_NAME:'请选择'}}
+
+
+
+
+ 隐患类型
+
+ {{pd.HIDDENTYPENAME?pd.HIDDENTYPENAME:'请选择'}}
+
+
+
+
+
+ 是否立即整改
+
+
+
+ 是
+
+
+
+ 是
+
+
+
+ 否
+
+
+
+
+
+ 整改责任部门
+
+ {{pd.RECTIFICATIONDEPTNAME?pd.RECTIFICATIONDEPTNAME:'请选择'}}
+
+
+
+
+ 整改责任人
+
+
+ {{pd.RECTIFICATIONORNAME?pd.RECTIFICATIONORNAME:'请选择'}}
+
+
+
+
+ 整改期限
+
+
+ {{pd.RECTIFICATIONDEADLINE?pd.RECTIFICATIONDEADLINE:'请选择'}}
+
+
+
+
+
+ 整改描述
+
+
+
+
+ 整改后图片
+
+
+ {{imgList1.length}}/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 播放视频
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-imgs.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-imgs.vue
new file mode 100644
index 0000000..232571d
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-imgs.vue
@@ -0,0 +1,377 @@
+
+
+
+ 返回
+ 检查照片
+
+
+
+
+
+ 检查照片
+
+
+ {{imgList.length}}/4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
new file mode 100644
index 0000000..71ba647
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue
@@ -0,0 +1,394 @@
+
+
+
+ 返回
+ 隐患排查项
+
+
+
+ 检查内容:{{item.CHECK_CONTENT}}
+ 检查标准:{{item.CHECK_STANDARD}}
+ 参考依据:{{item.REFERENCE_BASIS}}
+
+
+
+
+
+
+ 合格.{{ item.OPERATION_TYPE === 1 ? item.CHECK_QUALIFIED : '' }}
+
+
+
+
+
+
+
+
+
+ 不合格.{{ item.OPERATION_TYPE === 1 ? item.CHECK_UNQUALIFIED : '' }}
+
+
+
+
+
+
+
+
+
+ 不涉及
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
new file mode 100644
index 0000000..68925ef
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/custom/list-item-check-next.vue
@@ -0,0 +1,1208 @@
+
+
+
+ 返回
+ 检查信息
+
+
+
+ 日期选择
+
+
+ {{date}}
+
+
+
+
+ 时间选择
+
+
+ {{time}}
+
+
+
+
+
+ 检查部门&人
+
+
+
+
+
+
+
+
+ 检查部门
+
+ {{other[index].DEPARTMENT_NAME?other[index].DEPARTMENT_NAME:'请选择'}}
+
+
+
+
+ 检查人
+
+
+ {{other[index].USER_NAME?other[index].USER_NAME:'请选择'}}
+
+
+
+
+
+
+
+
+
+ 其他隐患信息
+
+
+
+
+
+
+
+
+ 隐患描述
+
+
+
+
+
+
+
+
+
+ 备注
+
+
+
+ 检查人签字
+
+
+
+
+ 签字照片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 签名
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-check-standard/custom/list-item.vue b/pages/application/hidden-danger-check-standard/custom/list-item.vue
new file mode 100644
index 0000000..d00e454
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/custom/list-item.vue
@@ -0,0 +1,261 @@
+
+
+
+ 返回
+ 检查项目列表
+
+ 扫描
+
+
+
+
+
+
+
+
+
+
+
+ {{item.DICTIONARY_NAMES.replaceAll(',','--')}}
+
+
+ 所属电子围栏:{{item.ELECTRONIC_FENCE}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-check-standard/custom/list.vue b/pages/application/hidden-danger-check-standard/custom/list.vue
new file mode 100644
index 0000000..b36f872
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/custom/list.vue
@@ -0,0 +1,441 @@
+
+
+
+ 返回
+ 隐患清单排查
+
+ 清单扫描
+
+
+
+
+
+
+ {{tabNav[index]}}
+
+
+
+
+
+
+ {{this.DEPTNAME}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ★{{item.NAME}}
+
+
+
+
+ 清单类型:{{item.TYPENAME}}
+ 排查周期:{{item.PERIODNAME}}
+
+
+ 包含检查项:{{item.count}}
+ 负责人:{{item.USER_NAME}}
+
+
+ 起止时间:{{item.START_DATE}} - {{item.END_DATE}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{background[dataFlag].msg}}
+
+
+
+
+
+
+
+
+
+
+
+ ★{{item.NAME}}
+
+
+
+
+ 清单类型:{{item.TYPENAME}}
+ 排查周期:{{item.PERIODNAME}}
+
+
+ 包含检查项:{{item.count}}
+ 负责人:{{item.USER_NAME}}
+
+
+ 起止时间:{{item.START_DATE}} - {{item.END_DATE}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{background[dataFlag].msg}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-check-standard/record/custom-list.vue b/pages/application/hidden-danger-check-standard/record/custom-list.vue
new file mode 100644
index 0000000..b29e31c
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/record/custom-list.vue
@@ -0,0 +1,540 @@
+
+
+
+ 返回
+ 隐患检查清单
+
+ 查询
+
+
+
+
+
+
+
+ 高级查询
+
+
+
+ 检查部门
+
+
+
+ {{DEPTNAME}}
+
+
+
+
+
+
+
+ 检查人
+
+
+
+
+ {{USER_NAME?USER_NAME:'请选择'}}
+
+
+
+
+
+
+
+ 清单类型
+
+
+
+
+ {{TYPE_NAME?TYPE_NAME:'请选择'}}
+
+
+
+
+
+
+
+ 排查周期
+
+
+
+
+ {{PERIOD_NAME?PERIOD_NAME:'请选择'}}
+
+
+
+
+
+
+ 时间查询
+
+
+
+
+
+ {{starDate==''?'开始时间':starDate}}
+
+
+ -
+
+
+
+ {{endDate==''?'结束时间':endDate}}
+
+
+
+
+
+
+ 重置
+
+
+ 完成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ★清单名称:{{item.NAME}}
+
+
+
+
+ 清单类型:{{item.TYPENAME}}
+ 排查周期:{{item.PERIODNAME}}
+
+
+ 部门:{{item.DEPARTMENT_NAME}}
+ 包保责任人部门:{{item.DEPARTMENT_NAME}}
+
+
+ 岗位:{{item.POST_NAME}}
+ 包保责任人岗位:{{item.POST_NAME}}
+ 人员:{{item.USER_NAME}}
+ 包保责任人:{{item.USER_NAME}}
+
+
+ 检查次数:{{item.count}}
+ 超期未检查次数:{{item.overTimeCount}}
+
+
+
+
+
+
+
+
+
+ {{background[dataFlag].msg}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-check-standard/record/record-info.vue b/pages/application/hidden-danger-check-standard/record/record-info.vue
new file mode 100644
index 0000000..934a64e
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/record/record-info.vue
@@ -0,0 +1,439 @@
+
+
+
+ 返回
+ 检查记录详情
+
+
+ 检查内容
+
+
+
+
+
+ 检查内容
+ 状态
+
+
+ {{item.CHECK_CONTENT}}
+
+
+ 合格
+
+ 合格
+
+
+ 不合格
+
+
+ 不涉及
+
+
+ 存在未整改隐患
+
+
+
+
+
+
+ 其他隐患信息
+
+
+
+
+
+ 隐患描述
+ 操作
+
+
+ {{item.HIDDENDESCR}}
+
+ 查看
+
+
+
+
+
+
+
+
+
+ 清单信息
+
+
+
+
+ 清单名称
+
+
+ {{pd.LIST_NAME}}
+
+
+
+
+ 排查清单类型
+
+
+ {{pd.SCREENTYPENAME}}
+
+
+
+
+ 检查人
+
+
+ {{pd.USERS}}
+
+
+
+
+ 检查时间
+
+
+ {{pd.CHECK_TIME}}
+
+
+
+
+ 所属部门
+
+
+ {{pd.DEPARTMENT_NAME}}
+
+
+
+
+ 所属岗位
+
+
+ {{pd.POST_NAME}}
+
+
+
+
+ 排查周期
+
+
+ {{pd.PERIODNAME}}
+
+
+
+
+ 清单类型
+
+
+ {{pd.TYPENAME}}
+
+
+
+
+ 排查日期
+
+
+ {{pd.START_DATE}} - {{pd.END_DATE}}
+
+
+
+
+
+ 签字照片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/hidden-danger-check-standard/record/record-list.vue b/pages/application/hidden-danger-check-standard/record/record-list.vue
new file mode 100644
index 0000000..1273d90
--- /dev/null
+++ b/pages/application/hidden-danger-check-standard/record/record-list.vue
@@ -0,0 +1,285 @@
+
+
+
+ 返回
+ 隐患检查记录
+
+
+
+
+
+ {{tabNav[index]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 清单名称:{{item.CUSTOM_NAME}}
+
+
+
+
+ 人员:{{item.PRINCIPALNAME?item.PRINCIPALNAME:ls.USER_NAME}}
+
+
+ 检查周期:{{item.DATESTART}}-{{item.DATEEND}}
+
+
+ 检查人:{{item.CHECK_USERS}}
+ 检查时间:{{item.CHECK_TIME}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{background[dataFlag].msg}}
+
+
+
+
+
+
+
+
+
+
+
+ 清单名称:{{item.CUSTOM_NAME?item.CUSTOM_NAME:ls.NAME}}
+
+
+
+ 人员:{{item.PRINCIPALNAME?item.PRINCIPALNAME:ls.USER_NAME}}
+
+
+ 检查周期:{{item.DATESTART}}-{{item.DATEEND}}
+
+
+ 清单类型:{{ls.TYPENAME}}
+ 清单周期:{{ls.PERIODNAME}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{background[dataFlag].msg}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/application/home.vue b/pages/application/home.vue
index fa14ad9..dc68ee6 100644
--- a/pages/application/home.vue
+++ b/pages/application/home.vue
@@ -4,29 +4,37 @@
+
+
+
+ 隐患快报
+
+
+
+
+
+
+ 隐患快报
+
+
+
- 隐患排查
+ 风险排查
- 隐患排查
+ 风险排查
- 隐患排查
-
-
-
-
-
- 隐患快报
+ 风险排查
@@ -35,7 +43,32 @@
检查记录
-
+
+
+
+ 隐患排查
+
+
+
+
+
+
+ 隐患排查
+
+
+
+
+
+ 隐患排查
+
+
+
+
+
+ 检查记录
+
+
+
diff --git a/uniCloud-aliyun/cloudfunctions/unipush/index.js b/uniCloud-aliyun/cloudfunctions/unipush/index.js
deleted file mode 100644
index 62eed8c..0000000
--- a/uniCloud-aliyun/cloudfunctions/unipush/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-exports.main = async (event, context) => {
- let body = event.body;
- if (event.isBase64Encoded) {body = Buffer.from(body);}
- if(!body) {return { message: 'no body'};}
-
- const param = JSON.parse(body);
-
- // 云函数是通用的,和项目没有直接的关系。通过传递 appId,可以为多个项目进行推送
- const uniPush = uniCloud.getPushManager({appId:"__UNI__C846DA5"});
- return await uniPush.sendMessage(param);
-};
\ No newline at end of file
diff --git a/uniCloud-aliyun/cloudfunctions/unipush/package.json b/uniCloud-aliyun/cloudfunctions/unipush/package.json
deleted file mode 100644
index 0799df8..0000000
--- a/uniCloud-aliyun/cloudfunctions/unipush/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "name": "unipush",
- "version": "1.0.0",
- "main": "index.js",
- "description": "消息推送",
- "extensions": {
- "uni-cloud-push": {}
- }
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/opendb-device.schema.json b/uniCloud-aliyun/database/opendb-device.schema.json
deleted file mode 100644
index 7c6cb44..0000000
--- a/uniCloud-aliyun/database/opendb-device.schema.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
- "bsonType": "object",
- "required": [],
- "permission": {
- "read": false,
- "create": false,
- "update": false,
- "delete": false
- },
- "properties": {
- "_id": {
- "description": "ID,系统自动生成"
- },
- "appid": {
- "bsonType": "string",
- "description": "DCloud appid"
- },
- "device_id": {
- "bsonType": "string",
- "description": "设备唯一标识"
- },
- "vendor": {
- "bsonType": "string",
- "description": "设备厂商"
- },
- "push_clientid": {
- "bsonType": "string",
- "description": "推送设备客户端标识"
- },
- "imei": {
- "bsonType": "string",
- "description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
- },
- "oaid": {
- "bsonType": "string",
- "description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
- },
- "idfa": {
- "bsonType": "string",
- "description": "iOS平台配置应用使用广告标识(IDFA)"
- },
- "imsi": {
- "bsonType": "string",
- "description": "国际移动用户识别码(International Mobile Subscriber Identification Number)"
- },
- "model": {
- "bsonType": "string",
- "description": "设备型号"
- },
- "platform": {
- "bsonType": "string",
- "description": "平台类型"
- },
- "uni_platform": {
- "bsonType": "string",
- "description": "uni-app 运行平台,与条件编译平台相同。"
- },
- "os_name": {
- "bsonType": "string",
- "description": "ios|android|windows|mac|linux "
- },
- "os_version": {
- "bsonType": "string",
- "description": "操作系统版本号 "
- },
- "os_language": {
- "bsonType": "string",
- "description": "操作系统语言 "
- },
- "os_theme": {
- "bsonType": "string",
- "description": "操作系统主题 light|dark"
- },
- "pixel_ratio": {
- "bsonType": "string",
- "description": "设备像素比 "
- },
- "network_model": {
- "bsonType": "string",
- "description": "设备网络型号wifi/3G/4G/"
- },
- "window_width": {
- "bsonType": "string",
- "description": "设备窗口宽度 "
- },
- "window_height": {
- "bsonType": "string",
- "description": "设备窗口高度"
- },
- "screen_width": {
- "bsonType": "string",
- "description": "设备屏幕宽度"
- },
- "screen_height": {
- "bsonType": "string",
- "description": "设备屏幕高度"
- },
- "rom_name": {
- "bsonType": "string",
- "description": "rom 名称"
- },
- "rom_version": {
- "bsonType": "string",
- "description": "rom 版本"
- },
- "location_latitude": {
- "bsonType": "double",
- "description": "纬度"
- },
- "location_longitude": {
- "bsonType": "double",
- "description": "经度"
- },
- "location_country": {
- "bsonType": "string",
- "description": "国家"
- },
- "location_province": {
- "bsonType": "string",
- "description": "省份"
- },
- "location_city": {
- "bsonType": "string",
- "description": "城市"
- },
- "create_date": {
- "bsonType": "timestamp",
- "description": "创建时间",
- "forceDefaultValue": {
- "$env": "now"
- }
- },
- "last_update_date": {
- "bsonType": "timestamp",
- "description": "最后一次修改时间",
- "forceDefaultValue": {
- "$env": "now"
- }
- }
- },
- "version": "0.0.1"
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/opendb-tempdata.schema.json b/uniCloud-aliyun/database/opendb-tempdata.schema.json
deleted file mode 100644
index 1b4f191..0000000
--- a/uniCloud-aliyun/database/opendb-tempdata.schema.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "bsonType": "object",
- "required": [
- "value",
- "expired"
- ],
- "permission": {
- "read": false,
- "create": false,
- "update": false,
- "delete": false
- },
- "properties": {
- "_id": {
- "description": "ID,系统自动生成"
- },
- "value": {
- "description": "值"
- },
- "expired": {
- "description": "过期时间",
- "bsonType": "timestamp"
- }
- },
- "version": "0.0.1"
-}
\ No newline at end of file
diff --git a/uniCloud-aliyun/database/uni-id-device.schema.json b/uniCloud-aliyun/database/uni-id-device.schema.json
deleted file mode 100644
index 4981d75..0000000
--- a/uniCloud-aliyun/database/uni-id-device.schema.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- "bsonType": "object",
- "required": [
- "user_id"
- ],
- "properties": {
- "_id": {
- "description": "ID,系统自动生成"
- },
- "user_id": {
- "bsonType": "string",
- "description": "用户id,参考uni-id-users表"
- },
- "ua": {
- "bsonType": "string",
- "description": "userAgent"
- },
- "uuid": {
- "bsonType": "string",
- "description": "设备唯一标识(需要加密存储)"
- },
- "os_name": {
- "bsonType": "string",
- "description": "ios|android|windows|mac|linux "
- },
- "os_version": {
- "bsonType": "string",
- "description": "操作系统版本号 "
- },
- "os_language": {
- "bsonType": "string",
- "description": "操作系统语言 "
- },
- "os_theme": {
- "bsonType": "string",
- "description": "操作系统主题 light|dark"
- },
- "vendor": {
- "bsonType": "string",
- "description": "设备厂商"
- },
- "push_clientid": {
- "bsonType": "string",
- "description": "推送设备客户端标识"
- },
- "imei": {
- "bsonType": "string",
- "description": "国际移动设备识别码IMEI(International Mobile Equipment Identity)"
- },
- "oaid": {
- "bsonType": "string",
- "description": "移动智能设备标识公共服务平台提供的匿名设备标识符(OAID)"
- },
- "idfa": {
- "bsonType": "string",
- "description": "iOS平台配置应用使用广告标识(IDFA)"
- },
- "model": {
- "bsonType": "string",
- "description": "设备型号"
- },
- "platform": {
- "bsonType": "string",
- "description": "平台类型"
- },
- "create_date": {
- "bsonType": "timestamp",
- "description": "创建时间",
- "forceDefaultValue": {
- "$env": "now"
- }
- },
- "last_active_date": {
- "bsonType": "timestamp",
- "description": "最后登录时间"
- },
- "last_active_ip": {
- "bsonType": "string",
- "description": "最后登录IP"
- }
- },
- "version": "0.0.1"
-}
\ No newline at end of file