From 6376ba7005148656b0f979c385de6bec6938f056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Thu, 30 Mar 2023 11:35:46 +0800
Subject: [PATCH] up

---
 .env.development                          |  4 +-
 src/views/daily/components/viewInfo.vue   | 35 +++++++++++++---
 src/views/daily/components/viewUpInfo.vue | 49 ++++++++++++++++++-----
 src/views/daily/index.vue                 | 28 ++++++-------
 4 files changed, 83 insertions(+), 33 deletions(-)

diff --git a/.env.development b/.env.development
index f15a303..e4f9680 100644
--- a/.env.development
+++ b/.env.development
@@ -2,6 +2,6 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://safety.115.langye.net/'
+#VUE_APP_BASE_API = 'http://safety.115.langye.net/'
 
-#VUE_APP_BASE_API = http://192.168.60.99:9001/
+VUE_APP_BASE_API = http://192.168.60.99:9001/
diff --git a/src/views/daily/components/viewInfo.vue b/src/views/daily/components/viewInfo.vue
index 1e0504a..49f1e7c 100644
--- a/src/views/daily/components/viewInfo.vue
+++ b/src/views/daily/components/viewInfo.vue
@@ -18,10 +18,23 @@
             </div>
           </el-form-item>
           <el-form-item label="附件" prop="file_list">
-            <div style="display: flex;flex-direction: column;align-items:flex-start">
-              <el-link v-for="item in form.files" target="_blank" :href="item.url" type="primary">
-                {{item.original_name}}
-              </el-link>
+            <div style="display: flex;flex-direction: column;">
+
+              <div v-for="item in form.files" style="display: flex;justify-content: space-between;">
+                <el-link target="_blank" :href="item.url" type="primary">
+                  {{item.original_name}}
+                </el-link>
+                <div style="display: flex;">
+                  <el-link target="_blank" style="margin-right: 10px;" @click="toshowFile(item.url)"
+                    type="primary">
+                    预览
+                  </el-link>
+                  <el-link target="_blank" :href="item.url" type="primary">
+                    下载
+                  </el-link>
+                </div>
+              </div>
+
             </div>
 
           </el-form-item>
@@ -32,6 +45,7 @@
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogFormVisible=false">关闭</el-button>
     </div>
+    <viewFile :is-show.sync="isShowViewFile" :url="fileUrl"></viewFile>
   </el-dialog>
 </template>
 
@@ -41,19 +55,28 @@
     getdaily
   } from "../../../api/daily/index.js";
 
+  import viewFile from '@/components/viewFile/viewFile.vue'
   export default {
+    components: {
+      viewFile
+    },
     data() {
       return {
         dialogFormVisible: false,
         form: {},
         fileList: [],
-        clientHeight: 0
+        clientHeight: 0,isShowViewFile: false,
+        fileUrl: ""
       }
     },
     created() {
-      this.clientHeight = document.documentElement.clientHeight*.6;
+      this.clientHeight = document.documentElement.clientHeight * .6;
     },
     methods: {
+      toshowFile(url) {
+        this.fileUrl = url;
+        this.isShowViewFile = true;
+      },
       async getinfo(id) {
 
         var that = this;
diff --git a/src/views/daily/components/viewUpInfo.vue b/src/views/daily/components/viewUpInfo.vue
index fd9c9ae..fbbbb18 100644
--- a/src/views/daily/components/viewUpInfo.vue
+++ b/src/views/daily/components/viewUpInfo.vue
@@ -1,25 +1,42 @@
 <template>
-
-  <el-dialog title="安全生产任务上报内容查看" :visible.sync="dialogFormVisible" width="90%">
-    <div class="dialogConcent" :style="{height:clientHeight+'px'}">
+
+    <el-drawer title="安全生产任务上报内容查看" :visible.sync="dialogFormVisible" direction="rtl">
+    <div class="dialogConcent" :style="{height:clientHeight+'px'}" style="padding: 20px;" >
       <el-scrollbar style="flex: 1">
         <el-form :model="form" ref="form" label-position="right" label-width="120">
           <el-form-item label="内容">
             <div style="width: 99.9%;" v-html="form.content">
             </div>
-          </el-form-item>
-          <el-form-item label="附件">
-            <el-link v-for="item in form.files" target="_blank" :href="item.url" type="primary">
-              {{item.original_name}}
-            </el-link>
+          </el-form-item>
+
+          <el-form-item label="附件" prop="file_list">
+            <div style="display: flex;flex-direction: column;">
+
+              <div v-for="item in form.files" style="display: flex;justify-content: space-between;">
+                <el-link target="_blank" :href="item.url" type="primary">
+                  {{item.original_name}}
+                </el-link>
+                <div style="display: flex;">
+                  <el-link target="_blank" style="margin-right: 10px;" @click="toshowFile(item.url)"
+                    type="primary">
+                    预览
+                  </el-link>
+                  <el-link target="_blank" :href="item.url" type="primary">
+                    下载
+                  </el-link>
+                </div>
+              </div>
+
+            </div>
+
           </el-form-item>
         </el-form>
       </el-scrollbar>
     </div>
+    <viewFile :is-show.sync="isShowViewFile" :url="fileUrl"></viewFile>
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogFormVisible=false">关 闭</el-button>
-    </div>
-  </el-dialog>
+    </div> </el-drawer>
 </template>
 
 <script>
@@ -27,20 +44,30 @@
     get
   } from "../../../api/daily/deptindex.js";
 
+  import viewFile from '@/components/viewFile/viewFile.vue'
 
   export default {
+    components: {
+      viewFile
+    },
     data() {
       return {
         dialogFormVisible: false,
         form: {},
         fileList: [],
-        clientHeight: 0
+        clientHeight: 0
+        ,isShowViewFile: false,
+        fileUrl: ""
       }
     },
     created() {
       this.clientHeight = document.documentElement.clientHeight * .6;
     },
     methods: {
+      toshowFile(url) {
+        this.fileUrl = url;
+        this.isShowViewFile = true;
+      },
       async getinfo(id) {
         var that = this;
         await get(id).then(res => {
diff --git a/src/views/daily/index.vue b/src/views/daily/index.vue
index c207be9..3f7fcf1 100644
--- a/src/views/daily/index.vue
+++ b/src/views/daily/index.vue
@@ -305,7 +305,20 @@
         deptOptions: [],
         tableDepartData: [],
 
-        departColumns: [{
+        departColumns: [
+          {
+            field: "操作",
+            title: "操作",
+            width: 220,
+            type: "opt",
+            fixed: "left"
+          },
+          {
+            field: "departments",
+            title: "科室",
+            type: "format",
+            align: "center"
+          },{
             field: "status",
             title: "状态",
             type: "format",
@@ -324,19 +337,6 @@
             type: "string",
             width: 180,
             align: "center"
-          },
-          {
-            field: "departments",
-            title: "科室",
-            type: "format",
-            align: "center"
-          },
-          {
-            field: "操作",
-            title: "操作",
-            width: 220,
-            type: "opt",
-            fixed: "right"
           }
         ],
       }