Merge branch 'master-V32-XuHaoJie' into 'master'

杭州-文档管理、对比分析-禁止视频上传、添加后提示添加成功



See merge request !159

@@ -338,11 +338,11 @@ export default {
          */
         let deleteDocument = (id, type) => {
 
-            let url = `/inspection-report/file/change`;
+            let url = `/inspection-report/file/change?status=0`;
             let msg = "您确认将该文件放入回收站？";
             if (props.isRecycle) {
                 msg = "您确认永久删除该文件？";
-                url = `/inspection-report/file/delete`;
+                url = `/inspection-report/file/delete?status=1`;
             }
 
             let info = [];
@@ -416,7 +416,7 @@ export default {
 
             proxy.$global.confirm("是否还原选择的文件？", function () {
 
-                proxy.$http.post(`/inspection-report/file/restore`, info, function (res) {
+                proxy.$http.post(`/inspection-report/file/restore?status=1`, info, function (res) {
                     if (res && res.code == 0) {
                         proxy.$global.showMsg('还原成功！');
                         if (props.isRecycle) {
@@ -626,6 +626,7 @@ export default {
          * 文件下载
          */
         let downloadFile = () => {
+            let status = props.isRecycle?1:0;
             let arr = getCheckedFile();
 
             let info = [];
@@ -642,7 +643,7 @@ export default {
                 fileName:fileNameData
             }
 
-            proxy.$http.downloadFile('/inspection-report/file/download', params);
+            proxy.$http.downloadFile('/inspection-report/file/download?status=' + status, params);
         }
 
         /**

@@ -64,9 +64,9 @@ export default {
                 '.jpeg',
                 '.jpg',
                 '.json',
-                '.mp2',
-                '.mp3',
-                '.mp4',
+                // '.mp2',
+                // '.mp3',
+                // '.mp4',
                 '.mpeg',
                 '.mpg',
                 '.mpp',

@@ -174,7 +174,6 @@ export default {
             loeadTable();
         }
         let getKpiType = (arr) => {
-            console.log(arr);
             var types = arr.map(function (v) {
                 e
                 return v.kpiId;
@@ -268,8 +267,7 @@ export default {
         let addRes = (row, index) => {
             tabFirstList.value.push(row);
             activeName.value = 'first'
-            //proxy.$global.showMsg("添加成功！");
-
+            proxy.$global.showMsg("添加成功！");
             // 加载折线图
             getChartData();