From 5cefd84dede5ecaaecc7df76e95f418cf1d44758 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 20 Nov 2024 15:49:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86is=5Fdeleted=E5=8F=AF=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipment.vue      | 10 ++++++++++
 src/views/em/equipment_form.vue |  9 +++++++--
 src/views/em/equipmentjc.vue    | 10 ++++++++++
 src/views/em/equipmentjk.vue    | 10 ++++++++++
 src/views/em/equipmentjl.vue    | 12 +++++++++++-
 src/views/em/equipmentzl.vue    | 10 ++++++++++
 6 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 217eeba0..de2e2673 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -17,6 +17,16 @@
           <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
           @change="handleQuery"></el-option>
         </el-select> -->
+        <el-select
+            v-model="query.is_deleted"
+            placeholder="筛选"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option label="在用" :value="false"></el-option>
+            <el-option label="已删" :value="true"></el-option>
+        </el-select>
         <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 28cf02ad..db18fe92 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -53,7 +53,7 @@
                 <el-input v-model="form.model" placeholder="规格型号" />
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
+            <el-col :md="8" :sm="24">
               <el-form-item label="设备状态">
                 <el-select style="width: 100%" v-model="form.state" placeholder="请选择">
                   <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
@@ -61,13 +61,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-			      <el-col :md="12" :sm="24">
+			      <el-col :md="8" :sm="24">
               <el-form-item label="设备分类">
                 <el-select v-model="form.cate" placeholder="所属大类" clearable style="width: 100%">
                   <el-option v-for="item in cateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :md="8" :sm="24">
+                  <el-form-item label="是否删除">
+              <el-switch v-model="form.is_deleted" style="--el-switch-on-color: #FF0000;"/>
+            </el-form-item>
+          </el-col>
           </el-row>
           <el-divider v-if="form.type == 50"/>
           <el-row v-if="form.type == 50">
diff --git a/src/views/em/equipmentjc.vue b/src/views/em/equipmentjc.vue
index f1f65989..24e9bba7 100644
--- a/src/views/em/equipmentjc.vue
+++ b/src/views/em/equipmentjc.vue
@@ -17,6 +17,16 @@
           <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
           @change="handleQuery"></el-option>
         </el-select> -->
+        <el-select
+            v-model="query.is_deleted"
+            placeholder="筛选"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option label="在用" :value="false"></el-option>
+            <el-option label="已删" :value="true"></el-option>
+        </el-select>
         <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>
diff --git a/src/views/em/equipmentjk.vue b/src/views/em/equipmentjk.vue
index e8b5825d..1e35dcfd 100644
--- a/src/views/em/equipmentjk.vue
+++ b/src/views/em/equipmentjk.vue
@@ -17,6 +17,16 @@
           <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
           @change="handleQuery"></el-option>
         </el-select> -->
+        <el-select
+            v-model="query.is_deleted"
+            placeholder="筛选"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option label="在用" :value="false"></el-option>
+            <el-option label="已删" :value="true"></el-option>
+        </el-select>
         <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>
diff --git a/src/views/em/equipmentjl.vue b/src/views/em/equipmentjl.vue
index f93fe51d..da05a704 100644
--- a/src/views/em/equipmentjl.vue
+++ b/src/views/em/equipmentjl.vue
@@ -5,7 +5,17 @@
         <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
       </div>
       <div class="right-panel">
-        <el-input v-model="query.search" placeholder="名称" clearable style="margin-right: 5px;"></el-input>
+        <el-select
+            v-model="query.is_deleted"
+            placeholder="筛选"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option label="在用" :value="false"></el-option>
+            <el-option label="已删" :value="true"></el-option>
+        </el-select>
+        <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="margin-right: 5px;"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>
     </el-header>
diff --git a/src/views/em/equipmentzl.vue b/src/views/em/equipmentzl.vue
index f01b2e2a..023b62af 100644
--- a/src/views/em/equipmentzl.vue
+++ b/src/views/em/equipmentzl.vue
@@ -17,6 +17,16 @@
           <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
           @change="handleQuery"></el-option>
         </el-select> -->
+        <el-select
+            v-model="query.is_deleted"
+            placeholder="筛选"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option label="在用" :value="false"></el-option>
+            <el-option label="已删" :value="true"></el-option>
+        </el-select>
         <el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
       </div>

From fed5c23a28d62b861489130a7d07517700467d8c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 20 Nov 2024 15:52:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20user=E5=A4=84element=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=AF=BC=E8=87=B4=E7=9A=84switch=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sys/user.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/sys/user.vue b/src/views/sys/user.vue
index 270fa7dc..5479143e 100644
--- a/src/views/sys/user.vue
+++ b/src/views/sys/user.vue
@@ -55,9 +55,8 @@
             clearable
             style="margin-left: 2px"
           >
-            <el-option label="全部" value=""></el-option>
-            <el-option label="在用" :value="deletedIs"></el-option>
-            <el-option label="已删" :value="isDeleted"></el-option>
+            <el-option label="在用" :value="false"></el-option>
+            <el-option label="已删" :value="true"></el-option>
           </el-select>
         </div>
         <div class="right-panel">
@@ -227,7 +226,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="是否删除">
-        <el-switch active-color="#f56c6c" v-model="addForm.is_deleted" />
+        <el-switch v-model="addForm.is_deleted" style="--el-switch-on-color: #FF0000;"/>
       </el-form-item>
     </el-form>
     <template #footer>

From 78053dac34f2cb87dad5d724c148b69f987e1616 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 20 Nov 2024 17:39:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=A0=87=E8=AE=B0=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BDjs=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/am/audio.vue   | 3 ++-
 src/views/am/monitor.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/am/audio.vue b/src/views/am/audio.vue
index f5658919..39872f70 100644
--- a/src/views/am/audio.vue
+++ b/src/views/am/audio.vue
@@ -91,7 +91,8 @@ export default {
   mounted(){
     let that = this;
     let host = window.location.host;
-		let jsUrl = host.indexOf('localhost')>-1?'http://222.222.144.147:6013/jsmap/jsmap.js':host+'/jsmap/jsmap.js';
+		let jsUrl = host.indexOf('localhost')>-1?'http://222.222.144.147:6013/jsmap/jsmap.js':window.location.protocol + "//" + host+'/jsmap/jsmap.js';
+    console.log(jsUrl)
 		that.loadScript('mapId',jsUrl, () => {
       that.canUseMap = true;
     })
diff --git a/src/views/am/monitor.vue b/src/views/am/monitor.vue
index 5f70cbcd..823e9e89 100644
--- a/src/views/am/monitor.vue
+++ b/src/views/am/monitor.vue
@@ -154,7 +154,7 @@ export default {
     this.getArea();
     let that = this;
     let host = window.location.host;
-    let jsUrl = host.indexOf('localhost') > -1 ? 'http://222.222.144.147:6013/jsmap/jsmap.js' : host + '/jsmap/jsmap.js';
+    let jsUrl = host.indexOf('localhost') > -1 ? 'http://222.222.144.147:6013/jsmap/jsmap.js' : window.location.protocol + "//" + host+'/jsmap/jsmap.js';
     that.loadScript('mapId', jsUrl, () => {
       that.canUseMap = true;
     })