fix 代办界面优化

imcs-ui/src/api/runManageCenter/mesNoticeLog.js

@@ -0,0 +1,19 @@
+/*********************** 【订单明细】API ********************/
+import axiosApi from '../AxiosApi.js'
+
+const apiList = {
+	getList: {
+    method: 'POST',
+    url: `/authority/mesNoticeLog/getList`
+  }
+ 
+}
+
+export default {
+	getList (data) {
+    return axiosApi({
+      ...apiList.getList,
+      data
+    })
+  }
+}

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/tab/accept/components/View.vue

@@ -6,13 +6,36 @@
     :visible.sync="isVisible"
     class="tenant-view"
   >
-    <div style="height: 800px;">
-
+    <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in dataList"
+              color="#0bbd87"
+              :key="index"
+              :icon="activity.icon"
+              :type="activity.type"
+              :size="activity.size"
+              :timestamp="activity.createTime"
+              placement="top">
+              <el-descriptions :title="用户信息">
+                  <el-descriptions-item label="用户名">{{activity.timestamp}}</el-descriptions-item>
+                  <el-descriptions-item label="手机号">18100000000</el-descriptions-item>
+                  <el-descriptions-item label="居住地">苏州市</el-descriptions-item>
+                  <el-descriptions-item label="备注">
+                    <el-tag size="small">学校</el-tag>
+                  </el-descriptions-item>
+                  <el-descriptions-item label="联系地址">江苏省苏州市吴中区吴中大道 1188 号</el-descriptions-item>
+              </el-descriptions>
+            </el-timeline-item>
+          </el-timeline>
     </div>
   </el-dialog>
 </template>
 <script>
 import warnLogApi from "@/api/lineSideLibrary/warnLog"
+import mesNoticeLogApi from "@/api/runManageCenter/mesNoticeLog"
+import { status } from "nprogress"
+
 export default {
   name: 'TenantView',
   filters: {
@@ -30,7 +53,7 @@ export default {
     }
   },
   data () {
-    return {     
+    return {   
       screenWidth: 0,      
       active: 1,
       width: this.initWidth(),
@@ -40,6 +63,16 @@ export default {
       taskNodeId: '',
       deviceId: '',
       logId:'',
+      status: [{
+          value: '0',
+          label: '已处理'
+        }, {
+          value: '1',
+          label: '未处理'
+        }, {
+          value: '2',
+          label: '异常'
+        }],
       callbackId: '',
       keys: [{name:'nodeName', value:'节点名称'},{name:'resourceDesc', value:'执行设备'},{name:'overtimeStatus', value:'是否超时'},{name:'procedureDesc', value:'工序名称'},{name:'targetResourceDesc', value:'目标设备'},{name:'planTime', value:'计划时间'},{name:'actualTime', value:'执行时间'}],
       //robotNodes:[{label:'舱体线机器人',value:"1"},{label:'伺服舵机',value:"2"},{label:'框体线机器人',value:"3"}], 
@@ -82,30 +115,15 @@ export default {
     setTenant (val) {
       this.tenant = { ...val }
       console.log(this.tenant)
-      this.taskNodeId = this.tenant.taskNodeId
-      this.callbackId = this.tenant.taskNodeId 
-      this.logId = this.tenant.id      
       this.fetch()
     },
     fetch(){      
-        warnLogApi.connected({id: this.tenant.taskNodeId}).then(response => {
+        mesNoticeLogApi.getList(this.tenant).then(response => {
 	        const res = response.data
 	        if (res.isSuccess) {
 	          this.dataList = res.data
-            this.deviceId = this.dataList[1]? this.dataList[1].deviceId : ''
-            console.log(this.dataList[1])
-            if(this.deviceId!=''){
-              warnLogApi.getStorageNode({resourceId: this.dataList[1].deviceId}).then(response => {
-	                const res = response.data
-	               if (res.isSuccess) {
-	                  this.storageNodeList = res.data
-                    console.log(this.storageNodeList)
-	               }	        
-	            })
-            }
 	        }	        
 	      }).finally(() => this.loading = false)       
-       
     },
     close () {
       this.$emit('close')