Commit 49c3a719 authored by 张冬's avatar 张冬

首页样式优化

parent 8bb78d73
// 引入ali-oss // 引入ali-oss
let OSS = require('ali-oss') let OSS = require('ali-oss');
/** /**
* [accessKeyId] {String}:通过阿里云控制台创建的AccessKey。 * [accessKeyId] {String}:通过阿里云控制台创建的AccessKey。
...@@ -8,14 +8,12 @@ let OSS = require('ali-oss') ...@@ -8,14 +8,12 @@ let OSS = require('ali-oss')
* [region] {String}:bucket所在的区域, 默认oss-cn-hangzhou。 * [region] {String}:bucket所在的区域, 默认oss-cn-hangzhou。
*/ */
let client = new OSS({ let client = new OSS({
region: 'oss-cn-beijing',
//云账号AccessKey有所有API访问权限,建议遵循阿里云安全最佳实践,部署在服务端使用RAM子账号或STS,部署在客户端使用STS。
accessKeyId: 'LTAI4GG1zbSAQrjAvWL8bJKX',
accessKeySecret: '06yXwRMA5ppeTb0hI29lG3jQqwr4A8',
bucket: 'hsz1997'
})
bucket: 'jieancai',
accesskeyId: 'LTAI4FyVepQBtS7P6waqWbjC',
accesskeySecret: 'Fu97bC8ygDnsef8dhXlU4ZEaB2gNDM',
region: 'oss-cn-beijing.aliyuncs.com'
});
/** /**
* 上传文件,大小不能超过5GB * 上传文件,大小不能超过5GB
...@@ -24,30 +22,29 @@ let client = new OSS({ ...@@ -24,30 +22,29 @@ let client = new OSS({
* *
* @retruns Promise * @retruns Promise
*/ */
export const put = async(ObjName, fileUrl) => { export const put = async (ObjName, fileUrl) => {
try { try {
let result = await client.put(`/img/${ObjName}`, fileUrl) let result = await client.put(`/img/${ObjName}`, fileUrl);
// AAA为文件夹, ObjName为文件名字,可以只写名字,就直接储存在 bucket 的根路径 // AAA为文件夹, ObjName为文件名字,可以只写名字,就直接储存在 bucket 的根路径
return result return result;
} catch (e) { } catch (e) {
console.log(e) console.log(e);
} }
} };
export const getFileNameUUID = () => { export const getFileNameUUID = () => {
function rx() { function rx() {
return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1) return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
} }
return `${+new Date()}_${rx()}${rx()}` return `${+new Date()}_${rx()}${rx()}`;
} };
export function client1(data) {//data后端提供数据 export function client1(data) {
//data后端提供数据
return new OSS({ return new OSS({
region: data.region, region: data.region,
accessKeyId: data.accessKeyId, accessKeyId: data.accessKeyId,
accessKeySecret: data.accessKeySecret, accessKeySecret: data.accessKeySecret,
bucket: data.bucket bucket: data.bucket
}) });
} }
...@@ -19,7 +19,6 @@ a { ...@@ -19,7 +19,6 @@ a {
} }
.link :hover { .link :hover {
color: rgb(51, 218, 193) !important; color: rgb(51, 218, 193) !important;
} }
a:hover { a:hover {
...@@ -229,6 +228,11 @@ img { ...@@ -229,6 +228,11 @@ img {
.el-icon-circle-close { .el-icon-circle-close {
color: white; color: white;
} }
i{ i {
color:#AFB0B3 ; color: #afb0b3;
}
.over {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
</el-tooltip> </el-tooltip>
</div> </div>
<!-- 消息中心 --> <!-- 消息中心 -->
<div class="btn-bell"> <!-- <div class="btn-bell">
<el-tooltip effect="dark" content="有1条未读消息:消息中心" placement="bottom"> <el-tooltip effect="dark" content="有1条未读消息:消息中心" placement="bottom">
<router-link to="/tabs"> <router-link to="/tabs">
<i class="el-icon-bell"></i> <i class="el-icon-bell"></i>
</router-link> </router-link>
</el-tooltip> </el-tooltip>
<span class="btn-bell-badge" v-if="message"></span> <span class="btn-bell-badge" v-if="message"></span>
</div> </div> -->
<!-- 用户头像 --> <!-- 用户头像 -->
<div class="user-avator"> <div class="user-avator">
{{ companyName }} {{ companyName }}
......
...@@ -29,33 +29,46 @@ ...@@ -29,33 +29,46 @@
</li> </li>
</ul> </ul>
<h1>项目信息</h1> <h1>项目信息</h1>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false"> </dataTable> <ul class="flex project-list">
<li class="flex-center project-item" v-for="(item, index) in tableData" :key="index">
<div class="flex-colunm">
<div >{{ item.number }}</div>
<p class="over">{{ item.state }}</p>
</div>
</li>
</ul>
<!-- <dataTable :table-data="tableData" :columns="columns" :is-pageobj="false"> </dataTable> -->
<h1>待办事项</h1> <h1>待办事项</h1>
<ul class="flex-between project-list"> <ul class="flex project-list">
<li class="flex-colunm project-item"> <li class="flex-center project-item">
<i class="el-icon-edit"></i> <div class="flex-colunm">
<p>待修改项目</p> <div >{{ detail.projectAduitNeedModify }}</div>
<div>{{ detail.projectAduitNeedModify }}</div> <p class="overflow">待修改项目</p>
</div>
</li> </li>
<li class="flex-colunm project-item"> <li class="flex-center project-item">
<i class="el-icon-edit-outline"></i> <div class="flex-colunm">
<p>待修改询价公告</p>
<div>{{ detail.inquiryNoticeNeedModify }}</div> <div>{{ detail.inquiryNoticeNeedModify }}</div>
<p class="flex-colunm">待修改询价公告</p>
</div>
</li> </li>
<li class="flex-colunm project-item"> <li class="flex-center project-item">
<i class="el-icon-folder"></i> <div class="flex-colunm">
<p>待修改招标公告</p> <div >{{ detail.biddingNoticeNeedModify }}</div>
<div>{{ detail.biddingNoticeNeedModify }}</div> <p class="overflow">待修改招标公告</p>
</div>
</li> </li>
<li class="flex-colunm project-item"> <li class="flex-center project-item">
<i class="el-icon-tickets"></i> <div class="flex-colunm">
<p>待签署应收账款买断合同</p> <div >{{ detail.payment }}</div>
<div>{{ detail.payment }}</div> <p class="overflow">待签署应收账款合同</p>
</div>
</li> </li>
<li class="flex-colunm project-item"> <li class="flex-center project-item">
<i class="el-icon-document-remove"></i> <div class="flex-colunm">
<p>待确认供应商凭证</p> <div >{{ detail.credentials }}</div>
<div>{{ detail.credentials }}</div> <p class="over">待确认供应商凭证</p>
</div>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -103,7 +116,7 @@ export default { ...@@ -103,7 +116,7 @@ export default {
state: '处于评标阶段的项目', state: '处于评标阶段的项目',
number: '10', number: '10',
url: '' url: ''
}, }
// { // {
// state: '处于定标阶段的项目', // state: '处于定标阶段的项目',
// number: '10', // number: '10',
...@@ -180,13 +193,21 @@ export default { ...@@ -180,13 +193,21 @@ export default {
</script> </script>
<style scoped> <style scoped>
.over{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.user > h1 { .user > h1 {
font-weight: bold; font-weight: bold;
margin-top: 50px; margin-top: 20px;
margin-bottom: 30px; margin-bottom: 20px;
font-size: 18px;
padding-left: 20px;
border-left: 4px solid #ff5203;
} }
.home { /* .home {
box-sizing: border-box; box-sizing: border-box;
padding: 30px; padding: 30px;
} }
...@@ -195,7 +216,7 @@ export default { ...@@ -195,7 +216,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 30px; padding: 30px;
background: #fff; background: #fff;
} } */
.user > .user-list { .user > .user-list {
width: 100%; width: 100%;
...@@ -211,7 +232,7 @@ export default { ...@@ -211,7 +232,7 @@ export default {
font-size: 30px; font-size: 30px;
} }
.user-item>i{ .user-item > i {
color: #fff; color: #fff;
} }
.user-item > p { .user-item > p {
...@@ -221,14 +242,28 @@ export default { ...@@ -221,14 +242,28 @@ export default {
} }
.project-list { .project-list {
margin-left: 30px; flex-wrap: wrap;
} }
.project-item { .project-item {
font-size: 30px; font-size: 26px;
width: 175px;
height: 144px;
background: #ffffff;
border-radius: 5px;
box-sizing: border-box;
padding: 20px 0;
}
.project-item > div {
width: 100%;
border-right: 1px solid #dbdcdd;
} }
.project-item > p { .project-list > .project-item:last-child > div {
border-right: none;
}
.project-item p {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 18px; font-size: 16px;
text-align: center;
} }
</style> </style>
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