瀏覽代碼

前端gjy

gjy 3 年之前
父節點
當前提交
c8af52d3f0
共有 1 個文件被更改,包括 1 次插入29 次删除
  1. 1 29
      public/static/print.html

+ 1 - 29
public/static/print.html

@@ -39,39 +39,12 @@
   </head>
   <body>
     <div id="app">
-<<<<<<< HEAD
-      {{dataList}}
-       <el-button @click="visible = true">Button</el-button>
-    </div>
-  </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
-  <script type="text/javascript">
-    new Vue({
-      el: '#app',
-      data: {
-        dataList: ""
-      },
-      computed: {},
-      methods: {
-
-      },
-      mounted() {debugger
-       let _data = localStorage.getItem("pricePrintList")
-        // var _data = decodeURIComponent(this.getQueryVariable("id"))
-        console.log(_data)
-        this.dataList = JSON.parse(_data)
-        // window.print()
-        // window.onafterprint = function(event) {
-        //   window.history.back(-1)
-        // };
-=======
       <div class="content">
         <div class="title">
           <div class="name">{{name}}价格对照表(按水分)</div>
           <div class="price">价格单位:元/公斤</div>
         </div>
-         <el-table :data="tableData" border style="width: 600px" :row-class-name="tableRowClassName">
+         <el-table :data="tableData" style="width: 600px" :row-class-name="tableRowClassName">
            <el-table-column prop="waterMin" label="水分下限(%)">
            </el-table-column>
            <el-table-column prop="waterMax" label="水分上限(%)">
@@ -132,7 +105,6 @@
         window.onafterprint = function(event) {
           window.history.back(-1)
         };
->>>>>>> 1d46949992a1fc8a79736807784052ab343c9846
       },
       watch: {
       }