Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-web

src/views/gasManage_syd/manage/gasManage/gasManage.vue

@@ -6,7 +6,7 @@
         <el-form-item label="关键字" prop="name">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="标签码/气瓶编号"
+            placeholder="标签码/气瓶编号/气体名称"
             clearable
             maxLength="30"
             size="small"

src/views/gasManage_syd/manage/infoRecord/abnormalRecord.vue

@@ -12,7 +12,7 @@
             size="small"
           />
         </el-form-item>
-        <el-form-item label="使用时间" prop="dateRange">
+        <el-form-item label="操作时间" prop="dateRange">
           <el-date-picker
             :clearable="false"
             v-model="dateRange"

src/views/gasManage_syd/manage/infoRecord/infoRecord.vue

@@ -573,7 +573,7 @@ export default {
         if(response.code==200){
           res.forEach(function(item){
             dataX.push(item.date)
-            dataY.push(item.amount)
+            dataY.push(item.count)
           })
           this.applyFun(dataX,dataY);
         }