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
---
src/views/operate/management/myIndex/components/closure/index.vue | 4
src/views/operate/viewEvent/index.vue | 2
.history/src/views/operate/disposal/casepool/dispatch/index_20230109162555.vue | 4
.history/src/views/operate/disposal/casepool/dispatch/index_20230109161424.vue | 4
.history/src/views/operate/disposal/casepool/dispatch/index_20221229133119.vue | 8
.history/src/views/operate/disposal/casepool/dispatch/index_20230109144424.vue | 8
.history/src/views/operate/disposal/casepool/dispatch/index_20230109162203.vue | 4
.history/src/views/operate/disposal/casepool/learn/index_20221229133119.vue | 4
src/utils/helper.js | 6
src/views/operate/disposal/casepool/pool/index.vue | 2
.history/src/views/operate/disposal/casepool/dispatch/index_20230109145446.vue | 4
src/views/operate/disposal/casepool/learn/index.vue | 2
.history/src/views/operate/disposal/casepool/dispatch/index_20230109154522.vue | 4
src/views/operate/viewEvent/components/illExamine/index.vue | 4
src/views/operate/disposal/casepool/notDeal/index.vue | 2
src/views/operate/viewEvent/components/examine/index.vue | 6
.history/src/views/operate/disposal/casepool/learn/index_20230109151615.vue | 4
src/views/operate/viewEvent/components/closure/index.vue | 8
.history/src/views/operate/disposal/casepool/dispatch/index_20230109145213.vue | 4
.history/src/views/operate/disposal/casepool/dispatch/index_20230109152624.vue | 4
src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue | 2
.history/src/views/operate/disposal/casepool/dispatch/index_20230109154536.vue | 4
.history/src/views/operate/disposal/casepool/dispatch/index_20230109153031.vue | 4
.history/src/views/operate/disposal/casepool/dispatch/index_20230109161434.vue | 4
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 15 +-
.history/src/views/operate/disposal/casepool/dispatch/index_20230109161701.vue | 4
src/views/operate/management/myIndex/components/examine/index.vue | 6
src/views/layout/components/Header/index.vue | 75 ++++++++++-
.history/src/views/operate/disposal/casepool/dispatch/index_20230109152926.vue | 4
src/views/operate/management/myIndex/components/illclosure/index.vue | 4
src/views/operate/viewEvent/components/illclosure/index.vue | 8
.history/src/views/operate/disposal/casepool/dispatch/index_20230109152904.vue | 4
src/views/operate/disposal/casepool/dispatch/index.vue | 2
.history/src/views/operate/disposal/casepool/dispatch/index_20230109162320.vue | 4
.history/src/utils/helper_20221213160258.js | 2
src/main.js | 3
src/views/systemSetting/platform/externalLinks.vue | 7 +
.history/src/views/operate/disposal/casepool/dispatch/index_20230109161639.vue | 4
.history/src/views/operate/disposal/casepool/learn/index_20230109145215.vue | 4
src/views/operate/management/myIndex/index.vue | 2
.history/src/utils/helper_20230103115611.js | 4
.history/src/views/operate/disposal/casepool/dispatch/index_20230109161321.vue | 4
src/views/operate/management/myIndex/components/illExamine/index.vue | 4
.history/src/views/operate/disposal/casepool/dispatch/index_20230109154559.vue | 4
.history/src/views/operate/disposal/casepool/dispatch/index_20230109165206.vue | 4
src/views/intelligentPatrol/statistics/unlawful/area/index.vue | 47 +++++++
46 files changed, 215 insertions(+), 102 deletions(-)
diff --git a/.history/src/utils/helper_20221213160258.js b/.history/src/utils/helper_20221213160258.js
index c9fafd0..885326c 100644
--- a/.history/src/utils/helper_20221213160258.js
+++ b/.history/src/utils/helper_20221213160258.js
@@ -137,6 +137,6 @@
]
export const RESOURCE_OPTIONS = [
- { label: '浜哄伐涓婃姤', value: 2 },
+ { label: '缃戞牸宸℃煡', value: 2 },
{ label: '瑙嗛宸℃煡', value: 1 }
]
diff --git a/.history/src/utils/helper_20230103115611.js b/.history/src/utils/helper_20230103115611.js
index 7ac38fd..94f9d62 100644
--- a/.history/src/utils/helper_20230103115611.js
+++ b/.history/src/utils/helper_20230103115611.js
@@ -123,7 +123,7 @@
export const EVENT_SOURCE = [
{ label: '瑙嗛宸℃煡', value: 1 },
- { label: '浜哄伐涓婃姤', value: 2 }
+ { label: '缃戞牸宸℃煡', value: 2 }
]
export const CATEGOTY = [
@@ -137,6 +137,6 @@
]
export const RESOURCE_OPTIONS = [
- { label: '浜哄伐涓婃姤', value: 2 },
+ { label: '缃戞牸宸℃煡', value: 2 },
{ label: '瑙嗛宸℃煡', value: 1 }
]
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>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109144424.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109144424.vue
index 2cf52f3..885a574 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109144424.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109144424.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>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109145213.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109145213.vue
index ecd0b2b..5a695c7 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109145213.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109145213.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109145446.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109145446.vue
index 0e7af8d..0c95780 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109145446.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109145446.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152624.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152624.vue
index 545b854..83ac425 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152624.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152624.vue
@@ -38,7 +38,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'"
@@ -550,4 +550,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152904.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152904.vue
index 0e7af8d..0c95780 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152904.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152904.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152926.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152926.vue
index a01c4e8..c8c3abb 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152926.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109152926.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109153031.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109153031.vue
index 605d4c6..b99c83b 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109153031.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109153031.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154522.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154522.vue
index cc8c56a..626c402 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154522.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154522.vue
@@ -42,7 +42,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'"
@@ -553,4 +553,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154536.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154536.vue
index 488fb59..3561f50 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154536.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154536.vue
@@ -43,7 +43,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'"
@@ -554,4 +554,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154559.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154559.vue
index 605d4c6..b99c83b 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154559.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109154559.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161321.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161321.vue
index bede128..a2640b1 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161321.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161321.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'"
@@ -550,4 +550,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161424.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161424.vue
index eab695c..9fafbb7 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161424.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161424.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'"
@@ -550,4 +550,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161434.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161434.vue
index bede128..a2640b1 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161434.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161434.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'"
@@ -550,4 +550,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161639.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161639.vue
index f9d5c8c..c8121af 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161639.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161639.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'"
@@ -550,4 +550,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161701.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161701.vue
index 605d4c6..b99c83b 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161701.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109161701.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162203.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162203.vue
index 0f8505d..4db4c2c 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162203.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162203.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162320.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162320.vue
index 1c3a913..4eba3d6 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162320.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162320.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162555.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162555.vue
index 1c3a913..4eba3d6 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162555.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109162555.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109165206.vue b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109165206.vue
index 65bf571..7daebb1 100644
--- a/.history/src/views/operate/disposal/casepool/dispatch/index_20230109165206.vue
+++ b/.history/src/views/operate/disposal/casepool/dispatch/index_20230109165206.vue
@@ -38,7 +38,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'"
@@ -549,4 +549,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/learn/index_20221229133119.vue b/.history/src/views/operate/disposal/casepool/learn/index_20221229133119.vue
index 6dfeaee..4f26748 100644
--- a/.history/src/views/operate/disposal/casepool/learn/index_20221229133119.vue
+++ b/.history/src/views/operate/disposal/casepool/learn/index_20221229133119.vue
@@ -39,7 +39,7 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<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'"
@@ -548,4 +548,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/learn/index_20230109145215.vue b/.history/src/views/operate/disposal/casepool/learn/index_20230109145215.vue
index 3793a50..151780b 100644
--- a/.history/src/views/operate/disposal/casepool/learn/index_20230109145215.vue
+++ b/.history/src/views/operate/disposal/casepool/learn/index_20230109145215.vue
@@ -38,7 +38,7 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<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'"
@@ -551,4 +551,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/.history/src/views/operate/disposal/casepool/learn/index_20230109151615.vue b/.history/src/views/operate/disposal/casepool/learn/index_20230109151615.vue
index 6dfeaee..4f26748 100644
--- a/.history/src/views/operate/disposal/casepool/learn/index_20230109151615.vue
+++ b/.history/src/views/operate/disposal/casepool/learn/index_20230109151615.vue
@@ -39,7 +39,7 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<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'"
@@ -548,4 +548,4 @@
padding: 0 5px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/main.js b/src/main.js
index ed23992..10da838 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,6 +20,7 @@
import map from '@/utils/map'
Vue.prototype.$map = map
Vue.prototype.$axios = api
+window.eventBus = new Vue();
router.beforeEach((to, from, next) => {
if (to.meta.needLogin) {
const token = sessionStorage.getItem('token');
@@ -40,4 +41,4 @@
store,
render: h => h(App)
}).$mount('#app')
-// Vue.config.devtools=true
\ No newline at end of file
+// Vue.config.devtools=true
diff --git a/src/utils/helper.js b/src/utils/helper.js
index 7ac38fd..e54bd6f 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -26,7 +26,7 @@
let arr;
await myrequest({
method: 'get',
- url: `sccg/dict/query_type?level=${level}&typeCode=${code}`
+ url: `sccg/dict/query_tree_type?level=${level}&typeCode=${code}`
})
.then(res => {
arr = res.data;
@@ -123,7 +123,7 @@
export const EVENT_SOURCE = [
{ label: '瑙嗛宸℃煡', value: 1 },
- { label: '浜哄伐涓婃姤', value: 2 }
+ { label: '缃戞牸宸℃煡', value: 2 }
]
export const CATEGOTY = [
@@ -137,6 +137,6 @@
]
export const RESOURCE_OPTIONS = [
- { label: '浜哄伐涓婃姤', value: 2 },
+ { label: '缃戞牸宸℃煡', value: 2 },
{ label: '瑙嗛宸℃煡', value: 1 }
]
diff --git a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
index e25d9bd..4ff6797 100644
--- a/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
+++ b/src/views/intelligentPatrol/statistics/unlawful/area/index.vue
@@ -57,6 +57,31 @@
<el-table-column prop="name" label="鍖哄煙鍚嶇О" min-width="10">
</el-table-column>
<el-table-column prop="count" label="浜嬩欢鎬绘暟" min-width="5">
+ <template slot-scope="scope">
+ <el-popover
+ placement="right"
+ width="400"
+ trigger="click">
+ <el-table :data="gridData">
+ <el-table-column width="150" property="date" label="鏃ユ湡"></el-table-column>
+ <el-table-column width="100" property="name" label="濮撳悕"></el-table-column>
+ <el-table-column width="300" property="address" label="鍦板潃"></el-table-column>
+ </el-table>
+ <div >
+ <el-pagination
+ background
+ :current-page="currentPages"
+ layout="prev, pager, next"
+ :total="totalNums"
+ :page-size="pageSizes"
+ @current-change="changeCurrentPages"
+ >
+ </el-pagination>
+ </div>
+ <el-button type="text" slot="reference" @click="seachTotalEvents(scope.row.id)">{{scope.row.count}}</el-button>
+ </el-popover>
+
+ </template>
</el-table-column>
<el-table-column prop="ratio" label="鍗犳瘮" min-width="5">
</el-table-column>
@@ -91,11 +116,16 @@
</template>
<script>
import { createNamespacedHelpers } from "vuex";
+import basecase from "@/api/operate/basecase";
const { mapActions } = createNamespacedHelpers("statistics");
export default {
data() {
return {
+ totalNums:1,
+ pageSizes:10,
+ currentPages:1,
+ gridData:[],
pickerOptions: {
shortcuts: [
{
@@ -141,6 +171,20 @@
methods: {
...mapActions(["searchByArea"]),
+ seachTotalEvents(id){
+ console.log(this.value2)
+ let params ={
+ type:1,
+ street:id,
+ current: this.currentPage,
+ size: this.pageSize,
+ }
+ params.startTime = this.value2[0]||''
+ params.endTime = this.value2[1]||''
+ basecase.baseCasePoolList(params).then(res=>{
+ console.log(res)
+ })
+ },
handleExport(e) {
this.$axios({
method: "post",
@@ -201,6 +245,9 @@
this.totalNum = res.total;
});
},
+ changeCurrentPages(page){
+ this.currentPages = page;
+ },
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
diff --git a/src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue b/src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue
index 6e3fe87..7becc68 100644
--- a/src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/inspectionTable/index.vue
@@ -16,7 +16,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'" :label="mystatus === 1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'"
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index 64d9514..2dc413c 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -6,6 +6,17 @@
<div class="menu-left__item" v-for="(item, index) in menuLeftList" :key="item.id" @click="changeActive(index)">
<span :class="item.checked ? 'my-active' : 'my-activeno'" @click="menuChange(item)">{{ item.label }}</span>
</div>
+ <div class="menu-left__item" v-for="(item, index) in menuLinkList" :key="item.id+index" >
+ <span class="link-active" @click="menuOpen(item)">{{ item.name }}</span>
+ </div>
+ <el-dropdown trigger="click" @command="handleCommand" v-if="linkLeng">
+ <span class="el-dropdown-link">
+ <i class="el-icon-arrow-down el-icon--right"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown" >
+ <el-dropdown-item v-for="(i,dx) in menuLinkLists" :key="i.id+dx" :command="i">{{i.name}}</el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
</div>
<!-- 鍙充晶鑿滃崟 -->
<div class="header-right">
@@ -123,6 +134,7 @@
import updatePassword from "./updatePassword";
import users from "@/api/users";
import { Message } from "element-ui";
+import {searchexternalLinks} from "@/api/system/portal/externalLinks";
export default {
components: {
@@ -130,6 +142,9 @@
},
data() {
return {
+ linkLeng:false,
+ menuLinkLists:[],
+ menuLinkList:[],
baseInformationVisible: false,
updatePasswordDialog: false,
channelSettingVisible: false,
@@ -159,12 +174,6 @@
url: '',
id: '4f',
},
- {
- label: '澶栭儴閾炬帴',
- checked: false,
- url: '',
- id: '5f',
- },
],
flag: {
user: false,
@@ -183,6 +192,12 @@
},
created() {
this.setLoginInfo();
+ this.getExternalLinks()
+ },
+ mounted(){
+ window.eventBus.$on('setFeaturesData', ()=>{ // 涓嶅甫鍙傛暟
+ this.getExternalLinks()
+ })
},
watch:{
$route() {
@@ -192,6 +207,32 @@
},
},
methods: {
+ handleCommand(e){
+ console.log(e)
+ this.menuOpen(e)
+ },
+ menuOpen(row){
+ window.open('http://'+row.url, '_blank');
+ },
+ async getExternalLinks() {
+ await searchexternalLinks().then((res) => {
+ let that = this
+ that.menuLinkList=[]
+ if (res.length > 5) {
+ that.linkLeng = true
+ }
+ that.menuLinkLists = res
+ for (let i = 0; i < res.length; i++) {
+ that.menuLinkList.push(res[i])
+ if (i == 4) {
+ break;
+ }
+ }
+ console.log(that.menuLinkLists)
+ // this.menuLinkList = res
+
+ });
+ },
cancelChannel(){
this.channelSettingVisible=false
},
@@ -323,15 +364,17 @@
if (data.id === '4f') {
window.open('http://116.62.234.187:8120/#/Customer', '_blank');
}
- if (data.id === '5f') {
- this.$router.push({ path: "/home/system/platform/externalLinks" })
- }
+
}
}
};
</script>
<style lang="scss" scoped>
+.el-dropdown-link {
+ cursor: pointer;
+ color: #409EFF;
+}
::v-deep .el-form {
padding: 3vh 5vw;
@@ -353,7 +396,7 @@
.header-left {
display: flex;
flex: 1;
-
+align-items: center;
.menu-left__item {
width: 120px;
@@ -368,7 +411,19 @@
}
}
}
+.link-active{
+ overflow:hidden;
+ white-space: nowrap;
+
+ text-overflow: ellipsis;
+
+ -o-text-overflow:ellipsis;
+}
+ .link-active:hover{
+ color: #2f54eb;
+ background-color: #313350;
+ }
.my-active {
border-radius: 20px;
color: #2f54eb;
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 7ab4be1..5d3984f 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -61,7 +61,7 @@
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
<span>{{
- scope.row.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡"
+ scope.row.eventSource === 2 ? "缃戞牸宸℃煡" : "瑙嗛宸℃煡"
}}</span>
</template>
</el-table-column>
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index 36ed818..725bbae 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/index.vue
@@ -65,7 +65,7 @@
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<template slot-scope="scope">
<span>{{
- scope.row.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡"
+ scope.row.eventSource === 2 ? "缃戞牸宸℃煡" : "瑙嗛宸℃煡"
}}</span>
</template>
</el-table-column>
diff --git a/src/views/operate/disposal/casepool/notDeal/index.vue b/src/views/operate/disposal/casepool/notDeal/index.vue
index 28f4a64..e157dcc 100644
--- a/src/views/operate/disposal/casepool/notDeal/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/index.vue
@@ -65,7 +65,7 @@
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="7">
<template slot-scope="scope">
<span>{{
- scope.row.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡"
+ scope.row.eventSource === 2 ? "缃戞牸宸℃煡" : "瑙嗛宸℃煡"
}}</span>
</template>
</el-table-column>
diff --git a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
index 15d17ee..6c812a8 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -37,11 +37,13 @@
</el-form-item>
<!-- 浜嬩欢绛夌骇 -->
<el-form-item class="optionItems" label="浜嬩欢绛夌骇:" prop="gradeId">
- <el-select v-model="vio.gradeId" placeholder="璇烽�夋嫨妗堜欢绛夌骇">
- <el-option v-for="item in eventLevelList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
+ <el-cascader
+ :show-all-levels="false"
+ v-model="vio.gradeId"
+ :props="{ value: 'id',label: 'name',children: 'children',emitPath:false}"
+ :options="eventLevelList"
+ ></el-cascader>
+
</el-form-item>
</div>
<!-- 妗堢敱 -->
@@ -447,6 +449,7 @@
},
// 鎻愪氦娉ㄥ唽淇℃伅
handleSubmit() {
+ console.log(this.vio)
this.$refs.user.validate((valid) => {
if (valid) {
const { vio } = this;
@@ -606,4 +609,4 @@
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index e39cc02..3fe1cfe 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -65,7 +65,7 @@
<template slot-scope="scope">
<span>{{
scope.row.eventSource === 2
- ? '浜哄伐涓婁紶'
+ ? '缃戞牸宸℃煡'
: '瑙嗛宸℃煡'
}}</span>
</template>
diff --git a/src/views/operate/management/myIndex/components/closure/index.vue b/src/views/operate/management/myIndex/components/closure/index.vue
index 139c4f6..90e6495 100644
--- a/src/views/operate/management/myIndex/components/closure/index.vue
+++ b/src/views/operate/management/myIndex/components/closure/index.vue
@@ -11,7 +11,7 @@
<div class="data-item">
<el-form-item label="闂鏉ユ簮:">
<span class="data-detail">{{
- baseCase.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡"
+ baseCase.eventSource === 2 ? "缃戞牸宸℃煡" : "瑙嗛宸℃煡"
}}</span>
</el-form-item>
<el-form-item label="鐧昏浜哄憳:">
@@ -390,4 +390,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index b8658f8..124a2c8 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -4,7 +4,7 @@
<el-form :model="baseCase" label-position="right" ref="viewForm" :rules="Rules" label-width="100px">
<div class="data-item">
<el-form-item label="闂鏉ユ簮:">
- <span class="data-detail">{{baseCase.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span>
+ <span class="data-detail">{{baseCase.eventSource === 2 ? '缃戞牸宸℃煡' : '瑙嗛宸℃煡'}}</span>
</el-form-item>
<el-form-item label="鐧昏浜哄憳:">
<span class="data-detail">{{baseCase.createUser}}</span>
@@ -153,7 +153,7 @@
data: {
baseCaseId: baseCase.id,
checkOpinion: baseCase.auditOpinion,
- result:index === 0 ? '椹冲洖':'閫氳繃',
+ result:index === 0 ? '椹冲洖':'閫氳繃',
}
})
.then(res => {
@@ -263,4 +263,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/management/myIndex/components/illExamine/index.vue b/src/views/operate/management/myIndex/components/illExamine/index.vue
index 0c52c52..93e7c89 100644
--- a/src/views/operate/management/myIndex/components/illExamine/index.vue
+++ b/src/views/operate/management/myIndex/components/illExamine/index.vue
@@ -4,7 +4,7 @@
<el-form :model="baseCase" label-position="right" ref="viewForm" :rules="Rules" label-width="160px">
<div class="data-item">
<el-form-item label="闂鏉ユ簮:">
- <span class="data-detail">{{baseCase.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span>
+ <span class="data-detail">{{baseCase.eventSource === 2 ? '缃戞牸宸℃煡' : '瑙嗛宸℃煡'}}</span>
</el-form-item>
<el-form-item label="鐧昏浜哄憳:">
<span class="data-detail">{{baseCase.createUser}}</span>
@@ -255,4 +255,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/management/myIndex/components/illclosure/index.vue b/src/views/operate/management/myIndex/components/illclosure/index.vue
index 814fa57..7569975 100644
--- a/src/views/operate/management/myIndex/components/illclosure/index.vue
+++ b/src/views/operate/management/myIndex/components/illclosure/index.vue
@@ -11,7 +11,7 @@
<div class="data-item">
<el-form-item label="闂鏉ユ簮:">
<span class="data-detail">{{
- baseCase.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡"
+ baseCase.eventSource === 2 ? "缃戞牸宸℃煡" : "瑙嗛宸℃煡"
}}</span>
</el-form-item>
<el-form-item label="鐧昏浜哄憳:">
@@ -415,4 +415,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index d71e2b4..15ecb8e 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -45,7 +45,7 @@
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
<span>{{
- scope.row.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡"
+ scope.row.eventSource === 2 ? "缃戞牸宸℃煡" : "瑙嗛宸℃煡"
}}</span>
</template>
</el-table-column>
diff --git a/src/views/operate/viewEvent/components/closure/index.vue b/src/views/operate/viewEvent/components/closure/index.vue
index bdf62d1..ddafc3d 100644
--- a/src/views/operate/viewEvent/components/closure/index.vue
+++ b/src/views/operate/viewEvent/components/closure/index.vue
@@ -4,7 +4,7 @@
<el-form :model="baseCase" label-position="right" ref="viewForm" :rules="Rules" label-width="100px">
<div class="data-item">
<el-form-item label="闂鏉ユ簮:">
- <span class="data-detail">{{baseCase.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span>
+ <span class="data-detail">{{baseCase.eventSource === 2 ? '缃戞牸宸℃煡' : '瑙嗛宸℃煡'}}</span>
</el-form-item>
<el-form-item label="鐧昏浜哄憳:">
<span class="data-detail">{{baseCase.createUser}}</span>
@@ -162,8 +162,8 @@
{
trigger:'blur',validator:checkFinal
}
- ]
-
+ ]
+
},
baseCase: {},
handlePassVo: {},
@@ -309,4 +309,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/viewEvent/components/examine/index.vue b/src/views/operate/viewEvent/components/examine/index.vue
index 4cc6b43..5bf88c4 100644
--- a/src/views/operate/viewEvent/components/examine/index.vue
+++ b/src/views/operate/viewEvent/components/examine/index.vue
@@ -4,7 +4,7 @@
<el-form :model="baseCase" label-position="right" ref="viewForm" :rules="Rules" label-width="100px">
<div class="data-item">
<el-form-item label="闂鏉ユ簮:">
- <span class="data-detail">{{baseCase.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span>
+ <span class="data-detail">{{baseCase.eventSource === 2 ? '缃戞牸宸℃煡' : '瑙嗛宸℃煡'}}</span>
</el-form-item>
<el-form-item label="鐧昏浜哄憳:">
<span class="data-detail">{{baseCase.createUser}}</span>
@@ -158,7 +158,7 @@
data: {
baseCaseId: baseCase.id,
checkOpinion: baseCase.auditOpinion,
- result:index === 0 ? '椹冲洖':'閫氳繃',
+ result:index === 0 ? '椹冲洖':'閫氳繃',
}
})
.then(res => {
@@ -254,4 +254,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/viewEvent/components/illExamine/index.vue b/src/views/operate/viewEvent/components/illExamine/index.vue
index 40ac436..d89381b 100644
--- a/src/views/operate/viewEvent/components/illExamine/index.vue
+++ b/src/views/operate/viewEvent/components/illExamine/index.vue
@@ -4,7 +4,7 @@
<el-form :model="baseCase" label-position="right" ref="viewForm" :rules="Rules" label-width="160px">
<div class="data-item">
<el-form-item label="闂鏉ユ簮:">
- <span class="data-detail">{{baseCase.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span>
+ <span class="data-detail">{{baseCase.eventSource === 2 ? '缃戞牸宸℃煡' : '瑙嗛宸℃煡'}}</span>
</el-form-item>
<el-form-item label="鐧昏浜哄憳:">
<span class="data-detail">{{baseCase.createUser}}</span>
@@ -254,4 +254,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/viewEvent/components/illclosure/index.vue b/src/views/operate/viewEvent/components/illclosure/index.vue
index ef7a7e2..3ee969d 100644
--- a/src/views/operate/viewEvent/components/illclosure/index.vue
+++ b/src/views/operate/viewEvent/components/illclosure/index.vue
@@ -4,7 +4,7 @@
<el-form :model="baseCase" label-position="right" ref="viewForm" :rules="Rules" label-width="160px">
<div class="data-item">
<el-form-item label="闂鏉ユ簮:">
- <span class="data-detail">{{baseCase.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡'}}</span>
+ <span class="data-detail">{{baseCase.eventSource === 2 ? '缃戞牸宸℃煡' : '瑙嗛宸℃煡'}}</span>
</el-form-item>
<el-form-item label="鐧昏浜哄憳:">
<span class="data-detail">{{baseCase.createUser}}</span>
@@ -158,8 +158,8 @@
{
trigger:'blur',validator:checkFinal
}
- ]
-
+ ]
+
},
baseCase: {},
handlePassVo: {},
@@ -319,4 +319,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index bee1938..9c72094 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -108,7 +108,7 @@
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template v-if="scope.row.eventSource" slot-scope="scope">
<span>{{
- scope.row.eventSource === 2 ? "浜哄伐涓婃姤" : "瑙嗛宸℃煡"
+ scope.row.eventSource === 2 ? "缃戞牸宸℃煡" : "瑙嗛宸℃煡"
}}</span>
</template>
</el-table-column>
diff --git a/src/views/systemSetting/platform/externalLinks.vue b/src/views/systemSetting/platform/externalLinks.vue
index 4f6e6d0..f697277 100644
--- a/src/views/systemSetting/platform/externalLinks.vue
+++ b/src/views/systemSetting/platform/externalLinks.vue
@@ -100,6 +100,7 @@
</div>
</template>
<script>
+import headerLink from '../../layout/components/Header/index'
import helper from "@/utils/mydate";
import { createNamespacedHelpers } from "vuex";
import departmentAside from "@/views/operate/fivepack/threepack/components/aside";
@@ -154,6 +155,9 @@
created() {
this.getList();
},
+ destroyed(){
+ window.eventBus.$off('setFeaturesData')
+ },
methods: {
...mapActions(["getOrgGridList", "deleteOrgGrid"]),
submitForm(formName) {
@@ -162,6 +166,7 @@
if (this.linkTitle == '娣诲姞澶栭儴閾炬帴') {
await addexternalLinks(this.linkForm).then(res => {
this.dialogUpdate = false
+ window.eventBus.$emit('setFeaturesData') // 涓嶅甫鍙傛暟
this.getList()
console.log(res)
})
@@ -252,6 +257,7 @@
url:''
}
this.linkTitle = '娣诲姞澶栭儴閾炬帴'
+
this.dialogUpdate = true;
},
handleEdit(row) {
@@ -266,6 +272,7 @@
type: "success",
message: "鍒犻櫎鎴愬姛锛�",
});
+ window.eventBus.$emit('setFeaturesData') // 涓嶅甫鍙傛暟
this.getList();
});
});
--
Gitblit v1.8.0