修改了项目进度

api/soil/soil-statistics.js

@@ -47,5 +47,9 @@ export default {
   pageGroupExpStatistics: data =>
     http
       .post('soil/v1/statistics/page_group_exp_statistics', data)
+      .then(res => res),
+  listExperimentProgress: data =>
+    http
+      .post('soil/v1/experiment/list_experiment_progress', data)
       .then(res => res)
 }

components/statistic/ProgressList.vue

@@ -7,9 +7,10 @@
           <div style="position: relative">
             <label class="view-progress fl">
 <!--              <Progress :percent="45" :stroke-width="20" status="active" text-inside />-->
-              <Progress :percent="30" status="active" hide-info></Progress>
+              <Progress :percent="state >= index ? 99.9: 0" status="active" hide-info></Progress>
+<!--              <Progress :percent="30" status="active" hide-info></Progress>-->
             </label>
-            <label :class="{'process-actives':state >= index}" class="progress-bg-gray fl process-actives">
+            <label :class="{'process-actives':state >= index}" class="progress-bg-gray fl">
               <label class="progress-bg-white" style="display: inline-block;max-width: 100%;margin-bottom: 4px;font-weight: 700;"></label>
             </label>
             <div class="clear"></div>

pages/workbench/sample-progress/SampleProgress.vue

@@ -41,7 +41,7 @@ export default {
       contractId: '',
       //
       page: 0,
-      rows: 10,
+      rows: 50,
       formObj: {},
       processObj: {
         height: document.documentElement.clientHeight - 300 + 'px'
@@ -74,14 +74,24 @@ export default {
         this.sampleInfo = []
       }
       Object.assign(this.formObj, this._searchParams())
-      const result = await soilStatistics.pageWaitEnd(this.formObj)
+      const result = await soilStatistics.listExperimentProgress(this.formObj)
       if (result) {
         const records = result.records
         const pages = result.pages
-        // for (let i = 0; i < records.length; i++) {
-        //   // 获取下标
-        //   records[i].index = this.sampleProgressList.indexOf(records[i].index)
-        // }
+        for (let i = 0; i < records.length; i++) {
+          // 获取下标
+          if (records[i].auditTime) {
+            records[i].progressIndex = 3
+          } else if (records[i].checkTime) {
+            records[i].progressIndex = 2
+          } else if (records[i].testEndTime) {
+            records[i].progressIndex = 1
+          } else if (records[i].allotTime) {
+            records[i].progressIndex = 0
+          } else {
+            records[i].progressIndex = -1
+          }
+        }
         // this.sampleInfo = records
         this.sampleInfo = this.sampleInfo.concat(records)
         this.$refs.myscrollfull.endByPage(this.sampleInfo.length, pages)

pages/workbench/sample-progress/SampleSteps.vue

@@ -6,7 +6,7 @@
         <Col span="6">
           <ul class="progress-ul">
             <li>
-              <div class="title">名称</div>
+              <div class="title">样品编号</div>
               <div class="cont">
                 <a
                    :class="{
@@ -16,17 +16,17 @@
                  'warning-color':itemInfo.queryType === 3
                  }"
                    style="font-weight: bold"
-                >{{itemInfo.client}}</a>
+                >{{itemInfo.sampleCode}}</a>
               </div>
             </li>
             <li>
-              <div class="title">编号</div>
+              <div class="title">试验名称</div>
               <div class="cont">
-                {{itemInfo.projectNo}}
+                {{itemInfo.name}}
               </div>
             </li>
             <li>
-              <div class="title">钻孔名称</div>
+              <div class="title">钻孔编号</div>
               <div class="cont">
                 {{itemInfo.boreholeName}}
               </div>
@@ -35,10 +35,10 @@
         </Col>
         <!--样品进度信息-->
         <Col span="18">
-          <ProgressList :progressList="[{name:'已分配',time:itemInfo.signDate,user:itemInfo.signer},
-        {name:'检测完成',time:itemInfo.receiveDate,user:itemInfo.receiver},{name:'已复核',time:itemInfo.testDate,user:itemInfo.tester},
-        {name:'已校核',time:itemInfo.reportMakeDate,user:itemInfo.reportMaker}]"
-                        :state="itemInfo.index"></ProgressList>
+          <ProgressList :progressList="[{name:'已分配',time:itemInfo.allotTime,user:itemInfo.alloter},
+        {name:'检测完成',time:itemInfo.testEndTime,user:itemInfo.testEnder},{name:'已复核',time:itemInfo.checkTime,user:itemInfo.checker},
+        {name:'已审核',time:itemInfo.auditTime,user:itemInfo.auditor}]"
+                        :state="itemInfo.progressIndex"></ProgressList>
         </Col>
       </Row>
     </div>