From 1a136c4df1ddee2fedb119a264e73147b79bfb1c Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期五, 05 十一月 2021 09:10:38 +0800
Subject: [PATCH] U 修改列表页面
---
src/pages/alarmWork/list.vue | 56 ++++++++++++++++-----------
src/assets/js/axios.js | 2
src/pages/alarmWork/components/listCard.vue | 8 ++--
src/pages/alarmWork/js/api.js | 10 +++++
4 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/src/assets/js/axios.js b/src/assets/js/axios.js
index ae03f80..0aa3a03 100644
--- a/src/assets/js/axios.js
+++ b/src/assets/js/axios.js
@@ -2,7 +2,7 @@
import axios from 'axios';
if (process.env.NODE_ENV == 'dev') {
// 璺ㄥ煙璇锋眰
- axios.defaults.baseURL = 'http://localhost:8919/fg/';
+ axios.defaults.baseURL = 'http://localhost:8090/';
axios.defaults.withCredentials = true; // 淇濇寔璇锋眰澶�
}
diff --git a/src/components/listCard.vue b/src/pages/alarmWork/components/listCard.vue
similarity index 87%
rename from src/components/listCard.vue
rename to src/pages/alarmWork/components/listCard.vue
index dfaa842..7de954f 100644
--- a/src/components/listCard.vue
+++ b/src/pages/alarmWork/components/listCard.vue
@@ -6,8 +6,8 @@
title="鐐瑰嚮鏌ョ湅璇︽儏"
>
<div class="">
- <span>宸ュ崟缂栧彿:123</span>
- <span>宸ュ崟鐢熸垚鏃堕棿:12233</span>
+ <span>宸ュ崟缂栧彿: {{data.orderId}}</span>
+ <span>宸ュ崟鐢熸垚鏃堕棿: {{data.workflowAlarm.alarmTime}}</span>
</div>
<div class="timer">澶勭悊鏃堕檺:3333</div>
</div>
@@ -16,13 +16,13 @@
<div class="item order-title">
<div class="inner">
<div class="title">宸ュ崟鏍囬</div>
- <div class="content">鏈烘埧鍛婅</div>
+ <div class="content" :title="data.title">{{data.title}}</div>
</div>
</div>
<div class="item order-content">
<div class="inner">
<div class="title">鍛婅鍐呭</div>
- <div class="content">鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒,鍐呴儴閿欒</div>
+ <div class="content" :title="data.taskDesc">{{data.taskDesc}}</div>
</div>
</div>
<div class="item">
diff --git a/src/pages/alarmWork/js/api.js b/src/pages/alarmWork/js/api.js
new file mode 100644
index 0000000..8dd9cb8
--- /dev/null
+++ b/src/pages/alarmWork/js/api.js
@@ -0,0 +1,10 @@
+import axios from '@/assets/js/axios';
+
+export const getList = function (param, data) {
+ return axios({
+ method: 'POST',
+ url: '/workflow/workflowMainList',
+ params: param,
+ data: data
+ });
+}
\ No newline at end of file
diff --git a/src/pages/alarmWork/list.vue b/src/pages/alarmWork/list.vue
index 554d043..ff71924 100644
--- a/src/pages/alarmWork/list.vue
+++ b/src/pages/alarmWork/list.vue
@@ -61,27 +61,12 @@
<script>
import FlexLayout from "@/components/FlexLayout.vue";
-import ListCard from "@/components/listCard.vue";
+import ListCard from "./components/listCard.vue";
-let list = [
- {
- a: 1
- },
- {
- a: 2
- },
- {
- a: 1
- },
- {
- a: 2
- },{
- a: 1
- },
- {
- a: 2
- }
-];
+import {
+ getList
+} from './js/api';
+
export default {
data() {
return {
@@ -120,11 +105,36 @@
},
handleCurrentChange (val) {
console.log(`褰撳墠椤�: ${val}`);
+ },
+ // 鏌ュ垪琛�
+ getList () {
+ let param = {
+ pageNum: 1,
+ pageSize: 1,
+ type: 1
+ };
+ let data = {
+
+ };
+ getList(param, data).then((res) => {
+ res = res.data;
+ console.log(res, '=====');
+ let list = [];
+ if (res.code) {
+ list = res.data;
+ }
+ console.log(list);
+ this.list = list;
+ }).catch((err) => {
+ console.error(err);
+ });
}
+
},
mounted() {
- this.unitType = this.$route.meta.unitType
- this.list = list;
+ this.unitType = this.$route.meta.unitType;
+
+ this.getList();
}
}
@@ -135,7 +145,7 @@
background: #fff;
border-bottom: 1px solid #c4c4c4;
margin-bottom: 16px;
- padding: 16px 10px;
+ padding: 14px 30px;
}
.contain-search span.label {
font-size: 18px;
--
Gitblit v1.9.1