Skip to content

V
vue-gjjs
Commit cc0dca2b by zhengxiaokui
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 6ecf0888 db352972
Showing with 228 additions and 46 deletions
src/components/SearchInput.vue
...@@ -25,9 +25,8 @@ ...@@ -25,9 +25,8 @@
:key="idx" :key="idx"
@mouseover="liOverEvent(idx)" @mouseover="liOverEvent(idx)"
@mouseup.left="searchEvent(item.text)" @mouseup.left="searchEvent(item.text)"
> v-html="item.text"
{{ item.text }} ></li>
</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -53,9 +52,11 @@ export default { ...@@ -53,9 +52,11 @@ export default {
searchContent: function(val, oldVal) { searchContent: function(val, oldVal) {
// console.log(val, oldVal); // console.log(val, oldVal);
if (val.trim() === "") { if (val.trim() === "") {
this.searchResult = [];
this.resultDisplay = false;
return; return;
} }
if (this.searchResult.map(r => r.text).includes(val)) { if (this.searchResult.map((r) => r.text).includes(val)) {
return; return;
} }
this.debounceWrapper(); this.debounceWrapper();
...@@ -64,28 +65,38 @@ export default { ...@@ -64,28 +65,38 @@ export default {
methods: { methods: {
queryData() { queryData() {
const testData = [ const testData = [
{ text: "打算大苏打", url: "" }, { text: "DD3500210260AA01", url: "" },
{ text: "sfsdfsdfsd", url: "" }, { text: "OC3500190001AA", url: "" },
{ text: "是多少粉丝", url: "" }, { text: "KZ3500210313AA", url: "" },
{ text: "士大夫大师傅士大夫", url: "" }, { text: "KZ3500210312AA", url: "" },
{ text: "士大夫胜多负少", url: "" }, { text: "DD3500210311AA01", url: "" },
{ text: "法国发过价格非常", url: "" }, { text: "DD3500210311AA01", url: "" },
{ text: "让他换个风格和规范还没好v你", url: "" }, { text: "KZ3500210311AA", url: "" },
{ text: "十分士大夫士大夫", url: "" }, { text: "CH3500200001AA", url: "" },
{ text: "v不错不错v吧", url: "" }, { text: "CH3323200001AB", url: "" },
{ text: "发的深入沟通和一个航班发", url: "" }, { text: "DV453500210260AA01", url: "" },
{ text: "白飞飞更好发挥", url: "" }, { text: "KZ3500210313AA", url: "" },
{ text: "价格和法国的", url: "" }, { text: "DD45350029760AA01", url: "" },
{ text: "士大夫是任天堂", url: "" }, { text: "CH3500343657001AA", url: "" },
{ text: "股份回购价款", url: "" }, { text: "CH35987567001AA", url: "" },
{ text: "分的高分很健康", url: "" }, { text: "CH243534200001AA", url: "" },
{ text: "热天语言同日u", url: "" }, { text: "CH350086786001AA", url: "" },
{ text: "微软谈好价格浮动", url: "" }, { text: "CH53454001AA", url: "" },
{ text: "v成本v那么就会有投入广告费", url: "" }, { text: "CH65645FG4545AA", url: "" },
]; ];
console.log("query data ..." + new Date().toLocaleString()); console.log("query data ..." + new Date().toLocaleString());
this.shuffle(testData); // this.shuffle(testData);
const res = testData; // const res = testData;
const res = testData
.filter((d) => d.text.indexOf(this.searchContent) > -1)
.map((d) =>
Object.assign(d, {
text: d.text.replace(
this.searchContent,
"<em>" + this.searchContent + "</em>"
),
})
);
if (res && res.length > 0) { if (res && res.length > 0) {
this.resultDisplay = true; this.resultDisplay = true;
this.searchResult = res; this.searchResult = res;
...@@ -103,11 +114,11 @@ export default { ...@@ -103,11 +114,11 @@ export default {
} }
}, },
searchEvent(val) { searchEvent(val) {
if (typeof val === 'string') { if (typeof val === "string") {
this.searchContent = val; this.searchContent = val;
} }
this.resultDisplay = false; this.resultDisplay = false;
// TODO // TODO
console.log("go to ..."); console.log("go to ...");
}, },
focusInput() { focusInput() {
...@@ -249,4 +260,9 @@ export default { ...@@ -249,4 +260,9 @@ export default {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.search-sug ul li >>> em {
color: #f73131;
font-style: normal;
}
</style> </style>
src/views/Business/index.vue
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
<style> <style>
#business_container { #business_container {
/* height: 100%; */ /* height: 100%; */
height: calc(100% - 55px); height: calc(100% - 45px);
position: absolute; position: absolute;
width: 100%; width: 100%;
} }
......
src/views/Home/CustomerAnalyse.vue
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
} }
#customerAnalyse .item-content #chart { #customerAnalyse .item-content #chart {
width: 98%; width: 98%;
height: calc(100% - 20px); height: calc(100% - 25px);
margin: 0 auto; margin: 0 auto;
} }
</style> </style>
src/views/Home/Hall.vue
...@@ -71,14 +71,19 @@ export default { ...@@ -71,14 +71,19 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
font-size: 14px;
} }
.dept-name { .dept-name {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.dept-name, .type-count {
flex: 1;
}
.first-word { .first-word {
width: 40px; width: 40px;
height: 40px; height: 60%;
max-height: 40px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -100,7 +105,7 @@ export default { ...@@ -100,7 +105,7 @@ export default {
color: #6c6f72; color: #6c6f72;
} }
.type-count .count-number { .type-count .count-number {
font-size: 25px; font-size: 20px;
margin-left: 20px; margin-left: 20px;
color: #000; color: #000;
} }
......
src/views/Home/QuickSearch.vue
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
#quickSearch .item-content .search-item { #quickSearch .item-content .search-item {
display: flex; display: flex;
display: flex; display: flex;
width: 150px; width: 145px;
/* height: 80px; */ /* height: 80px; */
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
......
src/views/Home/QuickVisit.vue
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
#quickVisit .item-content .visit-item { #quickVisit .item-content .visit-item {
display: flex; display: flex;
display: flex; display: flex;
width: 150px; width: 145px;
/* height: 80px; */ /* height: 80px; */
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
......
src/views/Home/index.vue
...@@ -39,19 +39,19 @@ export default { ...@@ -39,19 +39,19 @@ export default {
align-items: center; align-items: center;
} }
.home-item { .home-item {
height: 47%; height: 49%;
background-color: #ffffff; background-color: #ffffff;
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%); box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
border-radius: 8px; border-radius: 8px;
} }
#quickVisit { #quickVisit {
width: 65.3%; width: 66.3%;
} }
#noticeAnnouncement, #noticeAnnouncement,
#hall, #hall,
#customerAnalyse, #customerAnalyse,
#quickSearch { #quickSearch {
width: 32%; width: 33%;
} }
.home-item >>> .item-content { .home-item >>> .item-content {
/* max-height: calc(100% - 52px); */ /* max-height: calc(100% - 52px); */
......
src/views/Layout/SideMenu.vue
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<c-button icon="el-icon-s-unfold" v-else @click="openMenu"></c-button> <c-button icon="el-icon-s-unfold" v-else @click="openMenu"></c-button>
<!-- <c-input prefix-icon="el-icon-search" v-if="menuOpen" v-model="searchContent" <!-- <c-input prefix-icon="el-icon-search" v-if="menuOpen" v-model="searchContent"
@keyup.enter.native="searchMenuEvent" placeholder="全局搜索"></c-input> --> @keyup.enter.native="searchMenuEvent" placeholder="全局搜索"></c-input> -->
<c-search-input></c-search-input> <c-search-input v-show="menuOpen"></c-search-input>
</div> </div>
<c-content :height="250"> <c-content :height="250">
<img <img
......
src/views/Todo/index.vue
...@@ -24,17 +24,178 @@ export default { ...@@ -24,17 +24,178 @@ export default {
return { return {
tabVal: "todoList", tabVal: "todoList",
tableColumns: [ tableColumns: [
{ label: "业务编号", prop: "" }, { label: "业务编号", prop: "Own Reference" },
{ label: "交易名称", prop: "" }, { label: "交易名称", prop: "TRN" },
{ label: "客户名称", prop: "" }, { label: "客户名称", prop: "User" },
{ label: "币种", prop: "" }, { label: "币种", prop: "Cur" },
{ label: "金额", prop: "" }, { label: "金额", prop: "Relevant Amount" },
{ label: "交易创建时间", prop: "" }, { label: "交易创建时间", prop: "Entry" },
{ label: "任务分配时间", prop: "" }, // { label: "任务分配时间", prop: "" },
{ label: "机构类型", prop: "" }, { label: "机构类型", prop: "Branch" },
{ label: "交易优先级别", prop: "" }, { label: "交易优先级别", prop: "Status" },
],
tableData: [
{
TRN: "BDTDCK",
"Own Reference": "DD3500210260AA01",
"Addtional Text": "GUONEI",
Cur: "CNY",
"Relevant Amount": "2000",
Entry: "2021-12-13 17:01:14",
Req: "OA",
Sig: "O",
Rq0: "NN",
Rel0: "NN",
Rq1: "NA",
Rel1: "NN",
Rq2: "NN",
Rel2: "NN",
User: "'ZL",
Nam: "ZHL",
Status: "Waiting",
Branch: "押汇中心华北组",
},
{
TRN: "BOTDCR",
"Own Reference": "OC3500190001AA",
"Addtional Text": "",
Cur: "USD",
"Relevant Amount": "10000",
Entry: "2021-12-10 15:39:37",
Req: "OA",
Sig: "O",
Rq0: "NN",
Rel0: "NN",
Rq1: "NA",
Rel1: "NN",
Rq2: "NN",
Rel2: "NN",
User: "'ZL",
Nam: "ZHL",
Status: "Waiting",
Branch: "押汇中心华北组",
},
{
TRN: "DITOPN",
"Own Reference": "KZ3500210313AA",
"Addtional Text": "8888.00 ZhangSan 2000007350 GUONEI",
Cur: "CNY",
"Relevant Amount": "8888",
Entry: "2021-11-19 16:36:23",
Req: "OA",
Sig: "O",
Rq0: "NN",
Rel0: "NN",
Rq1: "NA",
Rel1: "NN",
Rq2: "NN",
Rel2: "NN",
User: "'MBF",
Nam: "马宝富",
Status: "Waiting",
Branch: "北京分行",
},
{
TRN: "DITOPN",
"Own Reference": "KZ3500210312AA",
"Addtional Text": "8888.00 ZhangSan 2000007350 GUONEI",
Cur: "CNY",
"Relevant Amount": "8888",
Entry: "2021-11-19 16:02:33",
Req: "OA",
Sig: "O",
Rq0: "NN",
Rel0: "NN",
Rq1: "NA",
Rel1: "NN",
Rq2: "NN",
Rel2: "NN",
User: "'MBF",
Nam: "马宝富",
Status: "Waiting",
Branch: "北京分行",
},
{
TRN: "BDTUDP",
"Own Reference": "DD3500210311AA01",
"Addtional Text": "GUONEI",
Cur: "CNY",
"Relevant Amount": "4000",
Entry: "2021-11-19 11:04:24",
Req: "OA",
Sig: "O",
Rq0: "NN",
Rel0: "NN",
Rq1: "NA",
Rel1: "NN",
Rq2: "NN",
Rel2: "NN",
User: "'MBF",
Nam: "马宝富",
Status: "Waiting",
Branch: "北京分行",
},
{
TRN: "DITDCK",
"Own Reference": "DD3500210311AA01",
"Addtional Text": "0.00 ZhangSan 2000007350 GUONEI",
Cur: "CNY",
"Relevant Amount": "4000",
Entry: "2021-11-19 11:03:48",
Req: "OA",
Sig: "O",
Rq0: "NN",
Rel0: "NN",
Rq1: "NA",
Rel1: "NN",
Rq2: "NN",
Rel2: "NN",
User: "'MBF",
Nam: "马宝富",
Status: "Waiting",
Branch: "北京分行",
},
{
TRN: "DITOPN",
"Own Reference": "KZ3500210311AA",
"Addtional Text": "5000.00 ZhangSan 2000007350 GUONEI",
Cur: "CNY",
"Relevant Amount": "5000",
Entry: "2021-11-19 11:00:13",
Req: "OA",
Sig: "O",
Rq0: "NN",
Rel0: "NN",
Rq1: "NA",
Rel1: "NN",
Rq2: "NN",
Rel2: "NN",
User: "'MBF",
Nam: "马宝富",
Status: "Waiting",
Branch: "北京分行",
},
{
TRN: "FCTCAN",
"Own Reference": "CH3500200001AA",
"Addtional Text": "",
Cur: "USD",
"Relevant Amount": "12000",
Entry: "2021-11-19 09:35:13",
Req: "OA",
Sig: "O",
Rq0: "NN",
Rel0: "NN",
Rq1: "NA",
Rel1: "NN",
Rq2: "NN",
Rel2: "NN",
User: "'MBF",
Nam: "马宝富",
Status: "Waiting",
Branch: "北京分行",
},
], ],
tableData: [],
}; };
}, },
methods: { methods: {
......
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