Explorar o código

按钮位置调整

shaun-sheep %!s(int64=5) %!d(string=hai) anos
pai
achega
c3ecf099e5

+ 7 - 4
src/components/dialogs/list/batchDialog.vue

@@ -18,7 +18,10 @@
       />
     </el-steps>
     <hr>
-    <div v-show="active === 0">
+    <div
+        v-show="active === 0"
+        style="overflow: hidden"
+    >
       <section>
         <p class="text-message">维护只有单值的信息点</p>
         <span class="small">请选择需维护的信息点</span>
@@ -187,7 +190,8 @@
       </el-button>
       <el-button
           @click="active = 0"
-      >上一步
+          style="margin-right: 10px"
+      >上 一 步
       </el-button>
     </div>
   </el-dialog>
@@ -424,7 +428,6 @@
             CheckReport: (checkReport.CheckReport.length && this.videoModel.checkReport) ? checkReport.CheckReport : undefined
           } : undefined
         }
-        console.log(multiple, 'multilp')
         let LedgerParam = {}
         if (this.radio === 1) { //组装数据,根据是覆盖该是增量,1是增量
           //    1:单选数据
@@ -536,7 +539,7 @@
 
     .next-step {
       display: block;
-      margin: 12px auto 0 auto;
+      float: right;
     }
 
     .checkbox {

+ 38 - 39
src/components/ledger/handsontables/device.vue

@@ -131,47 +131,47 @@
   </div>
 </template>
 <script>
-    import {
-        BeatchQueryParam,
-        deleteEquip,
-        getDataDictionary,
-        getEquipBelongs,
-        getEquipTableCon,
-        queryEquip,
-        queryUpdate,
-        updateEquip
-    } from "@/api/scan/request";
+  import {
+    BeatchQueryParam,
+    deleteEquip,
+    getDataDictionary,
+    getEquipBelongs,
+    getEquipTableCon,
+    queryEquip,
+    queryUpdate,
+    updateEquip
+  } from "@/api/scan/request";
 
 
-    import tools from "@/utils/scan/tools"
-    import handsonUtils from "@/utils/hasontableUtils"
-    import showTools from "@/utils/handsontable/notShow"
-    import text from "@/utils/handsontable/mainText"
-    import myCascader from "@/components/ledger/lib/cascader"
-    import buildFloor from '@/utils/handsontable/buildFloorData'
+  import tools from "@/utils/scan/tools"
+  import handsonUtils from "@/utils/hasontableUtils"
+  import showTools from "@/utils/handsontable/notShow"
+  import text from "@/utils/handsontable/mainText"
+  import myCascader from "@/components/ledger/lib/cascader"
+  import buildFloor from '@/utils/handsontable/buildFloorData'
 
-    import qrcode from "@/components/ledger/lib/qrcode"
-    import firm from "@/components/dialogs/list/firm"
-    import supplyDialog from "@/components/dialogs/list/supplyDialog"
-    import supplierDialog from "@/components/dialogs/list/supplierDialog"
-    import maintainerDialog from "@/components/dialogs/list/maintainerDialog"
-    import insurerDialog from "@/components/dialogs/list/insurerDialog"
-    import guaranteeDialog from "@/components/dialogs/list/guaranteeDialog"
-    import uploadFilesDialog from "@/components/dialogs/list/filesDialog"
-    import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog"
-    import picDialog from "@/components/dialogs/list/picDialog"
-    import batchDialog from "../../dialogs/list/batchDialog";
-    import systemType from "@/components/dialogs/list/systemType"
-    import myPagination from "@/components/ledger/lib/myPagination"
-    import detailsDialog from "@/components/ledger/lib/detailsDia"
-    import changeRea from "@/components/dialogs/changeRea"
-    import {mapGetters} from "vuex"
-    //图片查看
-    import lookPic from "@/components/ledger/lib/lookImages"
-    import Handsontable from "handsontable-pro"
-    import 'handsontable-pro/dist/handsontable.full.css'
-    import lStorage from '@/utils/localStorage'
-    //下拉插件
+  import qrcode from "@/components/ledger/lib/qrcode"
+  import firm from "@/components/dialogs/list/firm"
+  import supplyDialog from "@/components/dialogs/list/supplyDialog"
+  import supplierDialog from "@/components/dialogs/list/supplierDialog"
+  import maintainerDialog from "@/components/dialogs/list/maintainerDialog"
+  import insurerDialog from "@/components/dialogs/list/insurerDialog"
+  import guaranteeDialog from "@/components/dialogs/list/guaranteeDialog"
+  import uploadFilesDialog from "@/components/dialogs/list/filesDialog"
+  import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog"
+  import picDialog from "@/components/dialogs/list/picDialog"
+  import batchDialog from "../../dialogs/list/batchDialog";
+  import systemType from "@/components/dialogs/list/systemType"
+  import myPagination from "@/components/ledger/lib/myPagination"
+  import detailsDialog from "@/components/ledger/lib/detailsDia"
+  import changeRea from "@/components/dialogs/changeRea"
+  import {mapGetters} from "vuex"
+  //图片查看
+  import lookPic from "@/components/ledger/lib/lookImages"
+  import Handsontable from "handsontable-pro"
+  import 'handsontable-pro/dist/handsontable.full.css'
+  import lStorage from '@/utils/localStorage'
+  //下拉插件
 // import "@/assets/js/chosen.jquery.min";
 // import "@/assets/js/handsontable-chosen-editor";
 
@@ -1207,7 +1207,6 @@ export default {
             if (type === 'dialog') {
                 this.information = keys
             } else {
-                console.log(keys, 'file keys')
                 this.setDataToMain(keys, this.messKey, this.row);
             }
         },