修改了项目进度显示

api/soil/soil-entrust.js

@@ -183,5 +183,7 @@ export default {
   callOutAloneKeepSample: data =>
     http
       .post('soil/v1/sample/call_out_alone_keep_sample/', data)
-      .then(res => res)
+      .then(res => res),
+  listSummaryQuery: data =>
+    http.post('soil/v1/entrust/list_summary_query', data).then(res => res)
 }

components/flow/FlowBranch.vue

@@ -74,16 +74,18 @@ export default {
     // 右侧的连接线
     endValue() {
       // 最后一个节点数据
+      console.log('右侧连接线', this.list)
+      console.log('右侧连接线', this.endList)
       // const current_value = this.list[2].value
       const currentValue = this.list[2].value
       const endValue = this.endList[0].value
       // const list_0_value = this.list[0].value
       const listZeroValue = this.list[0].value
       // if (current_value) {
-      if (currentValue) {
-        return undefined
-      } else if (currentValue === false) {
+      if (currentValue === false || currentValue === undefined) {
         return undefined
+      } else if (currentValue) {
+        return endValue
       } else {
         // undefined,说明要接着向下走
         // eslint-disable-next-line no-lonely-if

pages/workbench/ItemFlow.vue

 <template>
   <div>
-    <div v-for="(itemInfo, index) in sampleInfo" :key="index" class="contract-box">
+    <div v-for="(itemInfo, index) in entrustList" :key="index" class="contract-box">
       <Row>
         <!--样品信息-->
         <Col span="6">
@@ -9,63 +9,56 @@
               <div class="title">委托单位</div>
               <div class="cont">
                 <span
-                  :title="itemInfo.client?itemInfo.client:''"
-                   :class="{
-                 'blue-color':itemInfo.queryType === 0,
-                 'green-color':itemInfo.queryType === 1,
-                  'red-color':itemInfo.queryType === 2,
-                 'warning-color':itemInfo.queryType === 3
-                 }"
                    style="font-weight: bold"
-                >{{itemInfo.client}}</span>
+                >{{itemInfo.entrustVO.client}}</span>
               </div>
             </li>
             <li>
               <div class="title">委托编号</div>
               <div class="cont">
-                {{itemInfo.entrustCode}}
+                {{itemInfo.entrustVO.entrustCode}}
               </div>
             </li>
             <li>
               <div class="title">钻孔名称</div>
               <div class="cont">
-                {{itemInfo.boreholeName}}
+                {{itemInfo.entrustVO.boreholeName}}
               </div>
             </li>
             <li>
               <div class="title">水深(米)</div>
               <div class="cont">
-                {{itemInfo.waterDepth}}
+                {{itemInfo.entrustVO.waterDepth}}
               </div>
             </li>
             <li>
               <div class="title">委托日期</div>
               <div class="cont">
-                {{itemInfo.waterDepth}}
+                {{$dateformat(itemInfo.entrustVO.entrustDate)}}
               </div>
             </li>
             <li>
               <div class="title">项目负责人</div>
               <div class="cont">
-                {{itemInfo.waterDepth}}
+                {{itemInfo.entrustVO.waterDepth}}
               </div>
             </li>
             <li>
               <div class="title">项目名称</div>
               <div class="cont">
-                {{itemInfo.waterDepth}}
+                {{itemInfo.entrustVO.waterDepth}}
               </div>
             </li>
             <li>
               <div class="title">钻孔位置</div>
               <div class="cont">
-                {{itemInfo.waterDepth}}
+                {{itemInfo.entrustVO.boreholeLocation}}
               </div>
             </li>
             <li>
               <div class="title">进度</div>
               <div class="cont">
-                {{itemInfo.waterDepth}}
+                {{itemInfo.entrustVO.progress.display}}
               </div>
             </li>
           </ul>
@@ -79,6 +72,7 @@
   </div>
 </template>
 <script>
+import { soilEntrust } from '../../api'
 import flowIndex from './flowIndex'
 export default {
   components: { flowIndex },
@@ -88,17 +82,7 @@ export default {
   data() {
     return {
       progressList: [],
-      sampleInfo: [
-        {
-          client:
-            '中海油服中海油服中海油服中海油服中海油服中海油服中海油服中海油服中海油服中海油服',
-          name: 1,
-          boreholeName: 1
-        },
-        { client: 2, name: 2, boreholeName: 2 },
-        { client: 3, name: 3, boreholeName: 3 },
-        { client: 4, name: 4, boreholeName: 4 }
-      ]
+      entrustList: []
     }
   },
   watch: {
@@ -107,9 +91,16 @@ export default {
     }
   },
   mounted() {
-    this._console(this.info)
+    this._getData()
   },
   methods: {
+    _getData: async function() {
+      const result = await soilEntrust.listSummaryQuery()
+      if (result) {
+        this.entrustList = result
+        console.log('this.entrustList', this.entrustList)
+      }
+    },
     _sampleClick(data) {
       // 样品详情
       this.$refs.detail._open(data)

pages/workbench/flowIndex.vue

@@ -117,14 +117,14 @@ export default {
         key3: true,
         key4: true,
         key5: true,
-        // key6: false,
+        key6: undefined,
         // key7: true,
         // key8: true,
         // key9: true,
         // key10: false,
         // key11: false,
         // key12: false,
-        key13: false,
+        key13: true,
         key14: false,
         key15: false,
         key16: false,
@@ -147,12 +147,14 @@ export default {
     },
     // 上面连接线颜色
     upLineClassObj() {
+      console.log('右侧线')
       const valueZero = this.list.end[0].value
       const upValue = this.list.branch[0][2].value
       const upValueZero = this.list.branch[0][0].value
       if (
-        upValue !== undefined ||
-        (upValue === undefined && upValueZero === undefined)
+        upValue === undefined ||
+        upValueZero === undefined ||
+        upValue === false
       ) {
         return undefined
       } else {

pages/workbench/workbench.vue

@@ -56,9 +56,9 @@
 <!--        <Col span="12">-->
 <!--          <CustomerContract></CustomerContract>-->
 <!--        </Col>-->
-      <Col span="24">
-        <ItemFlow></ItemFlow>
-      </Col>
+<!--      <Col span="24">-->
+<!--        <ItemFlow></ItemFlow>-->
+<!--      </Col>-->
       <div :style="{height}" v-if="moduleList.length" class="config_home">
         <Row :gutter="10">
           <Col