zhiyuan007 1 year ago
parent
commit
7fb2be6c93

+ 1 - 1
index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>市住建委信用信息数据库</title>
   </head>
   <body>
     <div id="app"></div>

+ 5 - 0
src/router/index.js

@@ -85,6 +85,11 @@ const router = createRouter({
           name: 'rewards-and-punishments-measure-manage',
           component:RewardsAndPunishmentsMeasureManage
         },
+        {
+          path: '/main/combined-reward-memorandum-manage',
+          name: 'combined-reward-memorandum-manage',
+          component:MemorandumManage
+        },
         {
           path: '/main/combined-reward-and-punishments-measure-manage',
           name: 'combined-reward-and-punishments-measure-manage',

+ 3 - 6
src/service/config.js

@@ -1,11 +1,8 @@
-// const url = 'http://10.81.66.1:8080/sqlWebService_KJFX/common/CommonWebService.asmx/';
-// const proBaseUrl = 'http://10.81.66.1:8080/sqlWebService_KJFX/common/CommonWebService.asmx';
-// const devBaseUrl = 'http://10.81.66.1:8080/sqlWebService_KJFX/common/CommonWebService.asmx';
 //  export const baseUrl = process.env.NODE_ENV ==='production'?proBaseUrl:devBaseUrl
-//export const baseUrl = 'http://10.90.7.241:9443/data-business-prod/'
-export const baseUrl = 'http://localhost:9250'
+export const baseUrl = 'http://10.90.7.241:9443/data-business-prod/'
+//export const baseUrl = 'http://localhost:9250'
 // export const baseUrl = 'http://10.81.66.9:9250'
-export const baseUrl_Address = 'http://localhost:9250'
+export const baseUrl_Address = 'http://10.81.66.9:9250'
 // export const baseUrl_Address = 'http://10.81.66.9:9252'
 export const timeout = 30000
 export const withCredentials=true

+ 4 - 4
src/service/credit-information/city-credit-information-platform-search/city-credit-information-platform-search.js

@@ -1,10 +1,10 @@
 
 
-import {requestInstance} from "@/service";
+import {requestInstance_Address} from "@/service";
 
 //信用信息 市信用信息平台查询  应用事项列表查询
 export function getYysxs(){
-    return requestInstance({
+    return requestInstance_Address({
         url:'/xyxxInterface/getYysxs?appkey='+localStorage.getItem("xyxx_userkeycode"),
         data:{
         }
@@ -14,7 +14,7 @@ export function getYysxs(){
 
 //信用信息 市信用信息平台查询  首页自然人列表查询
 export function getQueryDataCxbh(params){
-    return requestInstance({
+    return requestInstance_Address({
         url:'/xyxxInterface/getQueryDataCxbh?appkey='+localStorage.getItem("xyxx_userkeycode"),
         data:{
             ...params
@@ -24,7 +24,7 @@ export function getQueryDataCxbh(params){
 
 //信用信息 市信用信息平台查询  首页法人查询
 export function getQueryDataCxbhZrr(params){
-    return requestInstance({
+    return requestInstance_Address({
         url:'/xyxxInterface/getQueryDataCxbhZrr?appkey='+localStorage.getItem("xyxx_userkeycode"),
         data:{
             ...params

+ 19 - 19
src/service/index.js

@@ -62,25 +62,25 @@ const requestInstance_Address = axios.create({
     baseURL:baseUrl_Address,
     timeout,
     method:"post",
-    withCredentials,
-    responseType: "blob",
-    headers:{
-
-        "Content-Type":"application/x-www-form-urlencoded"
-    },
-    transformRequest:[(data) => {
-
-        if(data) {
-            let params = new FormData()
-            let keys = Object.keys(data)
-            keys.forEach(key => {
-                params.append(key,data[key])
-            })
-            return params
-        }
-        return data
-    }
-    ]
+    // withCredentials,
+    // responseType: "blob",
+    // headers:{
+    //
+    //     "Content-Type":"application/x-www-form-urlencoded"
+    // },
+    // transformRequest:[(data) => {
+    //
+    //     if(data) {
+    //         let params = new FormData()
+    //         let keys = Object.keys(data)
+    //         keys.forEach(key => {
+    //             params.append(key,data[key])
+    //         })
+    //         return params
+    //     }
+    //     return data
+    // }
+    // ]
 })
 requestInstance_Address.interceptors.request.use((config) => {
     return config

+ 1 - 0
src/service/policy-and-regulation-manage/policy-regulation-information/policy-regulation-information.js

@@ -41,3 +41,4 @@ export function proDeleteXyxxFlag(params){
     })
 }
 
+

+ 3 - 3
src/units/use-method/power-control.js

@@ -58,7 +58,7 @@ export  function getMenu(){
             {
                 "children":[
                     {
-                        "path":"memorandum-manage",
+                        "path":"combined-reward-memorandum-manage",
                         "name":"备忘录管理"
                     },
                     {
@@ -216,7 +216,7 @@ export  function getMenu(){
             {
                 "children":[
                     {
-                        "path":"memorandum-manage",
+                        "path":"combined-reward-memorandum-manage",
                         "name":"备忘录管理"
                     },
                     {
@@ -362,7 +362,7 @@ export  function getMenu(){
             {
                 "children":[
                     {
-                        "path":"memorandum-manage",
+                        "path":"combined-reward-memorandum-manage",
                         "name":"备忘录管理"
                     },
                     {

+ 28 - 3
src/views/main/c-views/policy-and-regulation-manage/memorandum-manage/MemorandumManage.vue

@@ -11,7 +11,7 @@
         <el-button  type="primary" :icon="Plus" @click="openDialog('add')">新增</el-button>-->
       </template>
       <template #operation="{data}">
-        <el-button  type="info" @click="openDialog('detail',data)">查看</el-button>
+        <el-button  type="info" @click="getDataFile(data)">查看</el-button>
         <el-button v-if="store.isManager"  type="info" @click="openDialog('edit',data)">修改</el-button>
         <el-button v-if="store.isManager"  type="info" @click="deleteObj(data)">删除</el-button>
       </template>
@@ -40,6 +40,7 @@ import {
 import {handleMes} from "@/units/element-ui/tip";
 import {InsertSyslog} from "@/units/use-method/user-log";
 import {closeShowLoading, showLoading} from "@/units/element-loading/element-loader";
+import axios from "axios";
 export default {
   name: "MemorandumManage",
   components:{MemorandumManageSettingDialog, CommonLayout},
@@ -68,7 +69,30 @@ export default {
         layoutRef.value.getResData(res.msg[0].Rows,res.msg[0].TotalRowCount)
       })
     }
-
+    function getDataFile(data){
+      let obj = {
+        "fileName":data.FILENAME + data.FILETYPE,
+        "type":"bwl"
+      }
+      axios({
+        method: "post",
+        url: '/api/XyxxApi/xyptFileDocument', // 请求地址
+        data: obj, // 参数
+        responseType: "blob", // 表明返回服务器返回的数据类型
+      }).then((res) => {
+        debugger
+        const blob = res.data;
+        if(blob.type==="application/octet-stream"){
+          const download_url = window.URL.createObjectURL(blob); //数据流作为下载的源
+          const eleLink = document.createElement('a');  //创建一个a标签
+          eleLink.href = download_url;              //下载的文件连接,实际就是下载的数据流
+          eleLink.download = obj.fileName;        //下载的文件名称
+          document.body.appendChild(eleLink)
+          eleLink.click()  //模拟下载文件
+          window.URL.revokeObjectURL(download_url)
+        }
+      })
+    }
     function openDialog(type,data){
       isEditDialogShow.value = true;
       changeOperation(type,data)
@@ -93,7 +117,8 @@ export default {
       isEditDialogShow,
       dialogOperationType,
       currentDialogOpObj,
-      store
+      store,
+      getDataFile
     }
 
   }

+ 1 - 1
src/views/main/c-views/policy-and-regulation-manage/memorandum-manage/MemorandumManageSettingDialog.vue

@@ -107,7 +107,7 @@ export default {
             formData.append("file",file.value.raw);
             formData.append("fileName",fileName + suffixName);
             formData.append("type","bwl")
-            axios.post('http://localhost:8081/upload/xypt',formData,{'Content-type':'multipart/form-data'}).then(res =>{
+            axios.post('http://10.90.7.241:9443/data-business-prod' +'/XyxxApi/xypt',formData,{'Content-type':'multipart/form-data'}).then(res =>{
               console.log(res);
               if(res.data[0].success=='true'){
                 insertBwl(fileName,suffixName)

+ 37 - 1
src/views/main/c-views/policy-and-regulation-manage/policy-regulation-information/PolicyRegulationInformation.vue

@@ -11,7 +11,7 @@
         <el-button   type="primary" :icon="Plus" @click="openDialog('add')">新增</el-button>-->
       </template>
       <template #operation="{data}">
-        <el-button  type="info" @click="openDialog('detail',data)">查看</el-button>
+        <el-button  type="info" @click="getDataFile(data)">查看</el-button>
         <el-button v-if="store.isManager"  type="info" @click="openDialog('edit',data)">修改</el-button>
         <el-button v-if="store.isManager"  type="info" @click="deleteObj(data)">删除</el-button>
       </template>
@@ -40,6 +40,8 @@ import PolicyRegulationInformationSettingDialog
 import {handleMes} from "@/units/element-ui/tip";
 import {InsertSyslog} from "@/units/use-method/user-log";
 import {closeShowLoading, showLoading} from "@/units/element-loading/element-loader";
+import axios from "axios";
+import {baseUrl} from "@/service/config";
 export default {
   name: "PolicyRegulationInformation",
   components:{PolicyRegulationInformationSettingDialog, CommonLayout},
@@ -84,6 +86,39 @@ export default {
         })
       })
     }
+    function getDataFile(data){
+      let type = "";
+      if(data.TYPE =="本市"){
+        type="bs"
+      }else if(data.TYPE =="国家"){
+        type="gj"
+      }else if(data.TYPE =="市住建委"){
+        type="zjw"
+      }
+      let obj = {
+        "fileName":data.FILENAME + data.FILETYPE,
+        "type":type
+      }
+      axios({
+        method: "post",
+        url: '/api/XyxxApi/xyptFileDocument', // 请求地址
+        data: obj, // 参数
+        responseType: "blob", // 表明返回服务器返回的数据类型
+      }).then((res) => {
+        debugger
+        const blob = res.data;
+        if(blob.type==="application/octet-stream"){
+          const download_url = window.URL.createObjectURL(blob); //数据流作为下载的源
+          const eleLink = document.createElement('a');  //创建一个a标签
+          eleLink.href = download_url;              //下载的文件连接,实际就是下载的数据流
+          eleLink.download = obj.fileName;        //下载的文件名称
+          document.body.appendChild(eleLink)
+          eleLink.click()  //模拟下载文件
+          window.URL.revokeObjectURL(download_url)
+        }
+      })
+
+    }
     return {
       policyRegulationInformation,
       policyRegulationInformationHeader,
@@ -94,6 +129,7 @@ export default {
       isEditDialogShow,
       dialogOperationType,
       currentDialogOpObj,
+      getDataFile,
       store
     }
 

+ 22 - 3
src/views/main/c-views/policy-and-regulation-manage/policy-regulation-information/PolicyRegulationInformationSettingDialog.vue

@@ -41,6 +41,7 @@ import {elAlert, handleMes} from "@/units/element-ui/tip";
 import {proInsertXyxxFlag, proUpdateXyxxFlag
 } from "@/service/policy-and-regulation-manage/policy-regulation-information/policy-regulation-information";
 import {InsertSyslog} from "@/units/use-method/user-log";
+import {baseUrl} from "@/service/config";
 export default {
   name: "PolicyRegulationInformationSettingDialog",
   components:{DiyElForm},
@@ -105,7 +106,7 @@ export default {
             formData.append("file",file.value.raw);
             formData.append("fileName",fileName + suffixName);
             formData.append("type",form.value.TYPE);
-            axios.post('http://localhost:8081/upload/xypt',formData,{'Content-type':'multipart/form-data'}).then(res =>{
+            axios.post( 'http://10.90.7.241:9443/data-business-prod' +'/XyxxApi/xypt',formData,{'Content-type':'multipart/form-data'}).then(res =>{
               console.log(res);
               if(res.data[0].success=='true'){
                 insertFlag(fileName,suffixName)
@@ -120,10 +121,19 @@ export default {
       })
     }
     function insertFlag(fileName,suffixName){
+      debugger
+      let type = "";
+      if(form.value.TYPE =="bs"){
+        type="本市"
+      }else if(form.value.TYPE =="gj"){
+        type="国家"
+      }else if(form.value.TYPE =="zjw"){
+        type="市住建委"
+      }
       proInsertXyxxFlag({
         wenhao: form.value.WENHAO,
         name: form.value.NAME,
-        type: form.value.TYPE,
+        type: type,
         username: localStorage.getItem("xyxx_username"),
         suffixName: suffixName,
         fileName: fileName,
@@ -137,11 +147,20 @@ export default {
       })
     }
     function updateFlag(){
+      debugger
+      let type = "";
+      if(form.value.TYPE =="bs"){
+        type="本市"
+      }else if(form.value.TYPE =="gj"){
+        type="国家"
+      }else if(form.value.TYPE =="zjw"){
+        type="市住建委"
+      }
       proUpdateXyxxFlag({
         code:props.currentDialogObj.CODE,
         wenhao: form.value.WENHAO,
         name: form.value.NAME,
-        type: form.value.TYPE,
+        type: type,
         suffixName: "",
         fileName: "",
         pubTime:form.value.TIME,

+ 10 - 0
vite.config.js

@@ -22,5 +22,15 @@ export default defineConfig({
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url))
     }
+  },
+
+  server: {
+    proxy: {
+      "/api": {
+        target: "http://10.90.7.241:9443/data-business-prod", // 所要代理的目标地址
+        changeOrigin: true,  //允许跨域
+        rewrite: (path) => path.replace(/^\/api/, ""),  // 重写传过来的path路径
+      },
+    },
   }
 })