新增需求1209

src/api/common/api.ts

@@ -36,13 +36,21 @@ export const downloadFile = (url, fileName?, parameter?) => {
   });
 };
 export const downloadonlinePreview = async (url, fileName,parameter) =>{
-  
-  let originUrl="http://218.246.6.165:8080"+apiUrl + url+"?path="+parameter.path+"&fileName="+parameter.fileName
+  //政务网访问地址
+  let originUrlWai="http://172.21.29.222:18084"+apiUrl + url+"?path="+parameter.path+"&fileName="+parameter.fileName
   // let fileType=parameter.fileName.substring(parameter.fileName.lastIndexOf(".")+1)
   // let uuid= buildUUID()
-  let previewUrl = originUrl + "&fullfilename=" +parameter.path.substring(parameter.path.lastIndexOf("/")+1); //带上文件名（带后缀）
+  let previewUrl = originUrlWai + "&fullfilename=" +parameter.path.substring(parameter.path.lastIndexOf("/")+1); //带上文件名（带后缀）
   console.log(previewUrl,'previewUrl')
-  window.open( 'http://218.246.6.173:9002' + "/onlinePreview?url=" + encodeURIComponent(Base64.encode(previewUrl)))
+  window.open( 'http://localhost:8012' + "/onlinePreview?url=" + encodeURIComponent(Base64.encode(previewUrl)))
+  //内网
+  let originUrlNei="http://172.21.29.222:18012"+apiUrl + url+"?path="+parameter.path+"&fileName="+parameter.fileName
+  // let fileType=parameter.fileName.substring(parameter.fileName.lastIndexOf(".")+1)
+  // let uuid= buildUUID()
+  let previewUrlNei = originUrlNei + "&fullfilename=" +parameter.path.substring(parameter.path.lastIndexOf("/")+1); //带上文件名（带后缀）
+  console.log(previewUrlNei,'previewUrl')
+  window.open( 'http://10.172.252.223:8012' + "/onlinePreview?url=" + encodeURIComponent(Base64.encode(previewUrlNei)))
+
   }
 export const downloadResource = async (url, fileName,parameter) =>{
   // let originUrl="http://localhost:3100"+apiUrl + url+"?path="+parameter.path+"&fileName="+parameter.fileName

src/views/projectLib/projectInfo/index.vue

@@ -6,9 +6,7 @@
       <!--操作栏-->
       <template #action="{ record }">
         <!-- <TableAction :actions="getTableAction(record)" /> -->
-        <TableAction
-          :actions="getTableAction(record)"
-        />
+        <TableAction :actions="getTableAction(record)" />
       </template>
 
       <template #projectName="{ record }">
@@ -278,6 +276,8 @@
     ];
   }
  
+
+
   async function handleDetailpage(record) {
     ProjectStage.value = record.stage;
     proid.value = record.id;
@@ -400,7 +400,7 @@
             plan[0].children[i].isfinish != '0'
           ) {
             message.error(record.projectName + '联合技术审查阶段审批中或已完成，无法进行变更！');
-            return
+            return;
           }
         }
       }
@@ -449,7 +449,7 @@
             plan[0].children[i].isfinish != '0'
           ) {
             message.error(record.projectName + '联合技术审查阶段审批中或已完成，无法进行变更！');
-            return
+            return;
           }
         }
       }

src/views/projectLib/projectPlan/viewPlanDetail.vue

@@ -135,7 +135,6 @@
   import planFileApproval from '@/views/ProcessApprovalSubPage/planFileApproval.vue';
   import { isShowByRoles } from '../../projectLib/projectInfo/projectInfo.api';
   import uploadURTfile from '@/views/projectLib/projectPlan/uploadURTfile.vue';
-
   let dataTo = defineProps(['projectId', 'projectStage', 'projectName']);
   let projectId = ref(dataTo.projectId);
   let isfinish = ref();
@@ -307,6 +306,7 @@
     let tableData = await getDataSource();
     console.log('tableData', tableData);
     //项目采购阶段先后顺序限制取消
+
     for (let x = 1; x < tableData.length; x++) {
       for (let i = 0; i < tableData[x].children.length; i++) {
         let child = tableData[x].children[i];

src/views/projectSummary/planSummary/projectContactSummary.vue

@@ -15,9 +15,9 @@
             <div id="2">
               <a-card :bordered="false">
                 <div class="font-semibold"> 资金支付情况 </div>
-                <Progress :percent="69" />
+                <Progress :percent="tab.projectFundPaymentProgress" />
                 <div class="font-semibold"> 中央资金支付情况 </div>
-                <Progress :percent="42" strokeColor="#2E54A1" />
+                <Progress :percent="tab.centralFundPaymentSituation" strokeColor="#2E54A1" />
               </a-card>
             </div>
           </div>