Commit b9f49829 authored by 晓彤's avatar 晓彤

图标修改

parents 2f4743f0 2b4a4edc
......@@ -3,7 +3,6 @@
src: url('../fonts/iconfont.woff2') format('woff2'),
url('../fonts/iconfont.woff') format('woff'),
url('../fonts/iconfont.ttf') format('truetype');
}
.iconfont {
......@@ -14,139 +13,124 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-data:before {
content: "\e6f9";
.icon-xiangmu1:before {
content: "\e61c";
}
.icon-3column:before {
content: "\e663";
}
.icon-column-4:before {
content: "\e664";
}
.icon-add:before {
content: "\e665";
}
.icon-add-circle:before {
content: "\e666";
.icon-money:before {
content: "\e66e";
}
.icon-adjust:before {
content: "\e667";
.icon-hammock:before {
content: "\e70c";
}
.icon-arrow-up-circle:before {
content: "\e668";
.icon-report:before {
content: "\e626";
}
.icon-arrow-right-circle:before {
content: "\e669";
.icon-structure:before {
content: "\ec7e";
}
.icon-arrow-down:before {
content: "\e66a";
.icon-query:before {
content: "\e636";
}
.icon-ashbin:before {
content: "\e66b";
.icon-shujujiemi:before {
content: "\e60c";
}
.icon-browse:before {
content: "\e66c";
.icon-interface:before {
content: "\e60e";
}
.icon-bottom:before {
content: "\e66d";
.icon-notice:before {
content: "\e732";
}
.icon-back:before {
content: "\e66e";
.icon-money1:before {
content: "\e904";
}
.icon-bad:before {
content: "\e66f";
.icon-case:before {
content: "\e600";
}
.icon-arrow-double-left:before {
content: "\e670";
.icon-consumption-fill:before {
content: "\e79d";
}
.icon-arrow-left-circle:before {
content: "\e671";
.icon-scenes-fill:before {
content: "\e79e";
}
.icon-arrow-double-right:before {
content: "\e672";
.icon-scenes:before {
content: "\e79f";
}
.icon-caps-lock:before {
content: "\e673";
.icon-consumption:before {
content: "\e7a0";
}
.icon-camera:before {
content: "\e674";
.icon-memcacheyunshujukuMemcac:before {
content: "\e61f";
}
.icon-close:before {
content: "\e675";
.icon-secure-payment-fill:before {
content: "\e8cd";
}
.icon-check-item:before {
content: "\e676";
.icon-cached:before {
content: "\e860";
}
.icon-calendar:before {
content: "\e677";
.icon-Icon_signin:before {
content: "\e61d";
}
.icon-comment:before {
.icon-modular:before {
content: "\e678";
}
.icon-column-vertical:before {
content: "\e679";
.icon-money2:before {
content: "\e6db";
}
.icon-complete:before {
content: "\e67a";
.icon-credits:before {
content: "\e8c1";
}
.icon-cry:before {
content: "\e67b";
}
.icon-eye-close:before {
content: "\e67c";
.icon-Memcached:before {
content: "\e66b";
}
.icon-file-delete:before {
content: "\e67d";
.icon-jira:before {
content: "\e7bc";
font-size:20px;
}
.icon-file:before {
content: "\e67e";
.icon-icon_dpsz:before {
content: "\e618";
}
.icon-hide:before {
content: "\e67f";
.icon-icon_ckbl_n:before {
content: "\e620";
}
.icon-link:before {
content: "\e680";
.icon-icon_cs_n:before {
content: "\e622";
}
.icon-meh-filling:before {
content: "\e68b";
.icon-icon_yhq_n:before {
content: "\e623";
}
.icon-cry-filling:before {
content: "\e689";
.icon-icon_yxtj_n:before {
content: "\e624";
}
.icon-home-filling:before {
content: "\e68d";
.icon-icon_yydd_n:before {
content: "\e625";
}
This diff is collapsed.
......@@ -6,242 +6,214 @@
"description": "",
"glyphs": [
{
"icon_id": "11474277",
"name": "data",
"font_class": "data",
"unicode": "e6f9",
"unicode_decimal": 59129
"icon_id": "642082",
"name": "project",
"font_class": "xiangmu1",
"unicode": "e61c",
"unicode_decimal": 58908
},
{
"icon_id": "15838406",
"name": "column-3",
"font_class": "3column",
"unicode": "e663",
"unicode_decimal": 58979
},
{
"icon_id": "15838423",
"name": "column-4",
"font_class": "column-4",
"unicode": "e664",
"unicode_decimal": 58980
},
{
"icon_id": "15838424",
"name": "add",
"font_class": "add",
"unicode": "e665",
"unicode_decimal": 58981
},
{
"icon_id": "15838425",
"name": "add-circle",
"font_class": "add-circle",
"unicode": "e666",
"unicode_decimal": 58982
"icon_id": "745697",
"name": "money",
"font_class": "money",
"unicode": "e66e",
"unicode_decimal": 58990
},
{
"icon_id": "15838426",
"name": "adjust",
"font_class": "adjust",
"unicode": "e667",
"unicode_decimal": 58983
"icon_id": "1203891",
"name": "hammock",
"font_class": "hammock",
"unicode": "e70c",
"unicode_decimal": 59148
},
{
"icon_id": "15838427",
"name": "arrow-up-circle",
"font_class": "arrow-up-circle",
"unicode": "e668",
"unicode_decimal": 58984
"icon_id": "1471607",
"name": "report",
"font_class": "report",
"unicode": "e626",
"unicode_decimal": 58918
},
{
"icon_id": "15838428",
"name": "arrow-right-circle",
"font_class": "arrow-right-circle",
"unicode": "e669",
"unicode_decimal": 58985
"icon_id": "3538533",
"name": "structure",
"font_class": "structure",
"unicode": "ec7e",
"unicode_decimal": 60542
},
{
"icon_id": "15838429",
"name": "arrow-down",
"font_class": "arrow-down",
"unicode": "e66a",
"unicode_decimal": 58986
"icon_id": "3991818",
"name": "query",
"font_class": "query",
"unicode": "e636",
"unicode_decimal": 58934
},
{
"icon_id": "15838430",
"name": "ashbin",
"font_class": "ashbin",
"unicode": "e66b",
"unicode_decimal": 58987
"icon_id": "5978737",
"name": "data-decrypt",
"font_class": "shujujiemi",
"unicode": "e60c",
"unicode_decimal": 58892
},
{
"icon_id": "15838432",
"name": "browse",
"font_class": "browse",
"unicode": "e66c",
"unicode_decimal": 58988
"icon_id": "7207747",
"name": "interface",
"font_class": "interface",
"unicode": "e60e",
"unicode_decimal": 58894
},
{
"icon_id": "15838433",
"name": "bottom",
"font_class": "bottom",
"unicode": "e66d",
"unicode_decimal": 58989
"icon_id": "7712702",
"name": "notice",
"font_class": "notice",
"unicode": "e732",
"unicode_decimal": 59186
},
{
"icon_id": "15838434",
"name": "back",
"font_class": "back",
"unicode": "e66e",
"unicode_decimal": 58990
"icon_id": "7736258",
"name": "money",
"font_class": "money1",
"unicode": "e904",
"unicode_decimal": 59652
},
{
"icon_id": "15838435",
"name": "bad",
"font_class": "bad",
"unicode": "e66f",
"unicode_decimal": 58991
"icon_id": "9473366",
"name": "case",
"font_class": "case",
"unicode": "e600",
"unicode_decimal": 58880
},
{
"icon_id": "15838436",
"name": "arrow-double-left",
"font_class": "arrow-double-left",
"unicode": "e670",
"unicode_decimal": 58992
"icon_id": "11494512",
"name": "consumption-fill",
"font_class": "consumption-fill",
"unicode": "e79d",
"unicode_decimal": 59293
},
{
"icon_id": "15838437",
"name": "arrow-left-circle",
"font_class": "arrow-left-circle",
"unicode": "e671",
"unicode_decimal": 58993
"icon_id": "11494518",
"name": "scenes-fill",
"font_class": "scenes-fill",
"unicode": "e79e",
"unicode_decimal": 59294
},
{
"icon_id": "15838438",
"name": "arrow-double-right",
"font_class": "arrow-double-right",
"unicode": "e672",
"unicode_decimal": 58994
"icon_id": "11494519",
"name": "scenes",
"font_class": "scenes",
"unicode": "e79f",
"unicode_decimal": 59295
},
{
"icon_id": "15838439",
"name": "caps-lock",
"font_class": "caps-lock",
"unicode": "e673",
"unicode_decimal": 58995
"icon_id": "11494522",
"name": "consumption",
"font_class": "consumption",
"unicode": "e7a0",
"unicode_decimal": 59296
},
{
"icon_id": "15838440",
"name": "camera",
"font_class": "camera",
"unicode": "e674",
"unicode_decimal": 58996
"icon_id": "13533323",
"name": "memcache 云数据库 Memcac",
"font_class": "memcacheyunshujukuMemcac",
"unicode": "e61f",
"unicode_decimal": 58911
},
{
"icon_id": "15838444",
"name": "close",
"font_class": "close",
"unicode": "e675",
"unicode_decimal": 58997
"icon_id": "15591395",
"name": "secure-payment-fill",
"font_class": "secure-payment-fill",
"unicode": "e8cd",
"unicode_decimal": 59597
},
{
"icon_id": "15838445",
"name": "check-item",
"font_class": "check-item",
"unicode": "e676",
"unicode_decimal": 58998
"icon_id": "15616783",
"name": "cached",
"font_class": "cached",
"unicode": "e860",
"unicode_decimal": 59488
},
{
"icon_id": "15838446",
"name": "calendar",
"font_class": "calendar",
"unicode": "e677",
"unicode_decimal": 58999
"icon_id": "15627921",
"name": "Icon_sign in",
"font_class": "Icon_signin",
"unicode": "e61d",
"unicode_decimal": 58909
},
{
"icon_id": "15838447",
"name": "comment",
"font_class": "comment",
"icon_id": "15838505",
"name": "modular",
"font_class": "modular",
"unicode": "e678",
"unicode_decimal": 59000
},
{
"icon_id": "15838448",
"name": "column-vertical",
"font_class": "column-vertical",
"unicode": "e679",
"unicode_decimal": 59001
"icon_id": "16678646",
"name": "money",
"font_class": "money2",
"unicode": "e6db",
"unicode_decimal": 59099
},
{
"icon_id": "15838450",
"name": "complete",
"font_class": "complete",
"unicode": "e67a",
"unicode_decimal": 59002
"icon_id": "18986647",
"name": "credits",
"font_class": "credits",
"unicode": "e8c1",
"unicode_decimal": 59585
},
{
"icon_id": "15838452",
"name": "cry",
"font_class": "cry",
"unicode": "e67b",
"unicode_decimal": 59003
},
{
"icon_id": "15838471",
"name": "eye-close",
"font_class": "eye-close",
"unicode": "e67c",
"unicode_decimal": 59004
"icon_id": "21053614",
"name": "Memcached",
"font_class": "Memcached",
"unicode": "e66b",
"unicode_decimal": 58987
},
{
"icon_id": "15838476",
"name": "file-delete",
"font_class": "file-delete",
"unicode": "e67d",
"unicode_decimal": 59005
"icon_id": "1444784",
"name": "jira",
"font_class": "jira",
"unicode": "e7bc",
"unicode_decimal": 59324
},
{
"icon_id": "15838480",
"name": "file",
"font_class": "file",
"unicode": "e67e",
"unicode_decimal": 59006
"icon_id": "21917816",
"name": "icon_dpsz",
"font_class": "icon_dpsz",
"unicode": "e618",
"unicode_decimal": 58904
},
{
"icon_id": "15838484",
"name": "hide",
"font_class": "hide",
"unicode": "e67f",
"unicode_decimal": 59007
"icon_id": "21917915",
"name": "icon_ckbl_n",
"font_class": "icon_ckbl_n",
"unicode": "e620",
"unicode_decimal": 58912
},
{
"icon_id": "15838493",
"name": "link",
"font_class": "link",
"unicode": "e680",
"unicode_decimal": 59008
"icon_id": "21917997",
"name": "icon_cs_n",
"font_class": "icon_cs_n",
"unicode": "e622",
"unicode_decimal": 58914
},
{
"icon_id": "15838616",
"name": "meh-filling",
"font_class": "meh-filling",
"unicode": "e68b",
"unicode_decimal": 59019
"icon_id": "21918003",
"name": "icon_yhq_n",
"font_class": "icon_yhq_n",
"unicode": "e623",
"unicode_decimal": 58915
},
{
"icon_id": "15838617",
"name": "cry-filling",
"font_class": "cry-filling",
"unicode": "e689",
"unicode_decimal": 59017
"icon_id": "21918012",
"name": "icon_yxtj_n",
"font_class": "icon_yxtj_n",
"unicode": "e624",
"unicode_decimal": 58916
},
{
"icon_id": "15838619",
"name": "home-filling",
"font_class": "home-filling",
"unicode": "e68d",
"unicode_decimal": 59021
"icon_id": "21918013",
"name": "icon_yydd_n",
"font_class": "icon_yydd_n",
"unicode": "e625",
"unicode_decimal": 58917
}
]
}
......@@ -25,7 +25,6 @@
<el-form-item>
<el-button type="success" plain @click="DialogVisible = true" class="el-icon-circle-plus">添加</el-button>
<div style="margin-top:20px;float:right;margin-right:300px">
<el-button @click="cancelSceneCaseFrom">取 消</el-button>
<el-button type="primary" @click="addSceneCaseFrom">确 定</el-button>
</div>
......@@ -89,7 +88,7 @@
</el-col>
<el-col :span="10">
<div class="div-left">
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea"></el-input>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea" autosize></el-input>
</div>
</el-col>
<el-col :span="2">
......@@ -123,7 +122,7 @@
</el-col>
<el-col :span="10">
<div class="div-left">
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea"></el-input>
<el-input v-model.trim="item.paramsValue" placeholder="请输入参数值" type="textarea" autosize></el-input>
</div>
</el-col>
<el-col :span="2">
......@@ -157,10 +156,10 @@
</el-col>
<el-col :span="10">
<div class="div-left">
<el-input v-model.trim="item.paramsValue" placeholder="请输入表达式" type="textarea"></el-input>
<el-input v-model.trim="item.paramsValue" placeholder="请输入表达式" type="textarea" autosize></el-input>
</div>
</el-col>
<el-col :span="2">
<el-col :span="2">autosize
<div class="div-operation">
<el-button size="mini" type="danger" @click="responeDel(index)" icon="el-icon-delete" style="height:40px;margin-left:20px">删除</el-button>
</div>
......@@ -395,7 +394,6 @@ export default {
// 获取场景用例列表
getSceneCaseList() {
getSceneCaseList(this.sceneCaseInfo).then((resp) => {
console.log('333', this.sceneTestcaseList)
this.sceneTestcaseList = resp.data.data
})
},
......@@ -439,7 +437,7 @@ export default {
sceneId: this.sceneCaseInfo.sceneId,
sequence: this.sceneTestcaseList.length + 1
})
// console.log('save----', this.sceneTestcaseList)
console.log('save----', this.sceneTestcaseList)
this.DialogVisible = false
this.sceneCaseForm.moduleFrom = ''
this.sceneCaseForm.interfaceFrom = ''
......@@ -455,7 +453,6 @@ export default {
// 编辑场景用例
editeSceneFrom(row) {
console.log('88', row)
this.editDialogVisible = true
this.sceneCaseForm.sequence = row.sequence
this.sceneCaseForm.interfaceId = row.interfaceId
......@@ -500,6 +497,7 @@ export default {
})
this.newSceneForm.sceneId = this.sceneCaseInfo.sceneId
this.newSceneForm.sceneTestcaseList = this.sceneTestcaseList
console.log('保存传递的参数值', this.newSceneForm.sceneTestcaseList)
this.$refs.sceneFormRef.validate((valid) => {
if (!valid) {
return false
......@@ -612,7 +610,7 @@ export default {
}
}
this.editDialogVisible = false
// console.log('新集合信息', this.sceneTestcaseList)
console.log('新集合信息', this.sceneTestcaseList)
},
cancelCaseFrom() {
this.editDialogVisible = false
......@@ -637,7 +635,7 @@ export default {
width: 300px;
}
.div-top {
margin-top: 10px;
margin-top: 5px;
}
.div-left {
margin-left: 5px;
......
......@@ -4,7 +4,8 @@
<div class="filter">
<!-- <el-input placeholder="请输入项目名称" style="width:15%"></el-input>
<el-button type="primary" icon="el-icon-search" @click="searchMockList">查询</el-button> -->
<el-button type="primary" icon="el-icon-circle-plus" @click="DialogAddVisible=true">新增</el-button>
<!-- <el-button type="primary" icon="el-icon-circle-plus" @click="DialogAddVisible=true">新增</el-button> -->
<el-button type="primary" icon="iconfont icon-icon_yhq_n" @click="DialogAddVisible=true">新增</el-button>
<!-- <el-button type="primary" class="iconfont icon-browse" @click="DialogAddVisible=true">新增</el-button> -->
</div>
<el-table :data="projectList" border style="width: 100%;margin-top:20px">
......
......@@ -22,7 +22,7 @@
</el-row>
<el-row>
<div class="col_style">
<el-col :span="5" style="color:#878080">运行时间(s)</el-col>
<el-col :span="5" style="color:#878080">运行时间(s):</el-col>
<el-col :span="19">
<el-input v-model="totalElapsedTime"></el-input>
</el-col>
......@@ -92,10 +92,10 @@
</template>
</el-table-column>
<el-table-column type='index' label="序号" width="100px"></el-table-column>
<el-table-column prop="testcaseName" label="用例名称" width="250px"></el-table-column>
<el-table-column prop="interfaceName" label="接口名称" width="250px"></el-table-column>
<el-table-column prop="testcaseName" label="用例名称" width="200px"></el-table-column>
<el-table-column prop="interfaceName" label="接口名称" width="200px"></el-table-column>
<el-table-column prop="interfaceUrl" label="接口URL"></el-table-column>
<el-table-column prop="elapsedTime" label="耗时(s)" width="200px"></el-table-column>
<el-table-column prop="elapsedTime" label="耗时(s)" width="150px"></el-table-column>
<el-table-column prop="status" label="结果" width="200px">
<template slot-scope="scope">
<el-tag :type="scope.row.status === 'pass' ? 'success' : 'danger'" close-transition effect="dark">{{scope.row.status}}</el-tag>
......@@ -240,7 +240,7 @@ export default {
margin-top: 30px;
}
.rowStyle {
margin-left: 150px;
margin-left: 60px;
margin-top: 20px;
font-size: 15px;
font-weight: bold;
......
......@@ -2,56 +2,56 @@
"menu": [
{
"id": 1,
"icon": "el-icon-money",
"icon": "iconfont icon-icon_yhq_n",
"title": "现金分期",
"child": [
{
"id": 1,
"title": "现金捞",
"icon": "el-icon-watermelon",
"icon": "iconfont icon-money",
"path": "/xyqb/getLoanData"
},
{
"id": 2,
"title": "现金造",
"icon": "el-icon-cherry",
"icon": "iconfont icon-money2",
"path": "/xyqb/genLoanData"
}
]
},
{
"id": 2,
"icon": "el-icon-bank-card",
"icon": "iconfont icon-icon_ckbl_n",
"title": "消费分期",
"child": [
{
"id": 1,
"title": "消金查",
"icon": "el-icon-pear",
"icon": "iconfont icon-query",
"path": "/vcc/checkData"
},
{
"id": 2,
"title": "消金捞",
"icon": "el-icon-grape",
"icon": "iconfont icon-consumption-fill",
"path": "/vcc/getData"
},
{
"id": 3,
"title": "消金造",
"icon": "el-icon-apple",
"icon": "iconfont icon-consumption",
"path": "/vcc/genData"
},
{
"id": 4,
"title": "授信回调",
"icon": "el-icon-soccer",
"icon": "iconfont icon-cached",
"path": "/vcc/risk"
},
{
"id": 5,
"title": "还款回调",
"icon": "el-icon-baseball",
"icon": "iconfont icon-secure-payment-fill",
"path": "/vcc/repaycallback"
}
]
......@@ -59,12 +59,12 @@
{
"id": 3,
"title": "Mock",
"icon": "el-icon-s-marketing",
"icon": "iconfont icon-icon_yxtj_n",
"child": [
{
"id": 1,
"title": "mock",
"icon": "el-icon-pear",
"icon": "iconfont icon-hammock",
"path": "/mock/list"
}
]
......@@ -72,36 +72,36 @@
{
"id": 4,
"title": "小工具",
"icon": "el-icon-s-opportunity",
"icon": "iconfont icon-icon_dpsz",
"child": [
{
"id": 1,
"title": "kdsp解密",
"icon": "el-icon-bicycle",
"icon": "iconfont icon-structure",
"path": "/effect/kdsp/decrypt"
},
{
"id": 2,
"title": "构建记录",
"icon": "el-icon-wallet",
"icon": "iconfont icon-structure",
"path": "/effect/jenkins/build"
},
{
"id": 3,
"title": "登录白名单",
"icon": "el-icon-coffee",
"icon": "iconfont icon-Icon_signin",
"path": "/effect/whitelist"
},
{
"id": 4,
"title": "缓存清理",
"icon": "el-icon-milk-tea",
"icon": "iconfont icon-memcacheyunshujukuMemcac",
"path": "/effect/clearcache"
},
{
"id": 5,
"title": "数据清理",
"icon": "el-icon-water-cup",
"icon": "iconfont icon-Memcached",
"path": "/effect/cleardata"
}
]
......@@ -109,42 +109,42 @@
{
"id": 5,
"title": "接口自动化",
"icon": "el-icon-s-opportunity",
"icon": "iconfont icon-icon_yydd_n",
"child": [
{
"id": 1,
"title": "项目管理",
"icon": "el-icon-bicycle",
"icon": "iconfont icon-xiangmu1",
"path": "/auto/ProjectList"
},
{
"id": 2,
"title": "模块管理",
"icon": "el-icon-wallet",
"icon": "iconfont icon-modular",
"path": "/auto/ModelList"
},
{
"id": 3,
"title": "接口管理",
"icon": "el-icon-bank-card",
"icon": "iconfont icon-interface",
"path": "/auto/InterfaceList"
},
{
"id": 4,
"title": "用例管理",
"icon": "el-icon-postcard",
"icon": "iconfont icon-case",
"path": "/auto/CaseList"
},
{
"id": 5,
"title": "场景管理",
"icon": "el-icon-thumb",
"icon": "iconfont icon-scenes",
"path": "/auto/SceneList"
},
{
"id": 6,
"title": "报告管理",
"icon": "el-icon-document",
"icon": "iconfont icon-report",
"path": "/auto/ReportList"
}
]
......@@ -152,12 +152,12 @@
{
"id": 6,
"title": "Jira相关",
"icon": "el-icon-hot-water",
"icon": "iconfont icon-jira",
"child": [
{
"id": 1,
"title": "jira-钉钉通知",
"icon": "el-icon-ice-tea",
"icon": "iconfont icon-notice",
"path": "/jira/notify"
}
]
......
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