From 7d0f48df2c3e5417eb385da1743eff014a4d45c3 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 18 三月 2024 13:50:58 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/video/index.vue | 99 +++++++++---
src/views/system/recovery/index.vue | 100 +++++++++---
src/views/system/check-result/index.vue | 4
src/views/system/unit/people/index.vue | 4
src/views/system/face/index.vue | 98 +++++++++---
src/views/system/score/index.vue | 25 ---
src/views/system/car/index.vue | 99 +++++++++---
7 files changed, 304 insertions(+), 125 deletions(-)
diff --git a/src/views/system/car/index.vue b/src/views/system/car/index.vue
index 64c4527..91b35be 100644
--- a/src/views/system/car/index.vue
+++ b/src/views/system/car/index.vue
@@ -1,5 +1,39 @@
<template>
<div class="app-container">
+ <el-card class="box-card" >
+ <el-row type="flex" align="middle" justify="space-between">
+ <el-col :xl="8" :lg="8" :md="10" :sm="8" :xs="6">
+ <div class="icon-container" style="background-color: #5599F7">
+ <i class="el-icon-truck"></i>
+ </div>
+ </el-col>
+ <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
+ <div class="dashboard">
+ <div class="dashboard-item">
+ <h3 style="color: #5C9BF8">{{ totalPosts }}</h3>
+ <p>璁惧鎬绘暟</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #3eba45">{{ totalMembers }}</h3>
+ <p>姝ｅ父鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #fe640d">{{ postsPercentage }}</h3>
+ <p>寮傚父鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #7868d9">{{ totalViews }}</h3>
+ <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3>{{ viewsPercentage }}%</h3>
+ <p>璁惧杩愯鐜�</p >
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </el-card>
+
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="璁惧鍚嶇О" prop="name">
<el-input
@@ -24,30 +58,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍦板潃" prop="address">
- <el-input
- v-model="queryParams.address"
- placeholder="璇疯緭鍏ヨ鏀垮尯鍩�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="瀹夎鏃堕棿" prop="installedTime">
- <el-date-picker clearable
- v-model="queryParams.installedTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨瀹夎鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="绠＄悊鍗曚綅" prop="managementUnit">
- <el-input
- v-model="queryParams.managementUnit"
- placeholder="璇疯緭鍏ョ鐞嗗崟浣�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+
<el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
<el-select
v-model="queryParams.defaultOrder"
@@ -169,6 +180,12 @@
dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
data() {
return {
+ totalPosts: 1156,
+ totalMembers: 1000,
+ postsPercentage: 156,
+ totalViews: 75,
+ viewsPercentage: 91.36,
+ totalErrors: 0,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -327,3 +344,37 @@
}
};
</script>
+
+<style lang="scss" scoped>
+
+.box-card {
+ background-color: #F5F9FE;
+ width: 100%;
+ margin-bottom: 20px;
+ height: 120px
+}
+.icon-container {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 20px;
+ width: 20%;
+ height: 80px;
+ margin-left: 5%;
+}
+.el-icon-truck {
+ font-size: 50px;
+ color: #FFFFFF;
+}
+
+.dashboard {
+ display: flex;
+ gap: 10%;
+ align-items: center;
+ margin-left: -50%;
+}
+
+.dashboard-item {
+ text-align: center;
+}
+</style>
diff --git a/src/views/system/check-result/index.vue b/src/views/system/check-result/index.vue
index d1b8738..593bafc 100644
--- a/src/views/system/check-result/index.vue
+++ b/src/views/system/check-result/index.vue
@@ -168,7 +168,7 @@
<el-descriptions-item>
<template slot="label">
<i class="el-icon-medal"></i>
- 缁煎悎鍒嗘暟
+ 绯荤粺鍒嗘暟
</template>
<el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
</el-descriptions-item>
@@ -182,7 +182,7 @@
<el-descriptions-item>
<template slot="label">
<i class="el-icon-medal"></i>
- 绯荤粺鍒嗘暟
+ 缁煎悎鍒嗘暟
</template>
<el-tag type="danger" size="small">{{detail.systemScore}}</el-tag>
</el-descriptions-item>
diff --git a/src/views/system/face/index.vue b/src/views/system/face/index.vue
index 9dfa69d..2d4ac6c 100644
--- a/src/views/system/face/index.vue
+++ b/src/views/system/face/index.vue
@@ -1,5 +1,39 @@
<template>
<div class="app-container">
+ <el-card class="box-card" >
+ <el-row type="flex" align="middle" justify="space-between">
+ <el-col :xl="8" :lg="8" :md="10" :sm="8" :xs="6">
+ <div class="icon-container" style="background-color: #5599F7">
+ <i class="el-icon-user"></i>
+ </div>
+ </el-col>
+ <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
+ <div class="dashboard">
+ <div class="dashboard-item">
+ <h3 style="color: #5C9BF8">{{ totalPosts }}</h3>
+ <p>璁惧鎬绘暟</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #3eba45">{{ totalMembers }}</h3>
+ <p>姝ｅ父鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #fe640d">{{ postsPercentage }}</h3>
+ <p>寮傚父鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #7868d9">{{ totalViews }}</h3>
+ <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3>{{ viewsPercentage }}%</h3>
+ <p>璁惧杩愯鐜�</p >
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </el-card>
+
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="璁惧鍚嶇О" prop="name">
<el-input
@@ -23,30 +57,6 @@
:value="dict.value"
/>
</el-select>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="address">
- <el-input
- v-model="queryParams.address"
- placeholder="璇疯緭鍏ュ湴鍧�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="瀹夎鏃堕棿" prop="installedTime">
- <el-date-picker clearable
- v-model="queryParams.installedTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨瀹夎鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="绠＄悊鍗曚綅" prop="managementUnit">
- <el-input
- v-model="queryParams.managementUnit"
- placeholder="璇疯緭鍏ョ鐞嗗崟浣�"
- clearable
- @keyup.enter.native="handleQuery"
- />
</el-form-item>
<el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
<el-select
@@ -210,6 +220,12 @@
dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
data() {
return {
+ totalPosts: 1156,
+ totalMembers: 1000,
+ postsPercentage: 156,
+ totalViews: 75,
+ viewsPercentage: 91.36,
+ totalErrors: 0,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -368,3 +384,37 @@
}
};
</script>
+
+<style lang="scss" scoped>
+
+.box-card {
+ background-color: #F5F9FE;
+ width: 100%;
+ margin-bottom: 20px;
+ height: 120px
+}
+.icon-container {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 20px;
+ width: 20%;
+ height: 80px;
+ margin-left: 5%;
+}
+.el-icon-user {
+ font-size: 50px;
+ color: #FFFFFF;
+}
+
+.dashboard {
+ display: flex;
+ gap: 10%;
+ align-items: center;
+ margin-left: -50%;
+}
+
+.dashboard-item {
+ text-align: center;
+}
+</style>
diff --git a/src/views/system/recovery/index.vue b/src/views/system/recovery/index.vue
index 9887f97..ca754c0 100644
--- a/src/views/system/recovery/index.vue
+++ b/src/views/system/recovery/index.vue
@@ -1,5 +1,39 @@
<template>
<div class="app-container">
+ <el-card class="box-card" >
+ <el-row type="flex" align="middle" justify="space-between">
+ <el-col :xl="8" :lg="8" :md="10" :sm="8" :xs="6">
+ <div class="icon-container" style="background-color: #5599F7">
+ <i class="el-icon-refresh-left"></i>
+ </div>
+ </el-col>
+ <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
+ <div class="dashboard">
+ <div class="dashboard-item">
+ <h3 style="color: #5C9BF8">{{ totalPosts }}</h3>
+ <p>璁惧鎬绘暟</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #3eba45">{{ totalMembers }}</h3>
+ <p>姝ｅ父鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #fe640d">{{ postsPercentage }}</h3>
+ <p>寮傚父鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #7868d9">{{ totalViews }}</h3>
+ <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3>{{ viewsPercentage }}%</h3>
+ <p>璁惧杩愯鐜�</p >
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </el-card>
+
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="璁惧鍚嶇О" prop="name">
<el-input
@@ -23,32 +57,6 @@
:value="dict.value"
/>
</el-select>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="address">
- <el-input
- v-model="queryParams.address"
- placeholder="璇疯緭鍏ュ湴鍧�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 170px"
- />
- </el-form-item>
- <el-form-item label="寮傚父鎭㈠鏃堕棿" prop="recoveryTime" label-width="130px">
- <el-date-picker clearable
- v-model="queryParams.recoveryTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨寮傚父鎭㈠鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="绠＄悊鍗曚綅" prop="managementUnit">
- <el-input
- v-model="queryParams.managementUnit"
- placeholder="璇疯緭鍏ョ鐞嗗崟浣�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 170px"
- />
</el-form-item>
<el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
<el-select
@@ -170,6 +178,12 @@
dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
data() {
return {
+ totalPosts: 1156,
+ totalMembers: 1000,
+ postsPercentage: 156,
+ totalViews: 75,
+ viewsPercentage: 91.36,
+ totalErrors: 0,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -328,3 +342,37 @@
}
};
</script>
+
+<style lang="scss" scoped>
+
+.box-card {
+ background-color: #F5F9FE;
+ width: 100%;
+ margin-bottom: 20px;
+ height: 120px
+}
+.icon-container {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 20px;
+ width: 20%;
+ height: 80px;
+ margin-left: 5%;
+}
+.el-icon-refresh-left {
+ font-size: 50px;
+ color: #FFFFFF;
+}
+
+.dashboard {
+ display: flex;
+ gap: 10%;
+ align-items: center;
+ margin-left: -50%;
+}
+
+.dashboard-item {
+ text-align: center;
+}
+</style>
diff --git a/src/views/system/score/index.vue b/src/views/system/score/index.vue
index 1a0bd98..bc293b4 100644
--- a/src/views/system/score/index.vue
+++ b/src/views/system/score/index.vue
@@ -17,16 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎿嶄綔绫诲瀷" prop="operateCategory">
- <el-select v-model="queryParams.operateCategory" placeholder="璇烽�夋嫨鎿嶄綔绫诲瀷" clearable>
- <el-option
- v-for="dict in dict.type.platform_operate_category"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
<el-form-item label="绉垎绫诲瀷" prop="scoreCategory">
<el-input
v-model="queryParams.scoreCategory"
@@ -88,11 +78,6 @@
<el-table-column label="鑰冩牳鍚�" align="center" prop="examineName" />
<el-table-column label="鍗曚綅鍚�" align="center" prop="unitName" />
<el-table-column label="鍒嗗��" align="center" prop="score" />
- <el-table-column label="鎿嶄綔绫诲瀷" align="center" prop="operateCategory">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_operate_category" :value="scope.row.operateCategory"/>
- </template>
- </el-table-column>
<el-table-column label="绉垎绫诲瀷" align="center" prop="scoreCategory">
<template slot-scope="scope">
<div v-if="scope.row.scoreCategory === 1">瑙嗛鍦ㄧ嚎鐜�</div>
@@ -148,16 +133,6 @@
<el-select v-model="form.examineId" placeholder="璇烽�夋嫨">
<el-option
v-for="item in examineList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎿嶄綔绫诲瀷" prop="operateCategory">
- <el-select v-model="form.operateCategory" placeholder="璇烽�夋嫨鎿嶄綔绫诲瀷">
- <el-option
- v-for="item in operateCategoryList"
:key="item.id"
:label="item.value"
:value="item.id">
diff --git a/src/views/system/unit/people/index.vue b/src/views/system/unit/people/index.vue
index 31a2fa1..c78430f 100644
--- a/src/views/system/unit/people/index.vue
+++ b/src/views/system/unit/people/index.vue
@@ -84,6 +84,7 @@
<el-table-column label="杩愮淮浜哄憳璐﹀彿" align="center" prop="ywPersonAccount" />
<el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnitName" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" />
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -135,6 +136,9 @@
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="remark">
+ <el-input v-model="form.remark" type="textarea" show-word-limit maxlength="150" placeholder="璇疯緭鍏ュ娉�" />
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
diff --git a/src/views/system/video/index.vue b/src/views/system/video/index.vue
index c69255f..a68de4e 100644
--- a/src/views/system/video/index.vue
+++ b/src/views/system/video/index.vue
@@ -1,5 +1,41 @@
<template>
+
<div class="app-container">
+
+ <el-card class="box-card" >
+ <el-row type="flex" align="middle" justify="space-between">
+ <el-col :xl="8" :lg="8" :md="10" :sm="8" :xs="6">
+ <div class="icon-container" style="background-color: #5599F7">
+ <i class="el-icon-video-camera"></i>
+ </div>
+ </el-col>
+ <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
+ <div class="dashboard">
+ <div class="dashboard-item">
+ <h3 style="color: #5C9BF8">{{ totalPosts }}</h3>
+ <p>璁惧鎬绘暟</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #3eba45">{{ totalMembers }}</h3>
+ <p>姝ｅ父鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #fe640d">{{ postsPercentage }}</h3>
+ <p>寮傚父鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #7868d9">{{ totalViews }}</h3>
+ <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3>{{ viewsPercentage }}%</h3>
+ <p>璁惧杩愯鐜�</p >
+ </div>
+ </div>
+ </el-col>
+ </el-row>
+ </el-card>
+
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="璁惧鍚嶇О" prop="name">
<el-input
@@ -23,30 +59,6 @@
:value="dict.value"
/>
</el-select>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="address">
- <el-input
- v-model="queryParams.address"
- placeholder="璇疯緭鍏ュ湴鍧�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="瀹夎鏃堕棿" prop="installedTime">
- <el-date-picker clearable
- v-model="queryParams.installedTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨瀹夎鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="绠＄悊鍗曚綅" prop="managementUnit">
- <el-input
- v-model="queryParams.managementUnit"
- placeholder="璇疯緭鍏ョ鐞嗗崟浣�"
- clearable
- @keyup.enter.native="handleQuery"
- />
</el-form-item>
<el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
<el-select
@@ -167,6 +179,12 @@
dicts: ['sys_normal_disable', 'platform_yes_no','camera_state'],
data() {
return {
+ totalPosts: 1156,
+ totalMembers: 1000,
+ postsPercentage: 156,
+ totalViews: 75,
+ viewsPercentage: 91.36,
+ totalErrors: 0,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -327,3 +345,36 @@
}
};
</script>
+<style lang="scss" scoped>
+
+.box-card {
+ background-color: #F5F9FE;
+ width: 100%;
+ margin-bottom: 20px;
+ height: 120px
+}
+.icon-container {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 20px;
+ width: 20%;
+ height: 80px;
+ margin-left: 5%;
+}
+.el-icon-video-camera {
+ font-size: 50px;
+ color: #FFFFFF;
+}
+
+.dashboard {
+ display: flex;
+ gap: 10%;
+ align-items: center;
+ margin-left: -50%;
+}
+
+.dashboard-item {
+ text-align: center;
+}
+</style>
--
Gitblit v1.8.0