fix

imcs-ui/src/views/zuihou/centralToolMagazine/cutterTestData/Index.vue

@@ -151,6 +151,7 @@
 
 
 <script>
+	import Pagination from "@/components/Pagination"
 	import classScheduleMgrApi from "@/api/modelingCenter/cutterTestData"
 	import { initDicts, initQueryParams } from '@/utils/commons'
 
@@ -161,7 +162,7 @@
 
 	export default {
 	  name: "WarehouseTypeMgr",
-	  components: { CutterTestCourse},
+	  components: { Pagination,CutterTestCourse},
 	  props: {
 	  },
 	  data () {

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/Index.vue

@@ -87,7 +87,11 @@
 			 </div>
 		  </template>
 	  </el-table-column>
-
+	  <el-table-column prop="source"  label='数据来源' width="100"></el-table-column>
+	  <el-table-column prop="targetSource"  label='数据流向' width="100"></el-table-column>
+      <!-- 报警内容 -->
+      <el-table-column prop="lineCode"  label='产线编码' width="100"></el-table-column>
+      <!-- 报警时间 -->
 	  <el-table-column prop="apiType" label='接口类型' width="200" >
 		  <template slot-scope="{ row }">			
 			 <div v-for="item in apiTypeList" :key="item.value" :value="item" >				
@@ -95,18 +99,15 @@
 			 </div>
 		  </template>
 	  </el-table-column>
-      <!-- 报警内容 -->
-      <el-table-column prop="lineCode"  label='产线编码' width="100"></el-table-column>
-      <!-- 报警时间 -->
-      <el-table-column prop="createTime" label='创建时间' width="160px"></el-table-column>
-      <!-- 是否需要人员处理 -->
       <el-table-column prop="apiAddress" label='接口地址' align="center" width="200px"></el-table-column>
+      <el-table-column prop="createTime" label='创建时间' width="160px"></el-table-column>
       <!-- 处理状态 -->
       <el-table-column prop="status" label='状态' align="center" width="120px">
       	<template slot-scope="{ row }">
-      		    <el-tag v-if="row.status == '0'" type="failed">已处理</el-tag>
-	      	    <el-tag v-if="row.status == '1'" type="success">未处理</el-tag>
-					
+      		    <el-tag v-if="row.status == '0'" >未处理</el-tag>
+	      	    <el-tag v-if="row.status == '1'">处理中</el-tag>
+	      	    <el-tag v-if="row.status == '2'">已处理</el-tag>
+	      	    <el-tag v-if="row.status == '99'">异常</el-tag>
 		</template>
       </el-table-column>
       <!-- 处理时间 -->