diff --git a/src/config/index.js b/src/config/index.js index ab1f10ec..ed447da5 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -65,7 +65,7 @@ const DEFAULT_CONFIG = { //小组件分布,com取值:views/home/components 文件名 copmsList: [ ['ticket'], - ['eventlist'], + // ['eventlist'], ['about'], ] diff --git a/src/views/ecm/event_handlefrom.vue b/src/views/ecm/event_handlefrom.vue index 4fc3471d..4d3a45f8 100644 --- a/src/views/ecm/event_handlefrom.vue +++ b/src/views/ecm/event_handlefrom.vue @@ -20,16 +20,16 @@ >{{ item.name }} - + {{ mark_options2[form.mark] }} - + {{ form.create_time }} {{ form.area_.name }} - + 作业 人员 @@ -37,9 +37,10 @@ 其他 - + {{ form.employee_.name }} + {{ form.employee_.belong_dept_name }} {{ form.operation_name }} {{ form.area_.name }} diff --git a/src/views/home/widgets/components/about.vue b/src/views/home/widgets/components/about.vue index 167a7652..64865f56 100644 --- a/src/views/home/widgets/components/about.vue +++ b/src/views/home/widgets/components/about.vue @@ -1,40 +1,30 @@ - + @@ -60,26 +50,23 @@ }, data() { return { - total:0, + apiObj:null, dutyAgg: [], - tableData:[], postOptions: [], option3: null, - operationnumber: null, - rpjnumber: null, - visitnumber: null, - apiObj1 : this.$API.third.blt.all + divHeight:null, + tableHeight:null, } }, created() { + this.apiObj = this.$API.ecm.event.list; var craeteTime = this.$TOOL.dateFormat( new Date().toLocaleDateString(), "yyyy-MM-dd" ); this.postOptions = []; - this.$API.ecm.event.cateAgg - .req({ completed: false, start_create: craeteTime }) + this.$API.ecm.event.cateAgg.req({ completed: false, start_create: craeteTime }) .then((res) => { res.details.forEach((itemI, indexI) => { this.postOptions.push({ value: itemI.count, name: itemI.cate__name }); @@ -91,7 +78,6 @@ trigger: "item", }, legend: { - // orient: 'vertical', left: 'center' }, series: [ @@ -109,19 +95,23 @@ }, ], }; - this.$API.third.blt.all - .req() - .then((res) => { - res.forEach((item) => { - this.total = res.length; - this.tableData.push(item.my_info); - }); - }); - // this.params.start_create = craeteTime; - // this.apiObj1 = this.$API.third.blt.all; + }, + mounted(){ + let height1 = document.getElementsByClassName('widgets-content')[0].clientHeight; + console.log(height1) + let bottomHeight = height1-138-120; + this.tableHeight = bottomHeight/2-10; + this.divHeight = bottomHeight/2+'px'; + + document.getElementById('totalEchart').style.height = this.divHeight }, methods: { - + moreEvent() { + this.$router.push({ + name: "event", + query: {}, + }); + }, }, } diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue index 58f4c57d..a87e7fb9 100644 --- a/src/views/home/widgets/components/eventlist.vue +++ b/src/views/home/widgets/components/eventlist.vue @@ -1,13 +1,8 @@ + + + + + + + + + + + + + + + + + + + + - diff --git a/src/views/home/widgets/components/ticket.vue b/src/views/home/widgets/components/ticket.vue index 8663cafc..83c4befc 100644 --- a/src/views/home/widgets/components/ticket.vue +++ b/src/views/home/widgets/components/ticket.vue @@ -46,10 +46,10 @@ -
+
-
+
正式员工
@@ -58,7 +58,7 @@
-
+
相关方
@@ -67,7 +67,7 @@
-
+
货车司机
@@ -76,7 +76,7 @@
-
+
访客
@@ -91,13 +91,88 @@ + + + +
+
+ + + +
{{ item.workflow__name }}
+
+
+
+
暂无待办工单
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
@@ -291,11 +478,12 @@ export default { justify-content: space-around; align-items: center; height: 80px; - + .count-list-item { width: 33.3333%; height: 50%; display: flex; + .item-img { width: 50px; @@ -353,6 +541,9 @@ export default { } } } + .count-list-item.zaichang{ + cursor: pointer; + } } .simple-title {