diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index cc6a3e25..7eceb216 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -966,41 +966,30 @@ export default {
},
getMaterialList() {
let that = this;
- this.$API.mtm.material.list
- .req({ page: 0, type: 20, count__gte: 1 })
- .then((res) => {
- let data = [];
- if (res.length > 0) {
- res.forEach((item) => {
+ let obj = {
+ query: {
+ "select_dept": "",
+ "groupby_dept": "",
+ "material_types": "20",
+ "select_material": "material.name as material_name",
+ "groupby_material": "material.name",
+ "select_material_name": "",
+ "groupby_material_name": ""
+ }
+ };
+ that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => {
+ let data = [];
+ let list = res.data2.ds0;
+ if (list.length > 0) {
+ list.forEach((item) => {
let arr = [];
- let colorText = "";
- if (
- item.count_safe !== null &&
- item.count_safe < item.count
- ) {
- colorText =
- '' +
- item.count +
- "";
- } else {
- colorText =
- '' +
- item.count +
- "";
- }
- arr[0] =
- item.name +
- "|" +
- item.specification +
- "|" +
- item.model;
+ arr[0] = item.material_name ;
arr[1] = item.count;
data.push(arr);
});
}
that.taskBoard.data = data;
- // console.log('getMaterialList', data)
- });
+ })
},
showTime() {
this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");