Skip to content

A
apaas-ui
Commit 610349f0 authored by 徐一鸣's avatar 徐一鸣
Browse files
Options

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

parents e7794227 de4af155
Expand all Show whitespace changes
Inline Side-by-side
Showing with 785 additions and 155 deletions
src/components/menu-copy.vue 0 → 100644
View file @ 610349f0
This diff is collapsed.
src/components/shop-car-apply/apply_service_state.vue
View file @ 610349f0
......@@ -227,6 +227,7 @@ export default {
.system {
padding: 0 30px;
position: relative;
margin-bottom: 10px;
}
.system .el-select {
position: absolute;
......
src/pages/service_shop/shop_car_apply.vue
View file @ 610349f0
......@@ -137,19 +137,19 @@ export default {
if(response.data.success&&data){
//应用
this.post_arr = [data]
this.post_arr[0].app_id = parseInt(pp_data.app_id)
this.post_arr[0].spec_id = parseInt(pp_data.spec_id)
this.post_arr[0].duration_method = parseInt(pp_data.duration_unit)
this.post_arr[0].duration = parseInt(pp_data.duration)
this.post_arr[0].app_id = parseInt(app_data.app_id)
this.post_arr[0].spec_id = parseInt(app_data.spec_id)
this.post_arr[0].duration_method = parseInt(app_data.duration_unit)
this.post_arr[0].duration = parseInt(app_data.duration)
this.post_arr[0].id = ''
this.service_arr.push({})
this.service_arr[0]['img'] = data.logo
this.service_arr[0]['title'] = data.app_name
this.service_arr[0]['type'] = data.type_name
this.service_arr[0]['auth'] = data.org_name
this.service_arr[0]['size'] = pp_data.spec_id==0?'部署':'开发'
this.service_arr[0]['applytype'] = '申请方式：'+pp_data.duration_unit==1?'月':'年'
this.service_arr[0]['num'] = pp_data.duration
this.service_arr[0]['size'] = '规格：'+(app_data.spec_id==0?'部署':'开发')
this.service_arr[0]['applytype'] = '申请方式：'+(app_data.duration_unit==1?'月':'年')
this.service_arr[0]['num'] = app_data.duration
this.service_arr[0]['isMg'] = false
this.service_arr[0]['isapp'] = true
}
......@@ -212,8 +212,6 @@ export default {
});
},
sub_service(){
console.log(this.$refs.apply_service.$refs.apply_service_state);
console.log(this.$refs.apply_service.$refs.apply_service_state[0].$refs.apply_service_state_table.metaData);
let formInline = this.$refs.apply_info.formInline
if(formInline.preson&&formInline.phone){
var phone_ruler=/^(?:(?:\+|00)86)?1[3-9]\d{9}$/
......@@ -230,6 +228,7 @@ export default {
}
var temp1 = this.$refs.apply_service.$refs.apply_service_state
this.post_arr.forEach((e,idx) => {
debugger
if(e.service_id){
temp.carts.push(
{
......@@ -270,13 +269,17 @@ export default {
return
}
for (let index = 0; index < temp.carts.length; index++) {
const e = temp.carts[index];
if(e.service_id){
if(e.apply_fields[0].selected == 0){
this.$message.error('请选择所需参数')
return
}
}
}
this.$http
.post(`/apaas/serviceapp/v3/shopcart/apply`,temp)
.then(response => {
......@@ -285,7 +288,7 @@ export default {
this.$message.success('申请成功')
this.$router.replace('/shop/service_application_successfully')
}else{
this.$message.error('申请失败')
this.$message.error(response.data.errMsg)
}
}).catch(()=>{
this.$message.error('申请失败')
......@@ -312,8 +315,8 @@ export default {
this.service_arr[l]['title'] = e.application.app_name
this.service_arr[l]['type'] = e.application.type_name
this.service_arr[l]['auth'] = e.application.org_name
this.service_arr[l]['size'] = e.spec_id==0?'部署':'开发'
this.service_arr[l]['applytype'] = '申请方式：'+e.duration_unit==1?'月':'年'
this.service_arr[l]['size'] = '规格：'+(e.spec_id==0?'部署':'开发')
this.service_arr[l]['applytype'] = '申请方式：'+(e.duration_unit==1?'月':'年')
this.service_arr[l]['num'] = e.duration
this.service_arr[l]['isMg'] = false
this.service_arr[l]['isapp'] = true
......
src/pages/user/user_info.vue
View file @ 610349f0
......@@ -58,12 +58,13 @@
<el-input v-model="user_data.userTypeName" :disabled="true"></el-input>
<el-button
v-if="(user_data.userType == 3 || user_data.userType == 4) && couldUp"
:class="option_btn"
class="option_btn"
@click="upLevel"
>升级为开发者</el-button>
<el-button
v-else-if="(user_data.userType == 3 || user_data.userType == 4) && !couldUp"
type="info"
class="option_btn_gray_dis"
disabled
>升级为开发者</el-button>
</el-form-item>
......@@ -184,6 +185,7 @@ export default {
},
data: () => ({
activeName: "0",
userId: "",
is_admin: 0,
user_data: {
accountNo: "",
......@@ -227,14 +229,15 @@ export default {
this.$api.user.getNowUser().then(response => {
if (response.data.success == 1) {
this.is_admin = response.data.data.is_admin;
this.getUserInfo(response.data.data.user_id);
this.userId = response.data.data.user_id;
this.getUserInfo();
} else {
console.log(response.data.errMsg);
}
});
},
getUserInfo(id) {
this.$api.user.getUserDetail({ id: id }).then(response => {
this.$api.user.getUserDetail({ id: this.userId }).then(response => {
if (response.data.success == 1) {
let data = response.data.data;
this.user_data.accountNo = data.user_id;
......@@ -298,6 +301,7 @@ export default {
message: "修改个人信息成功",
type: "success"
});
this.getUserInfo();
} else {
this.$message({
message: "修改个人信息失败",
......@@ -333,6 +337,7 @@ export default {
type: "success"
});
this.diaPassWord = false;
this.getUserInfo();
} else {
this.$message({
message: "修改密码失败",
......@@ -342,6 +347,14 @@ export default {
});
},
resetKey() {
this.$confirm("此操作将重置您的密钥, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
cancelButtonClass: "msg_btn_gray",
confirmButtonClass: "msg_btn",
type: "warning"
})
.then(() => {
this.$api.authority
.resetUserKey({ user_id: this.user_data.accountNo })
.then(response => {
......@@ -350,6 +363,7 @@ export default {
message: "重置密钥成功",
type: "success"
});
this.getUserInfo();
} else {
this.$message({
message: "重置密钥失败",
......@@ -357,6 +371,13 @@ export default {
});
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消重置"
});
});
},
upLevel() {
this.$api.authority.updateLevel().then(response => {
......@@ -366,6 +387,7 @@ export default {
type: "success"
});
this.couldUp = false;
this.getUserInfo();
} else {
this.$message({
message: "申请升级开发者失败",
......@@ -458,9 +480,7 @@ export default {
}
.option_btn_gray_dis {
width: 124px;
background-color: #e3e5ef;
border-radius: 8px;
color: #0f2683;
}
.info_item {
width: 70%;
......@@ -586,4 +606,23 @@ export default {
line-height: 24px;
height: 24px;
}
.msg_btn {
width: 70px;
background-color: #495feb;
border-radius: 8px;
color: #f8f9fd;
}
.msg_btn:hover {
background-color: #596ffb;
}
.msg_btn_gray {
width: 70px;
background-color: #e3e5ef;
border-radius: 8px;
color: #0f2683;
}
.msg_btn_gray:hover {
background-color: #e8eaf4;
color: #0f2683;
}
</style>
\ No newline at end of file
src/pages/workbench/workPlace.vue
View file @ 610349f0
......@@ -316,6 +316,7 @@ import helper from "@/services/helper.js";
import dashBoard from '../../components/e-charts/dashboard'
import { formatDateTime_date } from "@/utils/common";
import { mapGetters,mapState } from 'vuex'
import {getCookie} from '../../services/cookie'
var echarts = require("echarts");
export default {
data() {
......@@ -1162,7 +1163,7 @@ export default {
},
getUserData() {
this.person = this.userInfo.user_name;
this.login_time = this.userInfo.last_login;
this.login_time = decodeURIComponent(getCookie('lastLogin'));
},
getoperatingdata() {
this.$http
......
src/pages/workbench/yygl/apply_app_detail.vue
View file @ 610349f0
......@@ -24,8 +24,7 @@
<div class="type_box_select">
<mavon-editor v-model="list_arr" :boxShadow="false" :toolbarsFlag="false" :subfield="false" defaultOpen="preview" :editable="false" v-if="now_service == 0"/>
<info-list
v-if=" now_service == 1"
@download="download"
v-if=" now_service !== 0"
:list_arr="servicead_arr
"
>
......@@ -171,12 +170,7 @@ export default {
],
},
],
approval_arr3:[
{
title: "一级审批",
result: "审批中",
},
],
approval_arr3:[],
service_arr: ["基本信息", "申请审批信息"],
service_header_arr: {
id:"",
......@@ -280,7 +274,7 @@ export default {
created() {
this.getServiceInfo();
this.getreadme();
// this.getServiceBaseInfo();
this.getServiceBaseInfo();
this.getServiceapplyInfo();
},
mounted() {},
......@@ -294,36 +288,57 @@ export default {
})
.catch(function(response) {});
},
download(val){
console.log(val);
},
getServiceapplyInfo() {
this.$http
.get("./static/applyappdetail.json")
.get(`/apaas/hubApi/market/approvalInfo/${this.$route.params.id}`)
.then((response) => {
let data = response.data.data;
if(!(data&&data.length)){
this.approval_arr3.push({
title: "一级审批",
result: "待审批"
})
return
}
data.forEach(e => {
this.approval_arr3.push({
title: e.level==1?"一级审批":'二级审批',
result: e.apply_type_name,
arr: [
{
title: "审批时间：",
info: e.created,
},
{
title: "审批单位：",
info: e.department_name,
},
{
title: "审批人：",
info: e.user_name,
},
{
title: "审批意见：",
info: e.comments,
}
]
})
});
})
.catch(function(response) {});
},
getServiceBaseInfo() {
this.$http
.get("/apaas/hubApi/market/applyDetailInfo/"+this.$route.params.id)
.then((response) => {
let data = response.data.data;
this.$set(this.servicead_arr[1], "info", data.appapplyinfo.scene);
this.$set(this.servicead_arr[2], "info", data.appapplyinfo.filename);
this.$set(this.servicead_arr[2], "url", data.appapplyinfo.fileurl);
this.$set(this.servicead_arr[3], "info", data.appapplyinfo.size);
this.$set(this.servicead_arr[1], "info", data.scene);
this.$set(this.servicead_arr[2], "info", data.apply_file);
this.$set(this.servicead_arr[2], "url", data.apply_file);
this.$set(this.servicead_arr[3], "info", data.apply_type_name);
})
.catch(function(response) {});
},
// getServiceBaseInfo() {
// this.$http
// .get("/apaas/hubApi/market/applyDetailInfo/"+this.$route.params.id)
// .then((response) => {
// let data = response.data.data;
// this.$set(this.list_arr[0], "info", data.appbaseinfo.intorduce);
// this.$set(this.list_arr[1], "info", data.appbaseinfo.action);
// this.$set(this.list_arr[2], "info", data.scene);
// this.$set(this.list_arr[4], "info", data.contact_person);
// this.$set(this.list_arr[5], "info", data.contact_number);
// this.appcode = data.appbaseinfo.appcode;
// })
// .catch(function(response) {});
// },
deploy(val){
console.log(val);
},
......
src/request/api/general.js
View file @ 610349f0
......@@ -6,6 +6,9 @@ const general = {
logout(params) {
return axios.get(`/iam/api/logout?ReturnUrl=${encodeURIComponent(params.returnUrl)}`);
},
getNowMenu(params) {
return axios.get(`/apaas/backmgt/menu/user/menu?teamName=${params.teamName}`);
},
}
export default general;
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