@@ -97,12 +96,14 @@
{{
- approveStatus === '通过'
+ approveStatus === '通过' || role
? item.people.value
: '请申请后查看'
}}
-
+
{{ item.people.value }}
@@ -112,12 +113,14 @@
{{
- approveStatus === '通过'
+ approveStatus === '通过' || role
? item.phone.value
: '请申请后查看'
}}
-
+
{{ item.phone.value }}
@@ -169,7 +172,15 @@
import { ref, defineProps, watch } from 'vue'
import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router'
+ import { useStore } from 'vuex'
const router = useRouter()
+ const store = useStore()
+ const role = ref(false)
+ store.getters['user/roleList'].map((val) => {
+ if (val === '运维管理员') {
+ role.value = true
+ }
+ })
const approveStatus = ref('通过')
const whoShow1 = ref(whoShow)
diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
index 08762a55..34d7c050 100644
--- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue
@@ -8,8 +8,7 @@
>
-
+
{
+ if (val === '运维管理员') {
+ role.value = true
+ }
+ })
const approveStatus = ref('通过')
const whoShow1 = ref(whoShow)
let dataFrom = ref({
diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
index 401726db..16b0e1cc 100644
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@@ -7,8 +7,7 @@
:type="dataFrom.englishTitle"
>
-
+
@@ -52,12 +51,14 @@
{{
- approveStatus === '通过'
+ approveStatus === '通过' || role
? item.people.value
: '请申请后查看'
}}
-
+
{{ item.people.value }}
@@ -67,12 +68,14 @@
{{
- approveStatus === '通过'
+ approveStatus === '通过' || role
? item.phone.value
: '请申请后查看'
}}
-
+
{{ item.phone.value }}
@@ -124,7 +127,15 @@
import { ref, defineProps, watch } from 'vue'
import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router'
+ import { useStore } from 'vuex'
const router = useRouter()
+ const store = useStore()
+ const role = ref(false)
+ store.getters['user/roleList'].map((val) => {
+ if (val === '运维管理员') {
+ role.value = true
+ }
+ })
const approveStatus = ref('通过')
const whoShow1 = ref(whoShow)
let dataFrom = ref({
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
index b62cba8c..c6a1b31c 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
@@ -7,8 +7,7 @@
:type="dataFrom.englishTitle"
>
-
+
+
diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index 2e4c5ea6..40531283 100644
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@@ -59,6 +59,7 @@
v-for="item in contentList.data"
:key="item.index"
>
+
@@ -40,6 +39,7 @@
{{
approveStatus !== '通过' &&
+ !role &&
(carditem.attrType === '部门联系人' ||
carditem.attrType === '联系人电话')
? '请申请后查看'
@@ -50,6 +50,7 @@
:class="{
'blur-word':
approveStatus !== '通过' &&
+ !role &&
(carditem.attrType === '部门联系人' ||
carditem.attrType === '联系人电话'),
}"
@@ -80,7 +81,15 @@
import { pinyin } from 'pinyin-pro'
import { message } from 'ant-design-vue'
import { useRouter } from 'vue-router'
+ import { useStore } from 'vuex'
const router = useRouter()
+ const store = useStore()
+ const role = ref(false)
+ store.getters['user/roleList'].map((val) => {
+ if (val === '运维管理员') {
+ role.value = true
+ }
+ })
const approveStatus = ref('通过')
const whoShow1 = ref(whoShow)
let flag = ref(true)
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index f4f8eee2..f9c7ce3a 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -7,8 +7,7 @@
:type="dataFrom.englishTitle"
>
-
+
-
+
+
@@ -63,12 +62,14 @@
{{
- approveStatus === '通过'
+ approveStatus === '通过' || role
? item.people.value
: '请申请后查看'
}}
-
+
{{ item.people.value }}
@@ -78,12 +79,14 @@
{{
- approveStatus === '通过'
+ approveStatus === '通过' || role
? item.phone.value
: '请申请后查看'
}}
-
+
{{ item.phone.value }}
@@ -135,7 +138,15 @@
import { pinyin } from 'pinyin-pro'
import { ref, defineProps, watch } from 'vue'
import { useRouter } from 'vue-router'
+ import { useStore } from 'vuex'
const router = useRouter()
+ const store = useStore()
+ const role = ref(false)
+ store.getters['user/roleList'].map((val) => {
+ if (val === '运维管理员') {
+ role.value = true
+ }
+ })
const approveStatus = ref('通过')
const whoShow1 = ref(whoShow)
let dataFrom = ref({
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 341ba4ad..d6ab3764 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -6,7 +6,7 @@
-
@@ -127,7 +127,7 @@
+
+
+ 能力广场
@@ -833,7 +835,7 @@ let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB - console.log('select------------>', select) + let orderField =router.currentRoute.value.query.orderField // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等... let selectSubType = router.currentRoute.value.query.type || '' let queryName = ref('') @@ -926,7 +928,6 @@ ) { ;[title[0], title[2]] = [title[2], title[0]] } - debugger titleName.value = title } // 查询 @@ -1323,6 +1324,8 @@ globalData.data = [] } select = router.currentRoute.value.query.select + + if ( (select == '应用资源' && (paramsGetResources.orderField == '' || @@ -1619,19 +1622,23 @@ } // 青岛-西海岸处理 const getXiHaiAn = (res) => { - ;((res.data && res.data.data && res.data.data.list) || []).forEach( - (val) => { - val.id = val.serviceId // id - val.name = val.serviceName // 名字 - val.sjlCount = val.requestQuantity // 数据量 - val.applyCount = val.requestCount // 申请量 - val.deptName = val.departmentName // 部门 - val.createTime = val.createTime.split('.')[0] - val.createDate = val.createTime // 发布时间 - } - ) - resourceList.data = res.data.data.list || [] - resourceTotal.value = res.data.data.total || '' + const data = (res.data && res.data.data && res.data.data.list) || [] + const total = (res.data && res.data.data && res.data.data.total) || 0 + data.forEach((val) => { + val.id = val.serviceId // id + val.name = val.serviceName // 名字 + val.sjlCount = val.requestQuantity // 数据量 + val.applyCount = val.requestCount // 申请量 + val.deptName = val.departmentName // 部门 + val.createTime = val.createTime.split('.')[0] + val.createDate = val.createTime // 发布时间 + }) + + console.log('接口数据', data) + resourceList.data = data || [] + console.log('接口数据2', resourceList.data) + resourceTotal.value = total + console.log() } let shoppingCartList = ref([]) // 获取申购车列表 @@ -1779,6 +1786,10 @@ onMounted(() => { // 从本地读取查询条件，赋值 //西海岸基础设施放在最前面 + orderField= router.currentRoute.value.query.orderField //根据什么排序 + if(orderField){ + paramsGetResources.orderField=orderField + } setTitle() handleSetSearchData() listKey2.value++ @@ -1864,7 +1875,7 @@ query: newQuery, }) .then(() => { - tagFlag.value = false + // tagFlag.value = false chongzhi(true) getNewList() }) @@ -2454,7 +2465,7 @@ padding-top: 0.05rem; position: fixed; z-index: 10; - bottom: 1.56rem; + // bottom: 1.56rem; right: 0.1rem; cursor: pointer; background: #e3edfc; diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 32f66dff..6eda1c7c 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -812,7 +812,7 @@ console.log('res=====>', res.data.data) if (res.data.code == 0) { if (res.data.data.length == 0) { - message.warning('该关键词，暂无应用资源！') + // message.warning('该关键词，暂无应用资源！') } else { // 过滤本单位的应用系统 res.data.data.map((val) => { diff --git a/front/src/views/home/components/H5Player.vue b/front/src/views/home/components/H5Player.vue index 1d008d7f..89805674 100644 --- a/front/src/views/home/components/H5Player.vue +++ b/front/src/views/home/components/H5Player.vue @@ -2,7 +2,7 @@ 海康H5Player --> - + diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index 565eb9ac..e3d01f9c 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -152,6 +152,7 @@ > 查看详情 +
@@ -174,9 +175,11 @@
说明：已申请成功，使用方式及联系人请点击"查看详情"按钮查看。
@@ -277,7 +280,9 @@
申请单号：{{
@@ -112,7 +113,13 @@
审核结果：{{ status2[item.STATUS] }}
- 审核结果：{{ item.ended ? '审核完成' : '审核中' }} + 审核结果：{{ + item.ended + ? '审核完成' + : item.backToFirst + ? '审核中（被驳回，请修改申请或终止流程）' + : '审核中' + }}
申请日期：{{
@@ -152,6 +159,7 @@
height="80"
v-if="
item.processDefinitionName != '能力资源下架' &&
+ item.approveStatus !== '不通过' &&
(item.resourceStatus == 4 || item.resourceStatus == 5)
"
style="position: absolute; top: 20px; left: -850px"
@@ -1081,6 +1089,16 @@
height: 150px;
border-bottom: #cccccc 1px solid;
position: relative;
+ .withdraw {
+ width: 0.675rem;
+ height: 0.3rem;
+ background: url('~@/assets/home/withdraw.png') no-repeat;
+ background-size: 100%;
+ position: absolute;
+ top: 0.3rem;
+ left: 0.87rem;
+ transform: rotate(-30deg);
+ }
.content-body-title {
min-width: 100px;
diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue
index 47331e43..b379257c 100644
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@@ -9,38 +9,83 @@
+
-
+
-
-
+
+
基础设施
数据资源
组件服务
@@ -49,24 +94,44 @@
-
-
-
+
+
-
-
+
-
-
-
+
+
+ "
+ >
@@ -103,7 +183,8 @@
-
+ "
+ type="primary"
+ html-type="cancle"
+ @click="signOut"
+ >
退出申请
-
+ "
+ type="primary"
+ html-type="submit"
+ @click="processStartHandle()"
+ >
提交申请
@@ -139,7 +229,7 @@
@@ -150,248 +240,263 @@
申请人信息
-
-
-
+
-
-
+
-
-
+
需求信息
- 您已成功申请{{ - formName.demandSubject || '' + formName.demandSubject || '' }},请耐心等待审批结果，结果会第一时间通知您！