suojin
/
laboratory_maintenance_app
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页样式调整

Browse Source
test
zhangdi 1 year ago
parent 5256936d8a
commit aa170572c8
6 changed files with 223 additions and 582 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. 7
      api/api.js
  2. 5
      manifest.json
  3. 205
      pages/home/components/eacharts.vue
  4. 212
      pages/home/components/eacharts_pie.vue
  5. 48
      pages/home/index.vue
  6. 36
      pages/notice/announcement.vue

7
api/api.js
Unescape View File

@ -353,8 +353,13 @@ const install = (Vue, vm) => {
authorizations: true,
isparams: false
})
// 通知公告/
let getNoticeList = (params) => http.get('/blade-desk/notice/list', params, {
authorizations: true,
isparams: false
})
// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition,resetPwd};
vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition,resetPwd,getNoticeList};
}
export default {

5
manifest.json
Unescape View File

@ -53,7 +53,10 @@
"sdkConfigs" : {
"ad" : {},
"push" : {
"unipush" : {}
"unipush" : {
"version" : "2",
"offline" : false
}
},
"maps" : {
"amap" : {

205
pages/home/components/eacharts.vue
Unescape View File

@ -1,31 +1,9 @@
<template>
<view class="eacharts-box">
<view class="eacharts-time">
<!-- <u-form :model="form" ref="uForm">
<u-form-item label="选择时间:" label-width="140" :border-bottom="false">
<u-input v-model="form.searchTime" type="select" @click="calendarShow = true" :border="true"
placeholder="请选择时间" />
</u-form-item>
</u-form> -->
<u-calendar v-model="calendarShow" :mode="mode" @change="change"></u-calendar>
</view>
<!-- eacharts 图表 -->
<view class="echarts" v-if="type == 'maintenanceStatistics'">
<view class="echarts" >
<l-echart ref="chartRef" :key="Math.random()"></l-echart>
</view>
<!-- 饼状图 -->
<view class="echartsPie" v-if="type == 'maintenanceStatisticsPie'">
<view class="pie-item">
<view style="height:308rpx"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
<text class="pie-title">故障现象分类</text>
</view>
<view class="pie-item">
<view style="height:308rpx"><l-echart ref="chartRefPieRight" :key="Math.random()"></l-echart></view>
<text class="pie-title">设备分类</text>
</view>
</view>
</view>
</template>
<script>
@ -53,17 +31,7 @@ export default {
};
},
mounted() {
// 维修统计
if (this.type == "maintenanceStatistics") {
this.upkeepStat()
}
if (this.type == "maintenanceStatisticsPie") {
this.pieStat()
}
},
methods: {
// 维修统计
@ -72,12 +40,6 @@ export default {
startTime: this.form.startTime,
endTime: this.form.endTime,
}
// if(this.form.startTime!=''){
// query_.startTime=this.form.startTime
// }
// if(this.form.endTime!=''){
// query_.endTime=this.form.endTime
// }
this.$u.api.upkeepStat(query_).then(res => {
if (res.code == 200) {
this.upkeepStatInfo = JSON.parse(JSON.stringify(res.data))
@ -85,36 +47,6 @@ export default {
}
})
},
// 饼图数据
pieStat() {
let query_ = {
startTime: this.form.startTime,
endTime: this.form.endTime,
}
this.$u.api.pieStat(query_).then(res => {
if (res.code == 200) {
this.pieInfo = res.data
this.maintenancePieLeftInit();
this.maintenancePieRightInit();
}
})
},
selectFun() {
this.calendarShow = true;
},
change(e) {
this.form.startTime = e.startDate;
this.form.endTime = e.endDate;
this.form.searchTime = e.startDate + "-" + e.endDate;
if (this.type == "maintenanceStatistics") {
this.upkeepStat()
}
if (this.type == "maintenanceStatisticsPie") {
this.pieStat()
}
// 查询数据
},
// 维修统计柱状图
maintenanceInit() {
let opts = {
@ -174,147 +106,22 @@ export default {
return chart;
});
},
// 故障现象分类
maintenancePieLeftInit() {
let opts = {
series: [
{
name: "",
type: "pie",
radius: ['40%', '70%'],
label: {
// 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
normal: {
show: true,
fontSize: 8, // 是否显示标签[ default: false ]
position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
formatter: "{b}\n {c}", // 标签内容
color: '#000'
},
},
data: this.pieInfo.fault,
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: "rgba(0, 0, 0, 1)",
},
},
labelLine: {
// 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
normal: {
show: true, // 是否显示视觉引导线。
length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
length2: 5,
// 视觉引导项第二段的长度。
lineStyle: {
// 视觉引导线的样式
type: "solid",
},
},
},
},
],
};
this.$refs.chartRefPieLeft.init((config) => {
const { canvas } = config;
const chart = echarts.init(canvas, null, config);
chart.setOption(opts);
// 需要把 chart 返回
return chart;
});
},
maintenancePieRightInit() {
let opts = {
series: [
{
type: "pie",
radius: ['40%', '70%'],
label: {
// 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
normal: {
show: true,
fontSize: 8, // 是否显示标签[ default: false ]
position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
formatter: "{b}\n {c}", // 标签内容
color: '#000'
},
},
data: this.pieInfo.device,
labelLine: {
// 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
normal: {
show: true, // 是否显示视觉引导线。
length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
length2: 5,
// 视觉引导项第二段的长度。
lineStyle: {
// 视觉引导线的样式
type: "solid",
},
},
},
},
],
};
this.$refs.chartRefPieRight.init((config) => {
const { canvas } = config;
const chart = echarts.init(canvas, null, config);
chart.setOption(opts);
// 需要把 chart 返回
return chart;
});
},
},
};
</script>
<style lang="scss" scoped>
.eacharts-box {
background: #fff;
margin: 0 40rpx 32rpx;
margin: 0 32rpx 32rpx;
border-radius: 20rpx;
overflow: hidden;
.eacharts-time {
margin: 0 136rpx 0 24rpx;
display: flex;
flex-direction: row;
text {
line-height: 60rpx;
color: rgba(16, 16, 16, 1);
font-size: 28rpx;
margin-top: 30rpx;
margin-right: 10rpx;
}
}
height: 368rpx;
.echarts {
width: calc(100% - 64rpx);
height: 308rpx;
margin: 0 auto 20rpx;
}
.echartsPie {
width: calc(100% - 64rpx);
min-height: 308rpx;
margin: 0 auto 0;
.pie-item {
width: 100%;
height: 368rpx;
// float: left;
}
}
.pie-title {
height: 30rpx;
text-align: center;
display: block;
color: rgba(16, 16, 16, 1);
font-size: 28rpx;
height: 328rpx;
margin:30rpx auto 20rpx;
overflow: hidden;
}
}
</style>

212
pages/home/components/eacharts_pie.vue
Unescape View File

@ -4,7 +4,7 @@
<!-- 饼状图 -->
<view class="echartsPie">
<view class="pie-item">
<view style="height:308rpx"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
<view style="height:308rpx;margin-top: 40rpx;"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
</view>
</view>
@ -20,11 +20,17 @@ export default {
type: String,
default: "",
},
data:{
echartData: {
type: Array,
default: []
}
},
watch: {
echartData(val) {
this.pieInfo = val
this.maintenancePieInit()
}
},
data() {
return {
form: {
@ -32,137 +38,14 @@ export default {
startTime: "",
endTime: "",
},
calendarShow: false,
mode: "range",
upkeepStatInfo: {},
pieInfo: {},//饼图数据
};
},
mounted() {
this.maintenancePieLeftInit()
// // 维修统计
// if (this.type == "maintenanceStatistics") {
// this.upkeepStat()
// }
// if (this.type == "maintenanceStatisticsPie") {
// this.pieStat()
pieInfo: [],//饼图数据
// }
},
methods: {
// 维修统计
upkeepStat() {
let query_ = {
startTime: this.form.startTime,
endTime: this.form.endTime,
}
// if(this.form.startTime!=''){
// query_.startTime=this.form.startTime
// }
// if(this.form.endTime!=''){
// query_.endTime=this.form.endTime
// }
this.$u.api.upkeepStat(query_).then(res => {
if (res.code == 200) {
this.upkeepStatInfo = JSON.parse(JSON.stringify(res.data))
this.maintenanceInit();
}
})
},
// 饼图数据
pieStat() {
let query_ = {
startTime: this.form.startTime,
endTime: this.form.endTime,
}
this.$u.api.pieStat(query_).then(res => {
if (res.code == 200) {
this.pieInfo = res.data
this.maintenancePieLeftInit();
this.maintenancePieRightInit();
}
})
},
selectFun() {
this.calendarShow = true;
},
change(e) {
this.form.startTime = e.startDate;
this.form.endTime = e.endDate;
this.form.searchTime = e.startDate + "-" + e.endDate;
if (this.type == "maintenanceStatistics") {
this.upkeepStat()
}
if (this.type == "maintenanceStatisticsPie") {
this.pieStat()
}
// 查询数据
},
// 维修统计柱状图
maintenanceInit() {
let opts = {
tooltip: {},
legend: {
//图例组件
data: ["总计", "已完成", "未完成"],
},
xAxis: {
data: this.upkeepStatInfo.xData,
},
grid: {
top: "15%",
left: "10%",
right: "5%",
bottom: "15%",
},
yAxis: {},
series: [
{
name: "总计",
type: "bar",
data: this.upkeepStatInfo.total,
barWidth: 30, // 设置柱子宽度
barGap: "0", // 设置不同系列之间的间隔为0
itemStyle: {
color: "#2478f2",
},
},
{
name: "已完成",
type: "bar",
data: this.upkeepStatInfo.completed,
barWidth: 30, // 设置柱子宽度
barGap: "0", // 设置不同系列之间的间隔为0
itemStyle: {
color: "#84b7f9",
},
},
{
name: "未完成",
type: "bar",
data: this.upkeepStatInfo.unCompleted,
barWidth: 30, // 设置柱子宽度
barGap: "0", // 设置不同系列之间的间隔为0
itemStyle: {
color: "#5f9cf8",
},
},
],
};
this.$refs.chartRef.init((config) => {
const { canvas } = config;
const chart = echarts.init(canvas, null, config);
chart.setOption(opts);
// 需要把 chart 返回
return chart;
});
},
mounted() { },
methods: {
// 故障现象分类
maintenancePieLeftInit() {
maintenancePieInit() {
let opts = {
series: [
{
@ -180,7 +63,7 @@ export default {
},
},
data: this.data,
data: this.pieInfo,
emphasis: {
itemStyle: {
shadowBlur: 10,
@ -213,74 +96,20 @@ export default {
return chart;
});
},
maintenancePieRightInit() {
let opts = {
series: [
{
type: "pie",
radius: ['40%', '70%'],
label: {
// 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
normal: {
show: true,
fontSize: 8, // 是否显示标签[ default: false ]
position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
formatter: "{b}\n {c}", // 标签内容
color: '#000'
},
},
data: this.pieInfo.device,
labelLine: {
// 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
normal: {
show: true, // 是否显示视觉引导线。
length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
length2: 5,
// 视觉引导项第二段的长度。
lineStyle: {
// 视觉引导线的样式
type: "solid",
},
},
},
},
],
};
this.$refs.chartRefPieRight.init((config) => {
const { canvas } = config;
const chart = echarts.init(canvas, null, config);
chart.setOption(opts);
// 需要把 chart 返回
return chart;
});
},
},
};
</script>
<style lang="scss" scoped>
.eacharts-box {
background: #fff;
margin: 0 40rpx 32rpx;
margin: 0 32rpx 32rpx;
border-radius: 20rpx;
overflow: hidden;
.eacharts-time {
margin: 0 136rpx 0 24rpx;
display: flex;
flex-direction: row;
text {
line-height: 60rpx;
color: rgba(16, 16, 16, 1);
font-size: 28rpx;
margin-top: 30rpx;
margin-right: 10rpx;
}
}
.echarts {
width: calc(100% - 64rpx);
height: 308rpx;
height: 368rpx;
margin: 0 auto 20rpx;
}
@ -292,16 +121,9 @@ export default {
.pie-item {
width: 100%;
height: 368rpx;
overflow: hidden;
// float: left;
}
}
.pie-title {
height: 30rpx;
text-align: center;
display: block;
color: rgba(16, 16, 16, 1);
font-size: 28rpx;
}
}
</style>

48
pages/home/index.vue
Unescape View File

@ -9,8 +9,8 @@
</u-navbar>
<!-- 通知公告 -->
<view class="notice_box" v-if="noticeList.length > 0">
<u-notice-bar mode="horizontal" type="primary" :list="noticeList" :more-icon="true"
@getMore="getNotice()"></u-notice-bar>
<u-notice-bar mode="horizontal" type="primary" :list="noticeList" :more-icon="true" @getMore="getNotice()"
:is-circular="false"></u-notice-bar>
</view>
<view class="">
<view class="banner-swiper" v-if="swiperList.length > 0">
@ -34,20 +34,17 @@
</view>
</view>
<view class="work-title">实验室巡检</view>
<swiperSlider></swiperSlider>
<view class="work-title">设备统计</view>
<eacharts_pie :data="pieInfo"></eacharts_pie>
<eachartsPie :echartData="pieInfo"></eachartsPie>
<view class="work-title">检修单状态</view>
<eachartsPie :echartData="pieInfo"></eachartsPie>
<!-- <view>
<alarm></alarm>
</view> -->
<view class="work-title">维修统计</view>
<view class="statistics">
<eacharts :type="'maintenanceStatistics'"></eacharts>
<eacharts :type="'maintenanceStatisticsPie'"></eacharts>
<!-- <eacharts :type="'maintenanceStatisticsPie'"></eacharts> -->
</view>
</view>
<betone-tabbar ref="tabbarRef" />
@ -58,13 +55,13 @@
import swiperSlider from "./components/swiper.vue";
import alarm from "./components/alarm.vue";
import eacharts from "./components/eacharts.vue";
import eacharts_pie from "./components/eacharts_pie.vue";
import eachartsPie from "./components/eacharts_pie.vue";
export default {
components: {
swiperSlider,
alarm,
eacharts,
eacharts_pie
eachartsPie
},
data() {
return {
@ -72,23 +69,21 @@ export default {
workList: [],
pieInfo: [],//饼图数据
noticeList: [
'寒雨连江夜入吴',
'平明送客楚山孤',
'洛阳亲友如相问',
'一片冰心在玉壶'
],//通知列表
};
},
onLoad() {
this.pieStat()
},
onShow() {
this.$nextTick(() => {
this.$refs.tabbarRef.getPermission();
this.getNoticeList()
// this.BetLoading.show();
// setTimeout(() => {
// this.BetLoading.hide();
// }, 1000);
});
//工作台
this.getUserInfo()
this.getoverview()
},
@ -167,7 +162,18 @@ export default {
uni.navigateTo({
url: '/pages/notice/announcement',
});
},
getNoticeList() {
this.$u.api.getNoticeList().then(res => {
if (res.code == 200) {
let data = res.data.records
data.forEach(item => {
this.noticeList.push(item.title)
})
}
})
},
},
};
</script>
@ -257,10 +263,10 @@ export default {
}
.menu_box {
width: 100%;
background: #fff;
position: relative;
margin: 0 32rpx;
border-radius: 20rpx;
&::after {
content: '';
position: absolute;

36
pages/notice/announcement.vue
Unescape View File

@ -1,7 +1,8 @@
<template>
<view class="notice-list">
<scroll-view scroll-y="true" style="height:calc(100vh - 140rpx);width: 100%;background: #F5F5F5;margin-top:32rpx"
<scroll-view scroll-y="true"
style="height:calc(100vh - 140rpx);width: 100%;background: #F5F5F5;margin-top:32rpx"
:refresher-triggered="triggered" :refresher-enabled="true" @refresherrefresh="refresherrefresh"
refresher-background="#f1f1f1" @scrolltolower="onListBottom">
<ul class="card">
@ -9,12 +10,11 @@
<view class="title">
<view class="text">
<view>{{ item.title }}</view>
<view class="mark" v-if="!item.readStatus"></view>
<!-- <view class="mark" v-if="!item.readStatus"></view> -->
</view>
<view style="flex-shrink: 0;color: #999999;">{{ item.createdAt }}</view>
<view style="flex-shrink: 0;color: #999999;">{{ item.categoryName }}</view>
</view>
<view>
<!-- {{ item.content }} -->
<u-parse :html="item.content"></u-parse>
</view>
</li>
@ -32,12 +32,6 @@
data() {
return {
dataList: [
{
title:'11111',//标题
createdAt:'转发通知',
content:'222<p>44444444444</p>',
readStatus:true
}
],
current: 0,
style: {
@ -64,18 +58,21 @@
this.reSearch()
}
},
methods: {
getList() {
// this.$wx_http.get(requestName['pageNotice'], this.search).then(res => {
// let data = res.data.records
// this.scrollType = ''
// this.triggered = false
// if (data.length >= this.search.pageSize) {
// this.scrollType = 'more'
// }
// this.dataList = this.dataList.concat(data)
// })
this.$u.api.getNoticeList(this.search).then(res => {
if (res.code == 200) {
let data = res.data.records
this.scrollType = ''
this.triggered = false
if (data.length >= this.search.pageSize) {
this.scrollType = 'more'
}
this.dataList = this.dataList.concat(data)
}
})
},
reSearch() {
@ -106,6 +103,7 @@
height: calc(100vh - 0px);
background: #F5F5F5;
overflow: hidden;
.mark-read-btn {
background: #FFFFFF;
border-radius: 8rpx;

Write Preview
Loading…
Cancel
Save