Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

src/api/picManage/pic.js

@@ -8,31 +8,27 @@ export default {
     })
   },
   // 新增
-  add: (notice) => {
+  add: (param) => {
     return request({
-      url: 'api/notice/add',
+      url: 'api/kdFile',
       method: 'post',
-      data: notice
+      data: param
     })
   },
   // 标记已读（查询权限）
-  read: (responseId) => {
+  mod: (param) => {
     return request({
-      url: 'api/notice/read',
-      method: 'post',
-      data: {
-        id: responseId
-      }
+      url: 'api/kdFile',
+      method: 'put',
+      data: param
     })
   },
   // 删除
-  del: (notice) => {
+  del: (ids) => {
     return request({
-      url: 'api/notice/del',
-      method: 'post',
-      data: {
-        id: notice.id
-      }
+      url: 'api/kdFile',
+      method: 'delete',
+      data: ids
     })
   }
 }
\ No newline at end of file

src/layout/components/Navbar.vue

@@ -185,6 +185,7 @@ export default {
       }).then((res)=>{
         this.companyList = res.body || []
         this.currentCompany = this.companyList[0].id
+        localStorage.setItem('currGlobalCompId', this.currentCompany)
       })
         
     },
@@ -204,6 +205,7 @@ export default {
           duration: 3000 // 消息显示的时间，单位为 ms
         });
         setTimeout(() => {
+          localStorage.setItem('currGlobalCompId', value)
           window.location.reload()
         }, 500);
       })

src/views/kd/c/iot/tailings/data.vue

@@ -7,8 +7,8 @@
           <el-option v-for="mine in mineList" :key="mine.index" :label="mine.name" :value="mine.index" />
         </el-select>
         <el-input clearable size="small" placeholder="设备名称" style="width: 200px;" class="filter-item" />
-        <el-select v-model="value" placeholder="监测类型？" style="width: 200px;" class="filter-item">
-          <el-option label="选择类型？" value="1" />
+        <el-select v-model="value" placeholder="监测类型" style="width: 200px;" class="filter-item">
+          <el-option label="选择类型" value="1" />
         </el-select>
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$message('等待硬件对接中')">搜索</el-button>
         <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left">重置</el-button>