Merge branch 'xy-ly' of http://dev.xinyingpower.com:8080/git/xymp/frontend into xy-ly

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

@@ -233,7 +233,7 @@
           <el-table-column
             fixed="right"
             label="操作"
-            width="580"
+            width="340"
             v-if="roleUser != 2"
           >
             <template slot-scope="scope">
@@ -275,7 +275,7 @@
                 @click.native.stop="handlepicture(scope.row)"
                 >图片标记</el-button
               >
-              <el-button
+              <!-- <el-button
                 type="text"
                 @click.native.stop="handleDeviceReset(scope.row)"
                 >装置复位</el-button
@@ -294,7 +294,7 @@
                 type="text"
                 @click.native.stop="handleShowGPS(scope.row)"
                 >获取GPS位置</el-button
-              >
+              > -->
               <!-- <el-select
                 class="dropgps"
                 v-model="gpsvalue"
@@ -310,7 +310,7 @@
                 >
                 </el-option>
               </el-select> -->
-              <el-dropdown
+              <!-- <el-dropdown
                 class="dropgps"
                 trigger="click"
                 @command="
@@ -326,7 +326,7 @@
                   <el-dropdown-item command="open">开启GPS</el-dropdown-item>
                   <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
                 </el-dropdown-menu>
-              </el-dropdown>
+              </el-dropdown> -->
               <el-button
                 type="text"
                 class="deleteText"
@@ -803,8 +803,8 @@ export default {
   }
   .dropgps {
     color: @color-primary;
-    margin-left: 16px;
+    // margin-left: 16px;
-    margin-right: 16px;
+    // margin-right: 16px;
     cursor: pointer;
     font-size: 12px;
     width: 80px;