From 86ece3cb0915eda4c78e7caad3a1b8507f725f82 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Sat, 16 Jul 2022 10:00:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
back/public/index.html | 6 +-
back/src/mixins/view-module.js | 5 ++
.../src/views/modules/ability/bsabilityai.vue | 9 +++
.../LayerService/LayerServiceInformation.vue | 2 +-
.../views/home/components/KnowledgeBase.vue | 5 +-
.../personalCenter/components/MyBrowse.vue | 57 +++++++++++++++----
6 files changed, 68 insertions(+), 16 deletions(-)
diff --git a/back/public/index.html b/back/public/index.html
index 1d32cc9d..d96dc6a3 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -1,8 +1,8 @@
@@ -44,7 +44,7 @@
// 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.239: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.23.141:8000/renren-admin';
// WebSocket地址
diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js
index ae81da9b..b7b8b33e 100644
--- a/back/src/mixins/view-module.js
+++ b/back/src/mixins/view-module.js
@@ -109,6 +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.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data)
}
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 930685e1..c7a467c4 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -69,6 +69,14 @@
header-align="center"
align="center"
>
+
import { ref, reactive, defineProps } from 'vue'
import mybus from '@/myplugins/mybus'
- import { updateVisits } from '@/api/home'
+ import { updateVisits, browsingInsert } from '@/api/home'
const props = defineProps({
resourceList: { type: Array, default: null },
resourceTotal: { type: String, default: '' },
@@ -66,6 +66,9 @@
const openHref = (item) => {
console.log(item.id, 'wowowo')
console.log(item.visits, 'wowowo')
+ browsingInsert({ resourceId: item.id }).then((res) => {
+ // console.log(res)
+ })
const arrList = ref([])
arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
if (arrList.value.indexOf(item.id) === -1) {
diff --git a/front/src/views/personalCenter/components/MyBrowse.vue b/front/src/views/personalCenter/components/MyBrowse.vue
index 7cc980a6..eedeeb9b 100644
--- a/front/src/views/personalCenter/components/MyBrowse.vue
+++ b/front/src/views/personalCenter/components/MyBrowse.vue
@@ -44,7 +44,9 @@
>
@@ -142,6 +144,7 @@
import { onMounted, ref } from 'vue'
import { useRouter } from 'vue-router'
import { message } from 'ant-design-vue'
+ import { updateVisits, browsingInsert } from '@/api/home'
import mybus from '@/myplugins/mybus'
import { getBsList, BsDel, getTopCategory } from '@/api/personalCenter'
const router = useRouter()
@@ -171,7 +174,11 @@
console.log('编目一级=============>', res.data)
res.data.data.forEach((val) => {
// tabList.value.push(val.name)
- if (val.name == '应用资源' || val.name == '组件服务') {
+ if (
+ val.name == '应用资源' ||
+ val.name == '组件服务' ||
+ val.name == '知识库'
+ ) {
tabList.value.push(val.name)
}
})
@@ -234,7 +241,9 @@
name: val.resourceDTO.name,
id: val.id,
checked: false,
+ visits: val.resourceDTO.visits,
type: val.resourceDTO.type,
+ link: val.resourceDTO.link,
resourceId: val.resourceId,
createDate: val.createDate,
description: val.resourceDTO.description,
@@ -267,6 +276,28 @@
console.log('search======================>', name.value)
}
+ const openHref = (item) => {
+ browsingInsert({ resourceId: item.resourceId }).then((res) => {
+ // console.log(res)
+ })
+ const arrList = ref([])
+ arrList.value = JSON.parse(window.sessionStorage.getItem('visits'))
+ if (arrList.value.indexOf(item.resourceId) === -1) {
+ arrList.value.push(item.resourceId)
+ updateVisits({
+ id: item.resourceId,
+ visits: item.visits || '0',
+ }).then(() => {
+ window.sessionStorage.setItem('visits', JSON.stringify(arrList.value))
+ })
+ }
+ window.open(item.link)
+ // window.open(
+ // window.SITE_CONFIG.previewUrl +
+ // 'hisense_office/onlinePreview?url=' +
+ // btoa(encodeURI(item.fileHref))
+ // )
+ }
//申请id
const dataResourceId = ref([])
@@ -334,16 +365,20 @@
console.log(e)
}
// 详情
- const showItem = (id, type, delFlag) => {
+ const showItem = (id, type, delFlag, item) => {
if (delFlag == 0) {
- console.log('进入详情')
- mybus.emit('tabsChange', { flag: id })
- router.push({
- path: '/details',
- query: {
- id: id,
- },
- })
+ console.log('进入详情', item)
+ if (item.type === '知识库') {
+ openHref(item)
+ } else {
+ mybus.emit('tabsChange', { flag: id })
+ router.push({
+ path: '/details',
+ query: {
+ id: id,
+ },
+ })
+ }
}
}
From 2354d8da3bc8fec61d949f31448dee081078632f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Sat, 16 Jul 2022 14:27:58 +0800
Subject: [PATCH 2/4] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/modules/activiti/my-todo-task.vue | 15 +-
.../views/capacityOnTheShelf/Algorithm.vue | 17 +-
.../components/PutOnTheShelf.vue | 446 +++++++++---------
front/src/views/home/apply.vue | 2 +-
4 files changed, 254 insertions(+), 226 deletions(-)
diff --git a/back/src/views/modules/activiti/my-todo-task.vue b/back/src/views/modules/activiti/my-todo-task.vue
index d9c0482b..ebe89cce 100644
--- a/back/src/views/modules/activiti/my-todo-task.vue
+++ b/back/src/views/modules/activiti/my-todo-task.vue
@@ -1,8 +1,8 @@
@@ -40,6 +40,17 @@
align="center"
width="50"
>
+
{{
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index dd4c312a..b0340a92 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-15 17:38:56
+ * @LastEditTime: 2022-07-16 14:27:31
* @Description: 算法上架
-->
@@ -449,6 +449,21 @@
background: #999;
}
}
+ .finish {
+ color: #0087ff;
+ .bg-box {
+ background: #9ccefa;
+ color: #fff;
+ border: 1px solid #9ccefa;
+ span {
+ background: #0087ff;
+ border: 1px solid #0087ff;
+ }
+ }
+ .line {
+ background: #0087ff;
+ }
+ }
.btn {
display: flex;
justify-content: space-around;
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 742dc973..40449b33 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-17 14:11:08
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-15 17:34:47
+ * @LastEditTime: 2022-07-16 11:29:11
* @Description: 上架
-->
@@ -111,7 +111,9 @@
>
@@ -724,253 +726,253 @@
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 19bdb3f0..8683e7da 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -290,7 +290,7 @@
? list.value[0].children
.filter((val) => val.id == list.value[0].checkedList[0])[0]
.resourceName.concat(
- list.value[0].checkedList.length > 0
+ list.value[0].checkedList.length > 1
? '等能力申请' + num.value + '个'
: '能力申请'
)
From bb6d58f568c4f997f779a498a3b0caa285cd69dd Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Sat, 16 Jul 2022 14:40:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/SharingSituation.vue | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue
index 9fdf2b43..88b0eddc 100644
--- a/front/src/views/abilityStatistics/components/SharingSituation.vue
+++ b/front/src/views/abilityStatistics/components/SharingSituation.vue
@@ -182,15 +182,15 @@
})
}
let photoBg = ref([
- require('../../../assets/abilityStatistics/zhishiku-bg.png'),
require('../../../assets/abilityStatistics/yingyongziyuan-bg.png'),
+ require('../../../assets/abilityStatistics/zhishiku-bg.png'),
require('../../../assets/abilityStatistics/zujianfuwu-bg.png'),
require('../../../assets/abilityStatistics/shujuziyuan-bg.png'),
require('../../../assets/abilityStatistics/jichujianshe-bg.png'),
])
let photo = ref([
- require('../../../assets/abilityStatistics/zhishiku.png'),
require('../../../assets/abilityStatistics/yingyongziyuan.png'),
+ require('../../../assets/abilityStatistics/zhishiku.png'),
require('../../../assets/abilityStatistics/zujianfuwu.png'),
require('../../../assets/abilityStatistics/shujuziyuan.png'),
require('../../../assets/abilityStatistics/jichujianshe.png'),
@@ -202,19 +202,19 @@
// dataLists.value = res.data.data
res.data.data.map((item) => {
switch (item.type) {
- case '知识库':
- dataLists.value[0] = item
- break
case '应用资源':
dataLists.value[1] = item
break
- case '组件服务':
+ case '业务组件':
+ dataLists.value[0] = item
+ break
+ case '图层服务':
dataLists.value[2] = item
break
- case '数据资源':
+ case '开发组件':
dataLists.value[3] = item
break
- case '基础设施':
+ case '智能算法':
dataLists.value[4] = item
break
default:
From 6b0bb852120f09aadaec3d96a73b0d626b2e3007 Mon Sep 17 00:00:00 2001
From: wuhongjian
Date: Sat, 16 Jul 2022 15:04:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/public/index.html | 6 +-
front/src/utils/request.js | 5 +-
front/src/vab/plugins/permissions.js | 96 ++--
.../components/PutOnTheShelf.vue | 450 +++++++++---------
.../ApplicationDeploymentAndSecurity.vue | 5 -
.../views/personalCenter/VueTemplateDemo.vue | 36 +-
.../components/PurchaseVehicle.vue | 61 ++-
7 files changed, 349 insertions(+), 310 deletions(-)
diff --git a/front/public/index.html b/front/public/index.html
index 040ff813..90bd3425 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
@@ -46,7 +46,7 @@
// 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://15.2.21.238:9797';
+ window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
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.238:8888/renren-admin';
diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index 0f02346e..b51e88b3 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -74,8 +74,7 @@ instance.interceptors.request.use(
(config) => {
debugger
const token = getAccessToken()
- if (token)
- config.headers[tokenName] = token
+ if (token) config.headers[tokenName] = token
if (
config.data &&
config.headers['Content-Type'] ===
@@ -105,7 +104,7 @@ instance.interceptors.response.use(
response['Access-Control-Expose-Headers'] = 'redirect'
const { code, message } = response.data
debugger
- if (code=='0' && response.headers.token) {
+ if (code == '0' && response.headers.token) {
setAccessToken(response.headers.token)
} else {
const token = getAccessToken()
diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js
index 6139bd4b..f52e9f30 100644
--- a/front/src/vab/plugins/permissions.js
+++ b/front/src/vab/plugins/permissions.js
@@ -2,65 +2,65 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-01 17:23:11
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-11 16:39:36
+ * @LastEditTime: 2022-07-16 10:57:59
* @Description: 告诉大家这是什么
*/
/**
* @author chuzhixin 1204505056@qq.com
* @description 路由守卫，目前两种模式：all模式与intelligence模式
*/
- import router from '@/router'
- import store from '@/store'
- import getPageTitle from '@/utils/pageTitle'
- import { getUserInfo } from '@/api/user'
- import {
- // authentication,
- loginInterception,
- // recordRoute,
- routesWhiteList,
- } from '@/config'
- import { setAccessToken, getAccessToken } from '@/utils/accessToken'
- router.beforeEach(async (to, from, next) => {
- // debugger
- // const SSOTOKEN = to.query.SSOToken
- // if (SSOTOKEN) {
- // setAccessToken(SSOTOKEN)
- // }
- const token = getAccessToken()
- console.log('token', token)
- let hasToken = token || store.getters['user/accessToken']
- // debugger
- if (!loginInterception) hasToken = true
- console.log('hasToken存在巨大问题', hasToken)
- if (hasToken) {
+import router from '@/router'
+import store from '@/store'
+import getPageTitle from '@/utils/pageTitle'
+import { getUserInfo } from '@/api/user'
+import {
+ // authentication,
+ loginInterception,
+ // recordRoute,
+ routesWhiteList,
+} from '@/config'
+import { setAccessToken, getAccessToken } from '@/utils/accessToken'
+router.beforeEach(async (to, from, next) => {
+ // debugger
+ // const SSOTOKEN = to.query.SSOToken
+ // if (SSOTOKEN) {
+ // setAccessToken(SSOTOKEN)
+ // }
+ const token = getAccessToken()
+ console.log('token', token)
+ let hasToken = token || store.getters['user/accessToken']
+ // debugger
+ if (!loginInterception) hasToken = true
+ console.log('hasToken存在巨大问题', hasToken)
+ if (hasToken) {
// setAccessToken(hasToken)
- await store.dispatch('user/getUserInfo')
- debugger
- next()
- } else {
- let accessRoutes = []
- accessRoutes = await store.dispatch('routes/setRoutes')
- accessRoutes.forEach((item) => {
- router.addRoute(item)
- })
- if (routesWhiteList.indexOf(to.path) !== -1) {
- next()
- } else {
+ await store.dispatch('user/getUserInfo')
+ debugger
+ next()
+ } else {
+ let accessRoutes = []
+ accessRoutes = await store.dispatch('routes/setRoutes')
+ accessRoutes.forEach((item) => {
+ router.addRoute(item)
+ })
+ if (routesWhiteList.indexOf(to.path) !== -1) {
+ next()
+ } else {
// 这里是一个单点登录的入口
- getUserInfo().then(res=>{
+ getUserInfo().then((res) => {
console.log(res)
router.replace('/home')
})
// await store.dispatch('user/getUserInfo')
// next()
- // if (recordRoute)
- // next({ path: '/login', query: { redirect: to.path }, replace: true })
- // else next({ path: '/login', replace: true })
+ // if (recordRoute)
+ // next({ path: '/login', query: { redirect: to.path }, replace: true })
+ // else next({ path: '/login', replace: true })
// next()
- // window.open('http://www.baidu.com', '_self')
- }
- }
- })
- router.afterEach((to) => {
- document.title = getPageTitle(to.meta.title)
- })
+ // window.open('http://www.baidu.com', '_self')
+ }
+ }
+})
+router.afterEach((to) => {
+ document.title = getPageTitle(to.meta.title)
+})
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 742dc973..dbed1200 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -1,8 +1,8 @@
@@ -645,10 +645,11 @@
console.log('targetKeys: ', nextTargetKeys)
console.log('direction: ', direction)
console.log('moveKeys: ', moveKeys)
+ targetKeys.value = moveKeys
}
const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
- console.log('targetSelectedKeys: ', targetSelectedKeys)
+ console.log('targetSelectedKeys: ', sourceSelectedKeys, targetSelectedKeys)
}
const handleOk = (e) => {
@@ -724,253 +725,256 @@
diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
index 156f9d16..d6235ac1 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue
@@ -149,11 +149,6 @@
dataFrom.value.content[1].childrenContent.push(itemContent)
})
}
- let obj = {
- attrType: '访问地址',
- attrValue: props.dataList.link || '------',
- }
- dataFrom.value.content[0].childrenContent.push(obj)
}
}
)
diff --git a/front/src/views/personalCenter/VueTemplateDemo.vue b/front/src/views/personalCenter/VueTemplateDemo.vue
index 10f12b37..88753664 100644
--- a/front/src/views/personalCenter/VueTemplateDemo.vue
+++ b/front/src/views/personalCenter/VueTemplateDemo.vue
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-19 17:18:48
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-05-06 19:11:32
+ * @LastEditTime: 2022-07-16 15:01:48
* @Description: markdown编辑器
-->
@@ -44,7 +44,7 @@
}
},
created() {
- this.uuidSplice()
+ // this.uuidSplice()
this.getDevelopmentFile()
},
methods: {
@@ -92,12 +92,15 @@
const blob = new Blob([file], {
type: 'md',
})
- let myfile = new File([blob], this.uuidSnum + '.md')
+ if (this.uuidSnum === '') {
+ this.uuidSplice()
+ }
+ let myfile = new File([blob], this.uuidSnum)
var formData = new FormData()
const type = pinyin(this.dataFrom.type, {
pattern: 'initial',
}).replace(/\s*/g, '')
- formData.append('fileName', this.uuidSnum + '.md')
+ formData.append('fileName', this.uuidSnum)
formData.append('type', type)
formData.append('file', myfile) // 'file' 为HTTP Post里的字段名, file 对浏览器里的File对象
// formData.append('name', this.route.currentRoute.query.id + '.md')
@@ -118,22 +121,33 @@
}
},
async getDevelopmentFile() {
+ debugger
+ const uuidParam = this.dataFrom.infoList.filter((item) => {
+ if (item.attrType === '技术文档') {
+ return item
+ }
+ })
+ let uuid = ''
+ if (uuidParam[0].attrValue) {
+ uuid = uuidParam[0].attrValue.split('/')[1].split('.')[0]
+ }
+ this.uuidSnum = uuid
const type = pinyin(this.dataFrom.type, {
pattern: 'initial',
}).replace(/\s*/g, '')
console.log(type)
const param = {
type: type,
- resourceId: this.uuidSnum,
+ resourceId: uuid,
}
const res = await getDevelopmentFile(param)
this.text = res.data
- let infoList = {
- attrType: '技术文档',
- attrValue: this.text.data,
- delFlag: 0,
- }
- mybus.emit('chageDataFrom', infoList)
+ // let infoList = {
+ // attrType: '技术文档',
+ // attrValue: this.text.data,
+ // delFlag: 0,
+ // }
+ // mybus.emit('chageDataFrom', infoList)
console.log('res', res)
},
},
diff --git a/front/src/views/personalCenter/components/PurchaseVehicle.vue b/front/src/views/personalCenter/components/PurchaseVehicle.vue
index 2ce412ad..44ccfa72 100644
--- a/front/src/views/personalCenter/components/PurchaseVehicle.vue
+++ b/front/src/views/personalCenter/components/PurchaseVehicle.vue
@@ -68,8 +68,8 @@
-
-
+
+
@@ -131,7 +130,7 @@
title="是否删除该记录?"
ok-text="是"
cancel-text="否"
- @confirm="delOne(item)"
+ @confirm="delOne(item, valIndex)"
@cancel="cancel"
>
{
+ const clean = (index) => {
name.value = ''
type.value = ''
pageNum.value = '1'
@@ -463,10 +462,10 @@
checkedListAll.value = []
checkAll.value = false
showKey.value++
- getList()
+ getList('', index)
}
// 获取信息
- const getList = (type) => {
+ const getList = (type, index) => {
if (type == 'init') {
pageNum.value = 1
pageSize.value = 99999
@@ -491,7 +490,7 @@
val.pageNum = '1'
val.pageSize = '99999'
})
- if (statistics == res.data.data.list.length) {
+ if (statistics != 0 && statistics == res.data.data.list.length) {
checkAll.value = true
}
if (list.value.length == 0) {
@@ -501,8 +500,31 @@
load.value = Number(pageNum.value)
}
// console.log('整体页面加载次数===============>', load.value)
+ // 判断是否有已打开项，如果有重新载入之后自动打开
+ debugger
list.value = res.data.data.list
+ if (index || index === 0) {
+ debugger
+ list.value[index].show = true
+ // console.log('1111', list.value[index])
+ showNew(list.value[index])
+ // showBottom()
+ }
+ // list.value = res.data.data.list
+ console.log(
+ '重新请求值',
+ index,
+ // res.data.data.list[index].show,
+ list.value
+ )
+
total.value = res.data.data.deptCount
+ console.log(
+ '重新请求值2',
+ index,
+ // res.data.data.list[index].show,
+ list.value
+ )
showKey.value++
if (type == 'init' || type == 'changePage') {
getListByDeptId(list.value[0])
@@ -573,11 +595,15 @@
}
// 显示资源信息
const showBottom = (item) => {
+ debugger
item.show = !item.show
if (item.show) {
getListByDeptId(item)
}
}
+ const showNew = (item) => {
+ getListByDeptId(item)
+ }
// 切换页数
const pageChange = (val) => {
checkAll.value = false
@@ -642,13 +668,13 @@
}
// 判断是否全选
const judgeAll = (item, val) => {
- // console.log(
- // '判断是否全选============>',
- // item,
- // val,
- // list.value,
- // checkedList.value
- // )
+ console.log(
+ '判断是否全选============>',
+ item,
+ val,
+ list.value,
+ checkedList.value
+ )
if (!val) {
let all = true
list.value.map((val) => {
@@ -734,7 +760,7 @@
}
}
- const delOne = (item) => {
+ const delOne = (item, index) => {
// console.log(item)
sgcDel({
ids: [item.id],
@@ -743,7 +769,8 @@
message.success('删除成功')
// console.log('删除申购车列表================>', res)
mybus.emit('getSgcNum')
- clean()
+ clean(index)
+ // val.show = true
}
})
}