Skip to content

A
apaas-ui
Commit 9b1f3b26 authored by 张俊's avatar 张俊
Browse files
Options

Merge branch 'zj' into dev

parents 1f01833d de0746e6
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 91 deletions
src/pages/authority/organization/organizationdetail.vue
View file @ 9b1f3b26
...@@ -121,6 +121,10 @@ export default { ...@@ -121,6 +121,10 @@ export default {
) )
.then((response) => { .then((response) => {
console.log(response); console.log(response);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
let data = response.data.data; let data = response.data.data;
this.service_header_arr = { this.service_header_arr = {
name: data.department_name, name: data.department_name,
...@@ -145,7 +149,9 @@ export default { ...@@ -145,7 +149,9 @@ export default {
fixedurl: "/authority/organization/edit/" + this.$route.params.id, fixedurl: "/authority/organization/edit/" + this.$route.params.id,
}; };
}) })
.catch((response) => {}); .catch((response) => {
this.$message.error('请求失败')
});
}, },
get_list() { get_list() {
this.$http this.$http
...@@ -154,6 +160,10 @@ export default { ...@@ -154,6 +160,10 @@ export default {
) )
.then((response) => { .then((response) => {
// console.log(response); // console.log(response);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
let data = response.data.data; let data = response.data.data;
this.listTotal = response.data.total; this.listTotal = response.data.total;
this.datas = data; this.datas = data;
......
src/pages/authority/organization/organizationedit.vue
View file @ 9b1f3b26
...@@ -179,6 +179,10 @@ export default { ...@@ -179,6 +179,10 @@ export default {
) )
.then((response) => { .then((response) => {
console.log(response); console.log(response);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
let data = response.data.data; let data = response.data.data;
this.form = { this.form = {
name: data.department_name, name: data.department_name,
...@@ -205,10 +209,16 @@ export default { ...@@ -205,10 +209,16 @@ export default {
.put("/apaas/backmgt/department", temp) .put("/apaas/backmgt/department", temp)
.then((response) => { .then((response) => {
console.log(response); console.log(response);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
this.$message.success("保存成功"); this.$message.success("保存成功");
this.$router.back(-1); this.$router.back(-1);
}) })
.catch((response) => {}); .catch((response) => {
this.$message.success("保存失败");
});
}, },
backPage() { backPage() {
this.$router.back(-1); this.$router.back(-1);
...@@ -224,17 +234,27 @@ export default { ...@@ -224,17 +234,27 @@ export default {
.post("/apaas/backmgt/department", temp) .post("/apaas/backmgt/department", temp)
.then((response) => { .then((response) => {
console.log(response); console.log(response);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
this.$message.success("保存成功"); this.$message.success("保存成功");
this.$router.back(-1); this.$router.back(-1);
}) })
.catch((response) => {}); .catch((response) => {
this.$message.success("保存失败");
});
}, },
getOriginArr() { getOriginArr() {
this.$http this.$http
.get("/static/serviceedit.json") .get("/apaas/backmgt/department/list")
.then((response) => { .then((response) => {
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
let data = response.data.data; let data = response.data.data;
this.origin_arr = data.origin_arr; this.origin_arr = data
}) })
.catch(function(response) {}); .catch(function(response) {});
}, },
......
src/pages/authority/role/addroles.vue
View file @ 9b1f3b26
...@@ -281,6 +281,10 @@ export default { ...@@ -281,6 +281,10 @@ export default {
.get(`/apaas/backmgt/role/id/${this.$route.params.id}`) .get(`/apaas/backmgt/role/id/${this.$route.params.id}`)
.then((response) => { .then((response) => {
console.log(response); console.log(response);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
let data = response.data.data; let data = response.data.data;
this.form = { this.form = {
name: data.role_name, name: data.role_name,
......
src/pages/workbench/fwgl/apply_service_detail.vue
View file @ 9b1f3b26
...@@ -335,6 +335,10 @@ export default { ...@@ -335,6 +335,10 @@ export default {
this.$http this.$http
.get(`/apaas/service/v3/service/apply/service?apply_id=${this.$route.params.id}`) .get(`/apaas/service/v3/service/apply/service?apply_id=${this.$route.params.id}`)
.then((response) => { .then((response) => {
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
console.log(response.data.data); console.log(response.data.data);
let data = response.data.data; let data = response.data.data;
this.$set(this.service_header_arr, "name", data.name); this.$set(this.service_header_arr, "name", data.name);
......
src/pages/workbench/fwgl/approval_service_detail.vue
View file @ 9b1f3b26
...@@ -102,23 +102,23 @@ export default { ...@@ -102,23 +102,23 @@ export default {
[ [
{ {
title:'一级审批', title:'一级审批',
result:'审批通过', result:'',
arr:[ arr:[
{ {
title:'审批时间：', title:'审批时间：',
info:'2020-02-28 15:23:45' info:''
}, },
{ {
title:'审批单位：', title:'审批单位：',
info:'某某某城管局' info:''
}, },
{ {
title:'审批人：', title:'审批人：',
info:'张先生' info:''
}, },
{ {
title:'审批意见：', title:'审批意见：',
info:'同意' info:''
}, },
] ]
}, },
...@@ -212,32 +212,32 @@ export default { ...@@ -212,32 +212,32 @@ export default {
list_arr: [ list_arr: [
{ {
title: "申请单位：", title: "申请单位：",
info: "北京比格大数据有限公司" info: ""
}, },
{ {
title: "申请人：", title: "申请人：",
info: "李子维" info: ""
}, },
{ {
title: "申请人联系电话：", title: "申请人联系电话：",
info: "18342803360" info: ""
}, },
{ {
title: "场景描述：", title: "场景描述：",
info: "申请贵州省行政区划地图服务用于贵州省疫情监控决策指挥系统。" info: ""
}, },
{ {
title: "调用业务系统：", title: "调用业务系统：",
info: "决策指挥系统" info: ""
}, },
{ {
title: "业务系统域名：", title: "业务系统域名：",
info: "https://apaas.wodcloud.com/" info: ""
}, },
{ {
title: "申请文件：", title: "申请文件：",
info: "xxxx文件名称.txt", info: "",
url:'www.baidu.com', url:'',
type: "down" type: "down"
}, },
{ {
...@@ -248,11 +248,11 @@ export default { ...@@ -248,11 +248,11 @@ export default {
}, },
{ {
title: "申请时长：", title: "申请时长：",
info: "1年" info: ""
}, },
{ {
title: "申请规格：", title: "申请规格：",
info: "访问次数：20/日，访问量：100/日" info: ""
} }
] ]
}; };
...@@ -324,6 +324,10 @@ export default { ...@@ -324,6 +324,10 @@ export default {
.get(`/apaas/service/v3/service/approval/applied?apply_id=${this.$route.params.id}`) .get(`/apaas/service/v3/service/approval/applied?apply_id=${this.$route.params.id}`)
.then((response) => { .then((response) => {
console.log(response.data.data); console.log(response.data.data);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
let data = response.data.data; let data = response.data.data;
this.$set(this.service_header_arr, "name", data.name); this.$set(this.service_header_arr, "name", data.name);
this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name); this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name);
...@@ -366,7 +370,7 @@ export default { ...@@ -366,7 +370,7 @@ export default {
this.zd_table_arr = data.service_apply_info.res_fields?JSON.parse(data.service_apply_info.res_fields):[] this.zd_table_arr = data.service_apply_info.res_fields?JSON.parse(data.service_apply_info.res_fields):[]
}) })
.catch(function(response) { .catch(function(response) {
this.$message.error('请求失败')
}); });
}, },
} }
......
src/pages/workbench/fwgl/serviceDetail.vue
View file @ 9b1f3b26
...@@ -134,14 +134,14 @@ ...@@ -134,14 +134,14 @@
</p> </p>
<el-button <el-button
v-if="now_user == 1 && sizeset_flag" v-if="now_user == 1 && sizeset_flag"
:type="buy_style == 1 ? 'primary' : ''" :type="buy_style.indexOf(1) !== -1 ? 'primary' : ''"
@click="buy_style = 1" @click="change_buy(1)"
>按月购买</el-button >按月购买</el-button
> >
<el-button <el-button
v-if="now_user == 1 && sizeset_flag" v-if="now_user == 1 && sizeset_flag"
:type="buy_style == 2 ? 'primary' : ''" :type="buy_style.indexOf(2) !== -1 ? 'primary' : ''"
@click="buy_style = 2" @click="change_buy(2)"
>按年购买</el-button >按年购买</el-button
> >
<div class="savebtn" v-if="now_user == 1 && sizeset_flag"> <div class="savebtn" v-if="now_user == 1 && sizeset_flag">
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
data() { data() {
return { return {
now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员 now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
buy_style: 1, buy_style: [1],
responseParamUrl: "", responseParamUrl: "",
codeExampleUrl: "", codeExampleUrl: "",
yx_state: { yx_state: {
...@@ -579,6 +579,13 @@ export default { ...@@ -579,6 +579,13 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
change_buy(val){
if(this.buy_style.indexOf(val)!==-1){
this.buy_style.splice(this.buy_style.indexOf(val),1)
}else{
this.buy_style.push(val)
}
},
getCurrentUser() { getCurrentUser() {
this.$api.user.getNowUser().then(({ data }) => { this.$api.user.getNowUser().then(({ data }) => {
if (data.success == 1) { if (data.success == 1) {
...@@ -675,6 +682,11 @@ export default { ...@@ -675,6 +682,11 @@ export default {
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;
this.buy_type = data.request_spcs_info[0].type; this.buy_type = data.request_spcs_info[0].type;
if(this.buy_type == 3){
this.buy_style = [1,2]
}else{
this.buy_style = [this.buy_type]
}
} else { } else {
this.$message({ this.$message({
message: response.data.errMsg, message: response.data.errMsg,
...@@ -699,6 +711,11 @@ export default { ...@@ -699,6 +711,11 @@ export default {
console.log(data); console.log(data);
this.service_size_data = data.data; this.service_size_data = data.data;
this.buy_type = data.data[0].type; this.buy_type = data.data[0].type;
if(this.buy_type == 3){
this.buy_style = [1,2]
}else{
this.buy_style = [this.buy_type]
}
}) })
.catch(function(response) {}); .catch(function(response) {});
}, },
...@@ -709,7 +726,14 @@ export default { ...@@ -709,7 +726,14 @@ export default {
if (e.flag) { if (e.flag) {
e.id = 0; e.id = 0;
} }
e.type = this.buy_style; if(this.buy_style.length==0){
this.$message.error('请选择申请时长')
return
}else if(this.buy_style.length==2){
e.type = 3
}else{
e.type = this.buy_style[0]
}
delete e.undefined; delete e.undefined;
delete e.flag; delete e.flag;
temp.push(e); temp.push(e);
......
src/pages/workbench/fwgl/serviceEdit.vue
View file @ 9b1f3b26
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<el-select v-model="form.area" placeholder="请选择"> <el-select v-model="form.area" placeholder="请选择">
<el-option <el-option
v-for="item in area_arr" v-for="item in area_arr"
:key="item.value" :key="item.id"
:label="item.label" :label="item.name"
:value="item.value"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
<el-select v-model="form.origin" placeholder="请选择"> <el-select v-model="form.origin" placeholder="请选择">
<el-option <el-option
v-for="item in origin_arr" v-for="item in origin_arr"
:key="item.value" :key="item.department_id"
:label="item.label" :label="item.department_name"
:value="item.value"> :value="item.department_id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -90,9 +90,9 @@ ...@@ -90,9 +90,9 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item class="apass_button">
<el-button type="primary" @click="onSubmit('form')" class="right">保存</el-button> <el-button type="primary" @click="onSubmit('form')" class="right">保存</el-button>
<el-button class="right">取消</el-button> <el-button class="right" @click="calcle">取消</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -109,18 +109,18 @@ ...@@ -109,18 +109,18 @@
<p class="formtitle">是否开启：</p> <p class="formtitle">是否开启：</p>
<div class="openbgc" @click="openstart" :style="!open?{backgroundImage:'url('+require('@/assets/imgs/btn_off_hov.png')+')'}:{}"></div> <div class="openbgc" @click="openstart" :style="!open?{backgroundImage:'url('+require('@/assets/imgs/btn_off_hov.png')+')'}:{}"></div>
<p class="formtitle">最大连接数：</p> <p class="formtitle">最大连接数：</p>
<el-input v-model="maxline" placeholder="请输入内容"></el-input> <el-input :disabled="!open" v-model="maxline" placeholder="请输入内容"></el-input>
</div> </div>
<div v-if="now_safe==1"> <div v-if="now_safe==1">
<p class="formtitle">是否开启：</p> <p class="formtitle">是否开启：</p>
<div class="openbgc" @click="openstart1" :style="!open1?{backgroundImage:'url('+require('@/assets/imgs/btn_off_hov.png')+')'}:{}"></div> <div class="openbgc" @click="openstart1" :style="!open1?{backgroundImage:'url('+require('@/assets/imgs/btn_off_hov.png')+')'}:{}"></div>
<p class="formtitle">最大连接数：</p> <p class="formtitle">最大连接数：</p>
<el-input v-model="maxline1" placeholder="请输入内容"></el-input> <el-input :disabled="!open1" v-model="maxline1" placeholder="请输入内容"></el-input>
<div class="limitsd"> <div class="limitsd">
<p class="formtitle">有效时间：</p> <p class="formtitle">有效时间：</p>
<el-input v-model="usetime1" placeholder="请输入内容"></el-input> <el-input :disabled="!open1" v-model="usetime1" placeholder="请输入内容"></el-input>
<el-select class="timeslect" v-model="timevalue" placeholder="请选择"> <el-select :disabled="!open1" class="timeslect" v-model="timevalue" placeholder="请选择">
<el-option <el-option
v-for="item in timeoptions" v-for="item in timeoptions"
:key="item.value" :key="item.value"
...@@ -197,52 +197,7 @@ export default { ...@@ -197,52 +197,7 @@ export default {
}, },
], ],
safe_arr:['熔断管理','速率限制','TLS加密','敏感字段追踪'], safe_arr:['熔断管理','速率限制','TLS加密','敏感字段追踪'],
area_arr:[ area_arr:[],
{
label:'经济建设',
value:0,
},
{
label:'城市管理',
value:1,
},
{
label:'城市建设',
value:2,
},
{
label:'道路交通',
value:3,
},
{
label:'环境资源',
value:4,
},
{
label:'民生服务',
value:5,
},
{
label:'空间地理',
value:6,
},
{
label:'文化休闲',
value:7,
},
{
label:'社会团体',
value:8,
},
{
label:'教育机构',
value:9,
},
{
label:'其他',
value:10,
},
],
origin_arr:[], origin_arr:[],
rules:{ rules:{
name:[ name:[
...@@ -262,7 +217,16 @@ export default { ...@@ -262,7 +217,16 @@ export default {
} }
}; };
}, },
watch: {}, watch: {
open(){
this.maxline = ''
},
open1(){
this.maxline1 = ''
this.usetime1 = ''
this.timevalue = ''
},
},
computed: { computed: {
...mapGetters([ ...mapGetters([
'level', 'level',
...@@ -278,6 +242,7 @@ export default { ...@@ -278,6 +242,7 @@ export default {
} }
this.getOriginArr() this.getOriginArr()
this.getServiceInfo() this.getServiceInfo()
this.get_service_arae()
}, },
mounted() {}, mounted() {},
methods: { methods: {
...@@ -297,10 +262,21 @@ export default { ...@@ -297,10 +262,21 @@ export default {
}, },
getOriginArr(){ getOriginArr(){
this.$http this.$http
.get('/static/serviceedit.json') .get('/apaas/backmgt/department/list')
.then(response => {
let data = response.data.data
this.origin_arr = data
})
.catch(function(response) {
});
},
get_service_arae(){
this.$http
.get('/apaas/service/v3/service/manager/servarea')
.then(response => { .then(response => {
let data = response.data.data let data = response.data.data
this.origin_arr = data.origin_arr this.area_arr = data
}) })
.catch(function(response) { .catch(function(response) {
...@@ -315,7 +291,7 @@ export default { ...@@ -315,7 +291,7 @@ export default {
this.imgList = [] this.imgList = []
this.$set(this.form,'name',data.name) this.$set(this.form,'name',data.name)
this.$set(this.form,'desc',data.descript) this.$set(this.form,'desc',data.descript)
this.$set(this.form,'area',data.sectors-1) this.$set(this.form,'area',data.sectors)
this.$set(this.form,'origin',data.organization) this.$set(this.form,'origin',data.organization)
this.$set(this.form,'code',data.encode_method) this.$set(this.form,'code',data.encode_method)
this.$set(this.form,'people',data.register_user_info?data.register_user_info.user_name:data.register_user_info) this.$set(this.form,'people',data.register_user_info?data.register_user_info.user_name:data.register_user_info)
...@@ -337,7 +313,7 @@ export default { ...@@ -337,7 +313,7 @@ export default {
var temp = { var temp = {
id:parseInt(this.$route.params.id), id:parseInt(this.$route.params.id),
"name": this.form.name, "name": this.form.name,
"sectors": this.form.area+1, "sectors": this.form.area,
"organization": this.form.origin, "organization": this.form.origin,
"cover": this.form.fileList, "cover": this.form.fileList,
"openness": this.form.resource, "openness": this.form.resource,
...@@ -356,6 +332,10 @@ export default { ...@@ -356,6 +332,10 @@ export default {
.put("/apaas/service/v3/service/manager",temp) .put("/apaas/service/v3/service/manager",temp)
.then((response) => { .then((response) => {
console.log(response); console.log(response);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
this.$message.success('保存成功') this.$message.success('保存成功')
this.getServiceInfo() this.getServiceInfo()
}) })
...@@ -364,7 +344,7 @@ export default { ...@@ -364,7 +344,7 @@ export default {
}); });
}, },
calcle(){ calcle(){
console.log('1111'); this.$router.back(-1)
}, },
saveInfo(){ saveInfo(){
this.onSubmit('form') this.onSubmit('form')
......
src/pages/workbench/yygl/app_edit.vue
View file @ 9b1f3b26
...@@ -244,6 +244,11 @@ export default { ...@@ -244,6 +244,11 @@ export default {
.post('/apaas/hubApi/market/app',formData) .post('/apaas/hubApi/market/app',formData)
.then(response => { .then(response => {
console.log(response); console.log(response);
if(!response.data.success){
this.$message.error(response.data.errMsg)
return
}
this.$message.success('操作成功')
}) })
.catch(function(response) { .catch(function(response) {
......
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