From f437a2fc347d5fbdb24d15460f3e980891442995 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 23 Nov 2023 17:28:55 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ftp/oss.js                            |  2 +
 src/assets/scss/rq.scss                       |  7 ++++
 src/utils/httpRequest.js                      | 39 +++++++++++++++++++
 src/views/modules/board/sopBoard.vue          | 25 ++++++------
 src/views/modules/production/operator.vue     |  7 ----
 src/views/modules/taskmanage/chat-history.vue | 16 ++++++--
 src/views/modules/taskmanage/chatting.vue     | 21 +++++-----
 .../modules/taskmanage/mysendtasklist.vue     |  4 +-
 .../modules/taskmanage/task-file-list.vue     | 21 +++++-----
 .../taskmanage/task-file-upload-list.vue      | 19 ++++-----
 10 files changed, 109 insertions(+), 52 deletions(-)

diff --git a/src/api/ftp/oss.js b/src/api/ftp/oss.js
index 831b56b..c8f47ca 100644
--- a/src/api/ftp/oss.js
+++ b/src/api/ftp/oss.js
@@ -2,3 +2,5 @@ import { createAPI } from "@/utils/httpRequest.js";
 
 export const ossList = data => createAPI(`sys/oss/ossList`,'post',data)
 
+export const downFtpFileNotFtp = data => createAPI(`ftp/file/downFtpFileNotFtp?id=`+data.id,'post','download')
+
diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss
index 4dae365..22c3a3a 100644
--- a/src/assets/scss/rq.scss
+++ b/src/assets/scss/rq.scss
@@ -55,3 +55,10 @@
 .pad .el-tabs--border-card>.el-tabs__content {
   padding: 0px;
 }
+.red-label{
+  font-weight:bold;
+  color:#bd0b06
+}
+.redModel .el-form-item__label {
+  font-weight:bold;color:#bd0b06
+}
diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js
index f58e065..57c7cae 100644
--- a/src/utils/httpRequest.js
+++ b/src/utils/httpRequest.js
@@ -37,6 +37,38 @@ http.interceptors.response.use(response => {
 }, error => {
   return Promise.reject(error)
 })
+// ============================= 下载功能的请求 =============================
+const instance2 = axios.create({
+  baseURL: (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl),
+  timeout: 10000 * 30,
+  withCredentials: true,
+  responseType: 'blob',
+  headers: {
+    'Content-Type': 'application/json; charset=utf-8'
+  }
+})
+/**
+ * 请求拦截
+ */
+instance2.interceptors.request.use(config => {
+  config.headers['token'] = Vue.cookie.get('token') // 请求头带上token
+  return config
+}, error => {
+  return Promise.reject(error)
+})
+
+/**
+ * 响应拦截
+ */
+instance2.interceptors.response.use(response => {
+  if (response.data && response.data.code === 401) { // 401, token失效
+    clearLoginInfo()
+    router.push({name: 'login'})
+  }
+  return response
+}, error => {
+  return Promise.reject(error)
+})
 
 /**
  * 请求地址处理
@@ -121,6 +153,13 @@ export const createAPI = (url, method, data) => {
   } else {
     config.data = data
   }
+  if (data === 'download'){ // 下载功能的请求
+    return instance2({
+      url,
+      method,
+      ...config
+    })
+  }
   return instance({
     url,
     method,
diff --git a/src/views/modules/board/sopBoard.vue b/src/views/modules/board/sopBoard.vue
index 7a16409..ed5fb43 100644
--- a/src/views/modules/board/sopBoard.vue
+++ b/src/views/modules/board/sopBoard.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mod-config container ">
     <div  class="pdfMenu" >
-      <h1 style="color: white">SOP指导书  当前派工单|{{seqNo}}</h1>
+      <h1 style="color: white">SOP指导书  派工单|{{seqNo}}</h1>
     </div>
     <div  class="pdf-wrapper" ref="pdfWrapper">
       <img style="max-width:  100%;max-height: 100%;vertical-align:middle;" :src="sopUrl">
@@ -15,7 +15,7 @@
 <!--      ></pdf>-->
     </div>
     <div  class="pdfMenu" >
-      <h1 style="color: white">SIP指导书  当前操作员|{{operator}}</h1>
+      <h1 style="color: white">SIP指导书  操作员|{{operator}}</h1>
     </div>
     <div  class="pdf-wrapper" ref="pdfWrapper">
       <img style="max-width:  100%;max-height: 100%;vertical-align:middle;" :src="badUrl">
@@ -76,7 +76,7 @@
         //获取图片数据
         setInterval(() => {
           this.getPDF();
-        }, 60000)
+        }, 90000)
       },
       changePage() {
         //刷新图片
@@ -105,7 +105,6 @@
         }
         getSopAddress(data).then(({data}) => {
           if(data.code==0){
-            debugger
             if(data.data.nowSeqNo==null||data.data.nowSeqNo==''){
               this.sopUrl='';
               this.badUrl='';
@@ -120,8 +119,6 @@
               this.seqNo = data.data.nowSeqNo;
               this.sopList=data.sop;
               this.badList=data.bad;
-              console.log("开始打印")
-              console.log(data.sop)
               this.sopPage=1;
               this.badPage=1;
               this.sopMax=data.sop.length;
@@ -132,12 +129,17 @@
               if(this.badList.length>0){
                 this.badUrl=this.packageUrl+this.badList[0].attaFileNameDb;
               }
+            }else if(this.seqNo==data.data.nowSeqNo) {
+              this.sopList=data.sop;
+              this.badList=data.bad;
+              this.sopMax=data.sop.length;
+              this.badMax=data.bad.length;
             }
-            console.log("SOP："+ this.sopUrl)
-            console.log("不良："+ this.badUrl)
-            console.log(this.$store.state.user.tvSopUrl)
-            console.log(this.sopList)
-            console.log("SOP："+ this.sopList[0].attaFileNameDb)
+            // console.log("SOP："+ this.sopUrl)
+            // console.log("不良："+ this.badUrl)
+            // console.log(this.$store.state.user.tvSopUrl)
+            // console.log(this.sopList)
+            // console.log("SOP："+ this.sopList[0].attaFileNameDb)
           }else {
             this.sopUrl='';
             this.badUrl='';
@@ -215,6 +217,7 @@
     height: 100%;
   }
   .pdfMenu {
+    font-size: 11px;
     width: 7%;
     height: 100%;
     float: left;
diff --git a/src/views/modules/production/operator.vue b/src/views/modules/production/operator.vue
index fed54df..a393b05 100644
--- a/src/views/modules/production/operator.vue
+++ b/src/views/modules/production/operator.vue
@@ -88,13 +88,6 @@
         min-width="100"
         label="部门">
       </el-table-column>
-      <el-table-column
-        prop="tvId"
-        header-align="center"
-        align="left"
-        min-width="100"
-        label="工位电视机">
-      </el-table-column>
       <el-table-column
         prop="createdDate"
         header-align="center"
diff --git a/src/views/modules/taskmanage/chat-history.vue b/src/views/modules/taskmanage/chat-history.vue
index 124286a..52a7e07 100644
--- a/src/views/modules/taskmanage/chat-history.vue
+++ b/src/views/modules/taskmanage/chat-history.vue
@@ -11,14 +11,23 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="主题" prop="taskHeader">
-              <el-input style="width: 750px" v-model="headerData.taskHeader"></el-input>
+              <el-input style="width: 750px" v-model="headerData.taskHeader" readonly></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="redModel">
+            <el-form-item label="要求完成时间" prop="taskHeader" label-class="red-label" style="font-weight:bold;color:#bd0b06">
+              <el-input style="width: 750px" v-model="headerData.requiredCompletionDate" readonly></el-input>
+            </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
         <el-form-item label="任务描述">
-          <el-input type="textarea" style="width: 750px" v-model="headerData.taskDescription"></el-input>
+          <el-input type="textarea" style="width: 750px" v-model="headerData.taskDescription" readonly></el-input>
         </el-form-item>
           </el-col>
         </el-row>
@@ -87,7 +96,7 @@
         columnList: [
           {
             columnProp: "createDate",
-            columnLabel: "时间",
+            columnLabel: "沟通时间",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -155,6 +164,7 @@
         this.dataForm.taskId = row.id || 0
         this.headerData.taskHeader = row.taskHeader
         this.headerData.taskDescription = row.taskDescription
+        this.headerData.requiredCompletionDate = row.requiredCompletionDate
         this.visible = true
         this.getDataList()
       },
diff --git a/src/views/modules/taskmanage/chatting.vue b/src/views/modules/taskmanage/chatting.vue
index ebc1e0d..ceeda3d 100644
--- a/src/views/modules/taskmanage/chatting.vue
+++ b/src/views/modules/taskmanage/chatting.vue
@@ -79,6 +79,7 @@
 
 <script>
   import FtpUpload from '@/views/modules/common/ftp-upload.vue'
+  import {ossList,downFtpFileNotFtp} from '@/api/ftp/oss.js'
   import {saveChatHistory} from '@/api/taskmanage/chatHistory.js'
   import axios from "axios";
   import Vue from "vue";
@@ -155,17 +156,17 @@
       },
       // 下载附件
       downFtpFile(row){
-          //'/proxyApi/ftp/file/downFtpFile/'
-          // '/api/ftp/file/downFtpFile/'
-          axios.get( '/api/ftp/file/downFtpFile/' + row.id, {
-            responseType: 'blob',
-            headers: {
-              'Content-Type': 'application/json',
-              'token': Vue.cookie.get('token')
-            }
-          }).then(({data}) => {
+        // axios.get('/api/ftp/file/downFtpFile/' + row.id, {
+        //   responseType: 'blob',
+        //   headers: {
+        //     'Content-Type': 'application/json',
+        //     'token': Vue.cookie.get('token')
+        //   }
+        // }).then(({data}) => {
+        downFtpFileNotFtp(row)
+          .then(({data}) => {
             // 不限制文件下载类型
-            const blob = new Blob([data], {type: "application/octet-stream"})
+            const blob = new Blob([data], {type: "application/octet-stream;charset=utf-8"})
             // 下载文件名称
             const fileName = row.fileName
             // a标签下载
diff --git a/src/views/modules/taskmanage/mysendtasklist.vue b/src/views/modules/taskmanage/mysendtasklist.vue
index aaeebf4..5bafe83 100644
--- a/src/views/modules/taskmanage/mysendtasklist.vue
+++ b/src/views/modules/taskmanage/mysendtasklist.vue
@@ -519,10 +519,10 @@
         })
       },
       // 沟通记录
-      chatHistoryDialog(id){
+      chatHistoryDialog(row){
         this.chatHistoryVisible = true
         this.$nextTick(() => {
-          this.$refs.chatHistory.init(id)
+          this.$refs.chatHistory.init(row)
         })
       },
       // 附件
diff --git a/src/views/modules/taskmanage/task-file-list.vue b/src/views/modules/taskmanage/task-file-list.vue
index 3c9ebe5..33266bf 100644
--- a/src/views/modules/taskmanage/task-file-list.vue
+++ b/src/views/modules/taskmanage/task-file-list.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-  import {ossList} from '@/api/ftp/oss.js'
+  import {ossList,downFtpFileNotFtp} from '@/api/ftp/oss.js'
   import axios from "axios";
   import Vue from "vue";
   export default {
@@ -166,16 +166,17 @@
       },
       // 下载附件
       downFtpFile(row){
-        //'/proxyApi/ftp/file/downFtpFile/'
-        axios.get('/api/ftp/file/downFtpFile/' + row.id, {
-          responseType: 'blob',
-          headers: {
-            'Content-Type': 'application/json',
-            'token': Vue.cookie.get('token')
-          }
-        }).then(({data}) => {
+        // axios.get('/api/ftp/file/downFtpFile/' + row.id, {
+        //   responseType: 'blob',
+        //   headers: {
+        //     'Content-Type': 'application/json',
+        //     'token': Vue.cookie.get('token')
+        //   }
+        // }).then(({data}) => {
+        downFtpFileNotFtp(row)
+          .then(({data}) => {
           // 不限制文件下载类型
-          const blob = new Blob([data], {type: "application/octet-stream"})
+          const blob = new Blob([data], {type: "application/octet-stream;charset=utf-8"})
           // 下载文件名称
           const fileName = row.fileName
           // a标签下载
diff --git a/src/views/modules/taskmanage/task-file-upload-list.vue b/src/views/modules/taskmanage/task-file-upload-list.vue
index 1186469..63fd9cc 100644
--- a/src/views/modules/taskmanage/task-file-upload-list.vue
+++ b/src/views/modules/taskmanage/task-file-upload-list.vue
@@ -68,7 +68,7 @@
 </template>
 
 <script>
-  import {ossList} from '@/api/ftp/oss.js'
+  import {ossList,downFtpFileNotFtp} from '@/api/ftp/oss.js'
   import Vue from "vue";
   import FtpUpload from '@/views/modules/common/ftp-upload.vue'
   import axios from "axios";
@@ -213,14 +213,15 @@
       },
       // 下载附件
       downFtpFile(row) {
-        //'/proxyApi/ftp/file/downFtpFile/'
-        axios.get('/api/ftp/file/downFtpFile/' + row.id, {
-          responseType: 'blob',
-          headers: {
-            'Content-Type': 'application/json',
-            'token': Vue.cookie.get('token')
-          }
-        }).then(({data}) => {
+        // axios.get('/api/ftp/file/downFtpFile/' + row.id, {
+        //   responseType: 'blob',
+        //   headers: {
+        //     'Content-Type': 'application/json',
+        //     'token': Vue.cookie.get('token')
+        //   }
+        // }).then(({data}) => {
+        downFtpFileNotFtp(row)
+          .then(({data}) => {
           // 不限制文件下载类型
           const blob = new Blob([data], {type: "application/octet-stream"})
           // 下载文件名称