diff --git a/api/index/index.js b/api/index/index.js
index def5da9..fc4035c 100644
--- a/api/index/index.js
+++ b/api/index/index.js
@@ -176,4 +176,13 @@ export function getRegionTreeList() {
url: '/admin-api/system/area/tree',
method: 'GET',
})
+}
+
+//创建私有隐患库
+export function createPrivateHazard(data) {
+ return request({
+ url: '/admin-api/review/private-hazard-bank/create',
+ method: 'POST',
+ data: data
+ })
}
\ No newline at end of file
diff --git a/components/custom-nomore/custom-nomore.vue b/components/custom-nomore/custom-nomore.vue
index 0df48ff..160e4e0 100644
--- a/components/custom-nomore/custom-nomore.vue
+++ b/components/custom-nomore/custom-nomore.vue
@@ -3,7 +3,7 @@
- 我也是有底线的~
+ 到底了，没有更多数据了
diff --git a/pageIndex/addSafeCheck/readdSafeCheck.vue b/pageIndex/addSafeCheck/readdSafeCheck.vue
index 9bda4e7..cd179e0 100644
--- a/pageIndex/addSafeCheck/readdSafeCheck.vue
+++ b/pageIndex/addSafeCheck/readdSafeCheck.vue
@@ -69,7 +69,10 @@
- 隐患描述#{{ index + 1 }}
+
+ 隐患描述#{{ index + 1 }}
+ 同步至隐患库
+
@@ -183,6 +186,30 @@
+
+
+
@@ -217,6 +244,10 @@ export default {
arr: [
],
+ maps: {
+ text: 'label',
+ value: 'value'
+ },
hazardList: [],
addComForm: {
enterpriseName: '',
@@ -234,8 +265,15 @@ export default {
status: '1',//审核状态
disabled: false,
isReCheck: false, // 是否为复查
+ isTongBu: false, // 是否为复查
id: '',
- formData: {}
+ formData: {},
+ hazardLevelList: [],
+ hazardTypeList: [],
+ hazardLevel: '',
+ hazardType: '',
+ formData1: null,
+ selectItem: null,
}
},
onLoad(options) {
@@ -258,6 +296,11 @@ export default {
} else {
this.isReCheck = false
}
+ if (options.type && options.type == 4) {
+ this.isTongBu = true
+ } else {
+ this.isTongBu = false
+ }
},
onShow() {
@@ -274,9 +317,92 @@ export default {
})
}, 1500)
})
-
+ this.getDicts('hazard_level')
+ this.getDicts('hazard_type')
},
methods: {
+ reset1() {
+ this.hazardLevel = ''
+ this.hazardType = ''
+ this.formData1 = null
+ this.$refs.tongbuPopup.close()
+ },
+ tongbu(val) {
+ if (val == 2) {
+ if (!this.hazardLevel) {
+ uni.showToast({
+ title: '请选择隐患等级',
+ icon: 'none'
+ })
+ return
+ }
+ if (!this.hazardType) {
+ uni.showToast({
+ title: '请选择隐患类型',
+ icon: 'none'
+ })
+ return
+ }
+ let that = this
+ uni.showModal({
+ title: '提示',
+ content: '确定同步吗?',
+ showCancel: true,
+ success: function (res) {
+ if (res.confirm) {
+ that.formData1 = {
+ hazardDescription: that.selectItem.description,
+ inspectionBasis: that.selectItem.rectificationBasis,
+ remediationSuggestions: that.selectItem.rectificationSuggestion,
+ hazardType: that.hazardType,
+ hazardLevel: that.hazardLevel,
+ sort: 0,
+ status: true
+ }
+ debugger
+ Api.createPrivateHazard(that.formData1).then(res => {
+ uni.showToast({
+ title: '同步完成',
+ icon: 'none'
+ })
+ that.$refs.tongbuPopup.close()
+ that.$refs.paging.refresh()
+ that.hazardType = ''
+ that.hazardLevel = ''
+ that.formData1 = null
+ }).catch(err => {
+ console.log(err)
+ })
+ } else if (res.cancel) {
+ that.hazardType = ''
+ that.hazardLevel = ''
+ that.formData1 = null
+
+ console.log('用户点击取消');
+ }
+ }
+ })
+ }
+ },
+ tongbuPopup(item) {
+ this.selectItem = item
+ this.$refs.tongbuPopup.open()
+ },
+ getDicts(type) {
+ const params = {
+ type: type
+ }
+ getDicts(params).then(res => {
+ if (type === 'hazard_level') {
+ this.hazardLevelList = res.data
+ } else if (type === 'hazard_type') {
+ this.hazardTypeList = res.data
+
+ }
+ }).catch(err => {
+ console.log(err)
+ })
+ },
parseTime(time) {
return parseTime(time, '{y}-{m}-{d}')
},
@@ -1267,4 +1393,91 @@ export default {
}
}
}
+
+.form-item-titlebox {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .label1 {
+ font-size: 24rpx;
+ color: #0d6dc1;
+ border: solid 1rpx #0d6dc1;
+ padding: 5rpx 10rpx;
+ border-radius: 10rpx;
+ }
+}
+
+.popup-box {
+ padding: 30rpx;
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
+
+ &-content {
+ &-item {
+ margin-bottom: 40rpx;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ >text {
+ display: block;
+ font-size: 32rpx;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 20rpx;
+ }
+
+ .uni-data-checkbox {
+ display: flex;
+ flex-wrap: wrap;
+
+ ::v-deep .uni-checkbox-group {
+ display: flex;
+ flex-wrap: wrap;
+
+ .uni-label {
+ width: 50%;
+ margin-bottom: 20rpx;
+ display: flex;
+ align-items: center;
+
+ .uni-checkbox-input {
+ transform: scale(0.8);
+ margin-right: 10rpx;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ &-btn-box {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 30rpx;
+
+ &-item {
+ flex: 1;
+ height: 80rpx;
+ line-height: 80rpx;
+ text-align: center;
+ border-radius: 10rpx;
+ font-size: 30rpx;
+
+ &:first-child {
+ background-color: #f5f5f5;
+ color: #666;
+ margin-right: 20rpx;
+ }
+
+ &:last-child {
+ background-color: #007AFF;
+ color: #fff;
+ margin-left: 20rpx;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/pageIndex/aiAsk/aiAsk.vue b/pageIndex/aiAsk/aiAsk.vue
index 667154e..207079e 100644
--- a/pageIndex/aiAsk/aiAsk.vue
+++ b/pageIndex/aiAsk/aiAsk.vue
@@ -253,8 +253,8 @@ export default {
this.sseBuffer = "";
const url = 'https://e629859.r39.cpolar.top/agent-api/api/v3/user_share_chat_completions'
- + '?api_key=cjy-778af2cdb2f645ff99493cee58919e9d'
- + '&app_code=c8360e1c-6d21-11f0-8f29-00e04f309c26'
+ + '?api_key=cjy-c8c36aa2ffa64aa5b4b1e89b14166a4c'
+ + '&app_code=ebccfa05-78ab-11f0-9afa-00e04f3085ba'
+ '&random=' + this.random + '&user_input=' + encodeURIComponent(question);
const requestTask = wx.request({
diff --git a/pageIndex/checkHsitory/recheckHsitory.vue b/pageIndex/checkHsitory/recheckHsitory.vue
index 72f4eae..03e6b41 100644
--- a/pageIndex/checkHsitory/recheckHsitory.vue
+++ b/pageIndex/checkHsitory/recheckHsitory.vue
@@ -75,10 +75,13 @@
// 复制报告链接
// 签字 -->
查看报告
- 复查
- 同步到学一学
+ 查看详情
@@ -118,7 +121,7 @@
-
+
+