liuyiliang
/
smart-om-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
zhen 11 months ago
parent a8ad498a60 e9895ddf17
commit 8fffd3d41b
6 changed files with 194 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/smart/workorder.vue
  2. 4
      src/views/spares/manufacturerinfo.vue
  3. 4
      src/views/spares/materialclassification.vue
  4. 4
      src/views/spares/supplierinfo.vue
  5. 2
      src/views/spares/warehouse.vue
  6. 249
      src/views/wel/index.vue

2
src/views/smart/workorder.vue
Unescape View File

@ -30,7 +30,7 @@
<template #menu="{row,index}"> <template #menu="{row,index}">
<el-button @click="handleDetailSearch(row,index)" type="text" size="small" icon="el-icon-view" v-if="permission.workorder_view">查看详情</el-button> <el-button @click="handleDetailSearch(row,index)" type="text" size="small" icon="el-icon-view" v-if="permission.workorder_view">查看详情</el-button>
<el-button @click="openDialog(row)" type="text" size="small" icon="el-icon-upload2" v-if="permission.workorder_uploadRes">上传处理结果</el-button> <el-button @click="openDialog(row)" type="text" size="small" icon="el-icon-upload2" v-if="permission.workorder_uploadRes">上传处理结果</el-button>
<el-button @click="rowDel(row)" type="text" size="small" icon="el-icon-delete" v-if="permission.workorder_delete">删除</el-button> <el-button @click="rowDel(row)" type="text" size="small" icon="el-icon-delete" v-if="permission.workorder_delete">删 除</el-button>
</template> </template>
</avue-crud> </avue-crud>
<el-dialog title="上传处理结果" width="35%" :visible.sync="dialogFormVisible" :before-close="closeDialog"> <el-dialog title="上传处理结果" width="35%" :visible.sync="dialogFormVisible" :before-close="closeDialog">

4
src/views/spares/manufacturerinfo.vue
Unescape View File

@ -60,6 +60,8 @@
index: true, index: true,
viewBtn: true, viewBtn: true,
selection: true, selection: true,
refreshBtn: false,
searchShowBtn: false,
column: [ column: [
{ {
label: "统一社会信用代码/组织机构", label: "统一社会信用代码/组织机构",
@ -314,7 +316,7 @@
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(() => { }).then(() => {
expUtil.excelExportEasy(`/api/warehouse/export?daf-auth=${getToken()}`, this.search); expUtil.excelExportEasy(`/api/manufacturerinfo/export?daf-auth=${getToken()}`, this.search);
}); });
}, },
} }

4
src/views/spares/materialclassification.vue
Unescape View File

@ -58,6 +58,8 @@
index: true, index: true,
viewBtn: true, viewBtn: true,
selection: true, selection: true,
refreshBtn: false,
searchShowBtn: false,
column: [ column: [
{ {
label: "物资分配码", label: "物资分配码",
@ -235,7 +237,7 @@
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(() => { }).then(() => {
expUtil.excelExportEasy(`/api/warehouse/export?daf-auth=${getToken()}`, this.search); expUtil.excelExportEasy(`/api/materialclassification/export?daf-auth=${getToken()}`, this.search);
}); });
}, },
} }

4
src/views/spares/supplierinfo.vue
Unescape View File

@ -60,6 +60,8 @@
index: true, index: true,
viewBtn: true, viewBtn: true,
selection: true, selection: true,
refreshBtn: false,
searchShowBtn: false,
column: [ column: [
{ {
label: "统一社会信用代码/组织机构", label: "统一社会信用代码/组织机构",
@ -322,7 +324,7 @@
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(() => { }).then(() => {
expUtil.excelExportEasy(`/api/warehouse/export?daf-auth=${getToken()}`, this.search); expUtil.excelExportEasy(`/api/supplierinfo/export?daf-auth=${getToken()}`, this.search);
}); });
}, },
} }

2
src/views/spares/warehouse.vue
Unescape View File

@ -55,6 +55,8 @@
calcHeight: 210, calcHeight: 210,
searchShow: true, searchShow: true,
searchMenuSpan: 6, searchMenuSpan: 6,
refreshBtn: false,
searchShowBtn: false,
tip: false, tip: false,
border: true, border: true,
index: true, index: true,

249
src/views/wel/index.vue
Unescape View File

@ -1,29 +1,145 @@
<template> <template>
<div> <div>
<basic-container> <basic-container>
<avue-data-display :option="option"></avue-data-display> <div class="notification-container">
<div class="notification-heading">通知</div>
<p class="notification-title"><i class="el-icon-chat-line-round el-icon-home"></i> 今日消息</p>
<div class="headOverflowList">
<el-skeleton :rows="3" animated v-show="skeleton"/>
<div class="el-collapse">
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
</div>
</div>
<el-row>
<el-col :span="12">
<div class="notification-container-task">
<div class="notification-heading">任务信息</div>
<p class="notification-title"><i class="el-icon-document el-icon-home"></i> 今日任务</p>
<div class="overflowList">
<el-skeleton :rows="3" animated v-show="skeleton"/>
<div class="el-collapse">
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
</div>
</el-col>
<el-col :span="12">
<div class="notification-container-audit">
<div class="notification-heading">审核信息</div>
<p class="notification-title"><i class="el-icon-s-check el-icon-home"></i> 今日待审核</p>
<div class="overflowList">
<el-skeleton :rows="3" animated v-show="skeleton"/>
<div class="el-collapse">
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核设备台账</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核智能两票</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核备件管理</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-audit-head"><span class="el-collapse-span">待审核工单</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
</div>
</div>
</el-col>
</el-row>
</basic-container>
<el-col :span="16">
<basic-container>
<div id="main" style="height: 360px">
</div>
</basic-container> </basic-container>
</el-col>
</div> </div>
</template> </template>
<script> <script>
import {mapGetters} from "vuex"; import {mapGetters} from "vuex";
import * as echarts from 'echarts'; // import * as echarts from 'echarts';
import {dayLineStatistics , activities} from '@/api/desk/dashboard' // import {dayLineStatistics , activities} from '@/api/desk/dashboard'
export default { export default {
name: "wel", name: "wel",
data() { data() {
return { return {
data:[], data:[],
skeleton: false,
option: { option: {
span:6, span:6,
data: [] data: []
@ -34,75 +150,74 @@
...mapGetters(["userInfo"]), ...mapGetters(["userInfo"]),
}, },
mounted() { mounted() {
activities().then(res =>{
this.option.data = res.data.data
})
return false;
dayLineStatistics().then(res =>{
this.data = res.data.data
const myChart = echarts.init(document.getElementById('main'));
myChart.setOption({
dataset: {
dimensions: ['hours', 'T', 'Q'],
source: this.data
},
title: {
text: '每日请求'
},
tooltip: {
trigger: 'axis'
},
legend: {
data: ['T', 'Q'],
name: '123'
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
toolbox: {
feature: {
saveAsImage: {}
}
},
xAxis: {
type: 'category',
boundaryGap: false,
data: ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23']
},
yAxis: {
type: 'value'
},
series: [
{ type: 'line' ,smooth: true},
{ type: 'line' ,smooth: true},
]
});
})
}, },
methods: { methods: {
handleChange(val) {
console.log(val);
}
} }
}; };
</script> </script>
<style> <style>
.el-divider--horizontal { .notification-container {
margin: 12px 0 !important; padding: 14px;
background-color: #f7f7f7;
height: 260px;
box-shadow: 0 0 10px rgba(0,0,0,0.5);
}
.notification-container-task {
margin-top: 15px;
max-width: 94%;
padding: 14px;
height: 475px;
background-color: #f7f7f7;
box-shadow: 0 0 10px rgba(0,0,0,0.5);
}
.notification-container-audit {
margin-top: 15px;
max-width: 96%;
padding: 14px;
height: 475px;
background-color: #f7f7f7;
box-shadow: 0 0 10px rgba(0,0,0,0.5);
} }
.el-font-size { .notification-heading {
font-size: 14px; font-size: 24px;
margin-bottom: 10px;
}
.notification-content {
background-color: #fff; /* 白色内容背景 */
padding: 10px;
border-radius: 4px;
}
.notification-message {
font-size: 16px;
}
.notification-title {
font-size: 20px;
}
.el-icon-home {
color: #0087ff;
font-weight: bold;
}
.el-collapse-span {
margin-left: 20px;
}
.el-audit-head {
background-color: #0283f1;
color: white;
height: 40px;
line-height: 40px;
}
.headOverflowList {
height: 170px;
overflow: auto;
} }
.like { .overflowList {
cursor: pointer; height: 380px;
font-size: 25px; overflow: auto;
display: inline-block;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save