Merge branch 'master' of D:\播智教育\2020\benyi with conflicts.

ruoyi-ui/src/views/benyi/dayflowstudy/index.vue

@@ -24,36 +24,20 @@
           />
         </div>
       </el-col>
-      <el-col :span="20" :xs="24">
+      <div>
-        <el-card class="box-card">
+        <span>流程中所含任务</span>
-          <div slot="header" class="clearfix">
-            <span>{{title}}</span>
       </div>
-          <div class="text item">
+      <el-col :span="20" :xs="24" v-for="(item, index) in dayflowtaskList" :key="index" >
-            导言
+        <el-card :body-style="{ padding: '2px' }">
-            <br />
+          <div class="to-detail">
-            <label v-html="content"></label>
+            <el-tooltip effect="dark" :content="item.taskLable" placement="right">
-          </div>
+              <div>
-          <div class="text item">
+                <p class="info-title">{{item.taskLable}}</p>
-            目的
-            <br />
-            <label v-html="note"></label>
-          </div>
-          <div v-for="(item, index) in dayflowtaskList" :key="index" class="text item">
-            {{item.taskLable}}
-            <div
-              v-for="(item_standard, index_standard) in (dayflowstandardList.filter(p=>p.taskCode==item.code))"
-              :key="index_standard"
-              class="text item"
-            >{{item_standard.standardTitle}}
-            <br/>解读
-            <div
-              v-for="(item_unscramble, index_unscramble) in (dayflowunscrambleList.filter(p=>p.standardId==item_standard.id))"
-              :key="index_unscramble"
-              class="text item"
-            >{{item_unscramble.sort}}-{{item_unscramble.content}}
-            
               </div>
+            </el-tooltip>
+            <p class="info-title info-title-name">该任务所含标准个数:{{ item.standardCount }}</p>
+            <div class="bottom">
+              <time class="time">{{ parseTime(item.createtime) }}</time>
             </div>
           </div>
         </el-card>
@@ -63,31 +47,29 @@
 </template>
 
 <script>
+import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
 import { listDayflowtask } from "@/api/benyi/dayflow/dayflowtask";
-import { listStandard } from "@/api/benyi/dayflow/biaozhun/standard";
+import { listStandard } from "@/api/benyi/dayflow/biaozhun/standard"
-import { listUnscramble } from "@/api/benyi/dayflow/unscramble";
+import { treeselect } from "@/api/benyi/dayflow/dayflowmanger";
-import { treeselect, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
 
 export default {
   name: "Detail",
   data() {
     return {
+      // 遮罩层
+      loading: true,
       // 一日流程名称
       name: undefined,
       // 一日流程id
       id: undefined,
-      //标题
+      
-      title: "一日流程",
-      //导言
-      content: undefined,
-      //目的
-      note: undefined,
       // 根据一日流程id查到的名下任务列表
       dayflowtaskList: [],
       // 根据任务查询到名下标准
       dayflowstandardList: [],
-      //一日流程解读
-      dayflowunscrambleList: [],
       // 树状显示类型
       treeOptions: [],
       // 树结构
@@ -97,10 +79,8 @@ export default {
       },
       // 查询参数
       queryParams: {
-        detailId: undefined
+        detailId: undefined,
-      },
+        taskCode: undefined,
-      queryStandardParams: {
-        taskCode: undefined
       }
     };
   },
@@ -128,45 +108,60 @@ export default {
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.detailId = data.id;
-      this.title = data.label;
       this.getTaskList();
-      // console.log(this.dayflowtaskList[date.id])
+      console.log(this.dayflowtaskList);
+      console.log(this.dayflowtaskList[0].value.code);
       //this.getStandardList();
     },
     /** 查询一日流程任务列表 */
     getTaskList() {
+      this.loading = true;
       listDayflowtask(this.queryParams).then(response => {
         this.dayflowtaskList = response.rows;
+        // console.log(this.dayflowtaskList);
+        this.loading = false;
       });
-      getDetail(this.queryParams.detailId).then(response => {
+    },
-        this.content = response.data.content;
+    /** 查询任务标准列表 */
-        this.note = response.data.note;
+    // getStandardList() {
-      });
+    //   this.loading = true;
-      listStandard(null).then(response => {
+    //   listStandard(this.queryParams).then(response => {
-        this.dayflowstandardList = response.rows;
+    //     this.dayflowstandardList = response.rows;
-      });
+    //     console.log(this.dayflowstandardList);
-      listUnscramble(null).then(response => {
+    //     this.loading = false;
-        this.dayflowunscrambleList = response.rows;
+    //   });
-      });
+    // },
-    }
   }
 };
 </script>
+
 <style>
-.text {
+.time {
-  font-size: 14px;
+  line-height: 12px;
+  font-size: 12px;
+  color: #999;
 }
 
-.item {
+.bottom {
-  margin-bottom: 18px;
+  margin-top: 13px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 
-.clearfix:before,
+.to-detail {
-.clearfix:after {
+  /*cursor: pointer;*/
-  display: table;
+  padding: 14px;
-  content: "";
 }
-.clearfix:after {
+
-  clear: both;
+.info-title {
+  width: 100%; /*根据自己项目进行定义宽度*/
+  overflow: hidden; /*设置超出的部分进行影藏*/
+  text-overflow: ellipsis; /*设置超出部分使用省略号*/
+  white-space: nowrap; /*设置为单行*/
+}
+
+.info-title-name {
+  font-size: 12px;
 }
 </style>