问题清单调整

src/views/business/ba/lateralPosition/index.vue

@@ -1,21 +1,25 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-
+        <el-form-item label="楼层:">
+            <el-select v-model.trim="queryParams.floor"  size="small" style="width:120px" placeholder="请选择类型">
+            <el-option :value="item.id" :label="item.id" v-for="(item,index) in floorList" :key="index"></el-option>
+            </el-select>
+      </el-form-item>
       <el-form-item label="厕位类型:">
-        <el-select v-model.trim="queryParams.type"  size="small" style="width:160px" placeholder="请选择类型">
+        <el-select v-model.trim="queryParams.type"  size="small" style="width:120px" placeholder="请选择类型">
           <el-option value="female" label="女厕"></el-option>
           <el-option value="male" label="男厕"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="使用状态:">
-        <el-select v-model.trim="queryParams.status"  size="small" style="width:160px" placeholder="请选择使用状态">
+        <el-select v-model.trim="queryParams.status"  size="small" style="width:140px" placeholder="请选择使用状态">
           <el-option value="0" label="空闲"></el-option>
           <el-option value="1" label="在用"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="故障状态:">
-        <el-select v-model.trim="queryParams.isAlert"  size="small" style="width:160px" placeholder="请选择故障状态">
+        <el-select v-model.trim="queryParams.isAlert"  size="small" style="width:140px" placeholder="请选择故障状态">
           <el-option value="false" label="正常"></el-option>
           <el-option value="true" label="故障"></el-option>
         </el-select>
@@ -32,7 +36,7 @@
       </el-form-item>
        <el-form-item label="采集时间:" class="time">
          <el-date-picker
-          style="margin-top:5px;;width:340px"
+          style="margin-top:5px;;width:100px"
           v-model="dateRange"
           size="small"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -105,6 +109,25 @@ export default {
   name: "Device",
   data() {
     return {
+        floorList:[
+            {id:1},
+            {id:2},
+            {id:3},
+            {id:4},
+            {id:5},
+            {id:6},
+            {id:7},
+            {id:8},
+            {id:9},
+            {id:10},
+            {id:11},
+            {id:12},
+            {id:13},
+            {id:14},
+            {id:15},
+            {id:16},
+            {id:17}
+        ],
       fileList:[],
       loading:true,
       exportLoading:false,

src/views/business/deviceMange/deviceApi/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="厂商名称:" prop="storeName">
         <el-input
           v-model.trim="queryParams.storeName"
-          placeholder="请输入设备名称"
+          placeholder="请输入厂商名称"
           clearable
           size="small"
           style="width: 160px"
@@ -61,7 +61,7 @@
         >下载</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="厂家（商家）" align="left" prop="business"  show-overflow-tooltip />
+      <el-table-column label="厂商名称" align="left" prop="business"  show-overflow-tooltip />
       <el-table-column label="创建人" align="left" prop="addPeople"  show-overflow-tooltip />
       <el-table-column label="创建时间" align="left" prop="addTime"  show-overflow-tooltip />
       <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
@@ -105,8 +105,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" >
-            <el-form-item label="接口传输方式" prop="interfaceTransmissionMode" >
-              <el-select v-model="form.interfaceTransmissionMode"   placeholder="请选择接口传输方式">
+            <el-form-item label="传输方式" prop="interfaceTransmissionMode" >
+              <el-select v-model="form.interfaceTransmissionMode"   placeholder="请选择传输方式">
                 <el-option
                   v-for="item in transferTypeList"
                   :key="item.id"
@@ -245,9 +245,9 @@ export default {
       selectCity: {},
       selectArea: {},
       transferTypeList:[
-        {id:1,name:"NB-IOT",},
-        {id:2,name:"Lord-IOT",},
-        {id:3,name:"2G/4G/5G",},
+        {id:'1',name:"NB-IOT",},
+        {id:'2',name:"Lord-IOT",},
+        {id:'3',name:"2G/4G/5G",},
       ],
       dwtypeList:[
         {id:1,name:"火系统",},

src/views/business/deviceMange/deviceList/index.vue

@@ -44,9 +44,8 @@
         </template> -->
       </el-table-column>
       <el-table-column label="所属单位" align="left" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="所属建筑" align="left" prop="louyu"  show-overflow-tooltip />
-      <el-table-column label="安装位置" align="left" prop="posistion"  show-overflow-tooltip />
-      <el-table-column label="详细地址" align="left" prop="address"  show-overflow-tooltip />
+      <el-table-column label="安装楼层" align="left" prop="louyu"  show-overflow-tooltip />
+      <el-table-column label="详细地址" align="left" prop="unitinfo"  show-overflow-tooltip />
       <el-table-column label="设备状态" align="left" prop="deviceStatus"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.deviceStatus == '0' ? 'color4' : scope.row.deviceStatus == '300' ? 'color3' : 'color2'">{{scope.row.deviceStatus == '0' ? "正常" : scope.row.deviceStatus == '300' ? "故障" : "离线"}}</span>
@@ -98,11 +97,6 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="安装位置" prop="unitinfo">
-              <el-input v-model.trim="form.unitinfo" placeholder="请填写安装位置" @input="onInput()" maxlength="15" show-word-limit/>
-            </el-form-item>
-          </el-col>
           <el-col :span="12" >
             <el-form-item label="所属单位" prop="company" >
               <el-select v-model="form.company"   placeholder="请选择所属单位">
@@ -115,20 +109,21 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="建筑" prop="louyu">
+            <el-form-item label="安装楼层" prop="louyu">
               <el-select v-model="form.louyu"   placeholder="请选择所属建筑建筑">
                 <el-option
-                  v-for="item in buildList"
+                  v-for="item in floorList"
                   :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+                  :label="item.floorName"
+                  :value="item.floorName"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+
           <el-col :span="12">
             <el-form-item label="设备类型" prop="dwtype">
               <el-select v-model="form.dwtype"   placeholder="请选择设备类型">
@@ -141,6 +136,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="GPS地址" prop="posistion">
+              <el-input v-model.trim="form.posistion" placeholder="请填写GPS地址" @input="onInput()" maxlength="15" show-word-limit/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <!-- <el-col :span="12" >
@@ -155,14 +155,10 @@
               </el-select>
             </el-form-item>
           </el-col> -->
-          <el-col :span="12">
-            <el-form-item label="GPS地址" prop="posistion">
-              <el-input v-model.trim="form.posistion" placeholder="请填写GPS地址" @input="onInput()" maxlength="15" show-word-limit/>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="12" >
-            <el-form-item label="详细地址" prop="address">
-              <el-input type="textarea" v-model.trim="form.address" placeholder="请填写详细地址" @input="onInput()" maxlength="20" show-word-limit/>
+            <el-form-item label="安装位置" prop="unitinfo">
+              <el-input type="textarea" v-model.trim="form.unitinfo" placeholder="请输入安装位置" @input="onInput()" maxlength="20" show-word-limit/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -215,6 +211,7 @@
 </template>
 <script>
 import { addDevice, delDevice, updateDevice, getDevice, exportDevice, getDeviceType } from "@/api/business/deviceMange";
+import { getFloor} from "@/api/business/buildMange";
 import { getBuilding } from "@/api/business/buildMange";
 import { listChannel } from "@/api/system/product";
 import { BASEPATH } from "@/assets/js/common.js";
@@ -222,6 +219,7 @@ export default {
   name: "Device",
   data() {
     return {
+        floorList:[],
       update:false,
       add:false,
       loading:true,
@@ -319,10 +317,18 @@ export default {
     };
   },
   created() {
+    this.floor()
     this.getList();//初始化table
     this.init()
   },
   methods: {
+     /** 查询参数列表 */
+     floor() {
+      getFloor({ current: 1,size: 100}).then(response => {
+        this.floorList = response.data.records;
+        console.log(this.floorList )
+      });
+    },
     //强制el-input刷新
     onInput(){
         this.$forceUpdate();
@@ -415,6 +421,7 @@ export default {
           } else {
             this.update = false
             this.add = true
+            this.form.address = ""
             addDevice(this.form).then(response => {
               this.loading = false,
               this.msgSuccess("新增成功");

src/views/business/deviceMange/deviceType/index.vue

@@ -14,7 +14,7 @@
       <el-form-item label="类型参数:" prop="typeValue">
         <el-input
           v-model.trim="queryParams.typeValue"
-          placeholder="请输入厂家名称"
+          placeholder="请输入类型参数"
           clearable
           size="small"
           style="width: 160px"

src/views/index.vue

@@ -50,7 +50,7 @@
                         >
                             <div class="map" style="height: calc(48vh - 35px)">
                                 <!-- <iframe id="myIframe" style="width:100%;height:100%;border:none;" src='https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9'></iframe> -->
-                                <iframe
+                                <!-- <iframe
                                     id="myIframe"
                                     style="
                                         width: 100%;
@@ -58,14 +58,14 @@
                                         border: none;
                                     "
                                     src="https://www.thingjs.com/s/b11227d4fd5505106989737c?params=105b0f77fd24654d4eebc434e9"
-                                ></iframe>
+                                ></iframe> -->
                             </div>
                         </el-card>
                         <el-card class="box-card card_center2 mg10">
                             <div class="title">
                                 <span class="h2">实时告警信息</span>
                             </div>
-                            <div class="contain">
+                            <div class="contain" @click="toHiddenDanger">
                                 <el-table
                                     :data="index4Data"
                                     style="margin-top: 10px"
@@ -140,7 +140,7 @@
                             <div class="title">
                                 <span class="h2">隐患处理</span>
                             </div>
-                            <div class="contain">
+                            <div class="contain" @click="toHiddenDanger">
                                 <div>
                                     <ul id="pop">
                                         <li>
@@ -585,6 +585,13 @@ export default {
     },
     mounted() {},
     methods: {
+        // 跳转隐患管理
+        toHiddenDanger(){
+            this.$router.push({
+                path: '/OM/eventCenter/hiddenDanger',
+                // query: {}
+            })
+        },
         // 取消按钮
         cancel() {
             this.open = false;