'画面包'

src/api/zx/index.js

@@ -1065,11 +1065,12 @@ export function getBigScreenWarningList(data) {
 }
 
 //文件列表
-export function listFile(data) {
+export function listFile(query,data) {
   return request({
     url: '/zhFile/listFile',
     method: 'post',
-    data:data
+    data:data,
+    params:query
   })
 }
 //删除

src/assets/icons/svg/l-hb.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><defs><style>.a{fill:none;}.b{fill:#d6ebff;}</style></defs><g transform="translate(-11.98 -972)"><rect class="a" width="26" height="26" transform="translate(11.98 972)"/><g transform="translate(316.1 1275.48)"><path class="b" d="M-291.12-279.48a10.932,10.932,0,0,1-4.282-.865,10.962,10.962,0,0,1-3.5-2.357,10.963,10.963,0,0,1-2.357-3.5,10.932,10.932,0,0,1-.865-4.282,10.932,10.932,0,0,1,.865-4.282,10.962,10.962,0,0,1,2.357-3.5,10.963,10.963,0,0,1,3.5-2.357,10.931,10.931,0,0,1,4.282-.865,10.931,10.931,0,0,1,4.282.865,10.962,10.962,0,0,1,3.5,2.357,10.963,10.963,0,0,1,2.357,3.5,10.932,10.932,0,0,1,.865,4.282,10.932,10.932,0,0,1-.865,4.282,10.964,10.964,0,0,1-2.357,3.5,10.963,10.963,0,0,1-3.5,2.357A10.931,10.931,0,0,1-291.12-279.48Zm0-19.667a8.677,8.677,0,0,0-8.666,8.667,8.677,8.677,0,0,0,8.667,8.667,8.677,8.677,0,0,0,8.667-8.667,8.7,8.7,0,0,0-8.668-8.667Z" transform="translate(0 0)"/><path class="b" d="M-89.892-77.112a1.154,1.154,0,0,1-.637-.371,1.155,1.155,0,0,1-.287-.845,6.627,6.627,0,0,1,.513-2.2,1.17,1.17,0,0,1-.232-.289,4.037,4.037,0,0,1-.471-1.039,5.328,5.328,0,0,1-.078-2.85,4.566,4.566,0,0,1,1.418-2.309l.015-.013a5.574,5.574,0,0,1,2.3-1.108,24.75,24.75,0,0,1,5.481-.357h.592a1.729,1.729,0,0,1,1.225.505l.064.064.018.022a1.784,1.784,0,0,1,.376,1.283v.029l-.005.036a14.038,14.038,0,0,1-1.545,4.689,6.561,6.561,0,0,1-2.466,2.549l-.007,0a5.139,5.139,0,0,1-2.506.654h-.108a6.023,6.023,0,0,1-1.56-.252l-.005,0-.031-.011-.005,0a1.158,1.158,0,0,1-.457-.33,4.428,4.428,0,0,0-.2,1.072v.014a1.178,1.178,0,0,1-.913,1.046v.031l-.246,0-.247.005Zm3.705-3.867h.05a2.956,2.956,0,0,0,1.4-.353A4.256,4.256,0,0,0-83.157-83a12.024,12.024,0,0,0,1.146-3.155,22.77,22.77,0,0,0-4.789.3l-.02,0a3.165,3.165,0,0,0-1.343.624,2.192,2.192,0,0,0-.671,1.125,3.074,3.074,0,0,0,.008,1.406l.037-.041,0,0a9.983,9.983,0,0,1,2.349-1.8,4.41,4.41,0,0,1,1.873-.568c.027,0,.056,0,.084,0a1.167,1.167,0,0,1,.966.511,1.172,1.172,0,0,1,.086,1.165,1.172,1.172,0,0,1-.966.657,2.283,2.283,0,0,0-.938.291,8.879,8.879,0,0,0-1.739,1.3l-.041.047a1.156,1.156,0,0,1,.139.043A4.6,4.6,0,0,0-86.187-80.978Z" transform="translate(-205.48 -207.538)"/></g></g></svg>

src/components/FileUpload/index.vue

@@ -40,8 +40,6 @@
 
 <script setup>
 import { getToken } from "@/utils/auth";
-import cafeOfd from 'cafe-ofd'
-import 'cafe-ofd/package/index.css'
 const props = defineProps({
   modelValue: [String, Object, Array],
   // 数量限
@@ -108,6 +106,7 @@ watch(() => props.modelValue, val => {
 // 上传前校检格式和大小
 function handleBeforeUpload(file) {
   console.log(file,typeof file)
+  uploadList.value=[]
   // 校检文件类型
   if (props.fileType.length) {
     const fileName = file.name.split('.');
@@ -134,6 +133,7 @@ function handleBeforeUpload(file) {
 
 // 文件个数超出
 function handleExceed() {
+  console.log(fileList.value, number.value,uploadList.value,props.limit,'上传失败')
   proxy.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
 }
 
@@ -171,10 +171,12 @@ function uploadedSuccessfully() {
   if (number.value > 0 && uploadList.value.length === number.value) {
     fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
     uploadList.value = [];
+    fileList.value=[];
     number.value = 0;
     emit("update:modelValue", listToString(fileList.value));
     emit('reset')
     proxy.$modal.closeLoading();
+    console.log(fileList.value, number.value,uploadList.value,'上传成功')
   }
 }
 

src/components/Map/HuanBaoMap/HuanBaoMap.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="huan_bao_div" id="huanBaoMap"></div>
+  <div class="tu-li"></div>
   <div style="position: absolute;left: 20%;right: 0;bottom: 0;z-index: 9999;width: 300px;height: 120px">
     <div
         :class="active == 1 ? 'active' : ''"
@@ -444,4 +445,15 @@ const randomLayerId = () => Date.now().toString(36) + Math.random().toString(36)
   }
 }
 
+.tu-li{
+  width: 300px;
+  height: 243px;
+  position: absolute;
+  z-index: 99;
+  bottom: 100px;
+  right: 30px;
+  background-image: url("./img/tu_li.png");
+  background-size: 100%;
+}
+
 </style>

src/router/index.js

@@ -1000,9 +1000,9 @@ export const constantRoutes = [
         meta: { title: '专项工作', icon: 'l-gw-nocheck' }
       },
       {
-        path: 'system',
-        component: () => import('@/views/pages/environment/system'),
-        name: 'system',
+        path: 'system1',
+        component: () => import('@/views/pages/environment/system1'),
+        name: 'system1',
         meta: { title: '体系制度', icon: 'l-gw-nocheck' }
       }
     ]

src/views/pages/environment/special/index.vue

@@ -24,7 +24,7 @@
                   size="mini"
                   >重置</el-button
                 >
-                <FileUpload ref="upload" :fileType="['xls','xlsx','doc','docx','pdf','ofd'] " url="/zhFile/uploadFile?useScope=3&useScopeRemark=专项工作" :isShowTip="false"  @reset="reset"></FileUpload>
+                <FileUpload ref="upload" :fileType="['xls','xlsx','doc','docx','pdf'] " url="/zhFile/uploadFile?useScope=3&useScopeRemark=专项工作" :isShowTip="false"  @reset="reset"></FileUpload>
               </el-form-item>
             </el-form>
           </div>
@@ -85,9 +85,9 @@ const totals = ref(0);
 const extenson=ref('');
 const url=ref('')
 const queryList = () => {
-  listFile({
-    current: pageNo.value,
-    size: pageSize.value,
+  console.log(pageNo.value,pageSize.value,'ss')
+  listFile({pageNum: pageNo.value,
+    pageSize: pageSize.value},{
     fileName: form.value.fileName,
     useScope: form.value.useScope
   }).then((res) => {

src/views/pages/environment/system1/index.vue

@@ -83,9 +83,8 @@ const totals = ref(0);
 const extenson=ref('');
 const url=ref('')
 const queryList = () => {
-  listFile({
-    current: pageNo.value,
-    size: pageSize.value,
+  listFile({pageNum: pageNo.value,
+    pageSize: pageSize.value},{
     fileName: form.value.fileName,
     useScope: form.value.useScope
   }).then((res) => {