Skip to content

A
apaas-ui
Commit d1820da1 authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

page阶梯化，codes高度减少，menu加链接，tab-input/sel可禁用，fixtable在child结构下数据无法被修改，fix上传限制

parent 9a1ad0cb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 222 deletions
src/components/codes.vue
View file @ d1820da1
<template>
<!--
author: dixin
This height please adjust carefully, it is nausea
Now:
maxLines: 24 fontSize: 14 height: 430px
-->
<div>
<div class="ace-container">
<div class="ace-editor" ref="ace"></div>
......@@ -22,7 +28,7 @@ export default {
mounted() {
this.aceEditor = ace.edit(this.$refs.ace, {
maxLines: 38,
maxLines: 24,
minLines: 10,
fontSize: 14,
mode: this.acemodePath,
......@@ -58,18 +64,18 @@ export default {
<style scoped>
.ace-container {
width: 100%;
height: 633px !important;
height: 430px !important;
border-radius: 8px;
}
</style>
<style>
.ace-container /deep/ .ace-editor {
width: 100% !important;
height: 633px !important;
height: 430px !important;
}
.ace-container /deep/ .ace_content {
/* width: 100% !important; */
height: 633px !important;
height: 430px !important;
}
.ace-container /deep/ .ace_text-layer {
/* width: 100% !important; */
......
src/components/commodity-card.vue
View file @ d1820da1
......@@ -70,7 +70,7 @@ export default {
.com_card_top {
display: flex;
justify-content: space-between;
margin-bottom: 35px;
margin-bottom: 28px;
}
.com_card_name_v {
width: calc(100% - 80px);
......
src/components/menu.vue
View file @ d1820da1
......@@ -8,8 +8,8 @@
<div
v-for="(item, index) in user_arr"
:key="index + 700"
@click="gotopage(index)"
>{{ item }}</div>
@click="gotopage(item.path)"
>{{ item.name }}</div>
</div>
<div class="sj"></div>
</div>
......@@ -130,11 +130,11 @@ export default {
],
now_menu: 2,
user_arr: [
"个人档案",
"消息通知",
"收银中心",
"关于BD-aPaaS",
"退出登录"
{ name: "个人档案", path: "/user/user_info" },
{ name: "消息通知", path: "/user/message" },
{ name: "收银中心", path: "" },
{ name: "关于BD-aPaaS", path: "" },
{ name: "退出登录", path: "" }
],
shopping_list: [
{
......@@ -177,7 +177,7 @@ export default {
},
methods: {
gotopage(n) {
console.log(n);
this.$router.push(n);
},
settlement() {
this.$router.push({ name: "shoppingCart" });
......
src/components/order-list/order-list-com.vue
View file @ d1820da1
......@@ -30,7 +30,7 @@
</div>
<order-list :datas="datas"></order-list>
<!-- 分页 -->
<section class="order-pagination">
<section class="order_pagination">
<div class="order_page_total">共 {{ pagination.total }} 个条目</div>
<div class="order_page_item">
<div class="order_page_num">
......@@ -230,7 +230,7 @@ export default {
width: 360px;
padding: 10px;
}
.order-pagination {
.order_pagination {
font-size: 14px;
padding: 0 5% 20px;
display: flex;
......
src/components/service_list.vue
View file @ d1820da1
......@@ -89,7 +89,7 @@
</div>
<div class="gray_line"></div>
<!-- filter button -->
<div>
<div class="btn_group">
<el-button
v-for="(item, index) in buttonFilter"
:key="item.name"
......@@ -596,6 +596,9 @@ export default {
background-color: #515fe7;
color: #f8f9fd;
}
.btn_group {
margin-bottom: 15px;
}
</style>
<style>
.input_right .el-input__inner {
......
src/components/shop-cloud/shop-cloud.vue
View file @ d1820da1
......@@ -21,7 +21,7 @@
<el-tabs v-model="activeName" class="cloud_form" @tab-click="tabClick">
<el-tab-pane label="申请新的工作区域" name="0">
<el-form ref="formNew" :model="formNew" label-width="120px">
<div>基本信息</div>
<div class="form_title">基本信息</div>
<el-form-item label="工作区域名称">
<el-input v-model="formNew.workAreaName"></el-input>
</el-form-item>
......@@ -31,7 +31,7 @@
<el-form-item label="描述信息">
<el-input type="textarea" v-model="formNew.description"></el-input>
</el-form-item>
<div>工作区域申请规格</div>
<div class="form_title">工作区域申请规格</div>
<el-form-item label="CPU">
<el-input v-model="formNew.CPUs"></el-input>
</el-form-item>
......@@ -42,15 +42,16 @@
<el-input type="textarea" v-model="formNew.containerGroup"></el-input>
</el-form-item>
<el-form-item label="数据盘（可选）">
<el-input-number v-model="formNew.dataDisk" @change="handleChange" :min="1" :max="10"></el-input-number>块，每块
<el-input-number v-model="formNew.dataDisk" controls-position="right" @change="handleChange" :min="1" :max="10"></el-input-number>块，每块
<el-input-number
v-model="formNew.perDataDisk"
controls-position="right"
@change="handleChange"
:min="1"
:max="10"
></el-input-number>GB
</el-form-item>
<div>单个容器组规格</div>
<div class="form_title">单个容器组规格</div>
<div>CPU</div>
<el-form-item label="最高">
<el-input v-model="formNew.perCPUs"></el-input>核
......@@ -65,7 +66,7 @@
<el-form-item label="默认">
<el-input v-model="formNew.perRAM"></el-input>GB
</el-form-item>
<div>其他信息</div>
<div class="form_title">其他信息</div>
<el-form-item label="申请时长">
<el-input v-model="formNew.appDuration"></el-input>
<el-select v-model="formNew.durType" placeholder="请选择">
......@@ -101,7 +102,7 @@
</el-select>
<div v-if="formShow">
<el-form ref="formNew" :model="formNew" label-width="120px">
<div>基本信息</div>
<div class="form_title">基本信息</div>
<el-form-item label="工作区域名称">
<el-input v-model="formNew.workAreaName"></el-input>
</el-form-item>
......@@ -111,7 +112,7 @@
<el-form-item label="描述信息">
<el-input type="textarea" v-model="formNew.description"></el-input>
</el-form-item>
<div>工作区域申请规格</div>
<div class="form_title">工作区域申请规格</div>
<el-form-item label="CPU">
<el-input v-model="formNew.CPUs"></el-input>
</el-form-item>
......@@ -125,17 +126,19 @@
<el-input-number
v-model="formNew.dataDisk"
@change="handleChange"
controls-position="right"
:min="1"
:max="10"
></el-input-number>块，每块
<el-input-number
v-model="formNew.perDataDisk"
@change="handleChange"
controls-position="right"
:min="1"
:max="10"
></el-input-number>GB
</el-form-item>
<div>单个容器组规格</div>
<div class="form_title">单个容器组规格</div>
<div>CPU</div>
<el-form-item label="最高">
<el-input v-model="formNew.perCPUs"></el-input>核
......@@ -150,7 +153,7 @@
<el-form-item label="默认">
<el-input v-model="formNew.perRAM"></el-input>GB
</el-form-item>
<div>其他信息</div>
<div class="form_title">其他信息</div>
<el-form-item label="申请时长">
<el-input v-model="formNew.appDuration"></el-input>
<el-select v-model="formNew.durType" placeholder="请选择">
......@@ -243,6 +246,21 @@ export default {
<style scoped>
.cloud_form {
}
.form_title {
font-size: 18px;
margin: 10px 0;
padding: 0 0 0 20px;
position: relative;
}
.form_title::before {
position: absolute;
content: "";
width: 4px;
height: 16px;
background-color: blue;
left: 0;
top: 4px;
}
</style>
<style>
.cloud_form .el-input {
......
src/components/table-input.vue
View file @ d1820da1
......@@ -3,7 +3,7 @@
<el-input
ref="inp"
v-model="inputText"
:disabled="couldNotEdit"
:disabled="couldNotEdit || name == ''"
size="small"
@input="changeValue"
class="table_in_input"
......@@ -23,6 +23,14 @@ export default {
type: String,
default: ""
},
id: {
type: String,
default: ""
},
name: {
type: String,
default: ""
},
rowId: {
type: Number,
default: 0
......@@ -43,7 +51,8 @@ export default {
this.$emit("changeInputValue", {
rowId: this.rowId,
header: this.header,
inputValue: this.inputText
inputValue: this.inputText,
id: this.id
});
}
}
......
src/components/table-select.vue
View file @ d1820da1
......@@ -3,7 +3,7 @@
<el-select
ref="inp"
v-model="selectValue"
:disabled="couldNotEdit"
:disabled="couldNotEdit || name == ''"
size="small"
@input="changeValue"
class="table_in_select"
......@@ -17,10 +17,6 @@
:value="item.value"
></el-option>
</template>
<template v-else>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</template>
</el-select>
</div>
</template>
......@@ -43,6 +39,14 @@ export default {
type: String,
default: ""
},
id: {
type: String,
default: ""
},
name: {
type: String,
default: ""
},
rowId: {
type: Number,
default: 0
......@@ -53,17 +57,21 @@ export default {
}
},
data: () => ({
selectValue: ""
selectValue: "1"
}),
mounted() {
this.selectValue = this.item;
if (!this.selectValue || this.selectValue == "") {
this.selectValue = this.selectArr[0].value;
}
},
methods: {
changeValue() {
this.$emit("changeInputValue", {
rowId: this.rowId,
header: this.header,
inputValue: this.selectValue
inputValue: this.selectValue,
id: this.id
});
}
}
......
src/components/table-um.vue
View file @ d1820da1
......@@ -102,20 +102,14 @@
class="cur_pointer"
style="color: #0f2683"
@click="handleClick(btn.type, scope.row)"
>
上架
</em>
>上架</em>
<em
v-if="scope.row.state == 1"
class="cur_pointer"
style="color: #0f2683"
@click="handleClick(btn.type, scope.row)"
>
下架
</em>
<em v-if="scope.row.state == 2">
下架
</em>
>下架</em>
<em v-if="scope.row.state == 2">下架</em>
</em>
<em
......@@ -153,6 +147,8 @@
v-else-if="item.type === 'input'"
:item="helper.GetProperty(scope.row, item.prop)"
:header="item.prop"
:id="scope.row.id"
:name="scope.row.name"
:rowId="scope.$index"
:couldNotEdit="couldNotEdit"
@changeInputValue="changeInputValue"
......@@ -162,6 +158,8 @@
v-else-if="item.type === 'select'"
:item="helper.GetProperty(scope.row, item.prop)"
:header="item.prop"
:id="item.id"
:name="scope.row.name"
:selectArr="item.selectArr"
:rowId="scope.$index"
:couldNotEdit="couldNotEdit"
......@@ -177,15 +175,15 @@
<div slot="reference" class="overlit">{{ scope.row[item.prop] }}</div>
</el-popover>
<!-- 排名图标替换 -->
<span v-else-if="item.type === 'rank'">
<img src="../assets/imgs/list_ic_topone.png" alt="" v-if="scope.row[item.prop]==1">
<img src="../assets/imgs/list_ic_toptwo.png" alt="" v-if="scope.row[item.prop]==2">
<img src="../assets/imgs/list_ic_topthree.png" alt="" v-if="scope.row[item.prop]==3">
<span v-else-if="item.type === 'rank'">
<img src="../assets/imgs/list_ic_topone.png" alt v-if="scope.row[item.prop]==1" />
<img src="../assets/imgs/list_ic_toptwo.png" alt v-if="scope.row[item.prop]==2" />
<img src="../assets/imgs/list_ic_topthree.png" alt v-if="scope.row[item.prop]==3" />
{{ [1,2,3].indexOf(scope.row[item.prop])!==-1?'':scope.row[item.prop] }}
</span>
<!-- 服务添加图标 -->
<span v-else-if="item.type === 'hot'" :style="scope.row['hot']?{marginLeft:'-12px'}:{}">
<img src="../assets/imgs/list_ic_hot.png" alt="" v-if="scope.row['hot']">
<img src="../assets/imgs/list_ic_hot.png" alt v-if="scope.row['hot']" />
{{ scope.row[item.prop] }}
</span>
<!-- others -->
......@@ -257,7 +255,7 @@ export default {
"v-apaas-table-select": tableSelect,
"v-apaas-table-umhref": tableUmhref,
"d-confirm": DConfirm,
"v-apaas-table-filter": tableFilter,
"v-apaas-table-filter": tableFilter
},
props: {
// 表格型号：mini,medium,small
......@@ -286,7 +284,7 @@ export default {
},
inputPlaceholder: {
type: String,
default: "请输入账号、中文名",
default: "请输入账号、中文名"
},
url: {
type: String,
......@@ -396,7 +394,7 @@ export default {
],
search: "",
times: null,
showFliterList: false,
showFliterList: false
};
},
mounted() {
......@@ -421,7 +419,7 @@ export default {
this.getDataFromApiSync();
},
deep: true
},
}
},
methods: {
//本地删除
......@@ -615,8 +613,9 @@ export default {
changeInputValue(val) {
// You can delete the row when the row of data is empty, but I didn't do that
// console.log(this.$refs.cesTable)
this.selectedTabsPage[val.rowId][val.header] = val.inputValue;
this.$emit("changeTable", this.selectedTabsPage)
let arr = this.selectedTabsPage;
this.changeInput(arr, val.id, val.inputValue, val.header);
this.$emit("changeTable", this.selectedTabsPage);
if (
this.autoAdd &&
val.inputValue != "" &&
......@@ -625,6 +624,19 @@ export default {
this.addRow();
}
},
// 根据id修改该行数据
changeInput(arr, id, input, header) {
let self = this;
for (let i = 0; i < arr.length; i++) {
if (arr[i].id == id) {
arr[i][header] = input;
return false;
}
if (arr[i].children && arr[i].children.length != 0) {
self.changeInput(arr[i].children, id, input, header);
}
}
},
// 新增表格行
addRow() {
// at first, you should promise all colum in your table could be edit
......@@ -634,6 +646,10 @@ export default {
for (var item in this.selectedTabsPage[0]) {
newRow[item] = "";
}
newRow.id =
parseInt(Math.random() * 100000, 10) +
"" +
parseInt(Math.random() * 100000, 10);
this.selectedTabsPage.push(newRow);
},
// get now table data
......@@ -642,8 +658,8 @@ export default {
},
filterChange(filter) {
console.log(filter);
},
},
}
}
};
</script>
......@@ -665,6 +681,9 @@ export default {
.ces-table .el-table th.is-leaf {
border-bottom: 1px solid #ebeef5 !important;
}
.ces-table .el-table--border {
border: 1px solid #EBEEF5;
}
/* .ces-table .el-table--enable-row-hover, */
.ces-table .el-table tbody tr:hover > td {
background-color: #e4ecf8 !important;
......
src/components/upload_file.vue
View file @ d1820da1
......@@ -7,7 +7,7 @@
</div>
<el-image class="list_img_item" :src="item.url" :fit="fit"></el-image>
</div>
<cropper v-if="fileArray.length <= max" @getNewUrl="getNewUrl"></cropper>
<cropper v-if="fileArray.length <= max - 1" @getNewUrl="getNewUrl"></cropper>
</div>
<div v-else>
<el-upload
......@@ -170,7 +170,7 @@ export default {
getNewUrl(val) {
this.fileArray.push({ name: val, url: val });
this.$emit("getNewList", this.fileArray);
console.log(this.fileArray)
console.log(this.fileArray);
},
deleteImg(item, index) {
this.fileArray.splice(index, 1);
......
src/main.js
View file @ d1820da1
......@@ -18,6 +18,10 @@ import "@/icons"
import "./assets/css/index.css";
import VueI18n from 'vue-i18n'
Vue.use(VueI18n)
new Vue({
el: "#app",
router,
......
src/pages/services_shop.vue → src/pages/service_shop/services_shop.vue
View file @ d1820da1
......@@ -59,7 +59,7 @@
</template>
<script>
import shopList from "../components/shop-list";
import shopList from "@/components/shop-list";
export default {
components: {
......
src/pages/shop_car_apply.vue → src/pages/service_shop/shop_car_apply.vue
View file @ d1820da1
......@@ -13,9 +13,9 @@
</template>
<script>
import infoList from "../components/infoList";
import applyForm from "../components/shop-car-apply/apply_form";
import serviceList from "../components/shop-car-apply/service_list";
import infoList from "@/components/infoList";
import applyForm from "@/components/shop-car-apply/apply_form";
import serviceList from "@/components/shop-car-apply/service_list";
export default {
props: {
......
src/pages/shopping_cart.vue → src/pages/service_shop/shopping_cart.vue
View file @ d1820da1
......@@ -6,7 +6,6 @@
</template>
<script>
// @ is an alias to /src
import ShoppingCart from "@/components/shopping-cart/shopping-cart-com";
export default {
......
src/pages/apply_service_detail.vue → src/pages/workbench/fwgl/apply_service_detail.vue
View file @ d1820da1
......@@ -20,10 +20,10 @@
</template>
<script>
import serviceHeader from '../components/service-header'
import infoList from '../components/infoList'
import tableUm from '../components/table-um'
import processCard from '../components/process-card'
import serviceHeader from '@/components/service-header'
import infoList from '@/components/infoList'
import tableUm from '@/components/table-um'
import processCard from '@/components/process-card'
export default {
props: {
......
src/pages/approval_service_detail.vue → src/pages/workbench/fwgl/approval_service_detail.vue
View file @ d1820da1
......@@ -52,10 +52,10 @@
</template>
<script>
import serviceHeader from "../components/service-header";
import infoList from "../components/infoList";
import tableUm from "../components/table-um";
import processCard from "../components/process-card";
import serviceHeader from "@/components/service-header";
import infoList from "@/components/infoList";
import tableUm from "@/components/table-um";
import processCard from "@/components/process-card";
export default {
props: {},
components: {
......
src/pages/serviceDetail.vue → src/pages/workbench/fwgl/serviceDetail.vue
View file @ d1820da1
......@@ -137,15 +137,15 @@
</template>
<script>
import infoList from "../components/infoList";
import tableUm from "../components/table-um";
import infoList from "@/components/infoList";
import tableUm from "@/components/table-um";
import codes from "@/components/codes";
import norCard from "@/components/card";
import exampleIcon from "@/pages/example_icon";
import exampleIcon from "@/pages/example/example_icon";
import Topology from "@/components/topology.vue";
import serviceHeader from "../components/service-header";
import serviceHeader from "@/components/service-header";
import dialogAction from "@/components/dialog-action";
import { getRole } from "../utils/common";
import { getRole } from "@/utils/common";
export default {
components: {
infoList,
......
src/pages/serviceEdit.vue → src/pages/workbench/fwgl/serviceEdit.vue
View file @ d1820da1
......@@ -7,11 +7,11 @@
<div class="info_contain">
<div class="edit_change">
<div class="edit_change_box" @click="now_edit=0" :style="now_edit==0?{backgroundColor:'#e56600',color:'#ffffff'}:{}">
<img v-if="now_edit==0" src="../assets/imgs/nav_ic_xinxi_sel.png" alt="">
<img v-if="now_edit!==0" src="../assets/imgs/nav_ic_xinxi_nor.png" alt=""> 基本信息编辑</div>
<img v-if="now_edit==0" src="@/assets/imgs/nav_ic_xinxi_sel.png" alt="">
<img v-if="now_edit!==0" src="@/assets/imgs/nav_ic_xinxi_nor.png" alt=""> 基本信息编辑</div>
<div class="edit_change_box" @click="now_edit=1" :style="now_edit==1?{backgroundColor:'#e56600',color:'#ffffff'}:{}">
<img v-if="now_edit==1" src="../assets/imgs/nav_ic_anquan_sel.png" alt="">
<img v-if="now_edit!==1" src="../assets/imgs/nav_ic_anquan_nor.png" alt=""> 服务安全设置</div>
<img v-if="now_edit==1" src="@/assets/imgs/nav_ic_anquan_sel.png" alt="">
<img v-if="now_edit!==1" src="@/assets/imgs/nav_ic_anquan_nor.png" alt=""> 服务安全设置</div>
</div>
<el-form ref="form" :rules="rules" :model="form" label-width="0px" v-if="now_edit==0">
<el-form-item prop="name">
......@@ -107,14 +107,14 @@
<div class="safe_box_select">
<div v-if="now_safe==0">
<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>
<el-input v-model="maxline" placeholder="请输入内容"></el-input>
</div>
<div v-if="now_safe==1">
<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>
<el-input v-model="maxline1" placeholder="请输入内容"></el-input>
<div class="limitsd">
......@@ -133,7 +133,7 @@
<div v-if="now_safe==2">
<p class="formtitle">是否开启：</p>
<div class="openbgc" @click="openstart2" :style="!open2?{backgroundImage:'url('+require('../assets/imgs/btn_off_hov.png')+')'}:{}"></div>
<div class="openbgc" @click="openstart2" :style="!open2?{backgroundImage:'url('+require('@/assets/imgs/btn_off_hov.png')+')'}:{}"></div>
</div>
</div>
<div class="savebtn">
......@@ -146,8 +146,8 @@
</template>
<script>
import uploadFile from '../components/upload_file'
import { getRole } from "../utils/common";
import uploadFile from '@/components/upload_file'
import { getRole } from "@/utils/common";
export default {
props: {},
components: {
......@@ -434,7 +434,7 @@ export default {
.openbgc{
width: 56px;
height: 23px;
background-image: url('../assets/imgs/btn_on_hov.png');
background-image: url('~@/assets/imgs/btn_on_hov.png');
background-size:contain;
cursor: pointer;
}
......
src/pages/fwzc_fwcs.vue → src/pages/workbench/fwzc_fwcs.vue
View file @ d1820da1
......@@ -168,12 +168,12 @@
<div class="skfw_csfwxx">测试服务信息：</div>
<div class="test_succ">
<div v-if="skfwResult" class="skcs_jg">
<img src="../assets/imgs/test_icon_success.png" class="skcs_jg_img" />&nbsp;测试成功
<img src="@/assets/imgs/test_icon_success.png" class="skcs_jg_img" />&nbsp;测试成功
</div>
</div>
</div>
<div v-else class="skcs_jg">
<img src="../assets/imgs/test_icon_error.png" class="skcs_jg_img" />&nbsp;测试失败
<img src="@/assets/imgs/test_icon_error.png" class="skcs_jg_img" />&nbsp;测试失败
</div>
<div class="btn_footer">
<el-button class="reset" v-if="activeBtn == 0" @click="resetSjfw">重置</el-button>
......@@ -233,14 +233,14 @@
</el-form-item>
<el-form-item>
<p class="formname">接口编码：</p>
<el-input v-model="form.code" class="form_in"></el-input>
<el-input v-model="form.code" class="form_in" :disabled="true"></el-input>
</el-form-item>
<el-form-item>
<p class="formname">开放程度：</p>
<el-radio-group v-model="form.resource">
<el-radio label="1">共享</el-radio>
<el-radio label="2">受限</el-radio>
<el-radio label="3">敏感</el-radio>
<el-radio :label="1">共享</el-radio>
<el-radio :label="2">受限</el-radio>
<el-radio :label="3">敏感</el-radio>
</el-radio-group>
</el-form-item>
......@@ -259,7 +259,7 @@
import BlockRadius from "@/components/block-radius";
import CesTable from "@/components/table-um";
import Codes from "@/components/codes";
import uploadFile from "../components/upload_file";
import uploadFile from "@/components/upload_file";
export default {
components: {
BlockRadius,
......@@ -295,21 +295,42 @@ export default {
sjfw_qqcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" },
{ label: "示例值", prop: "example", type: "input", align: "left" },
{ label: "字段类型", prop: "field_type", type: "", align: "left" },
{ label: "字段名称", prop: "label", type: "input", align: "left" },
{
label: "是否必须",
prop: "needable",
label: "字段类型",
prop: "show_type",
type: "",
align: "left",
width: "140"
},
{
label: "字段名称*",
prop: "label",
type: "input",
align: "left"
},
{
label: "是否必须*",
prop: "is_must",
type: "select",
align: "left",
width: 100
width: 100,
selectArr: [
{ label: "是", value: 1 },
{ label: "否", value: 0 }
]
},
{ label: "字段说明", prop: "descript", type: "input", align: "left" }
],
sjfw_fhcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" },
{ label: "字段类型", prop: "field_type", type: "", align: "left" },
{ label: "字段名称", prop: "label", type: "input", align: "left" },
{ label: "示例值", prop: "example", type: "input", align: "left" },
{ label: "字段类型", prop: "show_type", type: "", align: "left" },
{
label: "字段名称*",
prop: "label",
type: "input",
align: "left"
},
{ label: "字段说明", prop: "descript", type: "input", align: "left" }
],
emptyText: "暂无数据",
......@@ -341,9 +362,9 @@ export default {
name: "",
desc: "",
area: "",
origin: "",
code: "",
resource: ""
origin: "1",
code: "自动生成",
resource: 0
},
imgList: [],
optionsArea: [
......@@ -366,7 +387,9 @@ export default {
request_fields: [],
response_fields: [],
cover: "",
noSearchUrl: ""
noSearchUrl: "",
requestRules: 0,
responseRules: 0
}),
computed: {},
watch: {},
......@@ -377,12 +400,13 @@ export default {
this.select = "GET";
this.serviceUrl = "";
},
getUrl(url) {
getUrl(enUrl) {
let url = decodeURI(enUrl);
let arr = [];
if (url.indexOf("?") != -1) {
this.noSearchUrl = url.substring(0, url.indexOf("?"));
let search = url.substring(url.indexOf("?") + 1);
let vars = search.split("&");
let arr = [];
for (let i = 0; i < vars.length; i++) {
if (vars[i] != "") {
let pair = vars[i].split("=");
......@@ -391,8 +415,9 @@ export default {
arr[i].requestValue = pair[1] ? pair[1] : "";
}
}
this.datasFw = arr;
}
this.serviceUrl = url;
this.datasFw = arr;
},
clickFwcs() {
let headers = {};
......@@ -463,9 +488,40 @@ export default {
},
resetSjfw() {},
nextJcxx() {
this.request_fields = this.$refs.fwcs_sjfw_qqcs.getTableData();
this.response_fields = this.$refs.fwcs_sjfw_fhcs.getTableData();
this.jcxxtx = true;
let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
this.requestRules = 0;
this.responseRules = 0;
this.checkTable(requestData, 0);
this.checkTable(responseData, 1);
if (this.requestRules == 0 && this.responseRules == 0) {
this.request_fields = requestData;
this.response_fields = responseData;
this.jcxxtx = true;
} else if (this.requestRules != 0) {
this.$message.error("请完善请求参数信息中的字段名称");
} else if (this.responseRules != 0) {
this.$message.error("请完善返回参数信息中的字段名称");
}
},
checkTable(arr, rule) {
let self = this;
for (let i = 0; i < arr.length; i++) {
if (arr[i].name && arr[i].name != "") {
if (!arr[i].label || arr[i].label == "") {
console.log(arr[i]);
if (rule == 0) {
this.requestRules = 1;
} else if (rule == 1) {
this.responseRules = 1;
}
return false;
}
}
if (arr[i].children && arr[i].children.length != 0) {
self.checkTable(arr[i].children, rule);
}
}
},
// edit form
getNewList(val) {
......@@ -479,7 +535,7 @@ export default {
name: this.form.name,
sectors: this.form.area,
organization: this.form.origin,
cover: this.cover,
cover: this.cover[0].url,
openness: this.form.resource,
descript: this.form.desc,
data_service_type1: this.activeBtn,
......@@ -500,8 +556,10 @@ export default {
.post(url, query)
.then(response => {
if (response.data.success == 1) {
this.$message.success("服务注册成功");
} else {
console.log(response.data.console.error);
console.log(response.data.errMsg);
this.$message.success(response.data.errMsg);
}
})
.catch(function(response) {
......
src/pages/workPlace.vue → src/pages/workbench/workPlace.vue
View file @ d1820da1
......@@ -3,7 +3,7 @@
<div class="person_info">
<div class="preson">
<div class="person_text">
<img src="../assets/imgs/img_head.png" alt />
<img src="@/assets/imgs/img_head.png" alt />
<span>你好，{{person}}！最近登录{{login_time}}</span>
</div>
<div class="person_menu">
......@@ -53,7 +53,7 @@
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
数据分析中心
<img style="vertical-align:-9px;" src="../assets/imgs/home_btn_enter.png" alt />
<img style="vertical-align:-9px;" src="@/assets/imgs/home_btn_enter.png" alt />
</p>
<div class="data_charts">
<div class="data_charts_left">
......@@ -95,7 +95,7 @@
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
数据资产看板
<img style="vertical-align:-9px;" src="../assets/imgs/home_btn_enter.png" alt />
<img style="vertical-align:-9px;" src="@/assets/imgs/home_btn_enter.png" alt />
</p>
<div class="data_charts" style="width:100%;">
<div class="data_charts_left">
......@@ -135,7 +135,7 @@
style="margin-top:20px;margin-bottom:10px;font-size:18px;color: #0d1847;font-weight:600;padding-left:20px;"
>
数据资产看板
<img style="vertical-align:-9px;" src="../assets/imgs/home_btn_enter.png" alt />
<img style="vertical-align:-9px;" src="@/assets/imgs/home_btn_enter.png" alt />
</p>
<div class="data_charts" style="width:100%;">
<div class="data_charts_left" style="width:590px;">
......@@ -169,7 +169,7 @@
{{now_user == 0?'我的服务':'服务管理'}}
<img
style="vertical-align:-9px;cursor: pointer;"
src="../assets/imgs/home_btn_enter.png"
src="@/assets/imgs/home_btn_enter.png"
@click="gotofw()"
alt
/>
......@@ -184,7 +184,7 @@
@click="now_type = index"
>{{item}}</div>
<div class="myservice_btn" v-if="now_user==0" @click="gotozc()">
<img src="../assets/imgs/home_ic_release.png" alt />&nbsp; 服务注册
<img src="@/assets/imgs/home_ic_release.png" alt />&nbsp; 服务注册
</div>
</div>
<table-um
......@@ -203,7 +203,7 @@
<img
@click="gotoyy"
style="vertical-align:-9px;"
src="../assets/imgs/home_btn_enter.png"
src="@/assets/imgs/home_btn_enter.png"
alt
/>
</p>
......@@ -238,8 +238,8 @@
<script>
import uuidv1 from "uuid/v1";
import tableUm from "../components/table-um";
import { getRole } from "../utils/common";
import tableUm from "@/components/table-um";
import { getRole } from "@/utils/common";
var echarts = require("echarts");
export default {
data() {
......@@ -718,7 +718,7 @@ export default {
[
{
text: "服务总数",
pic: require("../assets/imgs/ic_fuwuzs_navy.png"),
pic: require("@/assets/imgs/ic_fuwuzs_navy.png"),
bg: "#e6ebfe",
color: "#515fe7",
type:"service",
......@@ -726,7 +726,7 @@ export default {
},
{
text: "应用总数",
pic: require("../assets/imgs/ic_yingyongzs.png"),
pic: require("@/assets/imgs/ic_yingyongzs.png"),
bg: "#e5f4fe",
color: "#38aef9",
type:'app',
......@@ -734,7 +734,7 @@ export default {
},
{
text: "收益总额",
pic: require("../assets/imgs/ic_shouyize.png"),
pic: require("@/assets/imgs/ic_shouyize.png"),
bg: "#fcefd6",
color: "#ea7d19",
type:'getMoney',
......@@ -744,7 +744,7 @@ export default {
[
{
text: "组织用户数",
pic: require("../assets/imgs/ic_yonghuzs.png"),
pic: require("@/assets/imgs/ic_yonghuzs.png"),
bg: "#e6ebfe",
color: "#515fe7",
type:'areaUser',
......@@ -752,7 +752,7 @@ export default {
},
{
text: "服务总数",
pic: require("../assets/imgs/ic_fuwuzs.png"),
pic: require("@/assets/imgs/ic_fuwuzs.png"),
bg: "#e5f4fe",
color: "#38aef9",
type:'service',
......@@ -760,7 +760,7 @@ export default {
},
{
text: "应用总数",
pic: require("../assets/imgs/ic_yingyongzs.png"),
pic: require("@/assets/imgs/ic_yingyongzs.png"),
bg: "#e7fdfc",
color: "#25bdb1",
type:'app',
......@@ -768,7 +768,7 @@ export default {
},
{
text: "收益总额",
pic: require("../assets/imgs/ic_shouyize.png"),
pic: require("@/assets/imgs/ic_shouyize.png"),
bg: "#fcefd6",
color: "#ea7d19",
type:'getMoney',
......@@ -778,7 +778,7 @@ export default {
[
{
text: "用户总数",
pic: require("../assets/imgs/ic_yonghuzs.png"),
pic: require("@/assets/imgs/ic_yonghuzs.png"),
bg: "#e6ebfe",
color: "#515fe7",
type:'allUser',
......@@ -786,7 +786,7 @@ export default {
},
{
text: "服务总数",
pic: require("../assets/imgs/ic_fuwuzs.png"),
pic: require("@/assets/imgs/ic_fuwuzs.png"),
bg: "#e5f4fe",
color: "#38aef9",
type:'service',
......@@ -794,7 +794,7 @@ export default {
},
{
text: "应用总数",
pic: require("../assets/imgs/ic_yingyongzs.png"),
pic: require("@/assets/imgs/ic_yingyongzs.png"),
bg: "#e7fdfc",
color: "#25bdb1",
type:'app',
......@@ -802,7 +802,7 @@ export default {
},
{
text: "收益总额",
pic: require("../assets/imgs/ic_shouyize.png"),
pic: require("@/assets/imgs/ic_shouyize.png"),
bg: "#fcefd6",
color: "#ea7d19",
type:'getMoney',
......@@ -813,43 +813,43 @@ export default {
online_tool_arr: [
{
text: "智能绘图",
pic: require("../assets/imgs/home_tool_ic_znht.png"),
pic: require("@/assets/imgs/home_tool_ic_znht.png"),
bg: "#e5f4fe",
color: "#38aef9"
},
{
text: "数据开发",
pic: require("../assets/imgs/home_tool_ic_sjkf.png"),
pic: require("@/assets/imgs/home_tool_ic_sjkf.png"),
bg: "#e6ebfe",
color: "#515fe7"
},
{
text: "模型工场",
pic: require("../assets/imgs/home_tool_ic_mxgc.png"),
pic: require("@/assets/imgs/home_tool_ic_mxgc.png"),
bg: "#e6ebfe",
color: "#515fe7"
},
{
text: "流程设计",
pic: require("../assets/imgs/home_tool_ic_lcsj.png"),
pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
bg: "#e6ebfe",
color: "#515fe7"
},
{
text: "可视化报表",
pic: require("../assets/imgs/home_tool_ic_kshbb.png"),
pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
bg: "#fff2e2",
color: "#ea7d19"
},
{
text: "模板应用",
pic: require("../assets/imgs/home_tool_ic_mbyy.png"),
pic: require("@/assets/imgs/home_tool_ic_mbyy.png"),
bg: "#fff2e2",
color: "#ea7d19"
},
{
text: "应用创新",
pic: require("../assets/imgs/home_tool_ic_yycx.png"),
pic: require("@/assets/imgs/home_tool_ic_yycx.png"),
bg: "#e7fdfc",
color: "#25bdb1"
}
......@@ -867,37 +867,37 @@ export default {
app_arr: [],
manage_arr: [
{
pic: require("../assets/imgs/home_tool_ic_key.png"),
pic: require("@/assets/imgs/home_tool_ic_key.png"),
text: "我的密钥",
role:0,
},
{
pic: require("../assets/imgs/home_tool_ic_organize.png"),
pic: require("@/assets/imgs/home_tool_ic_organize.png"),
text: "组织管理",
role:1,
},
{
pic: require("../assets/imgs/home_tool_ic_key.png"),
pic: require("@/assets/imgs/home_tool_ic_key.png"),
text: "密钥管理",
role:1,
},
{
pic: require("../assets/imgs/home_tool_ic_quanxian.png"),
pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
text: "权限管理",
role:2,
},
{
pic: require("../assets/imgs/home_tool_ic_quanxian.png"),
pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
text: "容器管理",
role:2,
},
{
pic: require("../assets/imgs/home_tool_ic_quanxian.png"),
pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
text: "数据管控",
role:2,
},
{
pic: require("../assets/imgs/home_tool_ic_quanxian.png"),
pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
text: "消息新闻管理",
role:2,
}
......@@ -1522,7 +1522,7 @@ export default {
display: inline-block;
width: 3px;
height: 13px;
background-image: url("../assets/imgs/home_ic_more_w.png");
background-image: url("~@/assets/imgs/home_ic_more_w.png");
}
.menu {
width: 100%;
......@@ -1730,7 +1730,7 @@ export default {
line-height: 28px;
}
.person_menu:hover .person_manage_pic {
background-image: url("../assets/imgs/home_ic_more_b.png");
background-image: url("~@/assets/imgs/home_ic_more_b.png");
}
.manage_box {
......
src/pages/app_detail.vue → src/pages/workbench/yygl/app_detail.vue
View file @ d1820da1
......@@ -65,7 +65,7 @@
<div v-if="now_service == 2&&now_user == 0">
<p style="color:#8890a7;">压缩包：</p>
<p><img src="../assets/imgs/ic_olddata.png" alt="">{{oldpag_name}} <span class="download">下载原压缩包</span> </p>
<p><img src="@/assets/imgs/ic_olddata.png" alt="">{{oldpag_name}} <span class="download">下载原压缩包</span> </p>
<p style="color:#8890a7;margin:20px 0;">上传新的压缩包：</p>
<div class="uploadtips">
<p style="margin-left:-11px;"><i class="el-icon-warning-outline"></i>压缩包上传提示：</p>
......@@ -95,13 +95,13 @@
</template>
<script>
import infoList from "../components/infoList";
import tableUm from "../components/table-um";
import serviceHeader from "../components/service-header";
import infoList from "@/components/infoList";
import tableUm from "@/components/table-um";
import serviceHeader from "@/components/service-header";
import dialogAction from "@/components/dialog-action";
import uploadFile from '@/components/upload_file'
import serviceTabComments from '@/components/service-tab-comments'
import { getRole } from "../utils/common";
import { getRole } from "@/utils/common";
export default {
components: {
infoList,
......
src/pages/app_edit.vue → src/pages/workbench/yygl/app_edit.vue
View file @ d1820da1
......@@ -98,8 +98,8 @@
</template>
<script>
import uploadFile from '../components/upload_file'
import { getRole } from "../utils/common";
import uploadFile from '@/components/upload_file'
import { getRole } from "@/utils/common";
export default {
props: {},
components: {
......@@ -350,7 +350,7 @@ export default {
.openbgc{
width: 56px;
height: 23px;
background-image: url('../assets/imgs/btn_on_hov.png');
background-image: url('~@/assets/imgs/btn_on_hov.png');
background-size:contain;
cursor: pointer;
}
......
src/pages/apply_app_detail.vue → src/pages/workbench/yygl/apply_app_detail.vue
View file @ d1820da1
......@@ -39,11 +39,11 @@
</template>
<script>
import serviceHeader from "../components/service-header";
import infoList from "../components/infoList";
import tableUm from "../components/table-um";
import processCard from "../components/process-card";
import { getRole } from "../utils/common";
import serviceHeader from "@/components/service-header";
import infoList from "@/components/infoList";
import tableUm from "@/components/table-um";
import processCard from "@/components/process-card";
import { getRole } from "@/utils/common";
export default {
props: {},
components: {
......
src/pages/approval_app_detail.vue → src/pages/workbench/yygl/approval_app_detail.vue
View file @ d1820da1
......@@ -52,11 +52,11 @@
</template>
<script>
import serviceHeader from "../components/service-header";
import infoList from "../components/infoList";
import tableUm from "../components/table-um";
import processCard from "../components/process-card";
import {getRole} from "../utils/common"
import serviceHeader from "@/components/service-header";
import infoList from "@/components/infoList";
import tableUm from "@/components/table-um";
import processCard from "@/components/process-card";
import {getRole} from "@/utils/common"
export default {
props: {},
components: {
......
src/pages/deploy_app_detail.vue → src/pages/workbench/yygl/deploy_app_detail.vue
View file @ d1820da1
......@@ -195,15 +195,15 @@
</template>
<script>
import infoList from "../components/infoList";
import tableUm from "../components/table-um";
import serviceHeader from "../components/service-header";
import infoList from "@/components/infoList";
import tableUm from "@/components/table-um";
import serviceHeader from "@/components/service-header";
import dialogAction from "@/components/dialog-action";
import uploadFile from "@/components/upload_file";
import norCard from "@/components/card";
import exampleIcon from "@/pages/example_icon";
import exampleIcon from "@/pages/example/example_icon";
import Topology from "@/components/topology.vue";
import { getRole } from "../utils/common";
import { getRole } from "@/utils/common";
export default {
components: {
infoList,
......
src/pages/yygl.vue → src/pages/workbench/yygl/yygl.vue
View file @ d1820da1
......@@ -3,7 +3,7 @@
<side-nav-bar
:nav-list="navList"
title="我的应用"
:title-icon="require('../assets/imgs/tool_yingyong.png')"
:title-icon="require('@/assets/imgs/tool_yingyong.png')"
:title-path="navList[0] && navList[0].path"
></side-nav-bar>
<div class="main_container">
......
src/router/index.js
View file @ d1820da1
This diff is collapsed.
yarn.lock
View file @ d1820da1
......@@ -7110,6 +7110,11 @@ vue-hot-reload-api@^2.3.0:
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
vue-i18n@^8.17.7:
version "8.17.7"
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.17.7.tgz#d87e653e815a07f86e2c2dfe35261e6ea105c38a"
integrity sha512-7IQJ+72IIIxfR6Mt+X6EDmMP1i5oETFpc0FttnWKA9cgacf1DAlyho1aTItekG+AkbNs6nz4q3sYrXaPdC0irA==
vue-loader@^15.7.0:
version "15.9.0"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz#5d4b0378a4606188fc83e587ed23c94bc3a10998"
......
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