Commit fe16a102 authored by 张俊's avatar 张俊

应用仓库tabs显示

parent deb39c02
...@@ -86,7 +86,8 @@ export default { ...@@ -86,7 +86,8 @@ export default {
}, },
}, },
methods: { methods: {
showDialog(image) { showDialog(image,id) {
image.id = id
this.image = image; this.image = image;
this.imageData = []; this.imageData = [];
this.getImageDetail(); this.getImageDetail();
...@@ -152,7 +153,7 @@ export default { ...@@ -152,7 +153,7 @@ export default {
}, },
getImageDetail() { getImageDetail() {
this.$http this.$http
.get(`/apaas/hubApi/image/imageDetails/${this.image.name}`) .get(`/apaas/hubApi/image/imageDetails/${this.image.name}?app_id=${this.image.id}`)
.then(({ data }) => { .then(({ data }) => {
this.imageData = data.data || []; this.imageData = data.data || [];
}) })
......
...@@ -89,12 +89,12 @@ ...@@ -89,12 +89,12 @@
<b v-for="(btn, key) in item.btnList" :key="key" :style="{marginRight:item.btngap}"> <b v-for="(btn, key) in item.btnList" :key="key" :style="{marginRight:item.btngap}">
<em v-if="btn.label == '分配'"> <em v-if="btn.label == '分配'">
<em <em
v-if="btn.label == '分配' && scope.row.state == 0" v-if="btn.label == '分配' && !scope.row.use_uid"
class="cur_pointer" class="cur_pointer"
style="color: #0f2683" style="color: #0f2683"
@click="handleClick(btn.type, scope.row)" @click="handleClick(btn.type, scope.row)"
>分配</em> >分配</em>
<em v-if="btn.label == '分配' && scope.row.state == 1">已分配</em> <em v-if="btn.label == '分配' && scope.row.use_uid">已分配</em>
</em> </em>
<em v-else-if="btn.label == '当前版本'"> <em v-else-if="btn.label == '当前版本'">
......
...@@ -253,6 +253,9 @@ ...@@ -253,6 +253,9 @@
</div> </div>
</div> </div>
<table-um <table-um
v-for="(itx,idx) in service_head[now_user]"
:key="idx+5000"
v-show="idx == now_type"
:headers="service_head[now_user][now_type]" :headers="service_head[now_user][now_type]"
:datas="service_data" :datas="service_data"
:stripe="true" :stripe="true"
...@@ -325,6 +328,10 @@ ...@@ -325,6 +328,10 @@
</div> </div>
</div> </div>
</div> </div>
<allot-info-confirm
ref="allotConfirm"
@allot-success="allotSuccess"
></allot-info-confirm>
</div> </div>
</template> </template>
...@@ -334,6 +341,7 @@ import tableUm from "@/components/table/table-um"; ...@@ -334,6 +341,7 @@ import tableUm from "@/components/table/table-um";
import ListPagination from "@/components/comments-pagination"; import ListPagination from "@/components/comments-pagination";
import helper from "@/services/helper.js"; import helper from "@/services/helper.js";
import dashBoard from "../../components/e-charts/dashboard"; import dashBoard from "../../components/e-charts/dashboard";
import allotInfoConfirm from "@/components/allot-info-confirm";
import { formatDateTime_date } from "@/utils/common"; import { formatDateTime_date } from "@/utils/common";
import { mapGetters, mapState } from "vuex"; import { mapGetters, mapState } from "vuex";
import { getCookie } from "../../services/cookie"; import { getCookie } from "../../services/cookie";
...@@ -753,7 +761,7 @@ export default { ...@@ -753,7 +761,7 @@ export default {
{ {
prop: "sqzt", prop: "sqzt",
label: "操作", label: "操作",
width: "110px", width: "80px",
align: "center", align: "center",
type: "Button", type: "Button",
btnList: [ btnList: [
...@@ -761,9 +769,9 @@ export default { ...@@ -761,9 +769,9 @@ export default {
label: "分配", label: "分配",
type: "distribut" type: "distribut"
}, },
{ // {
label: "已分配" // label: "已分配"
} // }
] ]
} }
] ]
...@@ -1054,7 +1062,8 @@ export default { ...@@ -1054,7 +1062,8 @@ export default {
components: { components: {
tableUm, tableUm,
ListPagination, ListPagination,
dashBoard dashBoard,
allotInfoConfirm
}, },
computed: { computed: {
...mapGetters(["level"]), ...mapGetters(["level"]),
...@@ -1394,9 +1403,14 @@ export default { ...@@ -1394,9 +1403,14 @@ export default {
}) })
.catch(function(response) {}); .catch(function(response) {});
}, },
allotSuccess() {
// this.init(this.tempFliter);
this.get_service_list()
},
//分配接口调用 //分配接口调用
distribut(val) { distribut(val) {
console.log(val); console.log(val);
this.$refs.allotConfirm.getDetail(val.apply_id);
}, },
manage_func(n) { manage_func(n) {
console.log(n); console.log(n);
......
...@@ -292,6 +292,7 @@ export default { ...@@ -292,6 +292,7 @@ export default {
}, },
created() { created() {
console.log(this.$route);
if(this.userInfo){ if(this.userInfo){
this.now_user = this.level this.now_user = this.level
this.getServiceInfo(); this.getServiceInfo();
...@@ -305,6 +306,9 @@ export default { ...@@ -305,6 +306,9 @@ export default {
this.get_options() this.get_options()
this.get_file_name() this.get_file_name()
this.get_app_code() this.get_app_code()
if((this.now_user==0||this.now_user==4)&&this.$route.query.source=='apply'){
this.service_arr[0].splice(1, 2);
}
}, },
mounted() { mounted() {
this.header_arr = [ this.header_arr = [
...@@ -339,7 +343,7 @@ export default { ...@@ -339,7 +343,7 @@ export default {
}, },
methods: { methods: {
showImageDetail(item) { showImageDetail(item) {
this.$refs.imageDetail.showDialog(item); this.$refs.imageDetail.showDialog(item,this.$route.params.id);
}, },
getCurrentUser() { getCurrentUser() {
this.$api.user.getNowUser().then(({ data }) => { this.$api.user.getNowUser().then(({ data }) => {
......
...@@ -1268,7 +1268,7 @@ export default { ...@@ -1268,7 +1268,7 @@ export default {
`${this.detailsUrl + `${this.detailsUrl +
[item.app_id, item.deploy_id, item.id + "/" + item.app_id][ [item.app_id, item.deploy_id, item.id + "/" + item.app_id][
this.type this.type
]}` ]}?source=${item.source}`
); );
}, },
detailItemDeploy(item) { detailItemDeploy(item) {
......
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