`fix`

.env.production

@@ -14,7 +14,7 @@ VITE_APP_MONITRO_ADMIN = '/admin/applications'
 VITE_APP_POWERJOB_ADMIN = '/powerjob'
 
 # 生产环境
-VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_API = '/api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "vite serve --mode development",
-    "build:prod": "vite build --mode production &&vue-tsc --noEmit",
+    "build:prod": "vite build --mode production",
     "preview": "vite preview",
     "lint": "eslint src/**/*.{ts,js,vue} --fix",
     "prepare": "husky install",

src/views/file/list/index.vue

@@ -9,7 +9,7 @@
             <el-input
               v-model="searchForm.originalName"
               style="width: 240px"
-              placeholder="请输入"
+              placeholder="请输入文件名称"
             />
           </div>
         </div>
@@ -19,7 +19,7 @@
             <el-input
               v-model="searchForm.qiuquan"
               style="width: 240px"
-              placeholder="请输入"
+              placeholder="请输入丘权号"
             />
           </div>
         </div>
@@ -152,7 +152,6 @@
       v-model="logsshow"
       title="文件信息"
       :direction="'rtl'"
-      :before-close="handleClose"
     >
       <div>
         <el-descriptions title="项目信息" border :column="2">
@@ -200,6 +199,15 @@
 </template>
 
 <script lang="ts" setup>
+import txticon from "@/assets/icons/svg/txt.svg";
+import picicon from "@/assets/icons/svg/pic.svg";
+import pdficon from "@/assets/icons/svg/pdf1.svg";
+import docicon from "@/assets/icons/svg/doc.svg";
+import xlsicon from "@/assets/icons/svg/xls.svg";
+import ppticon from "@/assets/icons/svg/ppt.svg";
+import mp4icon from "@/assets/icons/svg/mp4.svg";
+import cadicon from "@/assets/icons/svg/cad.svg";
+import unknownicon from "@/assets/icons/svg/unknown.svg";
 import { ref, onMounted } from "vue";
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { listByIds, listArchivesFileList } from "@/api/system/oss/index";
@@ -316,15 +324,7 @@ const filelogs = (file) => {
 const activities = ref([
 ]);
 
-import txticon from "@/assets/icons/svg/txt.svg";
-import picicon from "@/assets/icons/svg/pic.svg";
-import pdficon from "@/assets/icons/svg/pdf1.svg";
-import docicon from "@/assets/icons/svg/doc.svg";
-import xlsicon from "@/assets/icons/svg/xls.svg";
-import ppticon from "@/assets/icons/svg/ppt.svg";
-import mp4icon from "@/assets/icons/svg/mp4.svg";
-import cadicon from "@/assets/icons/svg/cad.svg";
-import unknownicon from "@/assets/icons/svg/unknown.svg";
+
 
 const gettypeicon = (type) => {
   if (type.indexOf("png") != -1 || type.indexOf("jp") != -1) {

src/views/h5/filelist/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="content">
     <van-sticky :offset-top="0">
-      <van-nav-bar title="项目文件" left-text="返回" left-arrow @click-left="onClickLeft" @click-right="filterclick"> </van-nav-bar>
+      <van-nav-bar title="项目文件" left-text="返回" left-arrow @click-left="onClickLeft"> </van-nav-bar>
     </van-sticky>
     <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
       <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
@@ -39,6 +39,15 @@
   </div>
 </template>
 <script setup lang="ts">
+import txticon from '@/assets/icons/svg/txt.svg'
+import picicon from '@/assets/icons/svg/pic.svg'
+import pdficon from '@/assets/icons/svg/pdf1.svg'
+import docicon from '@/assets/icons/svg/doc.svg'
+import xlsicon from '@/assets/icons/svg/xls.svg'
+import ppticon from '@/assets/icons/svg/ppt.svg'
+import mp4icon from '@/assets/icons/svg/mp4.svg'
+import cadicon from '@/assets/icons/svg/cad.svg'
+import unknownicon from '@/assets/icons/svg/unknown.svg'
 import {
   listArchives,
   addArchives,
@@ -107,15 +116,7 @@ const downloadfile = (file) => {
 }
 
 
-import txticon from '@/assets/icons/svg/txt.svg'
-import picicon from '@/assets/icons/svg/pic.svg'
-import pdficon from '@/assets/icons/svg/pdf1.svg'
-import docicon from '@/assets/icons/svg/doc.svg'
-import xlsicon from '@/assets/icons/svg/xls.svg'
-import ppticon from '@/assets/icons/svg/ppt.svg'
-import mp4icon from '@/assets/icons/svg/mp4.svg'
-import cadicon from '@/assets/icons/svg/cad.svg'
-import unknownicon from '@/assets/icons/svg/unknown.svg'
+
 
 const gettypeicon = (type) => {
   if (type.indexOf('png') != -1 || type.indexOf('jp') != -1) {

src/views/project/list/index.vue

@@ -6,7 +6,7 @@
         <div class="item">
           <div>区域：</div>
           <div>
-            <el-select style="width: 120px;" v-model="searchForm.area" clearable placeholder="请选择">
+            <el-select style="width: 120px;" v-model="searchForm.area" clearable placeholder="请选择区域">
               <el-option
                 v-for="item in sys_area"
                 :key="item.value"
@@ -23,7 +23,7 @@
             <el-input
               v-model="searchForm.qiuquan"
               style="width: 200px"
-              placeholder="请输入"
+              placeholder="请输入丘权号"
             />
           </div>
         </div>
@@ -33,7 +33,7 @@
             <el-input
               v-model="searchForm.buildUnit"
               style="width: 200px"
-              placeholder="请输入"
+              placeholder="请输入建设单位"
             />
           </div>
         </div>
@@ -44,7 +44,7 @@
             <el-input
               v-model="searchForm.saveAddr"
               style="width: 200px"
-              placeholder="请输入"
+              placeholder="请输入存储位置"
             />
           </div>
         </div>
@@ -54,7 +54,7 @@
             <el-input
               v-model="searchForm.remark"
               style="width: 200px"
-              placeholder="请输入"
+              placeholder="请输入备注"
             />
           </div>
         </div>
@@ -69,7 +69,7 @@
             <el-input
               v-model="searchForm.addr"
               style="width: 240px"
-              placeholder="请输入"
+              placeholder="请输入地址"
             />
           </div>
         </div>
@@ -146,6 +146,7 @@
         <el-table-column prop="achievementDate" label="建档日期" width="110" />
         <el-table-column prop="saveAddr" label="存储位置" width="100" />
         <el-table-column prop="addr" label="地址" width="180" />
+        <el-table-column prop="community" label="小区" width="100" />
         <el-table-column prop="remark" label="备注" width="180" />
         <el-table-column prop="address" label="操作">
           <template #default="scope">
@@ -184,17 +185,18 @@
                   @confirm="deleteitem(scope.row.id)"
                 >
                   <template #reference>
-                    <el-button type="text" size="small">删除</el-button>
+                    <el-button type="danger" text size="small">删除</el-button>
                   </template>
                 </el-popconfirm>
               </div>
               <div v-hasPermi="['filemanager.project.filelook']">
-                <el-button type="text" size="small" @click="lookfiles(scope.row)">文件查看</el-button>
+                <el-button text type="warning" size="small" @click="lookfiles(scope.row)">文件查看</el-button>
               </div>
               <div v-if="scope.row.status == '2'">
                 <el-button
-                  type="text"
                   size="small"
+                  text
+                  type="success"
                   v-hasPermi="['filemanager.project.sh']"
                   @click="shproject(scope.row)"
                   >审核</el-button
@@ -256,7 +258,7 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button @click="shvisable = false">取消</el-button>
           <el-button type="danger" @click="updatecurrent(currentitem.id, 4)">
             不通过
           </el-button>
@@ -273,7 +275,7 @@
     >
       <el-form :model="currentitem" label-width="auto">
         <el-form-item label="区域：" required>
-          <el-select v-model="currentitem.area" clearable placeholder="请选择">
+          <el-select v-model="currentitem.area" clearable placeholder="请选择区域">
             <el-option
               v-for="item in sys_area"
               :key="item.value"
@@ -284,31 +286,51 @@
           </el-select>
         </el-form-item>
         <el-form-item label="电子档案编号：" required>
-          <el-input v-model="currentitem.ecode" placeholder="请输入" />
+          <el-input v-model="currentitem.ecode" placeholder="请输入电子档案编号" />
+        </el-form-item>
+
+        <el-form-item label="状态：" v-if="currenttype != 1" v-hasPermi="['filemanager.project.status']">
+          <el-select v-model="currentitem.status" clearable placeholder="请选择状态">
+            <el-option
+              v-for="item in sys_project_status"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="不通过原因：" v-if="currentitem.status==4 && currenttype != 1" v-hasPermi="['filemanager.project.status']">
+          <el-input type="textarea" v-model="currentitem.ext1" placeholder='{"projectreson": "此处填写原因"}' />
         </el-form-item>
 
         <el-form-item label="丘权号：" required>
-          <el-input v-model="currentitem.qiuquan" placeholder="请输入" />
+          <el-input v-model="currentitem.qiuquan" placeholder="请输入丘权号" />
         </el-form-item>
 
         <el-form-item label="建设单位：" required>
-          <el-input v-model="currentitem.buildUnit" placeholder="请输入" />
+          <el-input v-model="currentitem.buildUnit" placeholder="请输入建设单位" />
         </el-form-item>
 
         <el-form-item label="建档日期：">
-          <el-input v-model="currentitem.achievementDate" placeholder="请输入" />
+          <el-input v-model="currentitem.achievementDate" placeholder="请输入建档日期" />
         </el-form-item>
 
         <el-form-item label="存储位置：" required>
-          <el-input v-model="currentitem.saveAddr" placeholder="请输入" />
+          <el-input v-model="currentitem.saveAddr" placeholder="请输入存储位置" />
+        </el-form-item>
+
+        <el-form-item label="小区：">
+          <el-input type="text" v-model="currentitem.community" placeholder="请输入小区" />
         </el-form-item>
 
         <el-form-item label="地址：">
-          <el-input type="textarea" v-model="currentitem.addr" placeholder="请输入" />
+          <el-input type="textarea" v-model="currentitem.addr" placeholder="请输入地址" />
         </el-form-item>
 
         <el-form-item label="备注：">
-          <el-input type="textarea" v-model="currentitem.remark" placeholder="请输入" />
+          <el-input type="textarea" v-model="currentitem.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
 
@@ -388,6 +410,15 @@
 </template>
 
 <script lang="ts" setup>
+import txticon from '@/assets/icons/svg/txt.svg'
+import picicon from '@/assets/icons/svg/pic.svg'
+import pdficon from '@/assets/icons/svg/pdf1.svg'
+import docicon from '@/assets/icons/svg/doc.svg'
+import xlsicon from '@/assets/icons/svg/xls.svg'
+import ppticon from '@/assets/icons/svg/ppt.svg'
+import mp4icon from '@/assets/icons/svg/mp4.svg'
+import cadicon from '@/assets/icons/svg/cad.svg'
+import unknownicon from '@/assets/icons/svg/unknown.svg'
 import { ref, onMounted } from "vue";
 import { listByIds,delOss } from "@/api/system/oss";
 import {
@@ -399,6 +430,7 @@ import {
   saveArchive_files
 } from "@/api/archives/index";
 import _ from "lodash";
+import {useRoute} from "vue-router";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_area, sys_project_status } = toRefs<any>(
@@ -407,6 +439,7 @@ const { sys_area, sys_project_status } = toRefs<any>(
 const drawer = ref(false)
 const shvisable = ref(false);
 const pdfviewshow = ref(false);
+const route = useRoute();
 
 const searchForm = ref({
   area: "",
@@ -438,6 +471,10 @@ const totalnum = ref(0);
 
 const getnextdata = (page: number) => {
   currentpage.value = page;
+  if(route.query.status){
+    searchForm.value["status"]=route.query.status;
+  }
+  console.log(searchForm.value)
   listArchives({ pageSize: 10, pageNum: page, ...searchForm.value }).then((res) => {
     tableData.value = res.rows;
     totalnum.value = res.total;
@@ -681,15 +718,6 @@ const downloadfile = (file) => {
 
 
 
-import txticon from '@/assets/icons/svg/txt.svg'
-import picicon from '@/assets/icons/svg/pic.svg'
-import pdficon from '@/assets/icons/svg/pdf1.svg'
-import docicon from '@/assets/icons/svg/doc.svg'
-import xlsicon from '@/assets/icons/svg/xls.svg'
-import ppticon from '@/assets/icons/svg/ppt.svg'
-import mp4icon from '@/assets/icons/svg/mp4.svg'
-import cadicon from '@/assets/icons/svg/cad.svg'
-import unknownicon from '@/assets/icons/svg/unknown.svg'
 
 const gettypeicon = (type) => {
   if (type.indexOf('png') != -1 || type.indexOf('jp') != -1) {

vite.config.ts

@@ -26,7 +26,8 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://localhost:8080',
+          // target: 'http://localhost:8080',
+          target: 'https://filesystem.njdnyjs.com/api',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')