Merge branch 'master' of http://10.8.230.114:3000/wangbin/log-server-web

src/api/fileManager.js

@@ -78,3 +78,17 @@ export const deleteQiniuFileAndRecord = (data) => {
     data,
   });
 };
+export const renameQiniuFileAndRecord = (data) => {
+  return service({
+    url: "/fileManager/renameQiniuFileAndRecord",
+    method: "post",
+    data,
+  });
+};
+export const queryFolder = (data) => {
+  return service({
+    url: "/fileManager/queryFolder",
+    method: "post",
+    data,
+  });
+};

src/view/dataStatistics/data_abnormal_rate.vue

@@ -64,7 +64,7 @@
           fixed="left"
           prop="new_date"
           label="日期"
-          min-width="80"
+          min-width="90"
           sortable
         />
         <el-table-column
@@ -103,6 +103,27 @@
           min-width="60"
           align="center"
         />
+        <el-table-column prop="" label="目标" min-width="60" align="center">
+          <el-table-column
+            prop="new_target"
+            label="新增"
+            min-width="60"
+            align="center"
+          />
+          <el-table-column
+            prop="retained_target"
+            label="留存"
+            min-width="60"
+            align="center"
+          />
+          <el-table-column
+            prop="pay_target"
+            label="付费"
+            min-width="60"
+            align="center"
+          />
+        </el-table-column>
+
         <el-table-column
           prop="num_pull_account"
           label="下发账号"
@@ -380,7 +401,9 @@ const getSelectList = async () => {
   ];
   const data3 = directorRes.data.list;
   data3.forEach((e) => {
-    directorList.push({ value: e.name, label: e.name });
+    if (e.name != "备用") {
+      directorList.push({ value: e.name, label: e.name });
+    }
   });
   directorOptions.value = directorList;
 };
@@ -506,6 +529,9 @@ const getTableData = async () => {
           rate3: rate3,
           rate4: rate4,
           rate5: rate5,
+          new_target: e.new_target,
+          pay_target: e.pay_target,
+          retained_target: e.retained_target,
         };
         tableData.value.push(obj1);
       });

src/view/fileManager/qiniuTransfer.vue

@@ -3,6 +3,44 @@
     <div>
       <div class="gva-search-box">
         <div>
+          <el-form ref="searchForm" :inline="true" :model="searchInfo">
+            <el-form-item label="归属任务">
+              <el-select v-model="searchInfo.name" size="small" filterable>
+                <el-option
+                  v-for="item in taskOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="负责人">
+              <el-select v-model="searchInfo.director_name" size="small">
+                <el-option
+                  v-for="item in directorOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                size="small"
+                type="primary"
+                icon="search"
+                @click="onSubmit"
+                >查询</el-button
+              >
+              <el-button size="small" icon="refresh" @click="onReset"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <div class="gva-search-box" style="padding-bottom: 25px">
+        <div>
           <el-button
             size="small"
             type="primary"
@@ -19,61 +57,6 @@
             @click="switchCreateFolder()"
             >新建文件夹</el-button
           >
-          <el-form
-            ref="searchForm"
-            :inline="true"
-            :model="searchInfo"
-            style="margin-left: 50%"
-          >
-            <!-- <el-form-item label="文件名">
-              <el-input
-                v-model="searchInfo.pc_num"
-                placeholder="名称(支持模糊搜索)"
-                size="small"
-              />
-            </el-form-item> -->
-            <!-- <el-form-item label="格式类别">
-            <el-select v-model="searchInfo.set_meal_id" size="small"
-              ><el-option
-                v-for="item in setMealOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            /></el-select>
-          </el-form-item>
-          <el-form-item label="归属任务">
-            <el-select v-model="searchInfo.shop_id" size="small">
-              <el-option
-                v-for="item in shopOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="使用人">
-            <el-select v-model="searchInfo.director_name" size="small">
-              <el-option
-                v-for="item in directorOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item> -->
-            <el-form-item>
-              <!-- <el-button
-                size="small"
-                type="primary"
-                icon="search"
-                @click="onSubmit"
-                >查询</el-button
-              >
-              <el-button size="small" icon="refresh" @click="onReset"
-                >重置</el-button
-              > -->
-            </el-form-item>
-          </el-form>
         </div>
       </div>
       <div class="gva-btn-list">
@@ -410,7 +393,10 @@ import {
   addQiniuFile,
   deleteQiniuFile,
   deleteQiniuFileAndRecord,
+  renameQiniuFileAndRecord,
+  queryFolder,
 } from "@/api/fileManager";
+import { getDirectorList } from "@/api/responsiblePerson";
 import { ref } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { ArrowRight } from "@element-plus/icons-vue";
@@ -431,6 +417,7 @@ const formFolder = ref({
 });
 const taskOptions = ref();
 const fileTypeOptions = ref([]);
+const directorOptions = ref();
 const currentParentId = ref(0);
 const uploadVisible = ref(false);
 const progressFlag = ref(false);
@@ -649,11 +636,42 @@ const handleCommand = (val) => {
       getUrl(val.command);
       break;
     case "rename":
+      rename(val.command);
       break;
     default:
       break;
   }
 };
+//文件重命名
+async function rename(file) {
+  ElMessageBox.prompt("请输入新的文件名", "重命名", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    inputPattern:
+      /(?!((^(con)$)|^(con)\..*|(^(prn)$)|^(prn)\..*|(^(aux)$)|^(aux)\..*|(^(nul)$)|^(nul)\..*|(^(com)[1-9]$)|^(com)[1-9]\..*|(^(lpt)[1-9]$)|^(lpt)[1-9]\..*)|^\s+|.*\s$)(^[^\\\/\:\*\?\"\<\>\|]{1,255}$)/,
+    inputErrorMessage: "不允许这样命名",
+    inputValue: file.name,
+  })
+    .then(async ({ value }) => {
+      const res = await renameQiniuFileAndRecord({
+        id: file.id,
+        file_name: file.name,
+        file_name_new: value,
+        qiniu_key: file.qiniu_key,
+      });
+      // console.log(res);
+      if (res.code == 0) {
+        ElMessage.success(res.msg);
+        initMaterialPage(currentParentId.value);
+      }
+    })
+    .catch(() => {
+      // ElMessage({
+      //   type: "info",
+      //   message: "Input canceled",
+      // });
+    });
+}
 //获取下载链接
 async function getUrl(file) {
   ElMessageBox.alert(
@@ -791,7 +809,7 @@ function beforeAvatarUpload(file) {
 }
 //确定上传,记录文件信息在数据库中
 async function recordFile(aaa) {
-  // console.log(aaa);
+  console.log(aaa);
   const params = {
     parent_id: aaa.parentId,
     task_id: aaa.task_id,
@@ -1028,6 +1046,57 @@ async function initMaterialPage(id = 0) {
     }
   }
 }
+//获取下拉框list
+const getSelectList = async () => {
+  const taskListRes = await getAllTaskSimple({
+    page: 1,
+    pageSize: 999,
+  });
+  let taskList = [];
+  const data = taskListRes.data.list;
+  data.forEach((e) => {
+    taskList.push({
+      value: e.task_id + "|" + e.task_name,
+      label: e.task_id + "_" + e.task_name,
+    });
+  });
+  taskOptions.value = taskList;
+  //游戏负责人列表===============================
+  const directorRes = await getDirectorList();
+  let directorList = [];
+  const data3 = directorRes.data.list;
+  data3.forEach((e) => {
+    if (e.name != "备用") {
+      directorList.push({ value: e.name, label: e.name });
+    }
+  });
+  directorOptions.value = directorList;
+};
+const onReset = () => {
+  searchInfo.value = {};
+};
+const onSubmit = async () => {
+  // console.log(searchInfo.value)
+  files.value = [];
+  const table = await queryFolder({
+    ...searchInfo.value,
+  });
+  if (table.code === 0) {
+    // // console.log(table);
+    const folderList = table.data.folderList;
+    if (folderList != null) {
+      for (let i = 0; i < table.data.folderList.length; i++) {
+        var temp = {
+          id: table.data.folderList[i].id,
+          name: table.data.folderList[i].name,
+          isFile: false,
+        };
+        files.value.push(temp);
+      }
+    }
+  }
+};
+getSelectList();
 initMaterialPage();
 </script>