diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue index fe6f3ddd..d09be790 100644 --- a/back/src/views/modules/activiti/demo/comments.vue +++ b/back/src/views/modules/activiti/demo/comments.vue @@ -7,13 +7,19 @@ @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'" > - - - + + + + + + @@ -106,10 +112,9 @@ export default { mounted () {} } - diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue index 42319aaf..1f3ec8b6 100644 --- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -37,8 +37,8 @@

审批

同意 - 拒绝驳回 @@ -102,8 +102,8 @@ 退回 --> 同意 - 拒绝驳回 + {{ $t('user.status0') }} @@ -44,7 +114,9 @@ @@ -93,8 +165,22 @@ export default { const low = /^.*[a-z]+.*/ const up = /^.*[A-Z]+.*/ const spe = /^.*[^a-zA-Z0-9]+.*/ - console.log('包含数字', num.test(value), '包含字母', low.test(value), up.test(value), '包含特殊符号', spe.test(value)) - if (!(num.test(value) && (low.test(value) || up.test(value)) && spe.test(value))) { + console.log( + '包含数字', + num.test(value), + '包含字母', + low.test(value), + up.test(value), + '包含特殊符号', + spe.test(value) + ) + if ( + !( + num.test(value) && + (low.test(value) || up.test(value)) && + spe.test(value) + ) + ) { return callback(new Error(this.$t('validate.pwdStrength'))) } // if (!this.dataForm.id && !/\S/.test(value)) { @@ -113,38 +199,52 @@ export default { } var validateEmail = (rule, value, callback) => { if (value && !isEmail(value)) { - return callback(new Error(this.$t('validate.format', { attr: this.$t('user.email') }))) + return callback( + new Error( + this.$t('validate.format', { attr: this.$t('user.email') }) + ) + ) } callback() } var validateMobile = (rule, value, callback) => { if (value && !isMobile(value)) { - return callback(new Error(this.$t('validate.format', { attr: this.$t('user.mobile') }))) + return callback( + new Error( + this.$t('validate.format', { attr: this.$t('user.mobile') }) + ) + ) } callback() } return { username: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } + { + required: true, + message: this.$t('validate.required'), + trigger: 'blur' + } ], deptName: [ - { required: true, message: this.$t('validate.required'), trigger: 'change' } - ], - password: [ - { validator: validatePassword, trigger: 'blur' } + { + required: true, + message: this.$t('validate.required'), + trigger: 'change' + } ], + password: [{ validator: validatePassword, trigger: 'blur' }], confirmPassword: [ { validator: validateConfirmPassword, trigger: 'blur' } ], realName: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } + { + required: true, + message: this.$t('validate.required'), + trigger: 'blur' + } ], - email: [ - { validator: validateEmail, trigger: 'blur' } - ], - mobile: [ - { validator: validateMobile, trigger: 'blur' } - ] + email: [{ validator: validateEmail, trigger: 'blur' }], + mobile: [{ validator: validateMobile, trigger: 'blur' }] } } }, @@ -165,10 +265,7 @@ export default { this.$nextTick(() => { this.$refs.dataForm.resetFields() this.roleIdListDefault = [] - Promise.all([ - this.getRoleList(), - this.getPostList() - ]).then(() => { + Promise.all([this.getRoleList(), this.getPostList()]).then(() => { if (this.dataForm.id) { this.getInfo() } else { @@ -193,79 +290,98 @@ export default { }, // 获取角色列表 getRoleList () { - return this.$http.get('/sys/role/list').then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } - this.roleList = res.data - }).catch(() => {}) + return this.$http + .get('/sys/role/list') + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.roleList = res.data + }) + .catch(() => {}) }, // 获取岗位列表 getPostList () { - return this.$http.get('/sys/post/list').then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } - this.postList = res.data - }).catch(() => {}) + return this.$http + .get('/sys/post/list') + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.postList = res.data + }) + .catch(() => {}) }, // 获取信息 getInfo () { - this.$http.get(`/sys/user/${this.dataForm.id}`).then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) - } - this.dataForm = { - ...this.dataForm, - ...res.data, - roleIdList: [] - } - // 角色配置, 区分是否为默认角色 - for (var i = 0; i < res.data.roleIdList.length; i++) { - if (this.roleList.filter(item => item.id === res.data.roleIdList[i])[0]) { - this.dataForm.roleIdList.push(res.data.roleIdList[i]) - continue + this.$http + .get(`/sys/user/${this.dataForm.id}`) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) } - this.roleIdListDefault.push(res.data.roleIdList[i]) - } - }).catch(() => {}) + this.dataForm = { + ...this.dataForm, + ...res.data, + roleIdList: [] + } + // 角色配置, 区分是否为默认角色 + for (var i = 0; i < res.data.roleIdList.length; i++) { + if ( + this.roleList.filter( + (item) => item.id === res.data.roleIdList[i] + )[0] + ) { + this.dataForm.roleIdList.push(res.data.roleIdList[i]) + continue + } + this.roleIdListDefault.push(res.data.roleIdList[i]) + } + }) + .catch(() => {}) }, // 表单提交 - dataFormSubmitHandle: debounce(function () { - this.$refs.dataForm.validate((valid) => { - if (!valid) { - return false - } - if (this.submitFlag) { - this.submitFlag = false - this.dataForm.password = Encrypt(this.dataForm.password) - if (this.dataForm.id) { - delete this.dataForm.password + dataFormSubmitHandle: debounce( + function () { + this.$refs.dataForm.validate((valid) => { + if (!valid) { + return false } - this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', { - ...this.dataForm, - roleIdList: [ - ...this.dataForm.roleIdList, - ...this.roleIdListDefault - ] - }).then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) + if (this.submitFlag) { + this.submitFlag = false + this.dataForm.password = Encrypt(this.dataForm.password) + if (this.dataForm.id) { + delete this.dataForm.password } - this.$message({ - message: this.$t('prompt.success'), - type: 'success', - duration: 500, - onClose: () => { - this.visible = false - this.$emit('refreshDataList') - } + this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', { + ...this.dataForm, + roleIdList: [ + ...this.dataForm.roleIdList, + ...this.roleIdListDefault + ] }) - this.submitFlag = true - }).catch(() => {}) - } - }) - }, 1000, { leading: true, trailing: false }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.visible = false + this.$emit('refreshDataList') + } + }) + this.submitFlag = true + }) + .catch(() => {}) + } + }) + }, + 1000, + { leading: true, trailing: false } + ) } } diff --git a/front/public/index.html b/front/public/index.html index 20fff5c7..e5aa7167 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -48,22 +48,18 @@ // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin'; // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 西海岸版本 - window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; - window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; + // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797'; + // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/'; + // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/'; + // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // 开发 - // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; - // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; - // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin'; - window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; - // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; - // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; + window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; + window.SITE_CONFIG['previewUrl'] = 'http://192.168.124.236:9796/'; + window.SITE_CONFIG['frontUrl'] = 'http://192.168.124.236:9796/document/#/devModelFile/'; + window.SITE_CONFIG['apiURL'] = 'http://192.168.124.236:8888/renren-admin'; + window.SITE_CONFIG['websocketURL'] = '192.168.124.236:8888/renren-admin'; + window.SITE_CONFIG['POI_URL'] = 'http://192.168.124.236:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 84363a19..a579c418 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -275,3 +275,12 @@ export function AbilityToPullDownPages(params) { params, }) } + +// 终止流程 +export function endProcess(params) { + return request({ + url: '/act/task/endProcess', + method: 'post', + params, + }) +} diff --git a/front/src/assets/menu/TheOverallProcess-bg.png b/front/src/assets/menu/TheOverallProcess-bg.png new file mode 100644 index 00000000..eff5514c Binary files /dev/null and b/front/src/assets/menu/TheOverallProcess-bg.png differ diff --git a/front/src/assets/menu/apply.png b/front/src/assets/menu/apply.png index 4fadc028..fd0b06a7 100644 Binary files a/front/src/assets/menu/apply.png and b/front/src/assets/menu/apply.png differ diff --git a/front/src/assets/menu/callus.png b/front/src/assets/menu/callus.png new file mode 100644 index 00000000..c41e288a Binary files /dev/null and b/front/src/assets/menu/callus.png differ diff --git a/front/src/assets/menu/down.png b/front/src/assets/menu/down.png index 85462dc6..f9bb3c31 100644 Binary files a/front/src/assets/menu/down.png and b/front/src/assets/menu/down.png differ diff --git a/front/src/assets/menu/imgBG-long.png b/front/src/assets/menu/imgBG-long.png new file mode 100644 index 00000000..95974faa Binary files /dev/null and b/front/src/assets/menu/imgBG-long.png differ diff --git a/front/src/assets/menu/imgBG.png b/front/src/assets/menu/imgBG.png new file mode 100644 index 00000000..95b9da2a Binary files /dev/null and b/front/src/assets/menu/imgBG.png differ diff --git a/front/src/assets/menu/manual.png b/front/src/assets/menu/manual.png new file mode 100644 index 00000000..6b3c5ef9 Binary files /dev/null and b/front/src/assets/menu/manual.png differ diff --git a/front/src/assets/menu/service-application.png b/front/src/assets/menu/service-application.png new file mode 100644 index 00000000..10de2b03 Binary files /dev/null and b/front/src/assets/menu/service-application.png differ diff --git a/front/src/assets/menu/service-component.png b/front/src/assets/menu/service-component.png new file mode 100644 index 00000000..2affd86b Binary files /dev/null and b/front/src/assets/menu/service-component.png differ diff --git a/front/src/assets/menu/service-data.png b/front/src/assets/menu/service-data.png new file mode 100644 index 00000000..e6a8b8ad Binary files /dev/null and b/front/src/assets/menu/service-data.png differ diff --git a/front/src/assets/menu/service-infrastructure.png b/front/src/assets/menu/service-infrastructure.png new file mode 100644 index 00000000..5e9dab0b Binary files /dev/null and b/front/src/assets/menu/service-infrastructure.png differ diff --git a/front/src/assets/menu/shelves.png b/front/src/assets/menu/shelves.png index ede998d2..60c85489 100644 Binary files a/front/src/assets/menu/shelves.png and b/front/src/assets/menu/shelves.png differ diff --git a/front/src/utils/request.js b/front/src/utils/request.js index 8c28c563..24446dc5 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -98,7 +98,10 @@ instance.interceptors.response.use( } if (response.headers.redirect) { window.location.replace(response.headers.redirect) - return + // setTimeout(() => { + location.reload() + // }, 1000) + return response } if (response.headers.redirect === '/#/login') { var keys = document.cookie.match(/[^ =;]+(?=\=)/g) diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue index baba1447..789854a8 100644 --- a/front/src/views/capacityOnTheShelf/Algorithm.vue +++ b/front/src/views/capacityOnTheShelf/Algorithm.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-13 10:22:27 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-26 14:35:45 + * @LastEditTime: 2022-08-02 11:28:00 * @Description: 算法上架 --> - - - - - + \ No newline at end of file diff --git a/front/src/views/instructionManual/index.vue b/front/src/views/instructionManual/index.vue index b7617fcd..717e8b10 100644 --- a/front/src/views/instructionManual/index.vue +++ b/front/src/views/instructionManual/index.vue @@ -7,7 +7,8 @@ @click="changeName({ name: '技术文档' })"> 技术文档
- +
+ +
+

使用手册

+
- + +