接口对接修改

main
userName 3 months ago
parent 9a99bf879f
commit 1bc7fe12be

@ -19,7 +19,7 @@
<!-- <link href="https://api.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.css" rel="stylesheet">
<script src="https://api.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.js"></script> -->
<!-- <script src="/turf/turf-7.0.0.min.js"></script> -->
<script src="/turf/turf-7.0.0.min.js"></script>
<!-- <script src="https://cdn.jsdelivr.net/npm/@turf/turf@7.0.0/turf.min.js"></script> -->

@ -59,5 +59,8 @@ export function ImportCompanyInfo(params?: countItem) {
})
}
export function ExportBuilds(params?: countDetItem) {
return defHttp.post<countModel>({ url: Api.ExportBuilds, params });
return defHttp.post<countModel[]>({
url: Api.ExportBuilds,
responseType: 'blob',
})
}

@ -65,5 +65,8 @@ export function ImportCompanyInfo(params?: countItem) {
})
}
export function ExportZongdi(params?: countDetItem) {
return defHttp.post<countModel>({ url: Api.ExportZongdi, params });
return defHttp.post<countModel[]>({
url: Api.ExportZongdi,
responseType: 'blob',
})
}

@ -59,5 +59,8 @@ export function ImportCompanyInfo(params?: countItem) {
})
}
export function ExportCompany(params?: countDetItem) {
return defHttp.post<countModel>({ url: Api.ExportCompany, params });
return defHttp.post<countModel[]>({
url: Api.ExportCompany,
responseType: 'blob',
})
}

@ -137,10 +137,11 @@
limit: 9999
};
ExportCompany(params).then((res) => {
ExportCompany().then((res) => {
console.log('exres',res)
const content = res;
const blob = new Blob([content]);
const fileName = '企业用地信息' + getToday() + '.xlsx';
const fileName = '企业信息' + getToday() + '.xls';
if ('download' in document.createElement('a')) {
// IE
const elink = document.createElement('a');
@ -176,7 +177,7 @@
if (dates >= 0 && dates <= 9) {
dates = '0' + dates;
}
let datatime = year + '0' + month + '0' + dates + time + '0' + minutes + '0' + seconds;
let datatime = year + month + dates + time + minutes + seconds;
return datatime;
}
const viewAccount = (record) => {

@ -11,7 +11,7 @@
<div class="flex ai-c flex-li">
<div class="labelbox">建筑物编码</div>
<div class="inpbox">
<a-input v-model:value="props.showInfoData.szzdbm" :disabled="props.isRead" placeholder="请输入" />
<a-input v-model:value="props.showInfoData.jzwbm" :disabled="props.isRead" placeholder="请输入" />
</div>
</div>
<div class="flex ai-c flex-li">

@ -64,7 +64,7 @@ export const searchFormSchema: FormSchema[] = [
return {
api: getRightTable,
params: {
code: 'TDjtxz',
code: 'FWjg',
},
resultField: '',
labelField: 'itemName',

@ -59,7 +59,8 @@
<div class="flex ai-c flex-li">
<div class="labelbox">使用起始期</div>
<div class="inpbox">
<a-date-picker v-model:value="props.showInfoData.syqsq" :disabled="props.isRead" style="width:100%" :valueFormat="dateValueFormat" />
<a-input v-model:value="props.showInfoData.syqsq" :disabled="props.isRead" placeholder="请输入" />
<!-- <a-date-picker v-model:value="props.showInfoData.syqsq" :disabled="props.isRead" style="width:100%" :valueFormat="dateValueFormat" /> -->
</div>
</div>
<div class="flex ai-c flex-li">

@ -28,5 +28,16 @@ export const columns: BasicColumn[] = [
}
];
export const searchFormSchema: FormSchema[] = [
{
field: 'shxydm',
label: '社会信用代码',
component: 'Input',
colProps: { span: 6 },
},
{
field: 'syrmc',
label: '企业名称',
component: 'Input',
colProps: { span: 6 },
},
];

@ -41,7 +41,7 @@ const [registerTable, { getSelectRows }] = useTable({
showAdvancedButton: false,
schemas: searchFormSchema,
},
useSearchForm: false,
useSearchForm: true,
showIndexColumn: false,
showTableSetting: false,
tableSetting: { fullScreen: false },

@ -90,7 +90,7 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 4 },
},
{
field: 'djqmc',
field: 'djqdm',
component: 'ApiSelect',
label: '乡镇',
colProps: {
@ -109,12 +109,19 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
component: 'DatePicker',
component: 'Input',
label: '使用起始期',
field: 'syqsq',
colProps: { span: 4 },
componentProps: {},
},
// {
// component: 'DatePicker',
// label: '使用起始期',
// field: 'syqsq',
// colProps: { span: 4 },
// componentProps: {},
// },
{
field: 'tdxz',
component: 'ApiSelect',

@ -0,0 +1,69 @@
// vite.config.ts
import { defineApplicationConfig } from "file:///F:/%E9%A1%B9%E7%9B%AE/%E8%87%AA%E7%84%B6%E8%B5%84%E6%BA%90%E6%B8%85%E6%9F%A5%E4%B8%80%E4%BD%93%E5%8C%96/ZiRanZiYuanQingCchaYiTiHua/internal/vite-config/dist/index.mjs";
import { mars3dPlugin } from "file:///F:/%E9%A1%B9%E7%9B%AE/%E8%87%AA%E7%84%B6%E8%B5%84%E6%BA%90%E6%B8%85%E6%9F%A5%E4%B8%80%E4%BD%93%E5%8C%96/ZiRanZiYuanQingCchaYiTiHua/node_modules/.pnpm/vite-plugin-mars3d@3.1.3_rollup@2.79.2/node_modules/vite-plugin-mars3d/dist/index.js";
var vite_config_default = defineApplicationConfig({
overrides: {
optimizeDeps: {
include: [
"echarts/core",
"echarts/charts",
"echarts/components",
"echarts/renderers",
"qrcode",
"@iconify/iconify",
"ant-design-vue/es/locale/zh_CN",
"ant-design-vue/es/locale/en_US",
"@/../lib/vform/designer.umd.js"
]
},
build: {
/* 其他build生产打包配置省略 */
//...
target: "esnext",
commonjsOptions: {
include: /node_modules|lib/
//这里记得把lib目录加进来否则生产打包会报错
}
},
server: {
proxy: {
"/basic-api": {
target: "http://localhost:3000",
changeOrigin: true,
ws: true,
rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "")
// only https
// secure: false
},
"/upload": {
target: "http://localhost:3300/upload",
changeOrigin: true,
ws: true,
rewrite: (path) => path.replace(new RegExp(`^/upload`), "")
}
},
warmup: {
clientFiles: ["./index.html", "./src/{views,components}/*"]
}
},
define: {
"process.env": {
BASE_URL: "/"
}
},
css: {
preprocessorOptions: {
less: {
javascriptEnabled: true
}
}
},
plugins: [
mars3dPlugin()
]
}
});
export {
vite_config_default as default
};
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJGOlxcXFxcdTk4NzlcdTc2RUVcXFxcXHU4MUVBXHU3MTM2XHU4RDQ0XHU2RTkwXHU2RTA1XHU2N0U1XHU0RTAwXHU0RjUzXHU1MzE2XFxcXFppUmFuWmlZdWFuUWluZ0NjaGFZaVRpSHVhXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCJGOlxcXFxcdTk4NzlcdTc2RUVcXFxcXHU4MUVBXHU3MTM2XHU4RDQ0XHU2RTkwXHU2RTA1XHU2N0U1XHU0RTAwXHU0RjUzXHU1MzE2XFxcXFppUmFuWmlZdWFuUWluZ0NjaGFZaVRpSHVhXFxcXHZpdGUuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9GOi8lRTklQTElQjklRTclOUIlQUUvJUU4JTg3JUFBJUU3JTg0JUI2JUU4JUI1JTg0JUU2JUJBJTkwJUU2JUI4JTg1JUU2JTlGJUE1JUU0JUI4JTgwJUU0JUJEJTkzJUU1JThDJTk2L1ppUmFuWmlZdWFuUWluZ0NjaGFZaVRpSHVhL3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5pbXBvcnQgeyBtYXJzM2RQbHVnaW4gfSBmcm9tIFwidml0ZS1wbHVnaW4tbWFyczNkXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQXBwbGljYXRpb25Db25maWcoe1xuICBvdmVycmlkZXM6IHtcbiAgICBvcHRpbWl6ZURlcHM6IHtcbiAgICAgIGluY2x1ZGU6IFtcbiAgICAgICAgJ2VjaGFydHMvY29yZScsXG4gICAgICAgICdlY2hhcnRzL2NoYXJ0cycsXG4gICAgICAgICdlY2hhcnRzL2NvbXBvbmVudHMnLFxuICAgICAgICAnZWNoYXJ0cy9yZW5kZXJlcnMnLFxuICAgICAgICAncXJjb2RlJyxcbiAgICAgICAgJ0BpY29uaWZ5L2ljb25pZnknLFxuICAgICAgICAnYW50LWRlc2lnbi12dWUvZXMvbG9jYWxlL3poX0NOJyxcbiAgICAgICAgJ2FudC1kZXNpZ24tdnVlL2VzL2xvY2FsZS9lbl9VUycsXG4gICAgICAgICdALy4uL2xpYi92Zm9ybS9kZXNpZ25lci51bWQuanMnLFxuICAgICAgXSxcbiAgICB9LFxuICAgIGJ1aWxkOiB7XG4gICAgICAvKiBcdTUxNzZcdTRFRDZidWlsZFx1NzUxRlx1NEVBN1x1NjI1M1x1NTMwNVx1OTE0RFx1N0Y2RVx1NzcwMVx1NzU2NSAqL1xuICAgICAgLy8uLi5cbiAgICAgIHRhcmdldDogJ2VzbmV4dCcsXG4gICAgICBjb21tb25qc09wdGlvbnM6IHtcbiAgICAgICAgaW5jbHVkZTogL25vZGVfbW9kdWxlc3xsaWIvXG4gICAgICAgICAvL1x1OEZEOVx1OTFDQ1x1OEJCMFx1NUY5N1x1NjI4QWxpYlx1NzZFRVx1NUY1NVx1NTJBMFx1OEZEQlx1Njc2NVx1RkYwQ1x1NTQyNlx1NTIxOVx1NzUxRlx1NEVBN1x1NjI1M1x1NTMwNVx1NEYxQVx1NjJBNVx1OTUxOVx1RkYwMVx1RkYwMVxuICAgICAgICBcbiAgICAgIH0sXG4gICAgfSxcbiAgICBzZXJ2ZXI6IHtcbiAgICAgIHByb3h5OiB7XG4gICAgICAgICcvYmFzaWMtYXBpJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzAwMCcsXG4gICAgICAgICAgY2hhbmdlT3JpZ2luOiB0cnVlLFxuICAgICAgICAgIHdzOiB0cnVlLFxuICAgICAgICAgIHJld3JpdGU6IChwYXRoKSA9PiBwYXRoLnJlcGxhY2UobmV3IFJlZ0V4cChgXi9iYXNpYy1hcGlgKSwgJycpLFxuICAgICAgICAgIC8vIG9ubHkgaHR0cHNcbiAgICAgICAgICAvLyBzZWN1cmU6IGZhbHNlXG4gICAgICAgIH0sXG4gICAgICAgICcvdXBsb2FkJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzMwMC91cGxvYWQnLFxuICAgICAgICAgIGNoYW5nZU9yaWdpbjogdHJ1ZSxcbiAgICAgICAgICB3czogdHJ1ZSxcbiAgICAgICAgICByZXdyaXRlOiAocGF0aCkgPT4gcGF0aC5yZXBsYWNlKG5ldyBSZWdFeHAoYF4vdXBsb2FkYCksICcnKSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgICB3YXJtdXA6IHtcbiAgICAgICAgY2xpZW50RmlsZXM6IFsnLi9pbmRleC5odG1sJywgJy4vc3JjL3t2aWV3cyxjb21wb25lbnRzfS8qJ10sXG4gICAgICB9LFxuICAgIH0sXG4gICAgZGVmaW5lOiB7XG4gICAgICAncHJvY2Vzcy5lbnYnOiB7XG4gICAgICAgIEJBU0VfVVJMOiAnLycsXG4gICAgICB9LFxuICAgIH0sXG4gICAgY3NzOiB7XG4gICAgICBwcmVwcm9jZXNzb3JPcHRpb25zOiB7XG4gICAgICAgIGxlc3M6IHtcbiAgICAgICAgICBqYXZhc2NyaXB0RW5hYmxlZDogdHJ1ZSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgfSxcbiAgICBwbHVnaW5zOiBbXG4gICAgICBtYXJzM2RQbHVnaW4oKVxuICAgIF0sXG4gIH0sXG59KTtcblxuXG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQWdaLFNBQVMsK0JBQStCO0FBQ3hiLFNBQVMsb0JBQW9CO0FBRTdCLElBQU8sc0JBQVEsd0JBQXdCO0FBQUEsRUFDckMsV0FBVztBQUFBLElBQ1QsY0FBYztBQUFBLE1BQ1osU0FBUztBQUFBLFFBQ1A7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLE1BQ0Y7QUFBQSxJQUNGO0FBQUEsSUFDQSxPQUFPO0FBQUE7QUFBQTtBQUFBLE1BR0wsUUFBUTtBQUFBLE1BQ1IsaUJBQWlCO0FBQUEsUUFDZixTQUFTO0FBQUE7QUFBQSxNQUdYO0FBQUEsSUFDRjtBQUFBLElBQ0EsUUFBUTtBQUFBLE1BQ04sT0FBTztBQUFBLFFBQ0wsY0FBYztBQUFBLFVBQ1osUUFBUTtBQUFBLFVBQ1IsY0FBYztBQUFBLFVBQ2QsSUFBSTtBQUFBLFVBQ0osU0FBUyxDQUFDLFNBQVMsS0FBSyxRQUFRLElBQUksT0FBTyxhQUFhLEdBQUcsRUFBRTtBQUFBO0FBQUE7QUFBQSxRQUcvRDtBQUFBLFFBQ0EsV0FBVztBQUFBLFVBQ1QsUUFBUTtBQUFBLFVBQ1IsY0FBYztBQUFBLFVBQ2QsSUFBSTtBQUFBLFVBQ0osU0FBUyxDQUFDLFNBQVMsS0FBSyxRQUFRLElBQUksT0FBTyxVQUFVLEdBQUcsRUFBRTtBQUFBLFFBQzVEO0FBQUEsTUFDRjtBQUFBLE1BQ0EsUUFBUTtBQUFBLFFBQ04sYUFBYSxDQUFDLGdCQUFnQiw0QkFBNEI7QUFBQSxNQUM1RDtBQUFBLElBQ0Y7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNOLGVBQWU7QUFBQSxRQUNiLFVBQVU7QUFBQSxNQUNaO0FBQUEsSUFDRjtBQUFBLElBQ0EsS0FBSztBQUFBLE1BQ0gscUJBQXFCO0FBQUEsUUFDbkIsTUFBTTtBQUFBLFVBQ0osbUJBQW1CO0FBQUEsUUFDckI7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsU0FBUztBQUFBLE1BQ1AsYUFBYTtBQUFBLElBQ2Y7QUFBQSxFQUNGO0FBQ0YsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K
Loading…
Cancel
Save