Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/data/printTemplate.vue

@@ -15,7 +15,9 @@
         </p>
         <el-row :gutter="20" type="flex" justify="center">
           <el-col :span="6" style="text-align: center">
-            <div>
+            <div
+              @click="imgClick('https://images.shengws.com/fangji.jpg')"
+            >
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -23,11 +25,17 @@
                 content="点击查看大图"
                 placement="top-start"
               >
+                <!--<el-image-->
+                  <!--style="width: 200px; height: 200px"-->
+                  <!--:src="require('@/assets/home/1.jpg')"-->
+                  <!--:preview-src-list="imgs_one"-->
+                <!--&gt;</el-image>-->
+
                 <el-image
                   style="width: 200px; height: 200px"
                   :src="require('@/assets/home/1.jpg')"
-                  :preview-src-list="imgs_one"
                 ></el-image>
+
               </el-tooltip>
             </div>
             <el-radio v-model="radio" label="1" @change="change"
@@ -38,7 +46,10 @@
             :span="6"
             style="margin-left: 100px;margin-right: 100px;text-align: center"
           >
-            <div>
+            <div
+              @click="imgClick('https://images.shengws.com/fangji.jpg')"
+
+            >
               <el-tooltip
                 class="item"
                 effect="dark"
@@ -46,10 +57,15 @@
                 placement="top-start"
                 :hide-after="2000"
               >
+                <!--<el-image-->
+                  <!--style="width: 200px; height: 200px"-->
+                  <!--:src="require('@/assets/home/2.jpg')"-->
+                  <!--:preview-src-list="imgs_two"-->
+                <!--&gt;</el-image>-->
+
                 <el-image
                   style="width: 200px; height: 200px"
                   :src="require('@/assets/home/2.jpg')"
-                  :preview-src-list="imgs_two"
                 ></el-image>
               </el-tooltip>
             </div>
@@ -66,11 +82,17 @@
                 placement="top-start"
                 :hide-after="2000"
               >
+                <!--<el-image-->
+                  <!--style="width: 200px; height: 200px"-->
+                  <!--:src="require('@/assets/home/5.jpg')"-->
+                  <!--:preview-src-list="imgs_five"-->
+                <!--&gt;</el-image>-->
+
                 <el-image
                   style="width: 200px; height: 200px"
                   :src="require('@/assets/home/5.jpg')"
-                  :preview-src-list="imgs_five"
                 ></el-image>
+
               </el-tooltip>
             </div>
             <el-radio v-model="radio" label="5" @change="change"
@@ -86,10 +108,15 @@
                 placement="top-start"
                 :hide-after="2000"
               >
+                <!--<el-image-->
+                  <!--style="width: 200px; height: 200px"-->
+                  <!--:src="require('@/assets/home/serven.png')"-->
+                  <!--:preview-src-list="imgs_seven"-->
+                <!--&gt;</el-image>-->
+
                 <el-image
                   style="width: 200px; height: 200px"
                   :src="require('@/assets/home/serven.png')"
-                  :preview-src-list="imgs_seven"
                 ></el-image>
               </el-tooltip>
             </div>
@@ -108,10 +135,15 @@
                 placement="top-start"
                 :hide-after="2000"
               >
+                <!--<el-image-->
+                  <!--style="width: 200px; height: 200px;margin-left:-60px"-->
+                  <!--:src="require('@/assets/home/eight.png')"-->
+                  <!--:preview-src-list="imgs_six"-->
+                <!--&gt;</el-image>-->
+
                 <el-image
                   style="width: 200px; height: 200px;margin-left:-60px"
                   :src="require('@/assets/home/eight.png')"
-                  :preview-src-list="imgs_six"
                 ></el-image>
               </el-tooltip>
             </div>
@@ -132,10 +164,15 @@
                 placement="top-start"
                 :hide-after="2000"
               >
+                <!--<el-image-->
+                  <!--style="width: 200px; height: 200px;margin-left:30px"-->
+                  <!--:src="require('@/assets/home/template_six.png')"-->
+                  <!--:preview-src-list="imgs_eight"-->
+                <!--&gt;</el-image>-->
+
                 <el-image
                   style="width: 200px; height: 200px;margin-left:30px"
                   :src="require('@/assets/home/template_six.png')"
-                  :preview-src-list="imgs_eight"
                 ></el-image>
               </el-tooltip>
             </div>
@@ -166,20 +203,30 @@
           <!--</el-col>-->
         </el-row>
       </div>
+
+
+      <el-image-viewer
+        v-if="showViewer"
+        :on-close="closeViewer"
+        :url-list="imgs"
+      ></el-image-viewer>
+
     </div>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 import { getPrintTemplate, postPrintTemplate } from "@/api/data";
 import store from "@/store";
 
 export default {
   name: "printTemplate",
-  components: { BreadCrumb },
+  components: { ElImageViewer, BreadCrumb },
   data() {
     return {
+      showViewer:false,
       crumbs: [
         { path: false, name: "管理中心" },
         { path: "data/print", name: "打印模版" }
@@ -188,14 +235,16 @@ export default {
       imgUrl_Two: require("@/assets/home/2.jpg"),
       imgUrl_Five: require("@/assets/home/5.jpg"),
 
+      imgs:[],
+
       imgs_one: [
         // 'https://images.shengws.com/template_one.jpg'
         "https://images.shengws.com/fangji.jpg"
       ],
       imgs_two: ["https://images.shengws.com/template_two.jpg"],
       imgs_five: ["https://images.shengws.com/template_five.jpg"],
-      imgs_seven: ["http://images.shengws.com/serven.png"],
-      imgs_six: ["http://images.shengws.com/eight.png"],
+      imgs_seven: ["https://images.shengws.com/serven.png"],
+      imgs_six: ["https://images.shengws.com/eight.png"],
       imgs_eight: ["https://images.shengws.com/template_six.png"],
       imgs_ten: ["https://kuyi.shengws.com/template_ten.jpg"],
 
@@ -206,6 +255,15 @@ export default {
     };
   },
   methods: {
+    imgClick(val){
+      this.imgs = []
+      this.imgs.push(val)
+      this.showViewer = true
+
+    },
+    closeViewer() {
+      this.showViewer = false
+    },
     change: function(val) {
       console.log("val是什么", val);
       this.$confirm(

src/xt_pages/user/patients.vue

@@ -666,7 +666,7 @@
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志'
+        aLink.download = this.timestampToTime(log.export_time)+'错误日志'+".txt"
         aLink.click()
 
       },

src/xt_pages/workforce/appointment.vue

@@ -162,7 +162,7 @@
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志'
+        aLink.download = this.timestampToTime(log.export_time)+'错误日志.txt'
         aLink.click()
 
       },
@@ -412,7 +412,7 @@
             for (let b = 0; b < jihaos.length; b++) {
               let obj = {}
               obj['区号'] = this.partitions[key].name
-              obj['机号'] = jihaos[b].number
+              obj['机号'] = jihaos[b].number.toString()
               list.push(obj)
             }
 
@@ -655,6 +655,8 @@
 
         for (let key in this.partitions) {
           var jihaos = this.partitions[key].jihaos
+          console.log(jihaos)
+
           for (let i = 0; i < jihaos.length; i++) {
             total_device_number.push(jihaos[i].number)
           }
@@ -666,12 +668,23 @@
           }
         }
 
+        console.log(deviceNumber)
+        console.log(total_device_number)
+
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
             is_device_number = false
           }
         }
 
+
+        console.log("111111111")
+        console.log(is_system_zone)
+        console.log(is_device_number)
+        console.log("22222222222")
+
+
+
         //
 
         let tempObj = null
@@ -726,6 +739,10 @@
 
         }
 
+        console.log("333333333")
+        console.log(datas)
+        console.log("44444444444")
+
         let date_arr = []
         //校验文档是否规范
         for (let i = 0; i < datas.length; i++) {
@@ -734,6 +751,7 @@
           }
 
           if (datas[i].device_number_name == undefined) {
+            console.log(datas[i].name)
             is_device_number = false
 
           }
@@ -759,6 +777,11 @@
           }
         }
 
+        console.log("333333333")
+        console.log(is_system_zone)
+        console.log(is_device_number)
+        console.log("44444444444")
+
         //校验文档中同一天同个人是否存在多个排班
         let is_exist_repeat = false
         const obj3 = {}
@@ -797,6 +820,11 @@
           }
         }
 
+        console.log(header.length )
+        console.log(is_system_zone )
+        console.log(is_device_number)
+
+
         if (header.length > 65 || !is_system_zone || !is_device_number) {
           this.dialogVisible = true
           return

src/xt_pages/workforce/template.vue

@@ -234,7 +234,7 @@
         }
         const aLink = document.createElement('a')
         aLink.href = url
-        aLink.download = this.timestampToTime(log.export_time)+'错误日志'
+        aLink.download = this.timestampToTime(log.export_time)+'错误日志.txt'
         aLink.click()
 
       },