Commit 4d50a186 authored by zhouzihao's avatar zhouzihao

dev-显示微调

parent 218f03e7
...@@ -1201,6 +1201,8 @@ ...@@ -1201,6 +1201,8 @@
}, },
"@vue/cli-plugin-babel": { "@vue/cli-plugin-babel": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-3.2.0.tgz",
"integrity": "sha512-HRhwsUIZ9DZYH+cVS8O0Qfk2W43vKpl5/JcvCS8YWWmRjwZjjHtRDifnfQuLC3Q0cUMTcv4bv8vnPMtkAbvXKg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/core": "^7.0.0", "@babel/core": "^7.0.0",
...@@ -1210,6 +1212,8 @@ ...@@ -1210,6 +1212,8 @@
}, },
"@vue/cli-service": { "@vue/cli-service": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-3.2.0.tgz",
"integrity": "sha512-HTiaz1IBXV/JCfrmyhHJvDOYpPTBK0uQAekSVRTt5AddCeOV68ktdUqHbDe3VPDfrWFA5x3d3kIHlJd6WK31mA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@intervolga/optimize-cssnano-plugin": "^1.0.5", "@intervolga/optimize-cssnano-plugin": "^1.0.5",
...@@ -5323,6 +5327,8 @@ ...@@ -5323,6 +5327,8 @@
}, },
"gh-pages": { "gh-pages": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/gh-pages/-/gh-pages-2.0.1.tgz",
"integrity": "sha512-uFlk3bukljeiWKQ2XvPfjcSi/ou7IfoDf2p+Fj672saLAr8bnOdFVqI/JSgrSgInKpCg5BksxEwGUl++dbg8Dg==",
"dev": true, "dev": true,
"requires": { "requires": {
"async": "^2.6.1", "async": "^2.6.1",
...@@ -6264,6 +6270,8 @@ ...@@ -6264,6 +6270,8 @@
}, },
"iview": { "iview": {
"version": "3.1.5", "version": "3.1.5",
"resolved": "https://registry.npmjs.org/iview/-/iview-3.1.5.tgz",
"integrity": "sha512-lFom+Do/mJ4ejdu/+o/kCMWVGBpe85pIho7AsrOge/7IPuP5UbdSPu720qaEe4lC2T1AFczD74LlzqZ/mik0FA==",
"requires": { "requires": {
"async-validator": "^1.8.2", "async-validator": "^1.8.2",
"deepmerge": "^2.1.0", "deepmerge": "^2.1.0",
...@@ -6482,8 +6490,7 @@ ...@@ -6482,8 +6490,7 @@
"lodash": { "lodash": {
"version": "4.17.15", "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
"dev": true
}, },
"lodash._reinterpolate": { "lodash._reinterpolate": {
"version": "3.0.0", "version": "3.0.0",
...@@ -8013,6 +8020,8 @@ ...@@ -8013,6 +8020,8 @@
}, },
"postcss-cssnext": { "postcss-cssnext": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.1.0.tgz",
"integrity": "sha512-awPDhI4OKetcHCr560iVCoDuP6e/vn0r6EAqdWPpAavJMvkBSZ6kDpSN4b3mB3Ti57hQMunHHM8Wvx9PeuYXtA==",
"dev": true, "dev": true,
"requires": { "requires": {
"autoprefixer": "^7.1.1", "autoprefixer": "^7.1.1",
...@@ -8338,6 +8347,8 @@ ...@@ -8338,6 +8347,8 @@
}, },
"postcss-import": { "postcss-import": {
"version": "12.0.1", "version": "12.0.1",
"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
"integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
"dev": true, "dev": true,
"requires": { "requires": {
"postcss": "^7.0.1", "postcss": "^7.0.1",
...@@ -11575,7 +11586,9 @@ ...@@ -11575,7 +11586,9 @@
"dev": true "dev": true
}, },
"vue": { "vue": {
"version": "2.5.21" "version": "2.5.21",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.5.21.tgz",
"integrity": "sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ=="
}, },
"vue-hot-reload-api": { "vue-hot-reload-api": {
"version": "2.3.4", "version": "2.3.4",
...@@ -11597,7 +11610,9 @@ ...@@ -11597,7 +11610,9 @@
} }
}, },
"vue-router": { "vue-router": {
"version": "3.0.2" "version": "3.0.2",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.2.tgz",
"integrity": "sha512-opKtsxjp9eOcFWdp6xLQPLmRGgfM932Tl56U9chYTnoWqKxQ8M20N7AkdEbM5beUh6wICoFGYugAX9vQjyJLFg=="
}, },
"vue-style-loader": { "vue-style-loader": {
"version": "4.1.2", "version": "4.1.2",
...@@ -11611,6 +11626,8 @@ ...@@ -11611,6 +11626,8 @@
}, },
"vue-template-compiler": { "vue-template-compiler": {
"version": "2.5.21", "version": "2.5.21",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz",
"integrity": "sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw==",
"dev": true, "dev": true,
"requires": { "requires": {
"de-indent": "^1.0.2", "de-indent": "^1.0.2",
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"dependencies": { "dependencies": {
"axios": "^0.19.2", "axios": "^0.19.2",
"iview": "^3.1.5", "iview": "^3.1.5",
"lodash": "^4.17.15",
"vue": "^2.5.17", "vue": "^2.5.17",
"vue-router": "^3.0.1" "vue-router": "^3.0.1"
}, },
......
...@@ -515,7 +515,7 @@ export default { ...@@ -515,7 +515,7 @@ export default {
{ {
title:'构建日志列表', title:'构建日志列表',
name:'buildLogList', name:'buildLogList',
href:'/buildLog:ist', href:'/buildLogList',
closable:true, closable:true,
showInTags:false, showInTags:false,
showInMenus:true, showInMenus:true,
...@@ -525,8 +525,8 @@ export default { ...@@ -525,8 +525,8 @@ export default {
}, },
{ {
title:'项目源数据', title:'项目源数据',
name:'frontend-setting', name:'metaDataList',
icon:'logo-html5', icon:'ios-photos-outline',
href:'/metaDataList', href:'/metaDataList',
closable:true, closable:true,
showInTags:false, showInTags:false,
......
...@@ -41,7 +41,17 @@ export default new Router({ ...@@ -41,7 +41,17 @@ export default new Router({
component: () => import('@/views/ConfigList') component: () => import('@/views/ConfigList')
}, },
// 构建日志列表 // 构建日志列表
{
path: "buildLogList",
name: "buildLogList",
component: () => import("@/views/BuildLogList")
},
// 源数据 // 源数据
{
path: "metaDataList",
name: "metaDataList",
component: () => import("@/views/MetaDataList")
}
] ]
}, },
// 这个有什么用??? // 这个有什么用???
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<Drawer title="配置详情" :closable="false" v-model="isShow" width="720"> <Drawer title="配置详情" :closable="false" v-model="isShow" width="720">
<div> <div>
<Form :model="showData" label-position="left" :label-width="100"> <Form :model="showData" label-position="left" :label-width="100">
<h1>{{project_name}}在环境{{env_name}}({{env_id}})内的配置</h1> <h1>{{project_name}}】在【{{env_name}}({{env_id}})】内的配置</h1>
<FormItem label="配置类型"> <FormItem label="配置类型">
<Select v-model="showData.type" style="width:200px"> <Select v-model="showData.type" style="width:200px">
<Option <Option
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<Input v-model="showData.path"></Input> <Input v-model="showData.path"></Input>
</FormItem> </FormItem>
<FormItem label="配置内容"> <FormItem label="配置内容">
<Input v-model="showData.content" type="textarea" :autosize="true"></Input> <Input v-model="showData.content" type="textarea" :rows="20"></Input>
</FormItem> </FormItem>
</Form> </Form>
</div> </div>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
import MasterPage from "@/components/Master"; import MasterPage from "@/components/Master";
import axios from "axios"; import axios from "axios";
import config from "@/config/configs"; import config from "@/config/configs";
import _ from "lodash";
export default { export default {
components: { components: {
MasterPage MasterPage
...@@ -111,8 +111,8 @@ export default { ...@@ -111,8 +111,8 @@ export default {
}, },
{ {
title: "配置内容", title: "配置内容",
key: "content", key: "content"
// width: 300 // width: 300
}, },
{ {
title: "配置方式", title: "配置方式",
...@@ -193,6 +193,7 @@ export default { ...@@ -193,6 +193,7 @@ export default {
}); });
}, },
addShow: function() { addShow: function() {
this.env_name = (_.find(this.envlist, { env_id: this.env_id })).name;
this.isShow = true; this.isShow = true;
// 这里正好名字可以对上 // 这里正好名字可以对上
this.showData = { this.showData = {
...@@ -201,6 +202,7 @@ export default { ...@@ -201,6 +202,7 @@ export default {
}; };
}, },
show: function(index) { show: function(index) {
this.env_name = (_.find(this.envlist, { env_id: this.env_id })).name;
this.isShow = true; this.isShow = true;
this.showData = this.data1[index]; this.showData = this.data1[index];
}, },
......
...@@ -100,7 +100,7 @@ export default { ...@@ -100,7 +100,7 @@ export default {
{ {
title: "目标gitlab令牌", title: "目标gitlab令牌",
key: "target_git_token", key: "target_git_token",
width: 100 width: 200
}, },
{ {
title: "目标docker仓库地址", title: "目标docker仓库地址",
......
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