前端

src/views/demp/monitordata/Index.vue

@@ -8,7 +8,7 @@
             :placeholder="$t('设备编号')"
             class="filter-item search-item"
           />
-          <el-select v-model="ids" multiple placeholder="请选择企业" class="filter-item search-item">
+          <el-select v-model="ids" multiple placeholder="请选择企业" class="filter-item search-item" style="width:300px">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -398,8 +398,8 @@ export default {
     },
     // 停止定时器
     clear() {
-      clearInterval(this.intervalId) //清除计时器
-      this.intervalId = null //设置为null
+      clearInterval(this.intervalId)
+      this.intervalId = null
     },
     // expandChange(row, expandedRows) {
     //   if (this.expandKeys.indexOf(row.deviceId) >= 0) {
@@ -423,6 +423,7 @@ export default {
       this.dateValue = null
       this.queryParams = {}
       this.selectedSensorRow = row
+      // this.deviceId_history = row.deviceId
       this.historyDataVisible = true
     },
     drawHistoryChart() {
@@ -431,7 +432,7 @@ export default {
           this.queryParams.startTimeFrom = this.dateValue[0]
           this.queryParams.startTimeTo = this.dateValue[1]
         }
-        this.queryParams.deviceId = this.deviceId_history
+        this.queryParams.deviceId = this.selectedSensorRow.deviceId
         this.queryParams.sensorId = this.selectedSensorRow.sensorId
         this.queryParams.switchValue = this.switchValue
         this.$post('/demp/data/exchange/historyData/getHistoryData', {

src/views/detectdata/devicethreshold.vue

@@ -58,12 +58,15 @@
           </el-table-column>
           <el-table-column label="阈值设置" align="center">
             <template slot-scope="scope">
+              <el-tooltip content="设置阈值" placement="bottom" effect="light">
               <el-button
                 type="info"
                 icon="el-icon-setting"
                 circle
                 @click="handleThreshold(scope.row)"
               />
+              </el-tooltip>
+              <el-tooltip content="解除编辑锁定" placement="bottom" effect="light">
               <el-button
                 type="warning"
                 icon="el-icon-lock"
@@ -71,6 +74,7 @@
                 v-show="user.roleName!='企业用户'&&scope.row.editable!='1'"
                 @click="unlockEdit(scope.row)"
               />
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="监控设置" align="center">

src/views/deviceinfo/baseinfo.vue

@@ -77,43 +77,53 @@
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
-              <el-button
-                type="primary"
-                icon="el-icon-edit"
-                circle
-                @click="handleEdit(scope.row)"
-                v-show="scope.row.editable!=0"
-              />
-              <el-button
-                type="danger"
-                icon="el-icon-delete"
-                circle
-                v-show="user.roleName!='企业用户'"
-                @click="removeDeviceById(scope.row.deviceId)"
-              />
-              <el-button
-                type="success"
-                icon="el-icon-time"
-                circle
-                @click="timeSetting(scope.row)"
-              />
-              <el-button
-                type="warning"
-                icon="el-icon-lock"
-                circle
-                v-show="user.roleName!='企业用户'&&scope.row.editable!='1'"
-                @click="unlockEdit(scope.row.deviceId)"
-              />
+              <el-tooltip content="编辑" placement="bottom" effect="light">
+                <el-button
+                  type="primary"
+                  icon="el-icon-edit"
+                  circle
+                  @click="handleEdit(scope.row)"
+                  v-show="scope.row.editable!=0"
+                />
+              </el-tooltip>
+              <el-tooltip content="删除" placement="bottom" effect="light">
+                <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  circle
+                  v-show="user.roleName!='企业用户'"
+                  @click="removeDeviceById(scope.row.deviceId)"
+                />
+              </el-tooltip>
+              <el-tooltip content="设置工作时间" placement="bottom" effect="light">
+                <el-button
+                  type="success"
+                  icon="el-icon-time"
+                  circle
+                  @click="timeSetting(scope.row)"
+                />
+              </el-tooltip>
+              <el-tooltip content="解除编辑锁定" placement="bottom" effect="light">
+                <el-button
+                  type="warning"
+                  icon="el-icon-lock"
+                  circle
+                  v-show="user.roleName!='企业用户'&&scope.row.editable!='1'"
+                  @click="unlockEdit(scope.row.deviceId)"
+                />
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="传感器" align="center">
             <template slot-scope="scope">
-              <el-button
-                type="primary"
-                icon="el-icon-odometer"
-                circle
-                @click="sensorInfo(scope.row.deviceId)"
-              />
+              <el-tooltip content="传感器管理" placement="bottom" effect="light">
+                <el-button
+                  type="primary"
+                  icon="el-icon-odometer"
+                  circle
+                  @click="sensorInfo(scope.row.deviceId)"
+                />
+              </el-tooltip>
             </template>
           </el-table-column>
         </el-table>