Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/views/backOfficeSystem/HumanIntelligence/FollowLeads/index.vue

@@ -73,8 +73,8 @@ const qxkz = reactive({
 
 const searchConfiger = ref([
   { label: "情报标题", prop: 'qbmc', placeholder: "请输入情报标题", showType: "input" },
-  // { label: "情报来源", prop: 'cjLx', placeholder: "请选择情报来源", showType: "select", options: D_BZ_CJLX },
-  // { label: "来源单位", prop: 'ssbmdm', placeholder: "请选择来源单位", showType: "department" }
+  { label: "时间", prop: 'times', placeholder: "请输入时间", showType: "datetimerange" },
+  { label: "部门", prop: 'ssbmdm', placeholder: "请选择来源单位", showType: "department" }
 ]);
 
 const pageData = reactive({
@@ -105,16 +105,9 @@ const queryFrom = ref({});
 
 // 搜索
 const onSearch = (val) => {
-  const { lrkssj, zxkssj } = val
-  const promes = {
-    ...val,
-    ...pageData.pageConfiger,
-    lrkssj: lrkssj ? lrkssj[0] : '',
-    lrjssj: lrkssj ? lrkssj[1] : '',
-    zxkssj: zxkssj ? zxkssj[0] : '',
-    zxjssj: zxkssj ? zxkssj[1] : '',
-  }
-  queryFrom.value = { ...promes }
+  queryFrom.value = { ...val }
+  queryFrom.value.startTime = val.times ? val.times[0] : ''
+  queryFrom.value.endTime = val.times ? val.times[1] : ''
   pageData.pageConfiger.pageCurrent = 1;
   getList()
 }
@@ -132,6 +125,7 @@ const changeSize = (val) => {
 const getList = () => {
   pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  delete data.times;
   xxcjZxsSelectPage(data).then(res => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;

src/views/backOfficeSystem/HumanIntelligence/fileTransfer/index.vue

@@ -1,25 +1,27 @@
 <template>
   <div>
-
-    <!-- 搜索 -->
     <div ref="searchBox" class="mt10">
-      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
+      <Search :searchArr="searchConfiger" @submit="onSearch" />
     </div>
     <PageTitle :malginLeft="10" :height="35" backgroundColor="#ffff" :marginBottom="5" :marginTop="5">
       <template #left>
         <el-button size="small" type="primary" @click="getDataById('add', '')">
-          <el-icon style="vertical-align: middle">
-            <CirclePlus />
-          </el-icon>
+          <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
           <span style="vertical-align: middle">新增</span>
         </el-button>
       </template>
     </PageTitle>
     <!-- 表格 -->
     <div class="tabBox">
-      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
+      <MyTable 
+        :tableData="pageData.tableData" 
+        :tableColumn="pageData.tableColumn" 
+        :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" 
+        :tableConfiger="pageData.tableConfiger" 
+        :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData"
+      >
         <template #wjdx="{ row }">
           {{ row.wjdx }}MB
         </template>
@@ -30,16 +32,17 @@
         <template #controls="{ row }">
           <el-link size="small" type="primary" @click="getDataById('edit', row)">修改</el-link>
           <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
-          <el-link size="small" type="primary" @click="previewFile(row)"
-            v-if="row.wjlx == '.png' || row.wjlx == '.jpg' || row.wjlx == '.jpeg'">预览</el-link>
+          <el-link size="small" type="primary" @click="previewFile(row)" v-if="row.wjlx == '.png' || row.wjlx == '.jpg' || row.wjlx == '.jpeg'">预览</el-link>
           <el-link size="small" type="primary" @click="downloadFile(row)">下载</el-link>
           <el-link size="small" type="danger" @click="deleteFile(row)">删除</el-link>
         </template>
       </MyTable>
-      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
-        ...pageData.pageConfiger,
-        total: pageData.total
-      }"></Pages>
+      <Pages 
+        @changeNo="changeNo" 
+        @changeSize="changeSize" 
+        :tableHeight="pageData.tableHeight" 
+        :pageConfiger="{ ...pageData.pageConfiger, total: pageData.total }"
+      />
     </div>
   </div>
   <AddForm ref="addForm" @getList="getList" />
@@ -51,47 +54,22 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import { useRoute } from 'vue-router'
-import { qbcjZxsSelectPage } from "@/api/qbcj.js";
-import { reactive, ref, onMounted, getCurrentInstance, watch } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 import { getItem } from '@//utils/storage.js'
 import { deleteWjZzzAddEntity, getWjZzzAddEntity } from '@//api/qbcj.js'
 import AddForm from "./components/addForm.vue";
 const { proxy } = getCurrentInstance();
-// const { D_BZ_CJLX, D_GS_XS_LX } = proxy.$dict("D_BZ_CJLX", "D_GS_XS_LX"); //获取字典数据
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 const ids = ref([])
 const tableList = ref([]);
-onMounted(() => {
-  const { deptBizType, deptLevel } = getItem('deptId')[0]
-  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
-  qxkz.deptBizType = deptBizType
-  qxkz.deptLevel = Jb
-  getRouter()
-  tabHeightFn()
-  if (route.query.id) {
-    detailDiloag.value.init('edit', {
-      id: route.query.id
-    });
-    return
-  }
-  getList()
-});
-const chooseData = (val) => {
-  ids.value = val.map(item => {
-    return item.id
-  })
-  tableList.value = val
-}
+
 const qxkz = reactive({
   deptBizType: "",
   deptLevel: ""
 })
-
 const searchConfiger = ref([
   { label: "文件名称", prop: 'wjmc', placeholder: "请输入文件名称", showType: "input" },
-  // { label: "情报来源", prop: 'cjLx', placeholder: "请选择情报来源", showType: "select", options: D_BZ_CJLX },
-  // { label: "来源单位", prop: 'ssbmdm', placeholder: "请选择来源单位", showType: "department" }
 ]);
 
 const pageData = reactive({
@@ -117,6 +95,26 @@ const pageData = reactive({
   ]
 });
 const queryFrom = ref({});
+const addForm = ref(null)
+const route = useRoute()
+const routerMate = ref({})
+
+onMounted(() => {
+  const { deptBizType, deptLevel } = getItem('deptId')[0]
+  qxkz.deptBizType = deptBizType
+  qxkz.deptLevel = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
+  routerMate.value = route.meta;
+  getList()
+  tabHeightFn()
+  if (route.query.id) return detailDiloag.value.init('edit', { id: route.query.id });
+});
+
+const chooseData = (val) => {
+  if(Array.isArray(val)){
+    ids.value = val.map(item => item.id)
+    tableList.value = val
+  }
+}
 
 // 搜索
 const onSearch = (val) => {
@@ -162,67 +160,48 @@ const tabHeightFn = () => {
     tabHeightFn();
   };
 };
-const route = useRoute()
-const routerMate = ref({})
-const getRouter = () => {
-  routerMate.value = route.meta
-}
-const addForm = ref(null)
+
+
+
 const getDataById = (type, row) => {
   addForm.value.init(type, row, '01');
 }
 const previewFile = (item) => {
   window.open(item.wjdz);
 }
-const downloadFile = async (item) => {
-  console.log(item);
-  try {
-    const dataList =JSON.parse(item.wjdz)
-    if (dataList.length === 0) {
-      proxy.$message.warning('没有文件可下载');
-      return;
-    }
-console.log(dataList);
 
+const downloadFile = async (item) => {
+  try {
+    const dataList = JSON.parse(item.wjdz)
+    if (dataList.length === 0) return proxy.$message.warning('没有文件可下载');
     const downloadCount = dataList.length;
     let successCount = 0;
     let failCount = 0;
-
     proxy.$message.info(`开始下载${downloadCount}个文件...`);
-
     // 并行下载所有文件
     const downloadPromises = dataList.map(async (fileData, index) => {
-
       try {
+        // fileData.url = "http://47.108.232.77:9000/image/2025-01-06/081102a5418e4146beea277d18018e07.jpeg";
         // 使用fetch获取文件内容
-        const response = await fetch(fileData.url);
-        if (!response.ok) {
-          throw new Error('文件下载失败');
-        }
-
+        const downloadUrl = fileData.url.replace(/^https?:\/\/[^/]+/, '/zyminio');
+        const response = await fetch(downloadUrl);
+        if (!response.ok) throw new Error('文件下载失败');
         // 将响应转换为Blob对象
         const blob = await response.blob();
-
         // 创建下载链接
         const downloadLink = document.createElement('a');
         downloadLink.href = URL.createObjectURL(blob);
-
         // 设置下载文件的名称，避免冲突
-        const fileName = dataList.length > 1
-          ? `${item.wjmc}_${index + 1}`
-          : item.wjmc;
+        const fileName = dataList.length > 1 ? `${item.wjmc}_${index + 1}` : item.wjmc;
         downloadLink.download = fileName;
-
         // 触发下载
         document.body.appendChild(downloadLink);
         downloadLink.click();
-
         // 清理
         setTimeout(() => {
           document.body.removeChild(downloadLink);
           URL.revokeObjectURL(downloadLink.href);
         }, 100);
-
         successCount++;
       } catch (error) {
         console.error(`文件${index + 1}下载失败:`, error);
@@ -242,16 +221,12 @@ console.log(dataList);
       proxy.$message.warning(`成功下载${successCount}个文件，失败${failCount}个文件`);
     }
   } catch (error) {
-    console.error('文件下载失败:', error);
     proxy.$message.error('文件下载失败，请稍后重试');
   }
 }
+
 const deleteFile = (row) => {
-  proxy.$confirm('确定删除选中文件吗？', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
+  proxy.$confirm('确定删除选中文件吗？', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
     deleteWjZzzAddEntity({ ids: [row.id] }).then(res => {
       proxy.$message.success('删除成功');
       getList();

src/views/backOfficeSystem/integralList/dict.js

@@ -1,12 +1,7 @@
 /** 积分类型 */
 export const jflylxTypes = {
-  '01': '信息采集',
-  '02': '肯定',
-  '03': '转会商',
-  '04': '转合成',
-  '05': '转线索',
-  '06': '建模型',
-  '07': '战术研判',
-  '08': '战略研判'
+  '01': '采纳',
+  '02': '转线索',
+  '03': '研判',
 };