Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

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;
     })

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;
     })

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>

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">

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>

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>

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>

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>

src/views/sys/user.vue

@@ -55,9 +55,8 @@
             clearable
             style="margin-left: 2px"
           >
-            <el-option label="全部" value=""></el-option>
+            <el-option label="在用" :value="false"></el-option>
-            <el-option label="在用" :value="deletedIs"></el-option>
+            <el-option label="已删" :value="true"></el-option>
-            <el-option label="已删" :value="isDeleted"></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>