Merge branch 'vue_statistics_branch' of http://git.shengws.com/csx/Vue_New into vue_statistics_branch

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -77,7 +77,7 @@
               :key="index"
             >
             <template slot-scope="scope">
-
+              {{ scope.row.data[index].inspect_value}}
             </template>
         </el-table-column>
             <el-table-column fixed="right" label="操作" width="100">
@@ -384,7 +384,7 @@ export default {
               for(const mkey in this.ObjectData){
                  if (!(this.ObjectData[mkey].item_name in dd[key])) {
                    dd[key][this.ObjectData[mkey].item_name] = {
-                   ItemName: this.ObjectData[mkey].item_name,
+                   item_name: this.ObjectData[mkey].item_name,
                    name: mkey,
                    inspect_value:0
                   };
@@ -403,12 +403,15 @@ export default {
             this.tableData.map(item => {
             // console.log("item---",item.data)
               let newarr = Object.values(item.data);
-              //console.log("arr",arr)
+              // console.log("arr",newarr)
               newarr.sort((a,b)=>{
-                return projectArr.indexOf(a.ItemName)-projectArr.indexOf(b.ItemName);
+                // console.log(1111,a)
+                // console.log(2222,b)
+                return projectArr.indexOf(a.item_name)-projectArr.indexOf(b.item_name);
               });
               item.data = newarr
-           })
+              console.log(1111111111,item.data)
+            })
               console.log("表",this.tableData)
          }
       })