Skip to content

D
dsk-cr20g
Commit 46afa5e5 authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

parents 8e530b4d c3f3f177
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
dsk-operate-ui/public/index.html
View file @ 46afa5e5
......@@ -197,12 +197,12 @@
</head>
<body>
<div id="app">
<div id="loader-wrapper">
<!-- <div id="loader-wrapper">
<div id="loader"></div>
<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>
<div class="load_title">正在加载系统资源，请耐心等待</div>
</div>
</div>-->
</div>
</body>
</html>
dsk-operate-ui/src/assets/styles/ruoyi.scss
View file @ 46afa5e5
......@@ -104,7 +104,7 @@
/** 表格布局 **/
.pagination-container {
position: relative;
height: 25px;
height: 50px;
margin-bottom: 10px;
margin-top: 15px;
padding: 10px 20px !important;
......
dsk-operate-ui/src/utils/request.js
View file @ 46afa5e5
......@@ -49,7 +49,7 @@ service.interceptors.request.use(config => {
const s_url = sessionObj.url; // 请求地址
const s_data = sessionObj.data; // 请求数据
const s_time = sessionObj.time; // 请求时间
const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
const interval = 200; // 间隔时间(ms)，小于此时间视为重复提交
if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
const message = '数据正在处理，请勿重复提交';
console.warn(`[${s_url}]: ` + message)
......
dsk-operate-ui/src/views/detail/party-a/business/component/elCardinput.vue
View file @ 46afa5e5
......@@ -51,5 +51,7 @@ export default {
</script>
<style lang="scss" scoped>
.noborder{
margin-bottom: 0;
}
</style>
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ 46afa5e5
......@@ -189,7 +189,7 @@ export default {
provinceId:this.companyInfo.provinceId || '',
cityId:this.companyInfo.cityId || '',
districtId:this.companyInfo.districtCode || '',
registerAddress:this.companyInfo.provinceName+this.companyInfo.provinceName?'-'+this.companyInfo.provinceName:''+this.companyInfo.districtName?'-'+this.companyInfo.districtName:'',
registerAddress:this.companyInfo.provinceName+this.companyInfo.cityName?'-'+this.companyInfo.cityName:''+this.companyInfo.districtName?'-'+this.companyInfo.districtName:'',
creditCode:this.companyInfo.creditCode
}
let res = await claim(param)
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue
View file @ 46afa5e5
......@@ -98,7 +98,7 @@
@sort-change="sortChange"
>
<template slot="companyName" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName " v-html="scope.row.companyName"></router-link>
<router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName " v-html="scope.row.companyName"></router-link>
<div v-else v-html="scope.row.companyName || '--'"></div>
</template>
<template slot="area" slot-scope="scope">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment