From b9bf147a1f7f2491fb2ffee11603df6d5d250332 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 20 三月 2024 20:58:57 +0800
Subject: [PATCH] 视频监控修改

---
 src/views/system/video/index.vue    |   17 +++++
 src/views/system/recovery/index.vue |   62 ++++++++------------
 vue.config.js                       |    2 
 src/views/system/face/index.vue     |   36 +++++++----
 src/views/system/score/index.vue    |    7 ++
 src/views/system/car/index.vue      |   23 +++++--
 6 files changed, 88 insertions(+), 59 deletions(-)

diff --git a/src/views/system/car/index.vue b/src/views/system/car/index.vue
index cb7b06c..8f9ba87 100644
--- a/src/views/system/car/index.vue
+++ b/src/views/system/car/index.vue
@@ -26,6 +26,10 @@
               <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
             </div>
             <div class="dashboard-item">
+              <h3>{{ totalCar }}</h3>
+              <p>杩囪溅鏁版嵁鎬婚噺</p >
+            </div>
+            <div class="dashboard-item">
               <h3>{{ viewsPercentage }}%</h3>
               <p>璁惧杩愯鐜�</p >
             </div>
@@ -43,10 +47,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="鍦板尯" prop="onState">
+      <el-form-item label="鍖哄煙" prop="onState">
         <el-select
           v-model="queryParams.address"
-          placeholder="鍦板尯"
+          placeholder="璇烽�夋嫨鍖哄煙"
           clearable
         >
         <el-option label="鑷础甯�" value="鑷础甯�"/>
@@ -54,6 +58,9 @@
         <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
         <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
         <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
+        <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>
+        <el-option label="鑽e幙" value="鑽e幙"/>
+        <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>
         </el-select>
       </el-form-item>
       <el-form-item label="璁惧鐘舵��" prop="onState">
@@ -110,8 +117,8 @@
       <el-table-column type="selection" align="center" />
       <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed/>
       <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
-      <el-table-column label="鍖哄煙" align="center" prop="address" width="180"/>
       <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180"/>
+      <el-table-column label="鍖哄煙" align="center" prop="address" width="180"/>
       <el-table-column label="璁惧鐘舵��" align="center" prop="onState">
       <template slot-scope="scope">
         <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
@@ -198,11 +205,11 @@
   data() {
     return {
       totalPosts: 1156,
-      totalMembers: 1000,
-      postsPercentage: 156,
-      totalViews: 75,
-      viewsPercentage: 91.36,
-      totalErrors: 0,
+      totalMembers: 931,
+      postsPercentage: 182,
+      totalViews: 43,
+      viewsPercentage: 80.53,
+      totalCar: 2098530,
       // 閬僵灞�
       loading: true,
       // 閫変腑鏁扮粍
diff --git a/src/views/system/face/index.vue b/src/views/system/face/index.vue
index eee39a8..2755297 100644
--- a/src/views/system/face/index.vue
+++ b/src/views/system/face/index.vue
@@ -22,8 +22,12 @@
               <p>寮傚父鏁�</p >
             </div>
             <div class="dashboard-item">
-              <h3>{{ totalViews }}</h3>
+              <h3>{{ totalOrders }}</h3>
               <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
+            </div>
+            <div class="dashboard-item">
+              <h3>{{ totalViews }}</h3>
+              <p>鎶撴媿鏁版嵁鎬婚噺</p >
             </div>
             <div class="dashboard-item">
               <h3>{{ viewsPercentage }}%</h3>
@@ -43,17 +47,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="鍦板尯" prop="onState">
+      <el-form-item label="鍖哄煙" prop="onState">
         <el-select
           v-model="queryParams.address"
-          placeholder="鍦板尯"
+          placeholder="璇烽�夋嫨鍖哄煙"
           clearable
         >
-        <el-option label="鑷础甯�" value="鑷础甯�"/>
-        <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
-        <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
-        <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
-        <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
+          <el-option label="鑷础甯�" value="鑷础甯�"/>
+          <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
+          <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
+          <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
+          <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
+          <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>
+          <el-option label="鑽e幙" value="鑽e幙"/>
+          <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>
         </el-select>
       </el-form-item>
       <el-form-item label="璁惧鐘舵��" prop="onState">
@@ -109,8 +116,8 @@
       <el-table-column type="selection" align="center" />
       <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed/>
       <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
-      <el-table-column label="鍖哄煙" align="center" prop="address" width="180"/>
       <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180"/>
+      <el-table-column label="鍖哄煙" align="center" prop="address" width="180"/>
       <el-table-column label="璁惧鐘舵��" align="center" prop="onState">
       <template slot-scope="scope">
         <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
@@ -237,11 +244,12 @@
   dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
   data() {
     return {
-      totalPosts: 1156,
-      totalMembers: 1000,
-      postsPercentage: 156,
-      totalViews: 75,
-      viewsPercentage: 91.36,
+      totalPosts: 1490,
+      totalMembers: 1090,
+      postsPercentage: 319,
+      totalViews: 1200164,
+      totalOrders: 81,
+      viewsPercentage: 73.15,
       totalErrors: 0,
       // 閬僵灞�
       loading: true,
diff --git a/src/views/system/recovery/index.vue b/src/views/system/recovery/index.vue
index ea7654a..9ec015a 100644
--- a/src/views/system/recovery/index.vue
+++ b/src/views/system/recovery/index.vue
@@ -35,44 +35,31 @@
     </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-form-item label="鍏抽敭瀛�" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+          placeholder="璇疯緭鍏ュ叧閿瓧"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="璁惧鐘舵��" prop="onState">
+      <el-form-item label="鍖哄煙" prop="onState">
         <el-select
-          v-model="queryParams.onState"
-          placeholder="璁惧鐘舵��"
+          v-model="queryParams.address"
+          placeholder="璇烽�夋嫨鍖哄煙"
           clearable
-          style="width: 100px"
         >
-        <el-option
-          v-for="dict in dict.type.camera_state"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
+          <el-option label="鑷础甯�" value="鑷础甯�"/>
+          <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
+          <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
+          <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
+          <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
+          <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>
+          <el-option label="鑽e幙" value="鑽e幙"/>
+          <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>
         </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>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -94,16 +81,19 @@
 
     <el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180px" />
       <el-table-column label="璁惧鍚嶇О" align="center" prop="name" />
-      <el-table-column label="鏍囩" align="center" prop="tag" />
+      <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180px" />
+      <el-table-column label="鏍囩" align="center" prop="tag" >
+        {{"鐪佸巺鑰冩牳"}}
+      </el-table-column>
+      <el-table-column label="鍖哄煙" align="center" prop="region" >
+        {{"澶у畨鍖�"}}
+      </el-table-column>
       <el-table-column label="璁惧鐘舵��" align="center" prop="onState">
       <template slot-scope="scope">
         <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
       </template>
       </el-table-column>
-      <el-table-column label="鍖哄煙" align="center" prop="region" />
-      <el-table-column label="璇︾粏鍦板潃" align="center" prop="address" />
       <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder">
       <template slot-scope="scope">
         <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
@@ -179,11 +169,11 @@
   dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
   data() {
     return {
-      totalPosts: 1156,
-      totalMembers: 1000,
-      postsPercentage: 156,
-      totalViews: 75,
-      viewsPercentage: 91.36,
+      totalPosts: 8896,
+      totalMembers: 8029,
+      postsPercentage: 382,
+      totalViews: 141,
+      viewsPercentage: 90.25,
       totalErrors: 0,
       // 閬僵灞�
       loading: true,
diff --git a/src/views/system/score/index.vue b/src/views/system/score/index.vue
index c98bb4e..ba5dc99 100644
--- a/src/views/system/score/index.vue
+++ b/src/views/system/score/index.vue
@@ -95,6 +95,13 @@
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-s-check"
+            @click="handleAuditing(scope.row)"
+            v-hasPermi="['score:publish:audit']"
+          >瀹℃牳</el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >淇敼</el-button>
diff --git a/src/views/system/video/index.vue b/src/views/system/video/index.vue
index 6b0abb8..d144ed1 100644
--- a/src/views/system/video/index.vue
+++ b/src/views/system/video/index.vue
@@ -53,6 +53,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="鍖哄煙" prop="onState">
+        <el-select
+          v-model="queryParams.address"
+          placeholder="璇烽�夋嫨鍖哄煙"
+          clearable
+        >
+          <el-option label="鑷础甯�" value="鑷础甯�"/>
+          <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
+          <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
+          <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
+          <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
+          <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>
+          <el-option label="鑽e幙" value="鑽e幙"/>
+          <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="璁惧鐘舵��" prop="onState">
         <el-select
           v-model="queryParams.onState"
@@ -83,6 +99,7 @@
          />
          </el-select>
         </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
diff --git a/vue.config.js b/vue.config.js
index cf11cc5..e61f74f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.3.88:8080`,
+        target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

--
Gitblit v1.8.0