Merge branch 'fly' into xy-ly

src/views/management/monitoringEquipment/photographicDevice/index.vue

@@ -229,7 +229,37 @@
             :formatter="dateFormat"
           >
           </el-table-column> -->
-
+          <el-table-column
+            label="数据查询"
+            :show-overflow-tooltip="true"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <el-dropdown
+                class="dropgps"
+                trigger="click"
+                @command="
+                  (command) => {
+                    handleSearchCommand(command, scope.row);
+                  }
+                "
+              >
+                <span class="el-dropdown-link">
+                  数据查询<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="info">基本信息</el-dropdown-item>
+                  <el-dropdown-item command="workStatus"
+                    >工作状态</el-dropdown-item
+                  >
+                  <el-dropdown-item command="runState"
+                    >运行状态</el-dropdown-item
+                  >
+                  <el-dropdown-item command="GPS">GPS位置</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
           <el-table-column
             fixed="right"
             label="操作"
@@ -625,6 +655,11 @@ export default {
       this.$refs.picturetagsref.display(data);
     },
 
+    //数据查询
+    handleSearchCommand(command, row) {
+      console.log(command, row);
+    },
+
     // //新建弹窗handleAddPhoto
     // handleAddPhoto() {
     //   this.photoDialog = true;