update

src/views/commission/components/projectLookstudnt.vue

@@ -352,6 +352,7 @@
       import {getWord} from '@/components/tool/getWord'
 			import vpdf from "@/components/vpdf.vue";
 			import vword from "@/components/vword.vue";
+			import "../../../components/common/aws-sdk-2.235.1.min.js"
       export default {
 				components:{
 					vpdf,
@@ -564,6 +565,48 @@
     			    } else return (this.Wordss = { type: type, name: type });
     			  }
     			},
+					//下载文件
+    			downFile(f) {
+    			  var credentials = {
+    			    accessKeyId: "AKIATLPEDU37QV5CHLMH",
+    			    secretAccessKey: "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",
+    			  }; //秘钥形式的登录上传
+    			  window.AWS.config.update(credentials);
+    			  window.AWS.config.region = "cn-northwest-1"; //设置区域
+    			  let url2 = f;
+    			  let _url2 = "";
+    			  if (
+    			    url2.indexOf("https://view.officeapps.live.com/op/view.aspx?src=") != -1
+    			  ) {
+    			    _url2 = url2.split(
+    			      "https://view.officeapps.live.com/op/view.aspx?src="
+    			    )[1];
+    			  } else {
+    			    _url2 = url2;
+    			  }
+    			  var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
+    			  let name = decodeURIComponent(
+    			    _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+    			  );
+    			  var params = {
+    			    Bucket: "ccrb",
+    			    Key: name,
+    			  };
+    			  s3.getObject(params, function (err, data) {
+    			    if (err) console.log(err, err.stack); // an error occurred
+    			    else {
+    			      let url = window.URL.createObjectURL(new Blob([data.Body]));
+    			      let a = document.createElement("a");
+    			      a.name = name;
+    			      a.href = url;
+    			      a.download = name;
+    			      a.click();
+    			      console.log(data);
+    			    } // sxuccessful response
+    			  });
+					
+    			  return;
+    			},
         },
         computed:{   //经费总合
           reversedMessage: function () {

src/views/projectApply/components/studentProjectWordDetail.vue

@@ -1150,6 +1150,48 @@ export default {
           return console.log(this.Wordss);
         } else return (this.Wordss = { type: type, name: type });
       }
+    },
+		//下载文件
+    downFile(f) {
+      var credentials = {
+        accessKeyId: "AKIATLPEDU37QV5CHLMH",
+        secretAccessKey: "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",
+      }; //秘钥形式的登录上传
+      window.AWS.config.update(credentials);
+      window.AWS.config.region = "cn-northwest-1"; //设置区域
+      let url2 = f;
+      let _url2 = "";
+      if (
+        url2.indexOf("https://view.officeapps.live.com/op/view.aspx?src=") != -1
+      ) {
+        _url2 = url2.split(
+          "https://view.officeapps.live.com/op/view.aspx?src="
+        )[1];
+      } else {
+        _url2 = url2;
+      }
+      var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
+      let name = decodeURIComponent(
+        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+      );
+      var params = {
+        Bucket: "ccrb",
+        Key: name,
+      };
+      s3.getObject(params, function (err, data) {
+        if (err) console.log(err, err.stack); // an error occurred
+        else {
+          let url = window.URL.createObjectURL(new Blob([data.Body]));
+          let a = document.createElement("a");
+          a.name = name;
+          a.href = url;
+          a.download = name;
+          a.click();
+          console.log(data);
+        } // sxuccessful response
+      });
+
+      return;
     },
 		// 修改文件名称
 		updateFileName(){

src/views/projectApply/newStudentProjectApply.vue

@@ -687,7 +687,49 @@ export default {
 			if(!this.updateFile.fileName)return this.$message.error("请输入文件名称");
 			this.wordData.attachment[this.updateFile.index].fileName = this.updateFile.fileName;
 			this.dialogVisibleUpdateFile = false;
-		}
+		},
+		//下载文件
+    downFile(f) {
+      var credentials = {
+        accessKeyId: "AKIATLPEDU37QV5CHLMH",
+        secretAccessKey: "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",
+      }; //秘钥形式的登录上传
+      window.AWS.config.update(credentials);
+      window.AWS.config.region = "cn-northwest-1"; //设置区域
+      let url2 = f;
+      let _url2 = "";
+      if (
+        url2.indexOf("https://view.officeapps.live.com/op/view.aspx?src=") != -1
+      ) {
+        _url2 = url2.split(
+          "https://view.officeapps.live.com/op/view.aspx?src="
+        )[1];
+      } else {
+        _url2 = url2;
+      }
+      var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
+      let name = decodeURIComponent(
+        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+      );
+      var params = {
+        Bucket: "ccrb",
+        Key: name,
+      };
+      s3.getObject(params, function (err, data) {
+        if (err) console.log(err, err.stack); // an error occurred
+        else {
+          let url = window.URL.createObjectURL(new Blob([data.Body]));
+          let a = document.createElement("a");
+          a.name = name;
+          a.href = url;
+          a.download = name;
+          a.click();
+          console.log(data);
+        } // sxuccessful response
+      });
+
+      return;
+    },
   },
   mounted() {
 		this.getDraft();

src/views/projectApply/projectApplication.vue

@@ -281,7 +281,7 @@
               <el-button
                 type="primary"
                 v-if="
-                  [5,6,7].includes(scope.row.isupload) && $store.state.userInfo.type != 0 && $store.state.userInfo.type != 3
+                  [5,6,7].includes(scope.row.isupload) && ![0,3].includes($store.state.userInfo.type)
                 "
                 class="disa btnClass"
                 size="mini"
@@ -290,17 +290,41 @@
 							<el-button
                 type="primary"
                 v-if="
-                  scope.row.isupload == 2 && $store.state.userInfo.type != 0 && $store.state.userInfo.type != 3
+                  scope.row.isupload == 2 && ![0,3].includes($store.state.userInfo.type)
                 "
                 class="disa btnClass"
                 size="mini"
                 >待结项</el-button
               >
+							<el-button
+                type="primary"
+                v-if="
+                  scope.row.isupload == 3 && ![0,3].includes($store.state.userInfo.type)
+                "
+                class="disa btnClass"
+                size="mini"
+                >结项中</el-button
+              >
+							<el-button
+                type="primary"
+                v-if="
+                  scope.row.isupload == 4 && ![0,3].includes($store.state.userInfo.type)
+                "
+                class="disa btnClass"
+                size="mini"
+                >已结项</el-button
+              >
 
               <!--1管理员审核与院长 -->
+							<el-button
+                type="primary"
+                v-if="scope.row.isupload > 1 && [0,3].includes($store.state.userInfo.type)"
+                class="disa btnClass"
+                >已提交</el-button
+              >
               <el-button
                 v-if="
-                  scope.row.isupload == 0 && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
+                  scope.row.isupload == 0 && [0,3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 class="disa btnClass"
@@ -310,7 +334,7 @@
 
               <el-button
                 v-if="
-                  scope.row.isupload == 1 && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
+                  scope.row.isupload == 1 && [0,3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 size="mini"
@@ -321,7 +345,7 @@
 
               <el-button
                 v-if="
-                  [5,6,7].includes(scope.row.isupload) && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
+                  [3,5,6,7].includes(scope.row.isupload) && [0,3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 class="disa btnClass"
@@ -330,13 +354,22 @@
               >
 							<el-button
                 v-if="
-                  scope.row.isupload == 2 && ($store.state.userInfo.type == 0 || $store.state.userInfo.type == 3)
+                  scope.row.isupload == 2 && [0,3].includes($store.state.userInfo.type)
                 "
                 type="primary"
                 class="disa btnClass"
                 size="mini"
                 >待结项</el-button
               >
+							<el-button
+                v-if="
+                  [4].includes(scope.row.isupload) && [0,3].includes($store.state.userInfo.type)
+                "
+                type="primary"
+                class="disa btnClass"
+                size="mini"
+                >已结项</el-button
+              >
 
               <!-- <el-button type="primary"  size="mini" @click="appTable(scope.row.typeid,scope.row.courseId)" >申请表</el-button> -->
 

src/views/projectManage/components/studentProjectWordShow.vue

@@ -409,6 +409,7 @@
 import { getWord } from "@/components/tool/getWord";
 import vpdf from "@/components/vpdf.vue";
 import vword from "@/components/vword.vue";
+import '../../../components/common/aws-sdk-2.235.1.min.js'
 export default {
 	components:{vpdf,vword},
   data() {
@@ -611,6 +612,48 @@ export default {
     			      return console.log(this.Wordss);
     			    } else return (this.Wordss = { type: type, name: type });
     			  }
+    },
+		//下载文件
+    downFile(f) {
+      var credentials = {
+        accessKeyId: "AKIATLPEDU37QV5CHLMH",
+        secretAccessKey: "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",
+      }; //秘钥形式的登录上传
+      window.AWS.config.update(credentials);
+      window.AWS.config.region = "cn-northwest-1"; //设置区域
+      let url2 = f;
+      let _url2 = "";
+      if (
+        url2.indexOf("https://view.officeapps.live.com/op/view.aspx?src=") != -1
+      ) {
+        _url2 = url2.split(
+          "https://view.officeapps.live.com/op/view.aspx?src="
+        )[1];
+      } else {
+        _url2 = url2;
+      }
+      var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
+      let name = decodeURIComponent(
+        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+      );
+      var params = {
+        Bucket: "ccrb",
+        Key: name,
+      };
+      s3.getObject(params, function (err, data) {
+        if (err) console.log(err, err.stack); // an error occurred
+        else {
+          let url = window.URL.createObjectURL(new Blob([data.Body]));
+          let a = document.createElement("a");
+          a.name = name;
+          a.href = url;
+          a.download = name;
+          a.click();
+          console.log(data);
+        } // sxuccessful response
+      });
+
+      return;
     },
   },
   computed: {

src/views/projectSettlement/components/studentProjectWordShowNew.vue

@@ -349,6 +349,7 @@
     <script>
 		import vpdf from "@/components/vpdf.vue";
 			import vword from "@/components/vword.vue";
+			import "../../../components/common/aws-sdk-2.235.1.min.js"
       // import {getWord} from '@/components/tool/getWord'
       export default {
 				components:{vpdf,vword},
@@ -595,6 +596,48 @@
     			      return console.log(this.Wordss);
     			    } else return (this.Wordss = { type: type, name: type });
     			  }
+    },
+		//下载文件
+    downFile(f) {
+      var credentials = {
+        accessKeyId: "AKIATLPEDU37QV5CHLMH",
+        secretAccessKey: "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",
+      }; //秘钥形式的登录上传
+      window.AWS.config.update(credentials);
+      window.AWS.config.region = "cn-northwest-1"; //设置区域
+      let url2 = f;
+      let _url2 = "";
+      if (
+        url2.indexOf("https://view.officeapps.live.com/op/view.aspx?src=") != -1
+      ) {
+        _url2 = url2.split(
+          "https://view.officeapps.live.com/op/view.aspx?src="
+        )[1];
+      } else {
+        _url2 = url2;
+      }
+      var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
+      let name = decodeURIComponent(
+        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+      );
+      var params = {
+        Bucket: "ccrb",
+        Key: name,
+      };
+      s3.getObject(params, function (err, data) {
+        if (err) console.log(err, err.stack); // an error occurred
+        else {
+          let url = window.URL.createObjectURL(new Blob([data.Body]));
+          let a = document.createElement("a");
+          a.name = name;
+          a.href = url;
+          a.download = name;
+          a.click();
+          console.log(data);
+        } // sxuccessful response
+      });
+
+      return;
     },
         },
         computed:{   //经费总合