安生 4 lat temu
rodzic
commit
f3fd477731

+ 2 - 2
src/views/dashboard/BarChart.vue

@@ -72,7 +72,7 @@
         // 查询参数
         queryParams: {
           pageNum: 1,
-          pageSize:6,
+          pageSize:7,
           tatle: undefined,
           documentType: undefined,
           img: undefined,
@@ -150,7 +150,7 @@
 <style lang="less" scoped>
   .box-card{
     margin-left: 6px;
-    height: 407px;
+    height: 464px;
   }
   .el-table{
     color:#1890ff;

+ 14 - 8
src/views/dashboard/LineChart.vue

@@ -1,8 +1,8 @@
 <template>
-  <el-card  style="min-height: 407px;overflow: hidden;">
+  <el-card  style="min-height: 464px;overflow: hidden;">
     <div slot="header" class="clearfix">
       <img src="../../assets/image/sq.png" style="display: block;float: left;margin: 1px 5px 0 0;" height="15" width="17"/>
-      <span>我的事项</span>
+      <span>我的工作</span>
       <el-button style="float: right; padding: 3px 0;color: #000000;" type="text" @click="more">更多</el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -23,9 +23,12 @@
               <el-button type="text"  @click="openactform(scope.row.processInstanceId,scope.row.businessKey,scope.row.name,scope.row.title,scope.row.taskName)" style="color: black">{{scope.row.title}}</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="createTime" label="接收时间" width="180" align="center">
+          <el-table-column prop="taskName" label="流程名称"  width="180" align="left" ></el-table-column>
+          <el-table-column prop="createTime" label="到达时间" width="180" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.createTime | timefilters}}</span>
+              <el-button type="text"  @click="openactform(scope.row.processInstanceId,scope.row.businessKey,scope.row.name,scope.row.title,scope.row.taskName)" style="color: black">
+                <span>{{scope.row.createTime | timefilters}}</span>
+              </el-button>
             </template>
           </el-table-column>
 
@@ -39,9 +42,12 @@
             <el-button type="text" @click="detern1(scope.row)" style="color: black">{{scope.row.title}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="完成时间" width="180" align="center">
+        <el-table-column prop="taskName" label="流程名称"  width="180" align="left" ></el-table-column>
+        <el-table-column prop="createTime" label="处理时间" width="180" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.createTime | timefilters}}</span>
+            <el-button type="text" @click="detern1(scope.row)" style="color: black">
+              <span>{{scope.row.createTime | timefilters}}</span>
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -204,10 +210,10 @@
         // 待办请求
         toDoItemListInfo(this.queryParams).then(response => {
           this.toListItem = response.rows;
-          if(this.toListItem.length<5){
+          if(this.toListItem.length<4){
             this.toListItem.length=response.rows.length
           }else{
-            this.toListItem.length=5
+            this.toListItem.length=4
           }
           this.title = response.title;
           this.loading = false;

+ 10 - 6
src/views/dashboard/RaddarChart.vue

@@ -1,21 +1,25 @@
 <template>
-  <el-card class="box-card" style="margin-left: 0px">
+  <el-card class="box-card" style="margin-left: 0px;height: 400px;">
     <div slot="header" class="clearfix">
       <img src="../../assets/image/sq.png" style="display: block;float: left;margin: 1px 5px 0 0;" height="15" width="17"/>
       <span>我的申请</span>
       <el-button style="float: right; padding: 3px 0;color: #000000;" type="text" @click="more">更多</el-button>
     </div>
 
-      <el-table :data="myApplication" style="width: 100%;" :header-cell-style="{}">
+      <el-table :data="myApplication" size="mini" style="width: 100%;" :header-cell-style="{}">
         <!--             <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>-->
         <el-table-column prop="fwtitle" label="标题"  align="left" >
           <template slot-scope="scope">
             <el-button type="text" @click="myAppReturn(scope.row)" style="color: black">{{scope.row.fwtitle}}</el-button>
           </template>
         </el-table-column>
+        <el-table-column prop="taskName" label="流程名称"  width="180" align="left" ></el-table-column>
         <el-table-column prop="createTime" label="创建时间" width="180" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.create_time | timefilters}}</span>
+            <el-button type="text" @click="myAppReturn(scope.row)" style="color: black">
+              <span>{{scope.row.create_time | timefilters}}</span>
+            </el-button>
+
           </template>
         </el-table-column>
       </el-table>
@@ -64,7 +68,7 @@
         doneList: [],
         queryParams: {
           pageNum: 1,
-          pageSize: 5,
+          pageSize: 7,
           // orderByColumn: "createTime",
           // isAsc:"desc",//排序方式
         },
@@ -95,10 +99,10 @@
         listInfo(this.queryParams).then(response => {
 
           this.myApplication=response.rows
-          if(this.myApplication.length<5){
+          if(this.myApplication.length<7){
             this.myApplication.length=response.rows.length
           }else{
-            this.myApplication.length=5
+            this.myApplication.length=7
           }
           // this.title = response.title;
           this.loading = false;