Merge branch 'lzw' of yinet2020/YinetOASystemWeb into master

src/views/dashboard/LineChart.vue

@@ -87,37 +87,103 @@
           formId:'',
           flg:'2'},
         activeName: 'first',
-        myApplication: [],
+        myApplication: [
+          {
+            title:'',
+            taskName:'',
+            applyUser:'',
+            createUserName :'',
+            taskid: '',
+            fwtitle: '',
+            fwdept: '',
+            create_time: '',
+            dispose: '',
+            definitionId:'',
+            businessKey:''
+          }
+        ],
         toListItem: [],
         //参数
         queryParams: {
           pageNum: 1,
-          pageSize: 5,
-          orderByColumn: "createTime",
-          isAsc:"desc",//排序方式
+          pageSize: 4,
+          // executionId:undefined,
+          // processInstanceId:undefined,
+          // createTime:undefined,
+          // formKey:undefined,
+          // name:undefined,
+          // businessKey:undefined,
+          // taskName:undefined,
+          // id:undefined,
+          // title:undefined,
+          // processDfinitionId:undefined,
+          // assign:undefined,
+        },
+        //参数
+        query: {
+          pageNum: 1,
+          pageSize: 4,
+          actkey:undefined,
+          create_time:undefined,
+          avtive_send:undefined,
+          fwtitle:undefined,
+          apply_user:undefined,
+          title:undefined,
+          content:undefined,
+          copy_to:undefined,
+          applyUser:undefined,
+          update_time:undefined,
+          security_class:undefined,
+          businessKey:undefined,
+          ponderance:undefined,
+          taskName:undefined,
+          dispose:undefined,
+          id:undefined,
+          fwdept:undefined,
+          update_by:undefined,
+          accessory:undefined,
+          taskid:undefined,
+          definitionId:undefined,
         },
       }
     },
     created() {
-      this.getList();
       this.getList1();
+      this.getList();
+
     },
     methods: {
+
+      getList1() {
+        this.loading = true;
+        //我的申请
+        listInfo(this.queryParams).then(response => {
+            response.rows.length=4
+            this.myApplication=response.rows
+            this.title = response.title;
+            this.loading = false;
+            console.log(this.myApplication)
+          // this.loading = true
+        });
+      },
       handleClick(tab, event) {
         console.log(tab, event);
       },
       getList() {
         this.loading = true;
-        //我的申请
-        listInfo(this.queryParams).then(response => {
-          console.log(response.rows)
-          this.myApplication = response.rows;
-          this.title = response.title;
-          this.loading = false;
-        });
-        //待办请求
+      //  我的申请
+      //   listInfo(this.queryParams).then(response => {
+      //     console.log(response.rows)
+      //     this.myApplication = response.rows;
+      //     this.title = response.title;
+      //     this.loading = false;
+      //   });
+       // 待办请求
         toDoItemListInfo(this.queryParams).then(response => {
           console.log(response.rows)
+          console.log("a"+this.queryParams)
+          console.log("a"+this.queryParams)
+          response.rows.length=4
           this.toListItem = response.rows;
           this.title = response.title;
           this.loading = false;
@@ -137,16 +203,7 @@
         this.actOpen = true
         return vue.actForm = this.actForm
       },
-      getList1() {
-        this.loading = true;
-        //我的申请
-        listInfo(this.queryParams).then(response => {
-          console.log(response.rows)
-          this.myApplication = response.rows;
-          this.title = response.title;
-          this.loading = false;
-        });
-      },
+
 
       detern(row){
         const actkey = row.actkey

src/views/dashboard/PieChart.vue

@@ -23,12 +23,9 @@
           <el-input v-model="form.title" placeholder="请输入通知标题" clearable :style="{width: '100%'}">
           </el-input>
         </el-form-item>
-<!--          <div v-html="form.content" style="border: 1px solid #e5e5e5;border-radius: 4px;"></div>-->
-          <el-form-item label="通知内容" prop="Content" style="height: 240px;">
-            <Editor v-model="form.content" />
-            <!--            <el-input v-model="formData.Content" type="textarea" placeholder="请输入通知内容"-->
-            <!--              :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>-->
-          </el-form-item>
+        <el-form-item label="通知内容" prop="Content" style="height: 240px;">
+          <div v-html="form.content" style="border: 1px solid #e5e5e5;border-radius: 4px;"></div>
+        </el-form-item>
         <el-form-item label="附件列表：">
           <div v-html="form.fj" style="border: 1px solid #e5e5e5;border-radius: 4px;">{{form.fj}}</div>
         </el-form-item>