java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改首页展示

dev
caoyizhong 2 years ago
parent
f31cff91be
commit
521023aeea
5 changed files with 206 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/utils/request.js
  2. 137
      src/views/dashboard/HomePage.vue
  3. 6
      src/views/description/ProcessDescriptionList.vue
  4. 40
      src/views/modules/oss/OSSFileList.vue
  5. 87
      src/views/statisticanalysis/costecharts/ItemCost.vue

2
src/utils/request.js
Unescape View File

@ -17,7 +17,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
const service = axios.create({
//baseURL: '/jeecg-boot',
baseURL: apiBaseUrl, // api base_url
timeout: 50000 // 请求超时时间
timeout: 100000 // 请求超时时间
})
const err = (error) => {

137
src/views/dashboard/HomePage.vue
Unescape View File

@ -5,39 +5,90 @@
<a-card id="todo" style="float: left; width: 33%; height: 100%;padding-bottom: 10px;" :body-style="{height: '95%', overflow:'hidden'}">
<div style="height: 40px;font-weight: 600; font-size: 16px;line-height: 40px">
待办
公司风采
</div>
<div id="todoDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScrollTodo()">
<a-table
rowKey="id"
:loading="loading"
:show-header="false"
:columns="columns"
:dataSource="tasks"
:pagination="false"
:customRow="rowClick"
>
</a-table>
<div id="messageDiv" style="height: 280px;overflow-y: auto;margin: 0 0 0 0;" >
<!-- <div id="messageDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScrollTodo()">-->
<!-- <a-table-->
<!-- rowKey="id"-->
<!-- :loading="loading"-->
<!-- :show-header="false"-->
<!-- :columns="columns"-->
<!-- :dataSource="tasks"-->
<!-- :pagination="false"-->
<!-- :customRow="rowClick"-->
<!-- >-->
<!-- </a-table>-->
<!-- <a-carousel arrows autoplay>-->
<!-- <div-->
<!-- slot="prevArrow"-->
<!-- slot-scope="props"-->
<!-- class="custom-slick-arrow"-->
<!-- style="left: 10px;zIndex: 1"-->
<!-- >-->
<!-- <a-icon type="left-circle" />-->
<!-- </div>-->
<!-- <div slot="nextArrow" slot-scope="props" class="custom-slick-arrow" style="right: 10px">-->
<!-- <a-icon type="right-circle" />-->
<!-- </div>-->
<!--&lt;!&ndash; <a slot="customPaging" slot-scope="props">&ndash;&gt;-->
<!--&lt;!&ndash; <img :src="getImgUrl(props.i)" />&ndash;&gt;-->
<!--&lt;!&ndash; </a>&ndash;&gt;-->
<!-- <div class="rightullidiv" v-for="item in this.listMien">-->
<!-- <img :src="item.url" />-->
<!-- </div>-->
<!-- </a-carousel>-->
<a-carousel arrows autoplay >
<div
slot="prevArrow"
slot-scope="props"
class="custom-slick-arrow"
style="left: 10px;zIndex: 1"
>
<a-icon type="left-circle" />
</div>
<div slot="nextArrow" slot-scope="props" class="custom-slick-arrow" style="right: 10px">
<a-icon type="right-circle" />
</div>
<div v-for="item in this.listMien" style="height: 260px" >
<img class="rightulliimg" :src="item.url" />
</div>
</a-carousel>
</div>
</a-card>
<!--站内消息-->
<a-card id="message" style="width: 32%; height: 100%;margin: 0px 1%;padding-bottom: 10px;" :body-style="{height: '95%', overflow:'hidden'}">
<!-- <div style="height: 40px;font-weight: 600; font-size: 16px;line-height: 40px">-->
<!-- 站内消息-->
<!-- </div>-->
<!-- <div id="messageDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScrollMessage()">-->
<!-- <a-table-->
<!-- rowKey="id"-->
<!-- :loading="loading"-->
<!-- :show-header="false"-->
<!-- :columns="msgColumns"-->
<!-- :dataSource="msgContent"-->
<!-- :pagination="false"-->
<!-- :customRow="rowClickToDo"-->
<!-- >-->
<!-- </a-table>-->
<!-- </div>-->
<!-- <show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>-->
<div style="height: 40px;font-weight: 600; font-size: 16px;line-height: 40px">
站内消息
待办
</div>
<div id="messageDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScrollMessage()">
<div id="todoDiv" style="height: 250px;overflow-y: auto;margin: 0 0 0 0;" @scroll="heightScrollTodo()">
<a-table
rowKey="id"
:loading="loading"
:show-header="false"
:columns="msgColumns"
:dataSource="msgContent"
:columns="columns"
:dataSource="tasks"
:pagination="false"
:customRow="rowClickToDo"
:customRow="rowClick"
>
</a-table>
</div>
<show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>
</a-card>
<!--登录日志-->
<a-card id="log" style="width: 33%; height: 100%;padding-bottom: 10px;" :body-style="{height: '95%', overflow:'hidden'}">
@ -119,7 +170,6 @@ import KeyApplications from '@views/dashboard/KeyApplications'
// import { mixinDevice } from '@/utils/mixin'
// import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: 'HomePage',
// mixins:[JeecgListMixin,mixinDevice],
@ -142,6 +192,7 @@ export default {
keyApplications: '/keyApplications/processKeyApplications/list',
addKeyApplications: '/keyApplications/processKeyApplications/add',
lists: '/sys/log/listHomePage',
listMien: "/sys/oss/file/list",
listMseeage: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
editCementSend:"/sys/sysAnnouncementSend/editByAnntIdAndUserId",
},
@ -204,6 +255,7 @@ export default {
keyApplic:false,
//全部用户菜单
userMean:[],
listMien:[],
//用户子菜单
userChildren:[],
keyChildren:[],
@ -219,6 +271,13 @@ export default {
// console.log("res===========",res.result);
this.KeyApplicationsChildren = res.result;
}
}) ;
this.listMien = [];
getAction(this.url.listMien,{status:1}).then((res) => {
if (res.success) {
console.log("sfdvzdf", res.result.records||res.result);
this.listMien = res.result.records||res.result;
}
})
this.todoList();
this.loginList();
@ -231,6 +290,7 @@ export default {
},
methods: {
expandedRowKeys(row){
console.log("=====",row);
this.selectRowKeys = row;
@ -505,6 +565,45 @@ export default {
</script>
<style scoped>
.ant-carousel >>> .slick-slide img {
border: 5px solid #fff;
display: block;
margin: 5px auto;
height: 90%;
width: 85%;
/* 水平垂直居中 */
}
.ant-carousel >>> .slick-slide {
text-align: center;
height: 260px;
line-height: 160px;
background: #364d79;
overflow: hidden;
}
.ant-carousel >>> .custom-slick-arrow {
width: 25px;
height: 25px;
font-size: 25px;
color: #fff;
background-color: rgba(31, 45, 61, 0.11);
opacity: 0.3;
}
.ant-carousel >>> .custom-slick-arrow:before {
display: none;
}
.ant-carousel >>> .custom-slick-arrow:hover {
opacity: 0.5;
}
.ant-carousel >>> .slick-slide h3 {
color: #fff;
}
@import url("/src/assets/css/ali.css");
.iconfont {

6
src/views/description/ProcessDescriptionList.vue
Unescape View File

@ -99,11 +99,11 @@
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)" v-has="'description:edit'" v-h="'merchandiseNews:edit'">编辑</a>
<a @click="handleEdit(record)" v-has="'merchandiseNews:edit'">编辑</a>
<a-divider type="vertical" v-h="'merchandiseNews:delete'"/>
<a-divider type="vertical" v-has="'merchandiseNews:delete'"/>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a v-h="'merchandiseNews:delete'">删除</a>
<a v-has="'merchandiseNews:delete'">删除</a>
</a-popconfirm>
<!-- <a-dropdown>-->
<!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->

40
src/views/modules/oss/OSSFileList.vue
Unescape View File

@ -32,8 +32,8 @@
</div>
<!-- 操作按钮区域 -->
<!-- <div class="table-operator">-->
<!-- &lt;!&ndash; <a-button type="primary" icon="download" @click="handleExportXls('文件列表')">导出</a-button>&ndash;&gt;-->
<div class="table-operator">
<!-- <a-button type="primary" icon="download" @click="handleExportXls('文件列表')">导出</a-button>-->
<!-- <a-upload-->
<!-- name="file"-->
<!-- :multiple="false"-->
@ -48,20 +48,20 @@
<!-- </a-button>-->
<!-- </a-upload>-->
<!-- <a-upload-->
<!-- name="file"-->
<!-- :multiple="false"-->
<!-- :action="minioUploadAction"-->
<!-- :headers="tokenHeader"-->
<!-- :showUploadList="false"-->
<!-- :beforeUpload="beforeUpload"-->
<!-- @change="handleChange">-->
<!-- <a-button>-->
<!-- <a-icon type="upload"/>-->
<!-- MINIO文件上传-->
<!-- </a-button>-->
<!-- </a-upload>-->
<!-- </div>-->
<a-upload
name="file"
:multiple="false"
:action="minioUploadAction"
:headers="tokenHeader"
:showUploadList="false"
:beforeUpload="beforeUpload"
@change="handleChange">
<a-button>
<a-icon type="upload"/>
公司风采上传
</a-button>
</a-upload>
</div>
<!-- table区域-begin -->
<div>
@ -92,10 +92,10 @@
<span slot="action" slot-scope="text, record">
<a @click="handlePreview(record)">预览</a>
<a-divider type="vertical"/>
<a-divider type="vertical"/>
<a @click="downloadFile(record.url)">下载</a>
<!-- <a @click="ossDelete(record.id)">删除</a>-->
<a-divider type="vertical"/>
<a @click="ossDelete(record.id)" v-if="!!record.status">删除</a>
</span>
</a-table>
@ -176,7 +176,7 @@
{
title: '操作',
dataIndex: 'action',
width: 100,
width: 150,
align: "center",
scopedSlots: {customRender: 'action'},
}

87
src/views/statisticanalysis/costecharts/ItemCost.vue
Unescape View File

@ -3,25 +3,11 @@
<div style="width: 95%;height:100% ;background-color: #ffffff;margin-top: 2%;border-radius: 10px">
<div style="height: 20%;margin-left: 6%;padding-top: 2%">
<div style="font-size: 25px;margin-bottom: 5px;margin-bottom: 2%">项目部成本
<span style="margin: 0% 4%"> <a-month-picker :disabled-date="disabledDate" placeholder="选择日期" /> </span>
<j-dict-select-tag type="list" v-model="materialType" style="width: 30%"
:trigger-change="true" dictCode="material_type"
placeholder="请选择物资类型" @change="handleChange"/>
<span style="margin: 0% 4%"> <a-month-picker placeholder="选择日期" @change="disabledDate" v-model="this.formData.dateItem"/> </span>
<j-dict-select-tag type="list" v-model="formData.materialType" style="width: 30%"
dictCode="material_type" placeholder="请选择物资类型" @input="handleChange"/>
</div>
<!-- <div style="color: #ffffff;font-size: 19px;margin-bottom: 5px">项目部成本</div>-->
<!-- <div style="display: flex;align-items: center;justify-content: flex-start">-->
<!-- <div class="xian">月</div>-->
<!-- <div class="xian">季度</div>-->
<!-- <div class="xian">半年</div>-->
<!-- <div class="xian">年</div>-->
<!-- </div>-->
<!-- <div style="display: flex;align-items: center;justify-content: flex-start">-->
<!-- <div class="zi">生产类物资</div>-->
<!-- <div class="zi">非生产类物资</div>-->
<!-- <div class="zi">人员工资</div>-->
<!-- </div>-->
</div>
<div id="myItemCost" style="width: 95%; height: 80%"></div>
</div>
@ -30,6 +16,7 @@
<script>
import * as echarts from 'echarts';
import moment from 'moment'
// 引入基本模板
// let echarts = require('echarts/lib/echarts')
@ -42,21 +29,75 @@ export default {
name: 'ItemCost',
data() {
return {
moment,
msg: '我的echarts图表',
value2: '',
materialType: null,
timeNum: [], //月份数组
formData:{
dateItem: moment(new Date(), 'YYYY-MM'),
materialType: 1,
}
}
},
mounted() {
this.echartsInit()
this.getList();
this.echartsInit();
},
methods:{
getList() {
let date = new Date()
this.timeNum = this.getRecentMonth(date.getMonth() + 1)
// console.log(ss,"sdasDFsd");
},
/**
* 根据当前月份获取其前12个月的月份
* @param month
* @return {Array|*}
*/
getRecentMonth(month) {
let arr = []
for(let i = 11;i > 0;i --) {
let sixMonth = month - i
if(sixMonth <= 0) {
sixMonth = 12 + sixMonth
}
arr.push(sixMonth + '月')
}
arr.push(month + '月')
return arr;
},
//格式时间
filterTime(time,type) {
var date = new Date(time);
var y = date.getFullYear();
var m = date.getMonth() + 1;
m = m < 10 ? "0" + m : m;
if(!!type){
return y + "-" + m;
}
var d = date.getDate();
d = d < 10 ? "0" + d : d;
var h = date.getHours();
h = h < 10 ? "0" + h : h;
var minute = date.getMinutes();
minute = minute < 10 ? "0" + minute : minute;
var s = date.getSeconds();
s = s < 10 ? "0" + s : s;
return y + "-" + m + "-" + d + " " + h + ":" + minute + ":" + s;
},
disabledDate(current) {
// Can not select days before today and today
return current && current < moment().endOf('day');
// console.log("curzdsf",current);
let newTime = this.filterTime( current._d,1);
console.log(newTime);// 2022-02-16 00:00:00
this.formData.dateItem = newTime;
},
handleChange(value) {
console.log(`selected ${value}`);
console.log('selected',value);
},
handleBlur() {
console.log('blur');

Write Preview
Loading…
Cancel
Save