From b27571cf78742a5de2e1d43c4af5f8cc436860e2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 12 四月 2024 15:51:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/equipment/index.vue | 76 ++++++++------------------------------
1 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue
index ada2e73..1b6dd83 100644
--- a/src/views/system/equipment/index.vue
+++ b/src/views/system/equipment/index.vue
@@ -16,28 +16,24 @@
<p>璁惧鎬绘暟</p >
</div>
<div class="dashboard-item">
+ <h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
+ <p>浜鸿劯璁惧鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
+ <p>杞﹁締璁惧鏁�</p >
+ </div>
+ <div class="dashboard-item">
+ <h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
+ <p>瑙嗛璁惧鏁�</p >
+ </div>
+ <div class="dashboard-item">
<h3 style="color: #3eba45">{{ count.totalMembers }}</h3>
<p>姝ｅ父鏁�</p >
</div>
<div class="dashboard-item">
<h3 style="color: #fe640d">{{ count.postsPercentage }}</h3>
<p>寮傚父鏁�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.totalViews }}</h3>
- <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.noStore }}</h3>
- <p>鏃犲瓨鍌�</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.partStore }}</h3>
- <p>閮ㄥ垎瀛樺偍</p >
- </div>
- <div class="dashboard-item">
- <h3>{{ count.viewsPercentage }}%</h3>
- <p>璁惧杩愯鐜�</p >
</div>
</div>
</el-col>
@@ -84,21 +80,6 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
- <el-select
- v-model="queryParams.defaultOrder"
- placeholder="鏄惁鐢熸垚寮傚父宸ュ崟"
- clearable
- style="width: 170px"
- >
- <el-option
- v-for="dict in dict.type.platform_yes_no"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -130,16 +111,8 @@
<dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
</template>
</el-table-column>
- <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder" width="180" v-if="columns[3].visible">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
- </template>
- </el-table-column>
- <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180" v-if="columns[4].visible"/>
- <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180" v-if="columns[5].visible"/>
- <el-table-column label="淇′护鏃跺欢(ms)" align="center" prop="sipDelay" width="180" v-if="columns[6].visible"/>
- <el-table-column label="瑙嗛鏃跺欢(ms)" align="center" prop="videoDelay" width="180" v-if="columns[7].visible"/>
- <el-table-column label="鍏抽敭甯ф椂寤�(ms)" align="center" prop="iframeDelay" width="180" v-if="columns[8].visible"/>
+ <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180" v-if="columns[3].visible"/>
+ <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180" v-if="columns[4].visible"/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
@@ -176,25 +149,12 @@
</el-col>
<el-col :span="24">
<el-form-item label="鍦板潃锛�">{{ form.address }}</el-form-item>
- <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟锛�">
- <div v-if="form.defaultOrder === 1">鏄�</div>
- <div v-else-if="form.defaultOrder === 2">鍚�</div>
- </el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="瀹夎鏃堕棿锛�">{{ form.installedTime }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.managementUnit }}</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="淇′护鏃跺欢(ms)锛�"></el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="瑙嗛鏃跺欢(ms)锛�"></el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鍏抽敭甯ф椂寤�(ms)锛�"></el-form-item>
</el-col>
</el-row>
</el-form>
@@ -217,12 +177,8 @@
{ key: 0, label: `鏍囩`, visible: true },
{ key: 1, label: `鍖哄煙`, visible: true },
{ key: 2, label: `璁惧鐘舵�乣, visible: true },
- { key: 3, label: `鏄惁鐢熸垚寮傚父宸ュ崟`, visible: true },
- { key: 4, label: `鏁版嵁鏃堕棿`, visible: true },
- { key: 5, label: `绠＄悊鍗曚綅`, visible: true },
- { key: 6, label: `淇′护鏃跺欢`, visible: true },
- { key: 7, label: `瑙嗛鏃跺欢`, visible: true },
- { key: 8, label: `鍏抽敭甯ф椂寤禶, visible: true }
+ { key: 3, label: `鏁版嵁鏃堕棿`, visible: true },
+ { key: 4, label: `绠＄悊鍗曚綅`, visible: true },
],
count: {
totalPosts: 0,
--
Gitblit v1.8.0