From 25d9e60dc5a2773b32e79943e6090d53c48ff5ec Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Wed, 4 Jan 2023 16:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E6=98=BE=E7=A4=BA=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                          |  2 +-
 src/layouts/default/header/index.vue      |  4 ++++
 src/views/base/base-data/BaseDrawer.vue   |  4 ++--
 src/views/base/base-data/base.data.ts     | 16 +++++++++++++-
 src/views/visualization/components/JK.vue | 27 ++++++++++++++---------
 5 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/.env.development b/.env.development
index 75b92971..c4218e07 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
 
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
-VITE_PROXY = [["/api","http://lcny-api.peidikeji.cn"],["/upload","http://lcny-api.peidikeji.cn/api/web/upload"]]
+VITE_PROXY = [["/api","http://36.133.205.221:81"],["/upload","http://36.133.205.221:81/api/web/upload"]]
 
 # Delete console
 VITE_DROP_CONSOLE = false
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index 541080a8..66ec5da6 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -39,6 +39,10 @@
 
       <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
 
+      <div class="px-8px cursor-pointer">
+        <router-link to="/v">数据看板</router-link>
+      </div>
+
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
 
       <AppLocalePicker
diff --git a/src/views/base/base-data/BaseDrawer.vue b/src/views/base/base-data/BaseDrawer.vue
index 986ea402..a75adcfa 100644
--- a/src/views/base/base-data/BaseDrawer.vue
+++ b/src/views/base/base-data/BaseDrawer.vue
@@ -15,7 +15,7 @@
           @change="inputChange('longitude', $event)"
           v-model:value="model[field]"
           placeholder="请输入"
-        ></InputNumber>
+        />
       </template>
       <!-- 基地纬度 -->
       <template #address_lat="{ model, field }">
@@ -23,7 +23,7 @@
           @change="inputChange('latitude', $event)"
           v-model:value="model[field]"
           placeholder="请输入"
-        ></InputNumber>
+        />
       </template>
     </BasicForm>
     <Map v-model:modelValue="mapInfo" :params="params" />
diff --git a/src/views/base/base-data/base.data.ts b/src/views/base/base-data/base.data.ts
index 9a9cee13..04d60a76 100644
--- a/src/views/base/base-data/base.data.ts
+++ b/src/views/base/base-data/base.data.ts
@@ -6,6 +6,10 @@ export const columns: BasicColumn[] = [
     title: '基地名称',
     dataIndex: 'name',
   },
+  {
+    title: '排序',
+    dataIndex: 'sort',
+  },
   {
     title: '基地负责人',
     dataIndex: 'person',
@@ -74,7 +78,17 @@ export const accountFormSchema: FormSchema[] = [
     required: true,
     component: 'Input',
   },
-
+  {
+    field: 'sort',
+    label: '排序',
+    required: true,
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      precision: 0,
+    },
+    defaultValue: 0,
+  },
   {
     field: 'person',
     label: '基地负责人',
diff --git a/src/views/visualization/components/JK.vue b/src/views/visualization/components/JK.vue
index 481558e7..d70137e6 100644
--- a/src/views/visualization/components/JK.vue
+++ b/src/views/visualization/components/JK.vue
@@ -33,24 +33,24 @@
       </div>
       <div class="flex-1 px-11px flex flex-col py-10px box-content" :class="{ 'pt-0': !isBase }">
         <div class="flex-1">
-          <div class="bg-light-600 h-full" :class="{ 'h-140px': isBase }">
-            <VideoFlv
-              class="cursor-pointer"
-              v-if="currentVido"
-              :url="currentVido.url"
-              :name="currentVido.base_name"
-            />
+          <div
+            class="h-full"
+            :class="{ 'h-140px': isBase }"
+            v-for="(item, index) in listBig"
+            :key="index"
+          >
+            <VideoFlv class="cursor-pointer" :url="item.url" :name="item.base_name" />
           </div>
         </div>
         <div class="grid grid-cols-3 gap-x-6px pt-10px">
-          <div class="h-66px" v-for="item in list" :key="item.id">
+          <div class="h-66px" v-for="item in listSmall" :key="item.id">
             <VideoFlv
               class="cursor-pointer"
               :url="item.url"
               :name="item.base_name"
-              :screen="false"
-              @onClick="onChangeVideo(item)"
+              :screen="true"
             />
+            <!-- @onClick="onChangeVideo(item)" -->
             <!-- <img
               :src="item.img"
               class="object-cover w-full h-full"
@@ -98,6 +98,9 @@
 
       const currentVido = ref<any>(null)
 
+      const listSmall = computed(() => Data.list.slice(1, 4))
+      const listBig = computed(() => Data.list.slice(0, 1))
+
       const currentTabValue = computed(
         () => Data.tabList.find((e) => e.id == Data.currentTab)?.name ?? '',
       )
@@ -128,7 +131,7 @@
 
         currentVido.value = null
 
-        Data.list = resData.splice(0, 3).map((e, index) => {
+        Data.list = resData.splice(0, 4).map((e, index) => {
           const { rtsp_url } = e.extends
           const url = rtsp_url
           // const url = 'rtsp://admin:admin12345@183.222.79.115:9007/cam/realmonitor?channel=1&subtype=0'
@@ -157,6 +160,8 @@
 
       return {
         isBase,
+        listBig,
+        listSmall,
         onChangeVideo,
         currentVido,
         ...toRefs(Data),