diff --git a/back/public/index.html b/back/public/index.html index a18ed41c..3e830a61 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-15 18:41:00 + * @LastEditTime: 2022-07-21 15:03:51 * @Description: 告诉大家这是什么 --> @@ -44,8 +44,8 @@ // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.166:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://10.16.5.35:8888/renren-admin'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; - window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; + window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin'; + window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.23.141:8000/renren-admin'; // WebSocket地址 window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket'; diff --git a/back/src/assets/img/Capabilitydiagram.png b/back/src/assets/img/Capabilitydiagram.png new file mode 100644 index 00000000..26506b21 Binary files /dev/null and b/back/src/assets/img/Capabilitydiagram.png differ diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js index b7b8b33e..ae6c7a55 100644 --- a/back/src/mixins/view-module.js +++ b/back/src/mixins/view-module.js @@ -2,7 +2,7 @@ import Cookies from 'js-cookie' import qs from 'qs' import { deepClone } from '@/utils/form-generator/index' export default { - data () { + data() { /* eslint-disable */ return { // 设置属性 @@ -38,19 +38,19 @@ export default { } /* eslint-enable */ }, - created () { + created() { if (this.mixinViewModuleOptions.createdIsNeed) { this.query() } }, - activated () { + activated() { if (this.mixinViewModuleOptions.activatedIsNeed) { this.query() } }, methods: { // 获取数据列表 - query () { + query() { this.dataListLoading = true this.$http.get( this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({ @@ -109,11 +109,11 @@ export default { } console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL) - if (this.dataList[0].type === '组件服务') { - this.dataList.map(val => { - val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域') - }) - } + // if (this.dataList[0].type === '组件服务') { + // this.dataList.map(val => { + // val.infoList = val.infoList.filter(item => item.attrType === '部署位置' || item.attrType === '组件类型' || item.attrType === '应用领域') + // }) + // } if (this.mixinViewModuleOptions.requestCallback) { this.mixinViewModuleOptions.requestCallback(res.data) } @@ -123,11 +123,11 @@ export default { }) }, // 多选 - dataListSelectionChangeHandle (val) { + dataListSelectionChangeHandle(val) { this.dataListSelections = val }, // 排序 - dataListSortChangeHandle (data) { + dataListSortChangeHandle(data) { if (!data.order || !data.prop) { this.order = '' this.orderField = '' @@ -138,13 +138,13 @@ export default { this.query() }, // 分页, 每页条数 - pageSizeChangeHandle (val) { + pageSizeChangeHandle(val) { this.page = 1 this.limit = val this.query() }, // 分页, 当前页 - pageCurrentChangeHandle (val) { + pageCurrentChangeHandle(val) { this.page = val this.query() }, @@ -153,7 +153,7 @@ export default { this.query() }, // 新增 - addOrUpdateHandle (id) { + addOrUpdateHandle(id) { this.addOrUpdateVisible = true this.disabled = false this.$nextTick(() => { @@ -164,7 +164,7 @@ export default { }, // 组件服务新增 - addOrUpdateHandleAI (id) { + addOrUpdateHandleAI(id) { // const infoList = [] let showList = [] this.$http.get('category/getCategoryTree').then(({ data: res }) => { @@ -222,7 +222,7 @@ export default { }, 100) }, // 应用资源新增 - addOrUpdateHandleServe (id) { + addOrUpdateHandleServe(id) { // const infoList = [] let showList = [] this.$http.get('category/getCategoryTree').then(({ data: res }) => { @@ -280,7 +280,7 @@ export default { }, 100) }, // 修改 - UpdateHandle (val) { + UpdateHandle(val) { this.addOrUpdateVisible = true this.disabled = false const cloneVal = deepClone(val) @@ -305,7 +305,7 @@ export default { }) }, // 关闭当前窗口 - closeCurrentTab (data) { + closeCurrentTab(data) { var tabName = this.$store.state.contentTabsActiveName this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName) if (this.$store.state.contentTabs.length <= 0) { @@ -317,7 +317,7 @@ export default { } }, // 删除 - deleteHandle (id) { + deleteHandle(id) { if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) { return this.$message({ message: this.$t('prompt.deleteBatch'), @@ -351,7 +351,7 @@ export default { }).catch(() => { }) }, - deleteHandle2 (id) { + deleteHandle2(id) { console.log('删除========================》', id, this.dataListSelections) const ids = [] if (id) { @@ -369,7 +369,7 @@ export default { }) }, // 导出 - exportHandle () { + exportHandle() { var params = qs.stringify({ token: Cookies.get('ucsToken'), ...this.dataForm diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 7bdba7a9..5ec517a7 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -299,19 +299,19 @@ export default { this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data - this.dataList.map((item, index) => { - const dataListSinforList = [] - item.infoList.map((itemson, indexson) => { - if ( - itemson.attrType === '部署位置' || - itemson.attrType === '组件类型' || - itemson.attrType === '应用领域' - ) { - dataListSinforList.push(itemson) - } - }) - this.dataList[index].infoList = dataListSinforList - }) + // this.dataList.map((item, index) => { + // const dataListSinforList = [] + // item.infoList.map((itemson, indexson) => { + // if ( + // itemson.attrType === '部署位置' || + // itemson.attrType === '组件类型' || + // itemson.attrType === '应用领域' + // ) { + // dataListSinforList.push(itemson) + // } + // }) + // this.dataList[index].infoList = dataListSinforList + // }) console.log('this.dataList', this.dataList) this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total @@ -386,19 +386,19 @@ export default { this.mixinViewModuleOptions.requestCallback(res.data) } this.dataListLoading = false - this.dataList.map((item, index) => { - const dataListSinforList = [] - item.infoList.map((itemson, indexson) => { - if ( - itemson.attrType === '部署位置' || - itemson.attrType === '组件类型' || - itemson.attrType === '应用领域' - ) { - dataListSinforList.push(itemson) - } - }) - this.dataList[index].infoList = dataListSinforList - }) + // this.dataList.map((item, index) => { + // const dataListSinforList = [] + // item.infoList.map((itemson, indexson) => { + // if ( + // itemson.attrType === '部署位置' || + // itemson.attrType === '组件类型' || + // itemson.attrType === '应用领域' + // ) { + // dataListSinforList.push(itemson) + // } + // }) + // this.dataList[index].infoList = dataListSinforList + // }) } else { this.$message.error('未查询到相关信息') this.reset() diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue new file mode 100644 index 00000000..90f2e3cc --- /dev/null +++ b/back/src/views/modules/activiti/demo/putaway-process3.vue @@ -0,0 +1,529 @@ + + + + + diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue index 426d31e5..af120d5e 100644 --- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue +++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue @@ -176,29 +176,30 @@ export default { itemViewSon.children.map((itemSon, indexSon) => { // console.log('itemSon', itemSon) if (itemSon.name.indexOf('描述') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.description } else if (itemSon.name.indexOf('名称') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.name } else if (itemSon.name.indexOf('能力类型') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.type + } else if (itemSon.name === '部门联系人') { + console.log('itemSon.name', itemSon.name) + this.dataView.children[indexView].children[indexViewSon].children[ + indexSon + ].note1 = this.dataForm.deptContacts } else if (itemSon.name.indexOf('属部门') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.unit - } else if (itemSon.name.indexOf('共享条件') != -1) { - this.dataView.children[indexView].children[ - indexViewSon - ].children[indexSon].note1 = this.dataForm.shareCondition - } else if (itemSon.name.indexOf('共享类型') != -1) { - this.dataView.children[indexView].children[ - indexViewSon - ].children[indexSon].note1 = this.dataForm.shareType + } else if (itemSon.name === '部门联系人电话') { + this.dataView.children[indexView].children[indexViewSon].children[ + indexSon + ].note1 = this.dataForm.deptPhone } else if ( itemSon.name === '关联组件信息' && item.attrType === '关联组件信息' @@ -247,39 +248,40 @@ export default { itemViewSon.children.map((itemSon, indexSon) => { console.log('itemSon', itemSon) if (itemSon.name.indexOf('描述') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.description } else if (itemSon.name.indexOf('名称') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.name } else if (itemSon.name.indexOf('共享条件') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.shareCondition } else if (itemSon.name.indexOf('共享方式') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.shareMode } else if (itemSon.name.indexOf('共享类型') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.shareType - } else if (itemSon.name.indexOf('部门联系人') != -1) { - this.dataView.children[indexView].children[0].children[ + } else if (itemSon.name === '部门联系人') { + console.log('itemSon.name', itemSon.name) + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.deptContacts } else if (itemSon.name.indexOf('属部门') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.unit - } else if (itemSon.name.indexOf('部门联系人电话') != -1) { - this.dataView.children[indexView].children[0].children[ + } else if (itemSon.name === '部门联系人电话') { + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.deptPhone } else if (itemSon.name.indexOf('接口请求方式') != -1) { - this.dataView.children[indexView].children[0].children[ + this.dataView.children[indexView].children[indexViewSon].children[ indexSon ].note1 = this.dataForm.apiMethodType } else if ( @@ -403,7 +405,7 @@ export default { color: #333333; font-size: 22px; margin-bottom: 20px; - background: url('~@/assets/img/sj-jx.png') no-repeat; + background: url("~@/assets/img/sj-jx.png") no-repeat; background-position-x: 15px; } .multipleAdditionsClass { @@ -417,6 +419,7 @@ export default { flex-direction: column; align-items: center; padding: 10px; + overflow: hidden; & > div:first-child { margin-bottom: 10px; font-weight: bold; @@ -445,6 +448,14 @@ export default { align-items: center; padding: 10px; position: relative; + & > div { + -webkit-line-clamp: 5; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + word-break: break-all; + } & > div:first-child { margin-bottom: 10px; font-weight: bold; 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 2919c269..badbbd76 100644 --- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -36,7 +36,11 @@

审批

- + 同意 + 拒绝 +
+ + + + + + 取 消 + 确 定 + + @@ -81,6 +103,9 @@ export default { }, data () { return { + dialogVisible: false, + dialogType: '', + input: '', flagShow: false, // processVisible: true, visible: false, @@ -135,6 +160,22 @@ export default { } }) }, + showDialog (title) { + this.dialogVisible = true + this.dialogType = title + }, + handleClose (done) { + this.$confirm('确认关闭？') + .then((_) => { + this.input = '' + done() + }) + .catch((_) => {}) + }, + handleClose2 () { + this.dialogVisible = false + this.input = '' + }, methodsThree () { this.$http.get('/category/getCategoryTree').then((res) => { this.insertList = res.data.data @@ -152,14 +193,14 @@ export default { // } }) }, + // 同意与退回 agreeOrNot: debounce( function (data) { - console.log(data) - if (this.agreeOrList === '同意') { - console.log('this.dataForm.taskId', this.taskId) + if (this.dialogType === '同意') { + console.log('this.dataForm', this.dataForm) const params = qs.stringify({ taskId: this.taskId, - comment: this.inputAgree + comment: this.input }) console.log(params) this.$http @@ -178,6 +219,8 @@ export default { duration: 500, onClose: () => { this.visible = false + this.dialogVisible = false + this.input = '' if (this.callbacks.taskHandleSuccessCallback) { this.callbacks.taskHandleSuccessCallback(res) } @@ -185,14 +228,13 @@ export default { }) }) .catch(() => {}) - } else if (this.agreeOrList === '退回') { - console.log('this.dataForm.taskId', this.taskId) + } else if (this.dialogType === '拒绝') { const params = qs.stringify({ - taskId: this.taskId, - comment: this.inputNo + taskId: this.dataForm.taskId, + comment: this.input }) this.$http - .post('/act/task/backToFirst?', params) + .post('/act/task/endProcess?', params) .then(({ data: res }) => { if (res.code !== 0) { this.$message.error(res.msg) diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index 0c29bfbd..176502cb 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -2,54 +2,82 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-29 15:59:51 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-04 16:17:22 + * @LastEditTime: 2022-07-21 16:41:09 * @Description: 告诉大家这是什么 --> diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index af2606a0..f6ffaead 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -1141,6 +1141,9 @@ console.log('paramsGetResources', paramsGetResources) }) mybus.on('changeSelcted', () => { + // 添加申购车后，返回第一页 + paramsGetResources.pageNum = 1 + currentPage.value = 1 getAppResources() }) mybus.on('changeInfo', (info) => { @@ -1161,6 +1164,9 @@ getAppResources() }) mybus.on('changeCondition', (condition) => { + // 回到第一页，分页页码为1 + paramsGetResources.pageNum = 1 + currentPage.value = 1 // orderField: 'total' total 综合 visits 访问量 applyCount 申请量 score 评分 collectCount 收藏量 // orderType: 'ASC' ASC 升序 DESC 降序 paramsGetResources.orderField = condition.orderField diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 849231e5..8877cfa9 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -312,7 +312,8 @@ num.value > 1 ? '等能力申请' + num.value + '个' : '能力申请' ) : list.value[0].arr[0].resourceName.concat('能力申请'), // 标题 - applicationSystem: [], // 应用系统 + applicationSystem: '', // 应用系统 + // applicationSystem: [], // 应用系统 applicationScene: [], // 应用领域 applicationBackground: '', // 应用背景 effectWish: '', // 期望效果 @@ -710,86 +711,86 @@ diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index 35354823..8e68f09a 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -162,11 +162,14 @@ const logout = async () => { await store.dispatch('user/logout') window.sessionStorage.setItem('visits', JSON.stringify([])) - if (recordRoute) { - const fullPath = route.fullPath - router.push(`/login?redirect=${fullPath}`) - } else { - router.push('/login') + // 西海岸不返回登录页 + if (!whoShow1.itShowXiHaiAn) { + if (recordRoute) { + const fullPath = route.fullPath + router.push(`/login?redirect=${fullPath}`) + } else { + router.push('/login') + } } } // 跳转页面 @@ -281,6 +284,8 @@ // getMynotice() // }) // } + // 建立链接 -- 携带cookie参数 + onMounted(() => { getSgcTotal().then((res) => { // console.log('初始化========================>', res.data.data.count) diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 96ded629..749ffc71 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -162,7 +162,11 @@ > {{ item.shareType || '--' }} --> -
+
{{ item.deptName || '--' }}
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue index e6029fb4..2003708d 100644 --- a/front/src/views/mynoticeView/components/NoticeList.vue +++ b/front/src/views/mynoticeView/components/NoticeList.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-21 11:55:07 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-01 17:03:24 + * @LastEditTime: 2022-07-21 17:05:11 * @Description: 告诉大家这是什么 --> diff --git a/front/src/views/personalCenter/components/MyPublish.vue b/front/src/views/personalCenter/components/MyPublish.vue index c17c215c..f802d426 100644 --- a/front/src/views/personalCenter/components/MyPublish.vue +++ b/front/src/views/personalCenter/components/MyPublish.vue @@ -168,11 +168,13 @@ - + + + + diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue index b334b1bd..bde7c7ee 100644 --- a/front/src/views/personalCenter/components/addApplication.vue +++ b/front/src/views/personalCenter/components/addApplication.vue @@ -329,7 +329,7 @@ } const fileList = ref([]) - + const subimtFlag = ref(true) const processStartHandle = () => { if (id.value) { updateDemandForm(formName).then((upres) => { @@ -350,13 +350,17 @@ } }) } else { - formRef.value.validate().then(() => { - demandApply(formName).then((res) => { - applySuccess.value = false - message.success('操作成功！') - console.log('能力申请================>', res) + if (subimtFlag.value) { + subimtFlag.value = false + formRef.value.validate().then(() => { + demandApply(formName).then((res) => { + applySuccess.value = false + message.success('操作成功！') + console.log('能力申请================>', res) + subimtFlag.value = true + }) }) - }) + } } }