Skip to content

A
apaas-ui
"src/pages/technical-support/doc/index.vue" did not exist on "66973b92893f943bf2888362f138383a57b93342"
Commit f13a731c authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

parents 2801a2a5 14f1e993
Hide whitespace changes
Inline Side-by-side
Showing with 316 additions and 112 deletions
src/components/comments-pagination.vue
View file @ f13a731c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="total_info"> <div class="total_info">
<span>{{ `共${total}个条目` }}</span> <span>{{ `共${total}个条目` }}</span>
</div> </div>
<div class="page_size_action"> <div class="page_size_action" v-if="pageSizes.length">
<span>每页行数：</span> <span>每页行数：</span>
<el-select :value="pageSize" @change="sizeChange"> <el-select :value="pageSize" @change="sizeChange">
<el-option <el-option
......
src/components/order-list/order-list-cell.vue
View file @ f13a731c
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div> <div>规格：日访问次数：{{ cellItem.spec_svc_count }}次，日访问量：{{ cellItem.spec_svc_pv }}</div>
<div <div
class="cell_specification_type" class="cell_specification_type"
>申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.byYear') : $t('lang.byMonth') }}</div> >申请方式：{{ cellItem.duration_unit == 1 ? $t('lang.byMonth') : $t('lang.byYear') }}</div>
</div> </div>
</el-col> </el-col>
<el-col :span="4" class="approval_status"> <el-col :span="4" class="approval_status">
......
src/components/table/table-um.vue
View file @ f13a731c
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<el-table <el-table
:data="selectedTabsPage" :data="selectedTabsPage"
:size="size" :size="size"
:height="height"
:border="border" :border="border"
@select="select" @select="select"
@select-all="selectAll" @select-all="selectAll"
...@@ -139,6 +140,7 @@ ...@@ -139,6 +140,7 @@
v-else-if="item.type == 'href'" v-else-if="item.type == 'href'"
:header="item" :header="item"
:row="scope.row" :row="scope.row"
:ids="item.id"
:detailsUrl="detailsUrl" :detailsUrl="detailsUrl"
></v-apaas-table-umhref> ></v-apaas-table-umhref>
<!-- could edit --> <!-- could edit -->
...@@ -264,6 +266,7 @@ export default { ...@@ -264,6 +266,7 @@ export default {
"v-apaas-table-filter": TableFilter "v-apaas-table-filter": TableFilter
}, },
props: { props: {
height:'',
//是否滚动加载 //是否滚动加载
asyn_load1: { type: Boolean, default: false }, asyn_load1: { type: Boolean, default: false },
// 表格型号：mini,medium,small // 表格型号：mini,medium,small
...@@ -433,6 +436,7 @@ export default { ...@@ -433,6 +436,7 @@ export default {
//本地删除 //本地删除
deleteLocal(val) { deleteLocal(val) {
this.selectedTabsPage.splice(val.$index, 1); this.selectedTabsPage.splice(val.$index, 1);
this.$emit('changeTable',this.selectedTabsPage)
}, },
// get data // get data
getDataFromApiSync() { getDataFromApiSync() {
......
src/components/table/table-umhref.vue
View file @ f13a731c
<template> <template>
<div> <div>
<span v-if="this.row.id" class="href" @click="goHref(baseVal)">{{ text }}</span> <span v-if="this.row.id||ids" class="href" @click="goHref(baseVal)">{{ text }}</span>
<span v-else>{{text}}</span> <span v-else>{{text}}</span>
</div> </div>
</template> </template>
...@@ -10,7 +10,7 @@ import helper from "@/services/helper"; ...@@ -10,7 +10,7 @@ import helper from "@/services/helper";
import format from "string-format"; import format from "string-format";
export default { export default {
props: ["header", "row", "detailsUrl"], props: ["header", "row", "detailsUrl","ids"],
computed: { computed: {
text: function() { text: function() {
let text = helper.GetProperty(this.row, this.header.prop); let text = helper.GetProperty(this.row, this.header.prop);
...@@ -21,11 +21,22 @@ export default { ...@@ -21,11 +21,22 @@ export default {
let baseVal = helper.GetProperty(this.row, "id"); let baseVal = helper.GetProperty(this.row, "id");
return baseVal; return baseVal;
}, },
},
created(){
}, },
methods: { methods: {
// Jump routing using id as parameter // Jump routing using id as parameter
goHref(val) { goHref(val) {
this.$router.push(this.detailsUrl + val) if(this.ids){
if(this.ids.indexOf('.')==-1){
this.$router.push(this.detailsUrl + this.row[this.ids])
}else{
this.$router.push(this.detailsUrl + this.row[this.ids.split('.')[0]][this.ids.split('.')[1]])
}
}else{
this.$router.push(this.detailsUrl + val)
}
} }
} }
}; };
......
src/pages/authority/organization/organizationdetail.vue
View file @ f13a731c
<template> <template>
<div class="detail_contain"> <div class="detail_contain">
<p class="now_page_title">权限管理 / 组织用户 / <span>用户管理</span></p> <p class="now_page_title" v-if="now_user==2">权限管理 / 组织用户 / <span>用户管理</span></p>
<div class="info_contain"> <div class="info_contain">
<service-header <service-header
v-if="service_header_arr.name" v-if="service_header_arr.name"
...@@ -39,6 +39,7 @@ import serviceHeader from "@/components/service-header"; ...@@ -39,6 +39,7 @@ import serviceHeader from "@/components/service-header";
import apassTable from "@/components/apass-table"; import apassTable from "@/components/apass-table";
import dialogAction from "@/components/dialog-action"; import dialogAction from "@/components/dialog-action";
import ListPagination from "@/components/comments-pagination"; import ListPagination from "@/components/comments-pagination";
import { mapGetters,mapState } from 'vuex'
export default { export default {
props: [], props: [],
components: { components: {
...@@ -52,6 +53,7 @@ export default { ...@@ -52,6 +53,7 @@ export default {
table_url: "", table_url: "",
listTotal: 0, listTotal: 0,
currentPage: 1, currentPage: 1,
now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员
pageSize: 10, pageSize: 10,
pageSizes: [10, 50, 100], pageSizes: [10, 50, 100],
service_header_arr: { service_header_arr: {
...@@ -98,13 +100,36 @@ export default { ...@@ -98,13 +100,36 @@ export default {
}, 1000); }, 1000);
}, },
}, },
computed: {}, computed: {
...mapGetters([
'level',
]),
...mapState(['userInfo']),
},
created() { created() {
this.get_user(); this.get_user();
this.get_list(); this.get_list();
if(this.userInfo){
this.now_user = this.level
}else{
this.getCurrentUser()
}
}, },
mounted() {}, mounted() {},
methods: { methods: {
getCurrentUser() {
this.$api.user.getNowUser().then(({ data }) => {
if (data.success == 1) {
console.log("--- user info ---");
console.log(data.data);
console.log("--- user info ---");
this.$store.commit("userInfofun", data.data);
this.now_user = this.level
} else {
console.log(data.errMsg);
}
});
},
changePageSize(value) { changePageSize(value) {
this.pageSize = value; this.pageSize = value;
this.currentPage = 1; this.currentPage = 1;
......
src/pages/user/user_info.vue
View file @ f13a731c
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
> >
<p>当前用户类型：</p> <p>当前用户类型：</p>
<el-input v-model="user_data.userTypeName" :disabled="true"></el-input> <el-input v-model="user_data.userTypeName" :disabled="true"></el-input>
<el-button v-if="user_data.userType == 3" class="option_btn" @click="upLevel">升级为开发者</el-button> <el-button v-if="user_data.userType == 3" :disabled="!couldUp" :class="couldUp ? 'option_btn':'option_btn_gray'" @click="upLevel">升级为开发者</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -207,7 +207,8 @@ export default { ...@@ -207,7 +207,8 @@ export default {
blackAddShow: false, blackAddShow: false,
newIpWhite: "", newIpWhite: "",
newIpBlack: "", newIpBlack: "",
diaPassWord: false diaPassWord: false,
couldUp: true
}), }),
mounted() { mounted() {
this.getCurrentUser(); this.getCurrentUser();
...@@ -274,6 +275,7 @@ export default { ...@@ -274,6 +275,7 @@ export default {
} else if (this.activeName == 1) { } else if (this.activeName == 1) {
query = { query = {
pageType: "systemFile", // this page is system info pageType: "systemFile", // this page is system info
user_id: this.user_data.accountNo,
system_name: this.formBusiness.businessSystemName, system_name: this.formBusiness.businessSystemName,
domain_name: this.formBusiness.domainName, domain_name: this.formBusiness.domainName,
ip_whitelist: this.formBusiness.ip_white, ip_whitelist: this.formBusiness.ip_white,
...@@ -354,6 +356,7 @@ export default { ...@@ -354,6 +356,7 @@ export default {
message: "申请升级开发者成功", message: "申请升级开发者成功",
type: "success" type: "success"
}); });
this.couldUp = false;
} else { } else {
this.$message({ this.$message({
message: "申请升级开发者失败", message: "申请升级开发者失败",
......
src/pages/workbench/fwgl/approval_service_detail.vue
View file @ f13a731c
...@@ -352,7 +352,8 @@ export default { ...@@ -352,7 +352,8 @@ export default {
this.$set(this.list_arr[5], "info", data.service_apply_info.business_url); this.$set(this.list_arr[5], "info", data.service_apply_info.business_url);
this.$set(this.list_arr[6], "info", data.service_apply_info.apply_file.split('/')[data.service_apply_info.apply_file.split('/').length - 1]); this.$set(this.list_arr[6], "info", data.service_apply_info.apply_file.split('/')[data.service_apply_info.apply_file.split('/').length - 1]);
this.$set(this.list_arr[6], "url", data.service_apply_info.apply_file); this.$set(this.list_arr[6], "url", data.service_apply_info.apply_file);
this.$set(this.list_arr[8], "info", data.service_apply_info.duration+data.service_apply_info.duration_unit); debugger
this.$set(this.list_arr[8], "info", data.service_apply_info.duration+(data.service_apply_info.duration_unit==1?'月':'年'));
this.$set(this.list_arr[9], "info", "访问次数："+data.service_apply_info.request_spcs.pv+"/日 访问量："+data.service_apply_info.request_spcs.count+"/日"); this.$set(this.list_arr[9], "info", "访问次数："+data.service_apply_info.request_spcs.pv+"/日 访问量："+data.service_apply_info.request_spcs.count+"/日");
this.id = data.service_apply_info.id this.id = data.service_apply_info.id
if(data.service_apply_info.approval_status!==0){ if(data.service_apply_info.approval_status!==0){
......
src/pages/workbench/fwgl/serviceDetail.vue
View file @ f13a731c
...@@ -608,7 +608,7 @@ export default { ...@@ -608,7 +608,7 @@ export default {
); );
this.$set(this.servicead_arr[2], "info", data.req_fields); this.$set(this.servicead_arr[2], "info", data.req_fields);
this.$set(this.servicead_arr[3], "info", data.encode_method); this.$set(this.servicead_arr[3], "info", data.encode_method);
this.code_arr = data.res_fields; this.code_arr = data.res_fields_example;
this.res_data = JSON.parse(data.res_fields); this.res_data = JSON.parse(data.res_fields);
this.service_size_data = data.request_spcs_info; this.service_size_data = data.request_spcs_info;
this.size_arr_down = data.request_spcs_info; this.size_arr_down = data.request_spcs_info;
......
src/pages/workbench/workPlace.vue
View file @ f13a731c
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="menu"> <div class="menu">
<div <div
:class=" :class="
now_user == 0 now_user == 0||now_user == 4
? 'menu_box0' ? 'menu_box0'
: now_user == 1 : now_user == 1
? 'menu_box1' ? 'menu_box1'
...@@ -64,12 +64,12 @@ ...@@ -64,12 +64,12 @@
</div> </div>
<!-- 普通用户--数据分析 --> <!-- 普通用户--数据分析 -->
<div class="case_box" v-if="now_user == 0"> <div class="case_box" v-if="now_user == 0||now_user == 4">
<div class="data_asy"> <div class="data_asy">
<p <p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;" style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
> >
数据分析中心 云资源概况分析
<img <img
style="vertical-align:-9px;" style="vertical-align:-9px;"
src="@/assets/imgs/home_btn_enter.png" src="@/assets/imgs/home_btn_enter.png"
...@@ -77,13 +77,19 @@ ...@@ -77,13 +77,19 @@
/> />
</p> </p>
<div class="data_charts"> <div class="data_charts">
<div class="data_charts_left"> <div class="data_charts_left" style="width:100%;">
<p><span></span> 服务健康状态</p> <p><span></span>
<div :id="health" class="health"></div> 服务健康状态
</div> <el-select style="float:right;" v-model="fw_value" placeholder="请选择">
<div class="data_charts_right"> <el-option
<p><span></span> 服务运营分析</p> v-for="item in fw_options"
<div :id="yy_asy" class="yy_asy"></div> :key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</p>
<div :id="health" class="health" style="width:calc(100% - 40px)"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -179,11 +185,11 @@ ...@@ -179,11 +185,11 @@
<!-- 普通用户/组织管理员--服务 --> <!-- 普通用户/组织管理员--服务 -->
<div class="case_box"> <div class="case_box">
<div class="data_asy" :style="now_user == 0 ? {} : { width: '590px' }"> <div class="data_asy" :style="now_user == 0||now_user == 4 ? {} : { width: '590px' }">
<p <p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;" style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
> >
{{ now_user == 0 ? "我的服务" : "服务管理" }} {{ now_user == 0||now_user == 4 ? "我的服务" : "服务管理" }}
<img <img
style="vertical-align:-9px;cursor: pointer;" style="vertical-align:-9px;cursor: pointer;"
src="@/assets/imgs/home_btn_enter.png" src="@/assets/imgs/home_btn_enter.png"
...@@ -202,27 +208,36 @@ ...@@ -202,27 +208,36 @@
? { borderBottom: '4px solid #f5ab4c', color: '#e56600' } ? { borderBottom: '4px solid #f5ab4c', color: '#e56600' }
: {} : {}
" "
@click="now_type = index" @click="change_now_type(index)"
> >
{{ item }} {{ item }}
</div> </div>
<div class="myservice_btn" v-if="now_user == 0" @click="gotozc()"> <div class="myservice_btn" v-if="now_user == 0||now_user == 4" @click="gotozc()">
<img src="@/assets/imgs/home_ic_release.png" alt />&nbsp; 服务注册 <img src="@/assets/imgs/home_ic_release.png" alt />&nbsp; 服务注册
</div> </div>
</div> </div>
<table-um <table-um
:headers="service_head[now_user][now_type]" :headers="service_head[now_user][now_type]"
:url="service_url_arr[now_user][now_type]" :datas="service_data"
:paginationShow="true" :stripe="true"
height="285"
:detailsUrl="detailsUrl[now_user][now_type]"
@distribut="distribut" @distribut="distribut"
></table-um> ></table-um>
<list-pagination
:total="listTotal"
:page-size="pageSize"
:page-sizes="[]"
:current-page="currentPage"
@current-change="changeCurrentPage"
></list-pagination>
</div> </div>
</div> </div>
<div class="online_tool" :style="now_user == 0 ? {} : { width: '590px' }"> <div class="online_tool" :style="now_user == 0||now_user == 4 ? {} : { width: '590px' }">
<p <p
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;" style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
> >
{{ now_user == 0 ? "我的应用" : "平台应用" }} {{ now_user == 0||now_user == 4 ? "我的应用" : "平台应用" }}
<img <img
@click="gotoyy" @click="gotoyy"
style="vertical-align:-9px;" style="vertical-align:-9px;"
...@@ -241,28 +256,38 @@ ...@@ -241,28 +256,38 @@
? { borderBottom: '4px solid #f5ab4c', color: '#e56600' } ? { borderBottom: '4px solid #f5ab4c', color: '#e56600' }
: {} : {}
" "
@click="now_app = index" @click="change_now_app(index)"
> >
{{ item }} {{ item }}
</div> </div>
</div> </div>
<el-scrollbar class="myapp_contain" v-if="now_user == 0"> <el-scrollbar class="myapp_contain" v-if="now_user == 0||now_user == 4">
<div <div
v-for="(item, index) in app_arr" v-for="(item, index) in app_arr"
:key="index + 600" :key="index + 600"
class="myapp_box" class="myapp_box"
@click="gotopage(item.app_id,item.deploy_id)"
> >
<img :src="item.pic" alt style="width:60px;height:60px;" /> <img :src="item.logo" alt style="width:60px;height:60px;" />
<p>{{ item.name }}</p> <p>{{ item.app_name||item.deploy_name }}</p>
<p>{{ item.version }}</p> <p>{{ item.version||item.app_version }}</p>
</div> </div>
</el-scrollbar> </el-scrollbar>
<table-um <table-um
:headers="app_head[now_user][now_app]" :headers="app_head[now_user][now_app]"
:url="app_url_arr[now_user][now_app]" :datas="app_data"
:paginationShow="true" :stripe="true"
:detailsUrl="detailsUrl1[now_user][now_app]"
height="285"
></table-um> ></table-um>
<list-pagination
:total="listTotal1"
:page-size="pageSize"
:page-sizes="[]"
:current-page="currentPage1"
@current-change="changeCurrentPage1"
></list-pagination>
</div> </div>
</div> </div>
</div> </div>
...@@ -272,14 +297,33 @@ ...@@ -272,14 +297,33 @@
<script> <script>
import uuidv1 from "uuid/v1"; import uuidv1 from "uuid/v1";
import tableUm from "@/components/table/table-um"; import tableUm from "@/components/table/table-um";
import ListPagination from "@/components/comments-pagination";
import helper from "@/services/helper.js";
import { getRole } from "@/utils/common"; import { getRole } from "@/utils/common";
import { mapGetters,mapState } from 'vuex' import { mapGetters,mapState } from 'vuex'
var echarts = require("echarts"); var echarts = require("echarts");
export default { export default {
data() { data() {
return { return {
service_data:[],
app_data:[],
listTotal: 0,
currentPage: 1,
listTotal1: 0,
currentPage1: 1,
pageSize: 5,
person: "", person: "",
login_time: "", login_time: "",
detailsUrl:[
['/fwgl/0/0/servicedetail/','/fwgl/0/1/applyserviceedit/'],
['/fwgl/1/0/servicedetail/','/fwgl/1/1/approvalserviceedit/'],
['/fwgl/2/0/servicedetail/','/fwgl/2/1/approvalserviceedit/'],
],//服务跳转链接
detailsUrl1:[
['/yygl/0/0/detail/','/yygl/0/1/deploydetail/'],
['/yygl/1/0/detail/','/yygl/1/2/approvaldetail/'],
['/yygl/2/0/detail/','/yygl/2/2/approvaldetail/'],
],//应用跳转链接
now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员 now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员
now_type: 0, now_type: 0,
now_app: 0, now_app: 0,
...@@ -299,37 +343,39 @@ export default { ...@@ -299,37 +343,39 @@ export default {
label: "应用总数", label: "应用总数",
}, },
], ],
app_url_arr: [[], ["creat_app", "check_app"], ["creat_app", "check_app"]], app_url_arr: [['/apaas/hubApi/market/list','/apaas/hubApi/market/deployList'], ["/apaas/hubApi/market/list", "/apaas/hubApi/market/applyList"], ["/apaas/hubApi/market/list", "/apaas/hubApi/market/applyList"]],
app_head: [ app_head: [
[], [],
[ [
[ [
{ {
prop: "yymc", prop: "app_name",
label: "应用名称", label: "应用名称",
width: "90px", width: "90px",
align: "left", align: "left",
type:'href',
id:'app_id'
}, },
{ {
prop: "yylx", prop: "type_name",
label: "应用类型", label: "应用类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "yybb", prop: "version",
label: "应用版本", label: "应用版本",
width: "80px", width: "80px",
align: "center", align: "center",
}, },
{ {
prop: "yycjsj", prop: "create_date",
label: "应用创建时间", label: "应用创建时间",
width: "160px", width: "160px",
align: "center", align: "center",
}, },
{ {
prop: "yybscs", prop: "deploy_times",
label: "被部署次数", label: "被部署次数",
width: "100px", width: "100px",
align: "center", align: "center",
...@@ -337,31 +383,33 @@ export default { ...@@ -337,31 +383,33 @@ export default {
], ],
[ [
{ {
prop: "yymc", prop: "app_name",
label: "应用名称", label: "应用名称",
width: "90px", width: "90px",
align: "left", align: "left",
type:'href',
id:'id'
}, },
{ {
prop: "yylx", prop: "type_name",
label: "应用类型", label: "应用类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "yybb", prop: "version",
label: "应用版本", label: "应用版本",
width: "80px", width: "80px",
align: "center", align: "center",
}, },
{ {
prop: "yyspsj", prop: "time",
label: "应用审批时间", label: "应用审批时间",
width: "160px", width: "160px",
align: "center", align: "center",
}, },
{ {
prop: "spzt", prop: "apply_status",
label: "审批状态", label: "审批状态",
width: "100px", width: "100px",
align: "center", align: "center",
...@@ -371,31 +419,33 @@ export default { ...@@ -371,31 +419,33 @@ export default {
[ [
[ [
{ {
prop: "yymc", prop: "app_name",
label: "应用名称", label: "应用名称",
width: "90px", width: "90px",
align: "left", align: "left",
type:'href',
id:'app_id'
}, },
{ {
prop: "yylx", prop: "type_name",
label: "应用类型", label: "应用类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "yybb", prop: "version",
label: "应用版本", label: "应用版本",
width: "80px", width: "80px",
align: "center", align: "center",
}, },
{ {
prop: "yycjsj", prop: "create_date",
label: "应用创建时间", label: "应用创建时间",
width: "160px", width: "160px",
align: "center", align: "center",
}, },
{ {
prop: "yybscs", prop: "deploy_times",
label: "被部署次数", label: "被部署次数",
width: "100px", width: "100px",
align: "center", align: "center",
...@@ -403,31 +453,33 @@ export default { ...@@ -403,31 +453,33 @@ export default {
], ],
[ [
{ {
prop: "yymc", prop: "app_name",
label: "应用名称", label: "应用名称",
width: "90px", width: "90px",
align: "left", align: "left",
type:'href',
id:'id'
}, },
{ {
prop: "yylx", prop: "type_name",
label: "应用类型", label: "应用类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "yybb", prop: "version",
label: "应用版本", label: "应用版本",
width: "80px", width: "80px",
align: "center", align: "center",
}, },
{ {
prop: "yyspsj", prop: "time",
label: "应用审批时间", label: "应用审批时间",
width: "160px", width: "160px",
align: "center", align: "center",
}, },
{ {
prop: "spzt", prop: "apply_status",
label: "审批状态", label: "审批状态",
width: "100px", width: "100px",
align: "center", align: "center",
...@@ -437,37 +489,38 @@ export default { ...@@ -437,37 +489,38 @@ export default {
], ],
service_url_arr: [ service_url_arr: [
[ [
"nor_service_list", "/apaas/service/v3/service/manager/list",
"nor_apply_service", "/apaas/service/v3/service/apply/service/list",
"nor_service_sh", "/apaas/service/v3/service/manager/list",
"nor_cloud",
], ],
["nor_service_list", "nor_service_sh", "nor_cloud"], ["/apaas/service/v3/service/manager/list", "/apaas/service/v3/service/approval/applied/list", "nor_cloud"],
["nor_service_list", "nor_service_sh", "nor_cloud_manage"], ["/apaas/service/v3/service/manager/list", "/apaas/service/v3/service/approval/applied/list", "nor_cloud_manage"],
], ],
service_head: [ service_head: [
[ [
[ [
{ {
prop: "fwmc", prop: "name",
label: "服务名称", label: "服务名称",
width: "250px", width: "250px",
align: "left", align: "left",
type:'href',
id:'id',
}, },
{ {
prop: "fwlx", prop: "data_service_type1_name",
label: "服务类型", label: "服务类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "zcfbsj", prop: "create_time",
label: "注册发布时间", label: "注册发布时间",
width: "200px", width: "200px",
align: "center", align: "center",
}, },
{ {
prop: "bdycs", prop: "request_count",
label: "被调用次数", label: "被调用次数",
width: "110px", width: "110px",
align: "center", align: "center",
...@@ -475,25 +528,27 @@ export default { ...@@ -475,25 +528,27 @@ export default {
], ],
[ [
{ {
prop: "fwmc", prop: "name",
label: "服务名称", label: "服务名称",
width: "250px", width: "250px",
align: "left", align: "left",
type:'href',
id:'id',
}, },
{ {
prop: "fwlx", prop: "data_service_type1_name",
label: "服务类型", label: "服务类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "sqsj", prop: "apply_time",
label: "申请时间", label: "申请时间",
width: "200px", width: "200px",
align: "center", align: "center",
}, },
{ {
prop: "sqspzt", prop: "approval_status",
label: "申请审批状态", label: "申请审批状态",
width: "110px", width: "110px",
align: "center", align: "center",
...@@ -567,25 +622,27 @@ export default { ...@@ -567,25 +622,27 @@ export default {
[ [
[ [
{ {
prop: "fwmc", prop: "name",
label: "服务名称", label: "服务名称",
width: "140px", width: "140px",
align: "left", align: "left",
type:'href',
id:'id'
}, },
{ {
prop: "fwlx", prop: "data_service_type1_name",
label: "服务类型", label: "服务类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "zcfbsj", prop: "create_time",
label: "注册发布时间", label: "注册发布时间",
width: "180px", width: "180px",
align: "center", align: "center",
}, },
{ {
prop: "bdycs", prop: "request_count",
label: "被调用次数", label: "被调用次数",
width: "110px", width: "110px",
align: "center", align: "center",
...@@ -593,25 +650,27 @@ export default { ...@@ -593,25 +650,27 @@ export default {
], ],
[ [
{ {
prop: "fwmc", prop: "name",
label: "服务名称", label: "服务名称",
width: "140px", width: "140px",
align: "left", align: "left",
type:'href',
id:'service_apply_info.id'
}, },
{ {
prop: "fwlx", prop: "data_service_type1_name",
label: "服务类型", label: "服务类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "spsj", prop: "approval_time",
label: "审批时间", label: "审批时间",
width: "180px", width: "180px",
align: "center", align: "center",
}, },
{ {
prop: "spzt", prop: "approval_status",
label: "审批状态", label: "审批状态",
width: "110px", width: "110px",
align: "center", align: "center",
...@@ -669,25 +728,27 @@ export default { ...@@ -669,25 +728,27 @@ export default {
[ [
[ [
{ {
prop: "fwmc", prop: "name",
label: "服务名称", label: "服务名称",
width: "140px", width: "140px",
align: "left", align: "left",
type:'href',
id:'id'
}, },
{ {
prop: "fwlx", prop: "data_service_type1_name",
label: "服务类型", label: "服务类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "zcfbsj", prop: "create_time",
label: "注册发布时间", label: "注册发布时间",
width: "180px", width: "180px",
align: "center", align: "center",
}, },
{ {
prop: "bdycs", prop: "request_count",
label: "被调用次数", label: "被调用次数",
width: "110px", width: "110px",
align: "center", align: "center",
...@@ -695,25 +756,27 @@ export default { ...@@ -695,25 +756,27 @@ export default {
], ],
[ [
{ {
prop: "fwmc", prop: "name",
label: "服务名称", label: "服务名称",
width: "140px", width: "140px",
type:'href',
id:'service_apply_info.id',
align: "left", align: "left",
}, },
{ {
prop: "fwlx", prop: "data_service_type1_name",
label: "服务类型", label: "服务类型",
width: "120px", width: "120px",
align: "center", align: "center",
}, },
{ {
prop: "spsj", prop: "approval_time",
label: "审批时间", label: "审批时间",
width: "180px", width: "180px",
align: "center", align: "center",
}, },
{ {
prop: "spzt", prop: "approval_status",
label: "审批状态", label: "审批状态",
width: "110px", width: "110px",
align: "center", align: "center",
...@@ -889,14 +952,14 @@ export default { ...@@ -889,14 +952,14 @@ export default {
}, },
], ],
service_arr: [ service_arr: [
["服务列表", "申请服务", "服务审批", "云资源"], ["服务列表", "申请服务", "云资源"],
["服务列表", "服务审批", "云资源管理"], ["服务列表", "服务审批", "云资源管理"],
["服务列表", "服务审批", "云资源管理"], ["服务列表", "服务审批", "云资源管理"],
], ],
apptype_arr: [ apptype_arr: [
["部署的应用", "创新的应用"], ["应用仓库", "部署的应用"],
["创新应用", "应用审批"], ["应用仓库", "应用审批"],
["创新应用", "应用审批"], ["应用仓库", "应用审批"],
], ],
app_arr: [], app_arr: [],
manage_arr: [ manage_arr: [
...@@ -927,6 +990,7 @@ export default { ...@@ -927,6 +990,7 @@ export default {
}, },
components: { components: {
tableUm, tableUm,
ListPagination,
}, },
computed: { computed: {
...mapGetters([ ...mapGetters([
...@@ -936,7 +1000,6 @@ export default { ...@@ -936,7 +1000,6 @@ export default {
}, },
created() { created() {
this.getUserData(); this.getUserData();
this.getAppData();
}, },
mounted() { mounted() {
console.log(this.level); console.log(this.level);
...@@ -949,9 +1012,99 @@ export default { ...@@ -949,9 +1012,99 @@ export default {
} }
}, },
methods: { methods: {
gotopage(id,deploy){
if(deploy){
this.$router.push(this.detailsUrl1[0][1]+deploy)
}else{
this.$router.push(this.detailsUrl1[0][0]+id)
}
},
change_now_app(val){
this.now_app = val
this.currentPage1 = 1
this.get_app_list()
},
change_now_type(val){
this.now_type = val
this.currentPage = 1
this.get_service_list()
},
changeCurrentPage(value) {
this.currentPage = value;
this.get_service_list();
},
changeCurrentPage1(value) {
this.currentPage1 = value;
this.get_app_list();
},
get_app_list(){
this.$http
.get(`${this.app_url_arr[this.now_user][this.now_app]}?page=${this.currentPage1}&limit=${this.now_user==0||this.now_user==4?10000:this.pageSize}`)
.then((response) => {
if(!response.data.success){
return
}
let data = response.data.data;
if(this.now_user==0||this.now_user==4){
this.app_arr = data;
}else{
this.app_data = data
this.app_data.forEach(e => {
if(e.create_date){
e.create_date = e.create_date.split('.')[0].replace('T'," ")
}
});
this.listTotal1 = response.data.total
}
})
},
get_service_list(){
this.$http
.get(`${this.service_url_arr[this.now_user][this.now_type]}?page=${this.currentPage}&size=${this.pageSize}`)
.then((response) => {
console.log(response);
if(!response.data.success){
return
}
let data = response.data.data;
this.service_data = data.data
this.service_data.forEach(e => {
if(e.create_time){
e.create_time = e.create_time.split('+')[0].replace('T'," ")
}
if(e.service_apply_info&&e.service_apply_info.approval_time){
e.approval_time = helper.dateStringTransform(e.service_apply_info.approval_time)
}else{
e.approval_time = ''
}
if(e.service_apply_info&&e.service_apply_info.apply_time){
e.apply_time = helper.dateStringTransform(e.service_apply_info.apply_time)
}else{
e.apply_time = ''
}
if(e.service_apply_info&&e.service_apply_info.approval_status){
if(this.now_user!==0&&this.now_user!==4){
e.approval_status = ["-", "已审批", "待审批"][e.service_apply_info.approval_status]
}else{
e.approval_status = ["-", "待审批", "审批中", "审批通过", "审批未通过"][e.service_apply_info.approval_status]
}
}else{
e.approval_status = ''
}
});
this.listTotal = data.total
})
.catch(function(response) {});
},
init_func(){ init_func(){
this.getInfoData(); this.getInfoData();
if (this.now_user == 0) { this.get_service_list()
this.get_app_list()
if (this.now_user == 0||this.now_user == 4) {
this.getHealth(); this.getHealth();
this.getoperatingdata(); this.getoperatingdata();
} else if (this.now_user == 1) { } else if (this.now_user == 1) {
...@@ -1037,11 +1190,13 @@ export default { ...@@ -1037,11 +1190,13 @@ export default {
}, },
getyylxdata() { getyylxdata() {
this.$http this.$http
.get("./static/workpalce.json") .get("/apaas/hubApi/index/appTypesAnalysis")
.then((response) => { .then((response) => {
console.log(response); console.log(response);
let data = response.data.data; if(response.data.success){
this.init_yylx_asy(data.yylxdata); let data = response.data.data;
this.init_yylx_asy(data.series[0].data);
}
}) })
.catch(function(response) {}); .catch(function(response) {});
}, },
...@@ -1209,8 +1364,8 @@ export default { ...@@ -1209,8 +1364,8 @@ export default {
); );
window[this.yylx_asy].setOption(options, true); window[this.yylx_asy].setOption(options, true);
}, },
init_circle(data) { init_circle(data_val) {
var scaleData = data; // var data_val = data_val;
var rich = { var rich = {
white: { white: {
color: "#ddd", color: "#ddd",
...@@ -1234,11 +1389,15 @@ export default { ...@@ -1234,11 +1389,15 @@ export default {
var data = []; var data = [];
var color = ["#515fe7", "#36a5ec", "#da9f2a", "#23b2a7", "#d46002"]; var color = ["#515fe7", "#36a5ec", "#da9f2a", "#23b2a7", "#d46002"];
var legendarr = []; var legendarr = [];
for (var i = 0; i < scaleData.length; i++) { var temp2_data = 0
data_val.forEach(e => {
temp2_data = temp2_data + e.value
});
for (var i = 0; i < data_val.length; i++) {
data.push( data.push(
{ {
value: scaleData[i].value, value: data_val[i].value,
name: scaleData[i].name, name: data_val[i].name,
itemStyle: { itemStyle: {
normal: { normal: {
borderWidth: 5, borderWidth: 5,
...@@ -1249,12 +1408,12 @@ export default { ...@@ -1249,12 +1408,12 @@ export default {
}, },
}, },
{ {
value: 2, value: temp2_data/10,
name: "", name: "",
itemStyle: placeHolderStyle, itemStyle: placeHolderStyle,
} }
); );
legendarr.push(scaleData[i].name); legendarr.push(data_val[i].name);
} }
var seriesObj = [ var seriesObj = [
{ {
...@@ -1273,8 +1432,8 @@ export default { ...@@ -1273,8 +1432,8 @@ export default {
formatter: function(params) { formatter: function(params) {
var percent = 0; var percent = 0;
var total = 0; var total = 0;
for (var i = 0; i < scaleData.length; i++) { for (var i = 0; i < data_val.length; i++) {
total += scaleData[i].value; total += data_val[i].value;
} }
percent = ((params.value / total) * 100).toFixed(0); percent = ((params.value / total) * 100).toFixed(0);
if (params.name !== "") { if (params.name !== "") {
...@@ -1722,6 +1881,7 @@ export default { ...@@ -1722,6 +1881,7 @@ export default {
float: left; float: left;
margin: 10px 20px 40px 0px; margin: 10px 20px 40px 0px;
text-align: center; text-align: center;
cursor: pointer;
} }
.myapp_contain .myapp_box:nth-of-type(3n) { .myapp_contain .myapp_box:nth-of-type(3n) {
margin-right: 0; margin-right: 0;
......
src/request/api/service_shop.js
View file @ f13a731c
...@@ -26,10 +26,10 @@ Page=${params.Page}&Size=${params.Size}`); ...@@ -26,10 +26,10 @@ Page=${params.Page}&Size=${params.Size}`);
return axios.get(`/apaas/hubApi/market/appTypes`) return axios.get(`/apaas/hubApi/market/appTypes`)
}, },
getAppOrg() { getAppOrg() {
return axios.get(`/apaas/hubApi/market/departments`) return axios.get(`/apaas/hubApi/appShop/orgSource`)
}, },
getAppList(params) { getAppList(params) {
return axios.get(`/apaas/hubApi/market/list?online_state=${params.online_state}&appTypes=${params.appTypes}& return axios.get(`/apaas/hubApi/appShop/list?online_state=${params.online_state}&appTypes=${params.appTypes}&
businessArea=${params.businessArea}&developable=${params.developable}&orgSource=${params.orgSource}&order=${params.order}&page=${params.page}&limit=${params.limit}&search=${params.search}`); businessArea=${params.businessArea}&developable=${params.developable}&orgSource=${params.orgSource}&order=${params.order}&page=${params.page}&limit=${params.limit}&search=${params.search}`);
}, },
......
static/workpalce.json
View file @ f13a731c
...@@ -70,23 +70,23 @@ ...@@ -70,23 +70,23 @@
"fwlxdata":[ "fwlxdata":[
{ {
"name": "数据服务", "name": "数据服务",
"value": 10 "value": 40
}, },
{ {
"name": "感知服务", "name": "感知服务",
"value": 10 "value": 3
}, },
{ {
"name": "视频服务", "name": "视频服务",
"value": 10 "value": 2
}, },
{ {
"name": "时空服务", "name": "时空服务",
"value": 10 "value": 50
}, },
{ {
"name": "综合服务", "name": "综合服务",
"value": 10 "value": 0
} }
], ],
"yylxdata":[ "yylxdata":[
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment