liux
/
nxdt-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: liux:9eaeb603db67d786daeeb57018a4c3d373d2547a
Branches Tags
liux:master
...
compare: liux:6d9139269517b8446df5ebabadee825d16bb240b
Branches Tags
liux:master

3 Commits
9eaeb603db ... 6d91392695

Author SHA1 Message Date
BianLzhaoMin 6d91392695 bug修复 2025-06-23 17:13:54 +08:00
BianLzhaoMin 76e162abd4 bug修复 2025-06-19 15:10:30 +08:00
BianLzhaoMin ab6c20aa6f 优化加解密问题 2025-03-03 11:54:50 +08:00
13 changed files with 304 additions and 173 deletions
Show Stats Expand all files Collapse all files

13
api/project.js
View File

@ -74,9 +74,18 @@ export function getDictTableOption(data = {}) {
} }
// 监理单位-下拉 // 监理单位-下拉
// export function selectSupervisionUnit(data = {}) {
// return request({
// url: '/system/select/selectSupervisionUnit',
// method: 'post',
// data
// })
// }
// 2025-3-4 更换接口 原接口无数据 已同步与web端一致
export function selectSupervisionUnit(data = {}) { export function selectSupervisionUnit(data = {}) {
return request({ return request({
url: '/system/select/selectSupervisionUnit', url: '/system/select/selectSupervisionUnitUser',
method: 'post', method: 'post',
data data
}) })
@ -516,7 +525,7 @@ export function checkIsExistProName(data) {
export function getQxToken() { export function getQxToken() {
return request({ return request({
url: '/schedule/job/getQxToken', url: '/schedule/job/getQxToken',
method: 'get', method: 'get'
}) })
} }

14
config.js
View File

@ -1,16 +1,20 @@
// 应用全局配置 // 应用全局配置
module.exports = { module.exports = {
// baseUrl: 'https://vue.ruoyi.vip/prod-api', // baseUrl: 'https://vue.ruoyi.vip/prod-api',
baseUrl: 'http://218.21.27.6:1999/prod-api', // 正式环境 // baseUrl: 'http://218.21.27.6:1999/prod-api', // 正式环境
// baseUrl: 'http://192.168.0.14:21626/prod-api', // 测试环境 baseUrl: 'http://192.168.0.14:21626/nxdt-api', // 测试环境
// baseUrl: 'http://192.168.0.60:18080', // 赵福海
// baseUrl: 'http://192.168.0.58:19090', // 杰 // baseUrl: 'http://192.168.0.58:19090', // 杰
// baseUrl: 'http://192.168.0.176:18080', // 强 // baseUrl: 'http://192.168.0.176:18080', // 强
// baseUrl: 'http://192.168.0.38:18080', // 强
// fileUrl: 'http://192.168.0.14:21626/file/statics/', // 测试环境 // fileUrl: 'http://192.168.0.14:21626/file/statics/', // 测试环境
fileUrl: 'http://192.168.0.14:1999/file/statics/', // 测试环境
// fileUrl2: 'http://192.168.0.14:21626/file/statics', // 测试环境 // fileUrl2: 'http://192.168.0.14:21626/file/statics', // 测试环境
fileUrl2: 'http://192.168.0.14:1999/file/statics', // 测试环境
// 课件: 文件视频路径 // 课件: 文件视频路径
coursewareUrl: 'http://192.168.0.14:9090/nxdt-courseware', coursewareUrl: 'http://192.168.0.14:9090/nxdt-courseware',
fileUrl: 'http://218.21.27.6:1999/file/statics/', // 产线环境 // fileUrl: 'http://218.21.27.6:1999/file/statics/', // 产线环境
fileUrl2: 'http://218.21.27.6:1999/file/statics', // 产线环境 // fileUrl2: 'http://218.21.27.6:1999/file/statics', // 产线环境
// baseUrl: 'http://localhost:8080', // baseUrl: 'http://localhost:8080',
// 应用信息 // 应用信息
appInfo: { appInfo: {
@ -36,7 +40,7 @@ module.exports = {
url: '' url: ''
} }
] ]
}, }
// devServer: { // devServer: {
// disableHostCheck: true, // disableHostCheck: true,
// proxy: { // proxy: {

35
manifest.json
View File

@ -1,10 +1,11 @@
{ {
"name" : "宁夏电投二期", "name" : "宁夏电投二期",
"appid" : "__UNI__9ED2404", "appid" : "__UNI__92EF0C0",
"description" : "", "description" : "",
"versionName" : "1.1.0", "versionName" : "1.1.0",
"versionCode" : "100", "versionCode" : "100",
"transformPx" : false, "transformPx" : false,
"sassImplementationName" : "node-sass",
"app-plus" : { "app-plus" : {
"usingComponents" : true, "usingComponents" : true,
"nvueCompiler" : "uni-app", "nvueCompiler" : "uni-app",
@ -65,6 +66,38 @@
} }
}, },
"maps" : {} "maps" : {}
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
} }
} }
}, },

2
pages/delayRectificationApproval/index.vue
View File

@ -22,7 +22,7 @@
<div class="list-btn"> <div class="list-btn">
<div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div> <div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div>
<div> <div>
<u-button v-if="item.status == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)"> <u-button v-if="item.intoStatus == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
审批 审批
</u-button> </u-button>
</div> </div>

2
pages/hiddenDangerRectificationApproval/index.vue
View File

@ -22,7 +22,7 @@
<div class="list-btn"> <div class="list-btn">
<div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div> <div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div>
<div> <div>
<u-button v-if="item.status == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)"> <u-button v-if="item.intoStatus == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
审批 审批
</u-button> </u-button>
</div> </div>

4
pages/newProject/index.vue
View File

@ -9,7 +9,9 @@
<span class="line"></span> <span class="line"></span>
<span class="title">工程基本信息</span> <span class="title">工程基本信息</span>
</div> </div>
<div v-if="formData.projectTypeId == 2"><u-button text="新建" type="primary" size="mini" @click="addSupervision"></u-button></div> <div v-if="formData.projectTypeId == 2">
<u-button text="新建" type="primary" size="mini" @click="addSupervision"></u-button>
</div>
</div> </div>
<!-- 表单 --> <!-- 表单 -->

159
pages/randomlySnapPicture/addSnapPhoto.vue
View File

@ -18,32 +18,48 @@
isLink isLink
:label="formData.proName ? '' : '请选择工程名称'" :label="formData.proName ? '' : '请选择工程名称'"
@click="showPicker1 = true" @click="showPicker1 = true"
:disabled="opt.type === 'view'" :disabled="opt.pageType === 'view'"
></u-cell> ></u-cell>
</u-cell-group> </u-cell-group>
</u-form-item> </u-form-item>
<u-form-item label="问题描述" prop="description" required> <u-form-item label="问题描述" prop="description" required>
<u-textarea v-model="formData.description" clearable placeholder="请输入问题描述" @blur="filter" :disabled="opt.type === 'view'"/> <u-textarea
v-model="formData.description"
clearable
placeholder="请输入问题描述"
@blur="filter"
:disabled="opt.pageType === 'view'"
/>
</u-form-item> </u-form-item>
<u-form-item label="照片" prop="photoList"> <u-form-item label="照片" prop="photoType" required>
<uni-file-picker <uni-file-picker
v-model="formData.photoList" v-model="photoType"
:auto-upload="false" :auto-upload="false"
ref="files" ref="files"
limit="9" limit="9"
@select="selectImg" @select="selectImg"
@delete="deleteImg" @delete="deleteImg"
:readonly="opt.type === 'view'" :readonly="opt.pageType === 'view'"
/> />
</u-form-item> </u-form-item>
</u-form> </u-form>
<u-button class="btn" type="primary" shape="circle" v-if="opt.type !== 'view'" @click="submitForm"> <u-button class="btn" type="primary" shape="circle" v-if="opt.type !== 'view'" @click="submitForm">提交</u-button>
提交 <u-button
</u-button> class="btn"
<u-button class="btn" v-if="opt.type === 'edit' && opt.status === '已保存'" type="primary" shape="circle" @click="changeStatus(2)"> v-if="opt.pageType === 'edit' && opt.status === '已保存'"
type="primary"
shape="circle"
@click="changeStatus(2)"
>
转违章 转违章
</u-button> </u-button>
<u-button class="btn" v-if="opt.type === 'edit' && opt.status === '已保存'" type="primary" shape="circle" @click="changeStatus(3)"> <u-button
class="btn"
v-if="opt.pageType === 'edit' && opt.status === '已保存'"
type="primary"
shape="circle"
@click="changeStatus(3)"
>
转隐患 转隐患
</u-button> </u-button>
</div> </div>
@ -79,16 +95,18 @@ export default {
formData: { formData: {
proName: '', // 工程名称 proName: '', // 工程名称
proId: '', // 工程id proId: '', // 工程id
description: '', // 检查级别-显示 description: '' // 检查级别-显示
photoList: [], // 照片 // photoList: [] // 照片
photoType: [] // 照片-上传 // photoType: [] // 照片-上传
}, },
// 工程-下拉 // 工程-下拉
proOptions: [], proOptions: [],
rules: { rules: {
proName: { required: true, message: '请输入检查标题', trigger: ['blur'] }, proName: { required: true, message: '请输入检查标题', trigger: ['blur'] },
description: [{ required: true, message: '请输入问题描述', trigger: ['blur', 'change'] }], description: [{ required: true, message: '请输入问题描述', trigger: ['blur', 'change'] }]
// photoType: [{ required: true, message: '请添加照片', trigger: ['blur', 'change'] }]
}, },
photoType: []
} }
}, },
onLoad(opt) { onLoad(opt) {
@ -96,11 +114,16 @@ export default {
console.log('🚀 ~ onLoad ~ this.opt:', this.opt) console.log('🚀 ~ onLoad ~ this.opt:', this.opt)
this.token = uni.getStorageSync('App-Token') this.token = uni.getStorageSync('App-Token')
this.getProOptions() this.getProOptions()
if (this.opt.type === 'edit' || this.opt.type === 'view') { if (this.opt.pageType === 'edit' || this.opt.pageType === 'view') {
this.formData = this.opt this.formData = this.opt
this.formData.photoList.forEach(item => { // this.formData.photoType = []
item.filePath = item.url = config.fileUrl + item.filePath this.photoType = JSON.parse(opt.params).photoList
})
if (this.photoType.length > 0) {
this.photoType.forEach(item => {
item.url = config.fileUrl + item.filePath
})
}
} }
}, },
methods: { methods: {
@ -125,9 +148,11 @@ export default {
}, },
selectImg(e) { selectImg(e) {
console.log('🚀 ~ selectImg ~ e:', e) console.log('🚀 ~ selectImg ~ e:', e)
e.tempFiles.forEach(item => { // e.tempFiles.forEach(item => {
this.formData.photoList.push(item) // this.formData.photoList.push(item)
}) // })
this.upload(e.tempFiles[0].path)
}, },
upload(path) { upload(path) {
console.log('🚀 ~ upload ~ path:', path) console.log('🚀 ~ upload ~ path:', path)
@ -142,21 +167,48 @@ export default {
tokenType: 'APP' tokenType: 'APP'
}, },
success: res => { success: res => {
console.log('🚀 ~ upload ~ res:', res) // console.log('上传成功-----', res)
console.log(decryptCBC(JSON.parse(res.data).data)) // console.log(decryptCBC(JSON.parse(res.data).data))
this.formData.photoType.push(JSON.parse(res.data).data[0])
console.log('🚀 ~ upload ~ this.formData.photoType:', this.formData.photoType) const data = JSON.parse(res.data).data[0]
console.log('data-----', data)
// this.formData.photoType.push(JSON.parse(res.data).data[0])
// console.log(this.formData.photoType, ' this.formData.photoType')
this.photoType.push({
...data,
url: config.fileUrl + data.filePath
})
this.formData.photoList.push({
...data,
url: config.fileUrl + data.filePath
})
// console.log('🚀 ~ upload ~ this.formData.photoType:', this.formData.photoType)
}, },
fail: err => { fail: err => {
console.log('🚀 ~ upload ~ err:', err) console.log('🚀 ~ upload ~ err:', err)
uni.showToast({
title: '上传失败',
icon: 'none',
duration: 500
})
} }
}) })
}, },
deleteImg(e) { deleteImg(e) {
this.formData.photoList.splice(e.index, 1) console.log(e, '删除----')
// this.formData.photoType.splice(e.index, 1)
// this.formData.photoType = this.formData.photoType.filter(item => item.uuid !== e.uuid)
this.photoType = this.photoType.filter(item => item.filePath !== e.tempFile.filePath)
this.formData.photoList = this.formData.photoList.filter(item => item.filePath !== e.tempFile.filePath)
// console.log(this.formData.photoType, '删除----')
}, },
async submitForm() { async submitForm() {
if (!this.formData.photoList.length) { if (!this.photoType.length) {
uni.showToast({ uni.showToast({
title: '请添加照片', title: '请添加照片',
icon: 'none', icon: 'none',
@ -168,29 +220,30 @@ export default {
this.$refs.uForm this.$refs.uForm
.validate() .validate()
.then(async valid => { .then(async valid => {
this.formData.photoType = [] // this.formData.photoType = []
this.submit()
// 调用上传 // 调用上传
const uploadPromises = this.formData.photoList.map(item => { // const uploadPromises = this.formData.photoList.map(item => {
console.log('🚀 ~ submitForm ~ item:', item) // console.log('🚀 ~ submitForm ~ item:', item)
if (item.uuid) { // if (item.uuid) {
return this.upload(item.path) // return this.upload(item.path)
} // }
return Promise.resolve() // return Promise.resolve()
}) // })
Promise.all(uploadPromises) // Promise.all(uploadPromises)
.then(() => { // .then(() => {
// 所有上传操作完成后再提交 // // 所有上传操作完成后再提交
setTimeout(() => { // setTimeout(() => {
this.submit() // this.submit()
}, 800) // }, 800)
}) // })
.catch(error => { // .catch(error => {
// 处理上传失败的情况 // // 处理上传失败的情况
console.error('上传失败', error) // console.error('上传失败', error)
this.isLoading = false // this.isLoading = false
this.formData.photoType = [] // this.formData.photoType = []
}) // })
}) })
.catch(() => { .catch(() => {
this.isLoading = false this.isLoading = false
@ -200,10 +253,14 @@ export default {
async submit() { async submit() {
console.log('🚀 ~ submit ~ this.formData:', this.formData) console.log('🚀 ~ submit ~ this.formData:', this.formData)
try { try {
if (this.opt.type === 'edit') { if (this.opt.pageType === 'edit') {
this.formData.id = this.opt.id this.formData.id = this.opt.id
} }
const res = await addSnapshotForm(this.formData) const params = JSON.parse(JSON.stringify(this.formData))
params.photoType = params.photoList
console.log('提交参数---', params)
const res = await addSnapshotForm(params)
console.log('🚀 ~ submit ~ res:', res) console.log('🚀 ~ submit ~ res:', res)
this.isLoading = false this.isLoading = false
uni.showToast({ uni.showToast({
@ -221,7 +278,7 @@ export default {
let code = type === 2 ? '违章' : '隐患' let code = type === 2 ? '违章' : '隐患'
const res = updateSnapshotStatus({ snapshotId: this.opt.snapshotId, status: type }) const res = updateSnapshotStatus({ snapshotId: this.opt.snapshotId, status: type })
uni.showToast({ uni.showToast({
title: '转' + code + '成功', title: '转' + code + '成功',
icon: 'success', icon: 'success',
duration: 1500 duration: 1500
}) })

20
pages/randomlySnapPicture/index.vue
View File

@ -19,9 +19,17 @@
<div class="list-item">问题描述：{{ item.description }}</div> <div class="list-item">问题描述：{{ item.description }}</div>
<div class="list-item">状态：{{ item.status }}</div> <div class="list-item">状态：{{ item.status }}</div>
<div class="list-btn"> <div class="list-btn">
<div><u-button type="primary" size="mini" v-if="item.status !== '已保存'" @click="handleSeeEdit(1, item)">查看</u-button></div> <div>
<div><u-button type="primary" size="mini" v-if="item.status === '已保存'" @click="handleSeeEdit(2, item)">编辑</u-button></div> <u-button type="primary" size="mini" v-if="item.status !== '已保存'" @click="handleSeeEdit(1, item)">
<!-- <div><u-button type="primary" size="mini" @click="handleAdd(item)">新增隐患</u-button></div>--> 查看
</u-button>
</div>
<div>
<u-button type="primary" size="mini" v-if="item.status === '已保存'" @click="handleSeeEdit(2, item)">
编辑
</u-button>
</div>
<!-- <div><u-button type="primary" size="mini" @click="handleAdd(item)">新增隐患</u-button></div>-->
</div> </div>
</div> </div>
<u-empty mode="data" v-if="tableList.length === 0"></u-empty> <u-empty mode="data" v-if="tableList.length === 0"></u-empty>
@ -54,7 +62,7 @@ export default {
chickIcon() { chickIcon() {
console.log('🚀 ~ 点击右侧按钮chickIcon') console.log('🚀 ~ 点击右侧按钮chickIcon')
const params = { const params = {
type: 'add', type: 'add'
} }
uni.navigateTo({ uni.navigateTo({
url: '/pages/randomlySnapPicture/addSnapPhoto?params=' + JSON.stringify(params) url: '/pages/randomlySnapPicture/addSnapPhoto?params=' + JSON.stringify(params)
@ -79,9 +87,9 @@ export default {
console.log('🚀 ~ 查看编辑 ~ item:', item) console.log('🚀 ~ 查看编辑 ~ item:', item)
let params = {} let params = {}
if (type === 1) { if (type === 1) {
params = { type: 'view', ...item } params = { pageType: 'view', ...item }
} else if (type === 2) { } else if (type === 2) {
params = { type: 'edit', ...item } params = { pageType: 'edit', ...item }
} }
uni.navigateTo({ uni.navigateTo({
url: '/pages/randomlySnapPicture/addSnapPhoto?params=' + JSON.stringify(params) url: '/pages/randomlySnapPicture/addSnapPhoto?params=' + JSON.stringify(params)

2
pages/violationManagenment/violationPenalty.vue
View File

@ -21,7 +21,7 @@
<div class="list-btn"> <div class="list-btn">
<div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div> <div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div>
<div> <div>
<u-button v-if="item.status == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)"> <u-button v-if="item.intoStatus == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
审批 审批
</u-button> </u-button>
</div> </div>

2
store/modules/user.js
View File

@ -42,6 +42,8 @@ const user = {
Login({ commit }, userInfo) { Login({ commit }, userInfo) {
const username = userInfo.username.trim() const username = userInfo.username.trim()
const password = userInfo.password const password = userInfo.password
console.log('username', username, 'password', password)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(username, password) login(username, password)
.then(res => { .then(res => {

16
utils/aescbc.js
View File

@ -6,20 +6,20 @@ const cbc_iv = CryptoJS.enc.Utf8.parse('1234567812345678')
* 默认参数需要加密 * 默认参数需要加密
* @type {boolean} * @type {boolean}
*/ */
const jia_mi=true; const jia_mi = true
/** /**
* 默认后台会自动加密 * 默认后台会自动加密
* @type {boolean} * @type {boolean}
*/ */
const jie_mi=true; const jie_mi = true
/** /**
* 加密 * 加密
* @param word * @param word
* @returns {string} * @returns {string}
*/ */
export const encryptCBC = function(word) { export const encryptCBC = function (word) {
if(!jia_mi){ if (!jia_mi) {
return word; return word
} }
const srcs = CryptoJS.enc.Utf8.parse(word) const srcs = CryptoJS.enc.Utf8.parse(word)
const encrypted = CryptoJS.AES.encrypt(srcs, cbc_key, { const encrypted = CryptoJS.AES.encrypt(srcs, cbc_key, {
@ -34,9 +34,9 @@ export const encryptCBC = function(word) {
* @param word * @param word
* @returns {*} * @returns {*}
*/ */
export const decryptCBC = function(word) { export const decryptCBC = function (word) {
if(!jie_mi){ if (!jie_mi) {
return word; return word
} }
const encrypted = CryptoJS.AES.decrypt(word, cbc_key, { const encrypted = CryptoJS.AES.decrypt(word, cbc_key, {
iv: cbc_iv, iv: cbc_iv,

196
utils/bonus.js
View File

@ -1,19 +1,17 @@
export function lookFile() {
export function lookFile(){
// return 'http://192.168.0.14:21626/file/statics' //14服务器 // return 'http://192.168.0.14:21626/file/statics' //14服务器
return 'http://218.21.27.6:1999/file/statics' //1.6演示服务器 return 'http://218.21.27.6:1999/file/statics' //1.6演示服务器
} }
export function lookFaceFile(){ export function lookFaceFile() {
// return 'http://192.168.0.14:21626/file/statics/' //14服务器 // return 'http://192.168.0.14:21626/file/statics/' //14服务器
// return 'http://192.168.2.76:18080/file/statics/' // return 'http://192.168.2.76:18080/file/statics/'
return 'http://218.21.27.6:1999/file/statics/' //1.6演示服务器 return 'http://218.21.27.6:1999/file/statics/' //1.6演示服务器
} }
export function filePreview(){ export function filePreview() {
// return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器 // return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器
return 'http://218.21.27.6:18013/onlinePreview?url=' //1.6演示服务器 return 'http://218.21.27.6:18013/onlinePreview?url=' //1.6演示服务器
} }
// lookFile: 'http://218.21.27.6:1999/nxnyback/statics', // lookFile: 'http://218.21.27.6:1999/nxnyback/statics',
// filePreviewPath: 'http://218.21.27.6:8012/onlinePreview?url=', // filePreviewPath: 'http://218.21.27.6:8012/onlinePreview?url=',
// lookFile: 'http://112.29.103.165:14413/file/statics', // lookFile: 'http://112.29.103.165:14413/file/statics',
@ -32,12 +30,15 @@ export function parseTime(time, pattern) {
if (typeof time === 'object') { if (typeof time === 'object') {
date = time date = time
} else { } else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
time = parseInt(time) time = parseInt(time)
} else if (typeof time === 'string') { } else if (typeof time === 'string') {
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), ''); time = time
.replace(new RegExp(/-/gm), '/')
.replace('T', ' ')
.replace(new RegExp(/\.[\d]{3}/gm), '')
} }
if ((typeof time === 'number') && (time.toString().length === 10)) { if (typeof time === 'number' && time.toString().length === 10) {
time = time * 1000 time = time * 1000
} }
date = new Date(time) date = new Date(time)
@ -54,7 +55,9 @@ export function parseTime(time, pattern) {
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key] let value = formatObj[key]
// Note: getDay() returns 0 on Sunday // Note: getDay() returns 0 on Sunday
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } if (key === 'a') {
return ['日', '一', '二', '三', '四', '五', '六'][value]
}
if (result.length > 0 && value < 10) { if (result.length > 0 && value < 10) {
value = '0' + value value = '0' + value
} }
@ -66,89 +69,92 @@ export function parseTime(time, pattern) {
// 表单重置 // 表单重置
export function resetForm(refName) { export function resetForm(refName) {
if (this.$refs[refName]) { if (this.$refs[refName]) {
this.$refs[refName].resetFields(); this.$refs[refName].resetFields()
} }
} }
// 添加日期范围 // 添加日期范围
export function addDateRange(params, dateRange, propName) { export function addDateRange(params, dateRange, propName) {
let search = params; let search = params
search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; search.params =
dateRange = Array.isArray(dateRange) ? dateRange : []; typeof search.params === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}
if (typeof (propName) === 'undefined') { dateRange = Array.isArray(dateRange) ? dateRange : []
search.params['beginTime'] = dateRange[0]; if (typeof propName === 'undefined') {
search.params['endTime'] = dateRange[1]; search.params['beginTime'] = dateRange[0]
search.params['endTime'] = dateRange[1]
} else { } else {
search.params['begin' + propName] = dateRange[0]; search.params['begin' + propName] = dateRange[0]
search.params['end' + propName] = dateRange[1]; search.params['end' + propName] = dateRange[1]
} }
return search; return search
} }
// 回显数据字典 // 回显数据字典
export function selectDictLabel(datas, value) { export function selectDictLabel(datas, value) {
if (value === undefined) { if (value === undefined) {
return ""; return ''
} }
var actions = []; var actions = []
Object.keys(datas).some((key) => { Object.keys(datas).some(key => {
if (datas[key].value == ('' + value)) { if (datas[key].value == '' + value) {
actions.push(datas[key].label); actions.push(datas[key].label)
return true; return true
} }
}) })
if (actions.length === 0) { if (actions.length === 0) {
actions.push(value); actions.push(value)
} }
return actions.join(''); return actions.join('')
} }
// 回显数据字典（字符串、数组） // 回显数据字典（字符串、数组）
export function selectDictLabels(datas, value, separator) { export function selectDictLabels(datas, value, separator) {
if (value === undefined || value.length ===0) { if (value === undefined || value.length === 0) {
return ""; return ''
} }
if (Array.isArray(value)) { if (Array.isArray(value)) {
value = value.join(","); value = value.join(',')
} }
var actions = []; var actions = []
var currentSeparator = undefined === separator ? "," : separator; var currentSeparator = undefined === separator ? ',' : separator
var temp = value.split(currentSeparator); var temp = value.split(currentSeparator)
Object.keys(value.split(currentSeparator)).some((val) => { Object.keys(value.split(currentSeparator)).some(val => {
var match = false; var match = false
Object.keys(datas).some((key) => { Object.keys(datas).some(key => {
if (datas[key].value == ('' + temp[val])) { if (datas[key].value == '' + temp[val]) {
actions.push(datas[key].label + currentSeparator); actions.push(datas[key].label + currentSeparator)
match = true; match = true
} }
}) })
if (!match) { if (!match) {
actions.push(temp[val] + currentSeparator); actions.push(temp[val] + currentSeparator)
} }
}) })
return actions.join('').substring(0, actions.join('').length - 1); return actions.join('').substring(0, actions.join('').length - 1)
} }
// 字符串格式化(%s ) // 字符串格式化(%s )
export function sprintf(str) { export function sprintf(str) {
var args = arguments, flag = true, i = 1; var args = arguments,
flag = true,
i = 1
str = str.replace(/%s/g, function () { str = str.replace(/%s/g, function () {
var arg = args[i++]; var arg = args[i++]
if (typeof arg === 'undefined') { if (typeof arg === 'undefined') {
flag = false; flag = false
return ''; return ''
} }
return arg; return arg
}); })
return flag ? str : ''; return flag ? str : ''
} }
// 转换字符串，undefined,null等转化为"" // 转换字符串，undefined,null等转化为""
export function parseStrEmpty(str) { export function parseStrEmpty(str) {
if (!str || str == "undefined" || str == "null") { if (!str || str == 'undefined' || str == 'null') {
return ""; return ''
} }
return str; return str
} }
// 数据合并 // 数据合并
@ -156,16 +162,16 @@ export function mergeRecursive(source, target) {
for (var p in target) { for (var p in target) {
try { try {
if (target[p].constructor == Object) { if (target[p].constructor == Object) {
source[p] = mergeRecursive(source[p], target[p]); source[p] = mergeRecursive(source[p], target[p])
} else { } else {
source[p] = target[p]; source[p] = target[p]
} }
} catch (e) { } catch (e) {
source[p] = target[p]; source[p] = target[p]
} }
} }
return source; return source
}; }
/** /**
* 构造树型结构数据 * 构造树型结构数据
@ -179,65 +185,65 @@ export function handleTree(data, id, parentId, children) {
id: id || 'id', id: id || 'id',
parentId: parentId || 'parentId', parentId: parentId || 'parentId',
childrenList: children || 'children' childrenList: children || 'children'
}; }
var childrenListMap = {}; var childrenListMap = {}
var nodeIds = {}; var nodeIds = {}
var tree = []; var tree = []
for (let d of data) { for (let d of data) {
let parentId = d[config.parentId]; let parentId = d[config.parentId]
if (childrenListMap[parentId] == null) { if (childrenListMap[parentId] == null) {
childrenListMap[parentId] = []; childrenListMap[parentId] = []
} }
nodeIds[d[config.id]] = d; nodeIds[d[config.id]] = d
childrenListMap[parentId].push(d); childrenListMap[parentId].push(d)
} }
for (let d of data) { for (let d of data) {
let parentId = d[config.parentId]; let parentId = d[config.parentId]
if (nodeIds[parentId] == null) { if (nodeIds[parentId] == null) {
tree.push(d); tree.push(d)
} }
} }
for (let t of tree) { for (let t of tree) {
adaptToChildrenList(t); adaptToChildrenList(t)
} }
function adaptToChildrenList(o) { function adaptToChildrenList(o) {
if (childrenListMap[o[config.id]] !== null) { if (childrenListMap[o[config.id]] !== null) {
o[config.childrenList] = childrenListMap[o[config.id]]; o[config.childrenList] = childrenListMap[o[config.id]]
} }
if (o[config.childrenList]) { if (o[config.childrenList]) {
for (let c of o[config.childrenList]) { for (let c of o[config.childrenList]) {
adaptToChildrenList(c); adaptToChildrenList(c)
} }
} }
} }
return tree; return tree
} }
/** /**
* 参数处理 * 参数处理
* @param {*} params 参数 * @param {*} params 参数
*/ */
export function tansParams(params) { export function tansParams(params) {
let result = '' let result = ''
for (const propName of Object.keys(params)) { for (const propName of Object.keys(params)) {
const value = params[propName]; const value = params[propName]
var part = encodeURIComponent(propName) + "="; var part = encodeURIComponent(propName) + '='
if (value !== null && value !== "" && typeof (value) !== "undefined") { if (value !== null && value !== '' && typeof value !== 'undefined') {
if (typeof value === 'object') { if (typeof value === 'object') {
for (const key of Object.keys(value)) { for (const key of Object.keys(value)) {
if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') { if (value[key] !== null && value[key] !== '' && typeof value[key] !== 'undefined') {
let params = propName + '[' + key + ']'; let params = propName + '[' + key + ']'
var subPart = encodeURIComponent(params) + "="; var subPart = encodeURIComponent(params) + '='
result += subPart + encodeURIComponent(value[key]) + "&"; result += subPart + encodeURIComponent(value[key]) + '&'
} }
} }
} else { } else {
result += part + encodeURIComponent(value) + "&"; result += part + encodeURIComponent(value) + '&'
} }
} }
} }
@ -266,12 +272,14 @@ export function indexContinuous(num, size) {
*/ */
export function hideSensitiveInfo(info) { export function hideSensitiveInfo(info) {
// 假设只显示前三位和后四位，中间用星号代替 // 假设只显示前三位和后四位，中间用星号代替
if (info.length === 11) { // 手机号 if (info.length === 11) {
return info.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); // 手机号
} else if (info.length === 18) { // 身份证号 return info.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
return info.replace(/(\d{4})\d{10}(\w{4})/, '$1**********$2'); } else if (info.length === 18) {
// 身份证号
return info.replace(/(\d{4})\d{10}(\w{4})/, '$1**********$2')
} else { } else {
return info; // 其他情况，直接返回原始信息 return info // 其他情况，直接返回原始信息
} }
} }
@ -284,7 +292,7 @@ export function getFileData(fileList) {
return Promise.all(fileList.filter(item => item?.hasOwnProperty('raw')).map(item => item.raw)) return Promise.all(fileList.filter(item => item?.hasOwnProperty('raw')).map(item => item.raw))
} }
export function getParams(){ export function getParams() {
return { return {
proId: this.$store.state.user.thisIds.proId, proId: this.$store.state.user.thisIds.proId,
supUuid: this.$store.state.user.thisIds.supUuid, supUuid: this.$store.state.user.thisIds.supUuid,
@ -293,8 +301,8 @@ export function getParams(){
subUuid: this.$store.state.user.thisIds.subUuid, subUuid: this.$store.state.user.thisIds.subUuid,
userType: this.$store.state.user.userType, userType: this.$store.state.user.userType,
uuid: this.$store.state.user.thisIds.uuid, uuid: this.$store.state.user.thisIds.uuid,
parentUuid : this.$store.state.user.thisIds.parentUuid parentUuid: this.$store.state.user.thisIds.parentUuid
}; }
} }
/** /**

12
utils/request.js
View File

@ -85,13 +85,21 @@ const request = config => {
dataType: 'json' dataType: 'json'
}) })
.then(response => { .then(response => {
// console.log('🚀 ~ request ~ response:', response) console.log('🚀 ~ request ~ response:-------------', response)
if (!response[1]) { if (!response[1]) {
toast('系统异常, 请联系管理员') toast('系统异常, 请联系管理员')
reject('系统异常, 请联系管理员') reject('系统异常, 请联系管理员')
return return
} }
let res = JSON.parse(decryptCBC(response[1].data.data)) let res = null
if (typeof response[1].data.decrypt != 'undefined' && response[1].data.decrypt) {
res = JSON.parse(decryptCBC(response[1].data.data))
} else {
res = decryptCBC(response[1].data)
}
console.log('处理之后的res', res)
// let res = JSON.parse(decryptCBC(response[1].data.data))
// console.log('🚀 ~ request ~ 返回数据-data:', res) // console.log('🚀 ~ request ~ 返回数据-data:', res)
if (res.code === 200) { if (res.code === 200) {
resolve(res) resolve(res)