Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/equipment/metering/index.vue

@@ -19,9 +19,10 @@
          @refreshDataList="getData"
        ></table-form>
      </basic-container>
      <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px">
        <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
          <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 15px;">
      <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px" top="5vh">
        <div style="width:100%;height:400px;overflow-y: auto;">
          <div class="dia_body" id="printMetering">
            <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;">
            <el-row>
              <el-col :span="10" :offset="3">序号：</el-col>
              <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
@@ -42,9 +43,10 @@
            </el-row>
          </el-card>
        </div>
        </div>
        <span slot="footer" class="dialog-footer">
          <el-button @click="diaPrintTab = false">取 消</el-button>
          <el-button type="primary" @click="diaPrintTab = false">打 印</el-button>
          <el-button type="primary" @click="printFun">打 印</el-button>
        </span>
      </el-dialog>
    </div>
@@ -58,6 +60,7 @@
  import * as fecha from 'element-ui/lib/utils/date'
  import { remote } from '../../../api/admin/dict'
  import vueQr from 'vue-qr'
  import PrintJS from 'print-js'
  export default {
    data() {
      return {
@@ -82,7 +85,7 @@
          isRefresh: true, // 是否显示刷新按钮
          isShowHide: true, // 是否显示显影按钮
          isSearch: false, // 高级查询按钮
          defaultOrderBy: { column: 'manufactureDate', direction: 'desc' }
          defaultOrderBy: { column: 'id', direction: 'desc' }
        },
        table: {
          total: 0,
@@ -321,6 +324,32 @@
      })
    },
    methods: {
      printFun() {
          this.diaPrintTab = false;
          PrintJS({
              printable: 'printMetering',//页面
              type: "html",//文档类型
                maxWidth:450,
                targetStyles:['*'],                 
                style: `@page {
                  margin:0;
                  padding: 0;
                  size: 360px 170px;
                }
                html{
                  zoom:100%;
                }
                @media print{
                  width: 360px;
                  height: 170px;
                  margin:0;
                  padding: 0;
                }`,
                onPrintDialogClose: this.erexcel=false,
                targetStyles: ["*"], // 使用dom的所有样式，很重要
                font_size: '',
          });
      },
      pullEquipFun(){
        this.table.toolbar.find((e) => e.text === '同步').loading = true
        pullEquip().then(res=>{