From 5bbc98b1d80842f185d7d6baee520479b5f667a2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 24 Mar 2021 09:24:38 +0800
Subject: [PATCH] 健康码，包裹页面修改

---
 src/views/parcel/parcelKind.vue     |    4 ++--
 vue.config.js                       |    4 ++--
 src/views/healthcode/healthcode.vue |    5 +++--
 src/views/parcel/parcel.vue         |   19 +++----------------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/views/healthcode/healthcode.vue b/src/views/healthcode/healthcode.vue
index 3140694..40d1ef0 100644
--- a/src/views/healthcode/healthcode.vue
+++ b/src/views/healthcode/healthcode.vue
@@ -181,7 +181,9 @@
             }
           ]
         },
-        data: []
+        data: [],
+        isActive: false,
+        recorder: null,
       };
     },
     computed: {
@@ -202,7 +204,6 @@
         return ids.join(",");
       }
     },
-
     methods: {
       beforeOpen(done, type) {
       },
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 5880aa1..4321237 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -20,20 +20,15 @@
                @on-load="onLoad">
         
       <template slot="menu">
-        <el-button type="text" @click="dialogVisible=true">点击打开 Dialog</el-button>
+        <el-button type="text" @click="dialogVisible=true">查看包裹图片</el-button>
 
         <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
           <span>这是一段信息</span>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-          </span>
         </el-dialog>
       </template>
 
 
     </avue-crud>
-    
   </basic-container>
 </template>
 
@@ -97,11 +92,11 @@
               hide:true
             },
             {
-              label: "过机时间",
+              label: "安检时间",
               prop: "samplingTime",
             },
             {
-              label: "过机时间",
+              label: "安检时间",
               prop: "dateTime",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm:ss",
@@ -217,13 +212,6 @@
       refreshChange() {
         this.onLoad(this.page, this.query);
       },
-      handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {});
-      },
       onLoad(page, params = {}) {
         debugger;
         const { dateTime } = this.query;
@@ -231,7 +219,6 @@
           ...params,
         };
 
-        debugger;
         if (this.$route.query.decisioDiagramResult && this.$route.query!='' && this.$route.query!=null && this.$route.query!=undefined ) {
             if (this.$route.query.startTime != undefined && this.$route.query.startTime != null && this.$route.query.startTime != "" ) {
               this.page.currentPage = 1;
diff --git a/src/views/parcel/parcelKind.vue b/src/views/parcel/parcelKind.vue
index 0c29048..0738cd0 100644
--- a/src/views/parcel/parcelKind.vue
+++ b/src/views/parcel/parcelKind.vue
@@ -80,11 +80,11 @@
               hide:true
             },
             {
-              label: "过机时间",
+              label: "安检时间",
               prop: "samplingTime",
             },
             {
-              label: "过机时间",
+              label: "安检时间",
               prop: "dateTime",
               type: "datetime",
               format: "yyyy-MM-dd HH:mm:ss",
diff --git a/vue.config.js b/vue.config.js
index a18ba3f..6164246 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@
         proxy: {
             '/api': {
                 //本地服务接口地址
-                //target: 'http://localhost:82/',
-                target: 'https://web.byisf.com:18001/api/',
+                target: 'http://localhost:82/',
+                //target: 'https://web.byisf.com:18001/api/',
                 //远程演示服务地址,可用于直接启动项目
                 //target: 'https://saber.bladex.vip/api',
                 ws: true,

--
Gitblit v1.9.3