Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/views/dashboard/index.vue

@@ -90,7 +90,7 @@
 			      					<span v-else class="indexSpan">{{index+1}}</span>
 			      				</td>
 			      				<td width="60%"><div class="indexTd" :title="item.name">{{item.name}}</div></td>
-			      				<td width="30%"><countTo :duration="4000" :end-val="item.cnt" :start-val="0"/></td>
+			      				<td width="30%"><countTo :duration="4000" :end-val="parseInt(item.cnt)" :start-val="0"/></td>
 			      			</tr>
 			      		</table>
 			      	</div>
@@ -295,7 +295,7 @@
         this.queryParams.current = params.current ? params.current : this.queryParams.current;
         this.queryParams.size = params.size ? params.size : this.queryParams.size;
         loginLogApi.page(this.queryParams).then(response => {
-          const res = response.data;
+          const res = response.data;		  
           if (res.isSuccess) {
             this.tableData = res.data.records;
           }

imcs-ui/src/views/zuihou/developer/warnLong/Index.vue

@@ -82,7 +82,7 @@
       <!-- 设备 -->
       <el-table-column prop="resourceName" :label='$t("developer.table.warnLong.name")' width="100"></el-table-column>
       <!-- 报警内容 -->
-      <el-table-column prop="shelvesDesc" :label='$t("developer.table.warnLong.storgeId")' width="180px">
+      <el-table-column prop="shelvesDesc" :label='$t("developer.table.warnLong.storgeId")' >
 	      <template slot-scope="{ row }">
 			<span> {{row.resourceName}}-{{row.procedureName}}-{{row.instructionName}}-</span>
 			<span v-if="row.feedback">{{row.feedback}}</span>
@@ -156,8 +156,7 @@
 	//import lockingRecordApi from "@/api/lineSideLibrary/lockingRecord"
 	import warnLogApi from "@/api/lineSideLibrary/warnLog"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { convertEnum, initDicts, initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "InOutRecord",
 	  directives: { elDragDialog },