From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
.history/src/views/operate/disposal/casepool/dispatch/index_20221229133119.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20221229133119.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20221229133119.vue
index be6a3a7..79582a1 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20221229133119.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20221229133119.vue
@@ -39,7 +39,7 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
- <span>{{ scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡' }}</span>
+ <span>{{ scope.row.eventSource === 2 ? '缃戞牸宸℃煡' : '瑙嗛宸℃煡' }}</span>
</template>
</el-table-column>
<el-table-column :prop="mystatus === 1 ? 'category' :'category'"
@@ -114,7 +114,7 @@
:total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
- </div> -->
+ </div> -->
</div>
</main>
</div>
@@ -522,7 +522,7 @@
.el-checkbox{
display: none;
}
-
+
}
@@ -544,4 +544,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0