diff --git a/src/api/snapshot/snapshot.js b/src/api/snapshot/snapshot.js index 3b14b7b..93f0e57 100644 --- a/src/api/snapshot/snapshot.js +++ b/src/api/snapshot/snapshot.js @@ -5,7 +5,7 @@ export function getMySnapshotList(data) { return request({ url: '/project/snap/getMySnapshotList', method: 'get', - params: data + params: data, }) } //转违章或者转隐患 @@ -13,7 +13,7 @@ export function updateSnapshotStatus(data) { return request({ url: '/project/snap/updateSnapshotStatus', method: 'post', - data: data + data: data, }) } //删除随手拍 @@ -21,18 +21,18 @@ export function delSnapshot(data) { return request({ url: '/project/snap/delSnapshot', method: 'post', - data: data + data: data, }) } //更新随手拍 -export function updateSnapshot(data) { +export function updateSnapshot(data) { return request({ url: '/project/snap/updateSnapshot', method: 'post', headers: { 'Content-Type': 'multipart/form-data', }, - data + data, }) } @@ -41,17 +41,32 @@ export function updateAuditStatus(data) { return request({ url: '/project/snap/updateAuditStatus', method: 'post', - data: data + data: data, }) } - // 获取随手拍列表 export function getSnapshotList(data) { return request({ url: '/project/snap/getSnapshotList', method: 'get', - params: data + params: data, + }) +} +// 修改随手拍 +export function updateSnapshotApi(data) { + return request({ + url: '/app/snapshot/addSnapshotForm', + method: 'post', + data, + }) +} +// 获取工程下拉选 +export function getProOptionsApi(data = {}) { + return request({ + url: '/system/select/getProOptions', + method: 'post', + data, }) } @@ -62,7 +77,7 @@ export function transferViolation(data) { headers: { 'Content-Type': 'multipart/form-data', }, - data: data + data: data, }) } export function transferHiddenDanger(data) { @@ -72,6 +87,6 @@ export function transferHiddenDanger(data) { headers: { 'Content-Type': 'multipart/form-data', }, - data: data + data: data, }) } diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 44c545c..0630cd0 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -11,26 +11,25 @@ style="display: none" ref="upload" v-if="this.type == 'url'" - > - + >
diff --git a/src/components/pro-tabs/bns-timeline-tabs.vue b/src/components/pro-tabs/bns-timeline-tabs.vue index d35c0e3..711f74b 100644 --- a/src/components/pro-tabs/bns-timeline-tabs.vue +++ b/src/components/pro-tabs/bns-timeline-tabs.vue @@ -194,6 +194,7 @@ export default { auditReason: { type: Array, default: [], + required: false, }, showType: Number, // 1 展示审批意见 2 展示填写按钮 isExamine: false, // 是否为审批页面 true 是 展示审核按钮 false 否 diff --git a/src/utils/aescbc.js b/src/utils/aescbc.js index cc8912c..aa1625e 100644 --- a/src/utils/aescbc.js +++ b/src/utils/aescbc.js @@ -6,12 +6,12 @@ const cbc_iv = CryptoJS.enc.Utf8.parse('1234567812345678') * 默认参数需要加密 * @type {boolean} */ -const jia_mi = false +const jia_mi = true /** * 默认后台会自动加密 * @type {boolean} */ -const jie_mi = false +const jie_mi = true /** * 加密 * @param word diff --git a/src/views/snapshot/snapshotDetails.vue b/src/views/snapshot/snapshotDetails.vue index 95a2926..3a62e6c 100644 --- a/src/views/snapshot/snapshotDetails.vue +++ b/src/views/snapshot/snapshotDetails.vue @@ -57,6 +57,12 @@ + +