diff --git a/back/src/router/index.js b/back/src/router/index.js index b2f3777e..c386dc1b 100644 --- a/back/src/router/index.js +++ b/back/src/router/index.js @@ -5,10 +5,9 @@ import { isURL } from '@/utils/validate' import store from '@/store' import Cookies from 'js-cookie' - // 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题 const originalPush = Router.prototype.push -Router.prototype.push = function push(location) { +Router.prototype.push = function push (location) { return originalPush.call(this, location).catch(err => err) } @@ -42,7 +41,8 @@ export const moduleRoutes = { meta: { title: '主入口布局' }, children: [ // todos 临时调整，后期去掉 - { path: '/home', redirect: '/bscatalogue-bscatalogue', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } }, + // { path: '/home', redirect: '/bscatalogue-bscatalogue', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } }, + { path: '/home', redirect: '/workBench-workBench', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } }, { path: '/iframe', component: null, name: 'iframe', meta: { title: 'iframe', isTab: true } } ] } diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue index 9837ee1a..4f1e12cc 100644 --- a/back/src/views/modules/activiti/demo/putaway-process3.vue +++ b/back/src/views/modules/activiti/demo/putaway-process3.vue @@ -117,6 +117,7 @@ @@ -109,6 +109,7 @@ { if (this.dataForm.id) { this.getInfo() + } else { + this.dataForm = { + id: '', + username: '', + deptId: '', + deptName: '', + password: '', + confirmPassword: '', + realName: '', + gender: 0, + email: '', + mobile: '', + roleIdList: [], + postIdList: [], + status: 1 + } } }) }) @@ -219,30 +236,34 @@ export default { if (!valid) { return false } - this.dataForm.password = Encrypt(this.dataForm.password) - if (this.dataForm.id) { - delete this.dataForm.password - } - 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 + ] + }).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) } - }) - }).catch(() => {}) + 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 bdad5850..20fff5c7 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -48,16 +48,16 @@ // 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['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/'; diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 11efe16f..15f4921f 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,13 +1,13 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-28 09:36:58 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-07-28 14:32:04 * @Description: 数据资源参数配置 */ -const newLocation = 'qingdao' +//const newLocation = 'qingdao' // const newLocation = 'baotou' -// const newLocation = 'xihaian' +const newLocation = 'xihaian' // 数据资源数据 const whoShow = {} diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index ca1a3f45..75040aca 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -239,7 +239,7 @@ getStreamByChannelCode(param).then((res) => { console.log(res) visible.value = true - options.value.src = res.data.data + options.src = res.data.data }) } // const dataTypeList = () => { diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue index fe18730d..ca2033eb 100644 --- a/front/src/views/home/integrationServicesDetails.vue +++ b/front/src/views/home/integrationServicesDetails.vue @@ -23,13 +23,44 @@ - + +
+
+ +
+
+
+
+
{{i+1}}.{{item.description}}
+
+
+
+ + +
+
+ +
+
+
+
{{i+1}}.{{item.description}}
+
+
+
+ +
- +
@@ -43,48 +74,23 @@
- -
+ +
- +
-
-
-
-
文档
- -
-
-
技术文档
-
使用手册
-
-
-
-
-
{{ use.title }}
-
- {{ use.info[d] }}:{{ detailInfoObj[d] || '--' }} -
-
+
+
+ + +
- - -
@@ -102,6 +108,9 @@ const router = useRouter() const scrollTop = ref(0) const domArr = ref([]) + const painPoint = ref([]) + const solution = ref([]) + const step=ref([]) const id = router.currentRoute.value.query.id document.documentElement.style.transition = 'all 0.3s ease' document.documentElement.scrollTop = 0 @@ -117,20 +126,24 @@ const navList = ref([ { - name: '组合能力', + name: '场景痛点', + key: 'integration-pain-point', + }, + { + name: '解决方案', + key: 'integration-solution', + }, + { + name: '使用能力', key: 'integration-combination-ability', }, { - name: '使用方式', - key: 'integration-use-way', - }, - { - name: '常见问题', - key: 'common-problem', + name: '构建步骤', + key: 'integration-step', }, ]) - const selectNow = ref('integration-combination-ability') + const selectNow = ref('integration-pain-point') const useWayShowList = ref([ { @@ -214,9 +227,12 @@ attrType: '常见问题', attrValue: questionValue.attrValue || '[]', } + painPoint.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '场景痛点').attrValue) || [] + solution.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '解决方案').attrValue) || [] + step.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '使用步骤').attrValue) || [] let areaObj = { attrType: '应用领域', - attrValue: detailInfoObj.value.applicationArea, + attrValue: fuseAttrList.find((v) => v.attrType === '应用领域').attrValue, } combineList.value.map((item) => { let arr = ( @@ -409,6 +425,43 @@ } } + .pain-point { + padding: 0.8rem 0; + background: rgb(247, 248, 250); + .bg { + height: 2rem; + width: 2rem; + background: url('~@/assets/home/rhfw_square.png') no-repeat; + background-size: 100%; + margin-top: 0.3rem; + } + .content { + height: 2rem; + width: 6rem; + .content-item { + margin: 0.1rem; + } + } + } + + .solution { + padding: 0.8rem 0; + background: rgb(247, 248, 250); + .content { + height: 2rem; + width: 8rem; + .content-item { + margin: 0.3rem; + } + } + } + + .step { + padding: 0.8rem 0; + background: rgb(247, 248, 250); + + } + .combination-ability { padding: 0.8rem 0; background: rgb(247, 248, 250); diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue index 8a12240f..4892fd73 100644 --- a/front/src/views/newHome/components/Navigation.vue +++ b/front/src/views/newHome/components/Navigation.vue @@ -19,10 +19,10 @@ size="large" @search="onSearch" /> -
+
diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index c24845cb..045d22b3 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-07-12 09:42:44 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-25 15:07:05 + * @LastEditTime: 2022-07-28 14:13:22 * @Description:我的申请 能力申请 查看详情 -->