From f92db374b10955fc865e68d2f8eb237b1f588d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Fri, 24 Jun 2022 14:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E6=95=99=E8=82=B2=20=E4=B8=8A=E4=BC=A0=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9D=90=E6=96=99=20=20=E9=AA=86=E4=B9=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/icon_upload.png             | Bin 0 -> 2311 bytes
 src/components/account.vue                    |   2 +-
 src/views/companyAdmin/docManage.vue          |  16 ++--
 .../systemSetup/enterpriseInfo.vue            |   6 --
 .../laborManage/safetyTrainManage.vue         |  84 ++++++++++++++++--
 5 files changed, 91 insertions(+), 17 deletions(-)
 create mode 100644 src/assets/images/icon_upload.png

diff --git a/src/assets/images/icon_upload.png b/src/assets/images/icon_upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf28215e19cded108df62b3a260eeb917b2cc422
GIT binary patch
literal 2311
zcmcImdrT8|952;5rD4&?aGS5&bz>U2-d*24sYqK~87nX(5p*V8@2=&f?bY4^1vMhm
z%~y0fA7M;3$)+>L1sOgDJ|>Qd#>~eQ#mLi4f-+sE@j(RlyS{Xb68>3}>;3Nf{eC{5
z@8|oy-*ru9`uj1_Z$(Qal9*JhB@3Jr#bfj+@J&2v^?}nEuQivKNECAMi1L4zR3wp%
z%3`x~gdE$41jV@(B+c0wh2QN3(I7d=?<J`MMu6;$ll2(kyA8)-h^3A2JdF*rdCg2d
zYc2ILb4$~+snP<<K*LG1phQ0b0Nji~LVmZ)!xMfZ9Ka>OTD*<IP#{DoFv7_qA(Ugw
zgv^|efiwy&Lg8vXq%$aRtr}Bl6Cfpq8&FJ-;wl8g2~109bWrF612!M+AhIlTLR{d=
z2<Hoemq5|t;$lUyO2PS@C~hzS3?-^mA|L|cOFRPUM?Abdj9_7S%Ex*Imh(U&B5CIe
z1tScU21{^zBd{JmWD_t9^^;x{S72gE;Xs>h=uo#i63q)KMSvxw_l3ZGc8QlkvlyN$
z^ifPo5#tf$VKQ$%Cvbc|_Y!T9pZ}$hrXqyiLZ2&O4^5$ri*W;N9>n4SeO|)sV@QGX
zWpkV>+^EbjBcudXL(^;|#d<^y(?w086vjddj1g91z->&6DAn1xn!vRLu9<=92@DH{
z+Q1~xq(BZYn4?)o$#6n#HX_x-3#5l)QY}Uph*GdDO=xhXlGbW4gv1yPqE^xxgtXHP
zqSol_I-1hzlxjyn7s$78RH5jFm>(Qmnxg<l#7{!ckakR|Vh|;U*%6vj>k(3qs}U_=
zp>(uPOJj5xEyKrxXNPn>k1DF70is=p+f@{4Ky(yFBWjvfBL<4mBN|4Bkq(?9RXD(T
z#%tzWoX^J5z+Dv#(G=m}d~Om<5bGwL4C?hb#d!wkpb9I?gXWclo{+iB;?T;)LV>X(
zNJ^Y`BTR{HW&ls{Hv0nihNm-_U!2bX&>@;14C6V6P)z!mWG8TX7~_S$Og>K*4K03n
zt^Z%ehpeUYNsp5O+b0T(<)Gq56Ko9n-=00|d3bJ;!9<H4<wHi8NN2>7SsD!2rzGPz
zt}~fUhB+34!36H8)moEUjp^s$K`s{?W(_8zL$d_*J-0E2lfiB)E+gAKxQM(c7!N4V
z2VMiZ>MXZJB3+PbNzTq+@n@y2;L_|j%D!IvRNk*TQdc^z@9itIr*AQh*<#um8{PDY
zJT`e+Ib@PsQ=*%wJfr`w8_;0Py|fmy6Z?_ge%6^+RF$TzEa|9l7F!*TV%^PqhTFd!
z-7|A+Wx`iPuD<Y2L;SSL-{SlBCVCnUcC@VeXql6gO&M{nv?qzu9xE~vvfb%%={thK
zwccBF*QL{qdsOoeyXyDV_8!}A>p7DDu=!x$?=4p)Uu5J+GRksWg{|y4X=aq_PX9Z<
zj;a{_^wy4!ZMH+y*xQwpI}gq~Hff@M{^5PHs3Uzxg}K_cJ6HW1`=q*~zRN95E?3P3
zTfyvpRgH7=$xX)AUDb<jcdtv8-e|aAc3)G&eR-;US?jiH>3aIa-}}|jz&L%)Y0c&l
zt)Di25I3pn<cNz?%dTlVq8C*xAQ9Py@f)LhXLO!_w@3P!a(82D+>^6)BkS)k>1;N)
z%PZ2l5@dtBwn-QEPxkhGemCc4rhn5b$9Z;zVjxbxznO=r*W2k6PrH-9Njn~u9@Cw{
ztZ&?#ure1JBlM<qx-8e<?2o<Bkg#&WlxU&%%FmD2_V?6ofLAB19H`H3z9B1F+SE4j
z$&#Jzd}sB%*WzVeI?2fX_m)Mu9-OJPY+0qBIYqj#w6(;WyZTU*{QMtrYhc;phjk-Q
zUc5lRJs4k=S597cuAO>d^dL83V0GK0*hXx{_we1cKr;@EZ_jx!p{%yIO1iPT=+wmJ
z*Xkc>1@bc08|@$a?aZ#nvcyUCHH)mvqc3jNe~dQN2-e+auC>(#+xPg@oW!N`9Y5_{
QC;nAQO-Z->V9G212b+{ZfB*mh

literal 0
HcmV?d00001

diff --git a/src/components/account.vue b/src/components/account.vue
index 316a2e16..b90b7e6f 100644
--- a/src/components/account.vue
+++ b/src/components/account.vue
@@ -14,7 +14,7 @@
           <el-avatar size="large" icon="el-icon-user-solid"></el-avatar>
           <div style="margin-left:10px">
             <p>{{ $store.state.userInfo.companyName }}</p>
-            <!-- 横琴不需要客服电话-->
+            <!-- 横琴和鹤洲不需要客服电话-->
             <!-- <p>客服电话：{{$store.state.userInfo.customerServicePhone}}</p> -->
           </div>
         </div>
diff --git a/src/views/companyAdmin/docManage.vue b/src/views/companyAdmin/docManage.vue
index 21c5e623..4a5ac2bd 100644
--- a/src/views/companyAdmin/docManage.vue
+++ b/src/views/companyAdmin/docManage.vue
@@ -48,7 +48,8 @@
                     <template slot-scope="scope">
                         <div class="tableBtns">
                             <div @click="downFn(scope.row)" class="operationText">
-                                <el-link type="primary">{{$t('message.docManage.table.download')}}</el-link>
+                                <!-- <el-link class="downfn" type="primary">{{$t('message.docManage.table.download')}}</el-link> -->
+                                <a :href="downloadUrl" class="downfn">下载</a>
                             </div>
                             <div @click="editFn(scope.row)" class="operationText">
                                 <img src="@/assets/images/icon-edit.png" width="15px" height="15px"/>
@@ -147,6 +148,7 @@
         name: "registerAudit",
         data() {
             return {
+                downloadUrl:'',
                 searchForm: {
                     fileName: "",
                 },
@@ -271,10 +273,11 @@
             downFn(item) {
                 updateFileDownloadNumApi({id: item.id}).then((res) => {
                     // window.open(this.$store.state.FILEURL+item.filePath)
-                    var a = document.createElement("a");
-                    a.href = this.$store.state.FILEURL + item.filePath
-                    a.download = item.fileName;
-                    a.click();
+                    // var a = document.createElement("a");
+                    // a.href = this.$store.state.FILEURL + item.filePath
+                    // a.download = item.fileName;
+                    // a.click();
+                    this.downloadUrl = this.$store.state.FILEURL + item.filePath
                 });
             },
             //查看条数
@@ -291,6 +294,9 @@
     };
 </script>
 <style lang="less" scoped>
+.downfn{
+    text-decoration: none;
+}
     .searchBox {
         justify-content: space-between;
     }
diff --git a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
index 581dc7f3..c61f40bf 100644
--- a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
+++ b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
@@ -202,12 +202,6 @@ export default {
                             if(res.success){
                               this.$message.success(this.$t('message.companyDiagram.editSuccess'));//编辑成功！
                               this.getDetail()
-                              this.form.headerConfiguration = "",//标头配置
-                              this.form.enterpriseBackground='',//企业后台
-                              this.form.enterpriseFront='',//企业前台
-                              this.form.projectBackground='',//项目后台
-                              this.form.equipmentChina='',//设备中台
-                              this.form.dataCenter=""//资料中心
                             }
                         })
                     }else {
diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index 7ac5e19f..f2671d06 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -82,7 +82,7 @@
         ></el-table-column>
         <el-table-column
           prop="workernum"
-          :label='$t("message.laborMange.numberOfPeople")'
+          :label="$t('message.laborMange.numberOfPeople')"
           align="center"
         ></el-table-column>
         <!-- <el-table-column
@@ -102,10 +102,18 @@
         <el-table-column
           :label="$t('message.personnelPosition.beaconManage.table.operation')"
           align="center"
-          width="180"
+          width="300"
         >
           <template slot-scope="scope">
             <div class="tableBtns">
+              <div @click="uploadPoint(scope.row)" class="operationText">
+              <img
+                  src="@/assets/images/icon_upload.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span><a :href="uploadaurl" class="uploadpoint">下载</a></span>
+              </div>
               <div @click="editPoint(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-edit.png"
@@ -222,6 +230,19 @@
             <el-button type="primary" @click="selectWorkerDialog = true">
               {{ $t("message.laborDev.selectWorker") }}
             </el-button>
+             <!-- 添加上传相关材料 -->
+            <el-upload
+             name="files"
+              class="upload-demo uploadBtn"
+              :action="$store.state.UPLOADURL"
+              multiple
+              :file-list="fileList"
+              :on-preview="handlePreview"
+              :on-success="handleSuccess"
+              :show-file-list="false"
+            >
+              <el-button type="primary">材料上传</el-button>
+            </el-upload>
           </el-form-item>
           <el-table
             class="tables dialogTable"
@@ -263,8 +284,16 @@
                   v-model="scope.row.isQualified"
                   :placeholder="$t('message.laborDev.allType')"
                 >
-                  <el-option :label='$t("message.laborMange.qualified")' :value="1"> </el-option
-                  ><el-option :label='$t("message.laborMange.disqualification")' :value="2"> </el-option>
+                  <el-option
+                    :label="$t('message.laborMange.qualified')"
+                    :value="1"
+                  >
+                  </el-option
+                  ><el-option
+                    :label="$t('message.laborMange.disqualification')"
+                    :value="2"
+                  >
+                  </el-option>
                 </el-select>
               </template>
             </el-table-column>
@@ -357,6 +386,8 @@ export default {
   components: { selectWorker },
   data() {
     return {
+      uploadaurl:'',
+      fileList:[],
       searchForm: {
         eduType: "",
         eduCourseName: "",
@@ -368,6 +399,7 @@ export default {
       cardDialogTitle: "",
       cardDialog: false,
       cardForm: {
+        uploadAttachments:"",
         eduAddr: "",
         eduClasshour: 0,
         eduContent: "",
@@ -412,8 +444,29 @@ export default {
   mounted() {
     this.loadAllPerson();
     this.loadCardData();
+    let xxx = this.$store.state.FILEURL
+    console.log('url',xxx)
   },
   methods: {
+    handlePreview(file,type){
+      //  console.log('file',file)
+      // console.log('fileList',type)
+    },
+    handleSuccess(file,fileList){
+      console.log('成功的file',file)
+      this.cardForm.uploadAttachments = file.data[0].filename
+      if(file.status == "SUCCESS"){
+        this.$message({
+          message: '相关材料上传成功！',
+          type: 'success'
+        });
+      }else{
+        this.$message({
+          message: '上传失败，请重新上传！',
+          type: 'error'
+        });
+      }
+    },
     changeScore(index, value) {
       console.log("changeScore", value, index);
       var json = this.cardForm.list[index];
@@ -501,6 +554,19 @@ export default {
         this.cardForm.list = res.result.list;
       });
     },
+    // 下载材料
+    uploadPoint(item){
+      console.log('item',item)
+      if(item.uploadAttachments != null){
+        this.uploadaurl = this.$store.state.FILEURL + item.uploadAttachments
+      }else{
+        this.$message({
+          message: '当前没有相关材料！',
+          type: 'error'
+        });
+        this.uploadaurl = window.location
+      }
+    },
     removePoint(item) {
       this.$confirm(
         this.$t("message.personnelPosition.beaconManage.table.confirmText") +
@@ -551,7 +617,7 @@ export default {
             var item = {
               isQualified: element.isQualified,
               score: element.score,
-              workerId: this.isAdd ? element.id:element.workerId,
+              workerId: this.isAdd ? element.id : element.workerId,
               projectSn: this.$store.state.projectSn,
             };
             if (!this.isAdd) {
@@ -605,6 +671,14 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.uploadpoint{
+  text-decoration: none;
+  color:black;
+}
+.uploadBtn{
+  display: inline-block;
+  margin-left: 10px;
+}
 .dialogFormBox2 {
   width: 95% !important;
 }