HC_YFZX
/
CaiYuanYiTiHua
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

dianlixunjian
刘妍 2024-08-28 17:16:52 +08:00
parent cb9e1d3314 8f1cfcc373
commit 1be57b5b26
14 changed files with 94 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/Upload/src/components/FileUpload.vue
View File

@ -24,7 +24,7 @@
</UploadDragger>
<div class="file-item" v-for="(item, index) in fileList" :key="index">
{{ item.name }}
{{ handlerDealFileName(item.name) }}
<span class="delete-btn" @click="handlerDelete(index)" v-if="!$attrs.disabled"
><DeleteOutlined
/></span>
@ -158,6 +158,14 @@
}
}
function handlerDealFileName(path){
const regex = /([^/\\]+)(?=\.[^/\\]*$|$)/;
const matchStr = path.match(regex);
if(matchStr?.length){
return matchStr[0];
}
}
const showIcon = (url) => {
if(
url.indexOf('.png') !== -1 ||

1
src/components/illegalmining/PaginationComponent/index.vue
View File

@ -4,6 +4,7 @@
size="small"
v-model:pageSize="props.pageData.limit"
v-model:current="props.pageData.page"
:show-total="total => `共 ${total} 条数据`"
:total="props.total"
show-size-changer
show-quick-jumper

14
src/components/illegalmining/SearchComponent/index.vue
View File

@ -64,6 +64,16 @@
@change="(value) => emits('screenDataChange',value,'typename')"
/>
</div>
<div class="screen-item" style="margin-right: 13px;margin-bottom:12px;" v-if="showItem('register')">
<div class="screen-item-label">是否立案</div>
<a-select
allowClear
style="width: 97px"
:options="registerOptions"
v-model:value="props.screenData.register"
@change="(value) => emits('screenDataChange',value,'register')"
/>
</div>
<div class="screen-item" style="margin-bottom:12px;" v-if="showItem('time')">
<div class="screen-item-label" style="margin-right: 10px;">下发时间</div>
<a-range-picker
@ -82,7 +92,7 @@
class="item-input"
v-model:value="props.screenData.caseNo"
@change="(value) => emits('screenDataChange',value.target.value,'caseNo')"
style="width:404px;"
:style="`width:${smallInput.includes(props.usePage)? '219': '404'}px;`"
/>
</div>
<div class="screen-item" style="margin-left: 10px;cursor: pointer;">
@ -101,7 +111,7 @@ import { defineProps, defineEmits, ref, h } from "vue"
import { SearchOutlined } from "@ant-design/icons-vue"
import Icon from '@/components/Icon/Icon.vue';
import { yearOptions } from '@/utils/global'
import { polygonSourceOptions, polygonTypeOptions, countiesOptions, statusOptions, usePageGetSearchItem } from '@/components/illegalmining/util'
import { polygonSourceOptions, polygonTypeOptions, countiesOptions, statusOptions, usePageGetSearchItem, smallInput, registerOptions } from '@/components/illegalmining/util'
import { getChildrenTree } from '@/api/demo/system';
const props = defineProps(["screenData","usePage"])

2
src/components/illegalmining/ShowListComponent/index.vue
View File

@ -248,7 +248,7 @@ const getParams = (data) => {
}
break
default:
if(props.screenData[key] && props.screenData[key] !== ''){
if(props.screenData[key] !== null && props.screenData[key] !== undefined && props.screenData[key] !== ''){
params[key] = props.screenData[key]
}
break

9
src/components/illegalmining/util.ts
View File

@ -7,6 +7,7 @@
* 处理状态 nowStatus
* 下发时间段 startTime-endTime
* 图斑号 caseNo
* 是否立案 register
*/
// 图斑来源
import { getChildrenTree } from '@/api/demo/system';
@ -60,6 +61,11 @@ export const processIllegalTypeOptions = [
{ label: '购销非法开采矿产品', value: '购销非法开采矿产品'},
{ label: '其他', value: '其他'},
]
// 是否立案
export const registerOptions = [
{ label: '是', value: 1},
{ label: '否', value: 0},
]
export const countiesOptions = counties.map(item => {
return {
label: item.name,
@ -76,4 +82,5 @@ export const usePageRequestUrl = {
}
export const usePageGetSearchItem = {
'patternfilling': ["year", "tubanlaiyuan", "typename", "countyid", "streetid", "nowStatus", "time", "caseNo"],
}
}
export const smallInput:any = []

2
src/views/demo/illegalmining/patternfilling/MapList/index.vue
View File

@ -85,7 +85,7 @@ const query = () => {
}
break
default:
if(screenData.value[key] && screenData.value[key] !== ''){
if(screenData.value[key] !== null && screenData.value[key] !== undefined && screenData.value[key] !== ''){
params[key] = screenData.value[key]
}
break

6
src/views/demo/statistical/illegaltreatment/AuditProgress/index.vue
View File

@ -258,7 +258,7 @@
'yearOptions',
'dataList',
]);
const emits = defineEmits(['auditProgressScreenChange', 'showInfo', 'changeTask', 'openLoading', 'closeLoading']);
const emits = defineEmits(['auditProgressScreenChange', 'showInfo', 'changeTask', 'openLoading', 'closeLoading','getCountList']);
const flowWfDataStore = flowStore();
const userStore = useUserStore()
@ -332,6 +332,10 @@
querysBtn();
})
}
const closeMolder = () => {
querysBtn()
emits('getCountList')
}
</script>
<style lang="less" scoped>

1
src/views/demo/statistical/illegaltreatment/index.vue
View File

@ -14,6 +14,7 @@
@changeTask="changeTask"
@openLoading="openLoading"
@closeLoading="closeLoading"
@getCountList="getCountList"
/>
<MapList
@changeTask="changeTask"

15
src/views/demo/system/cloudManagement/Modal/modal.vue
View File

@ -78,7 +78,7 @@
v-model:value="props.modalData.data.classField"
placeholder="请先选择图层"
:options="classFieldOptioins"
:fieldNames="{ label: 'column_name', value: 'column_name' }"
:fieldNames="{ label: 'nameAndValue', value: 'column_name' }"
:disabled="props.modalData.data.layer == undefined"
@change="classFieldChange"
/>
@ -96,7 +96,7 @@
v-model:value="props.modalData.data.areaField"
placeholder="请先选择图层"
:options="classFieldOptioins"
:fieldNames="{ label: 'column_name', value: 'column_name' }"
:fieldNames="{ label: 'nameAndValue', value: 'column_name' }"
:disabled="props.modalData.data.layer == undefined"
/>
</a-form-item>
@ -205,7 +205,16 @@
// 分类字段、选择面积计算字段options
function getClassFieldOptioins(tableName) {
let query = { tableName: tableName };
GetTableAndViewColumnList(query).then((res) => {
GetTableAndViewColumnList(query).then((res: any) => {
if (res) {
res.forEach((element) => {
if (element.description == null) {
element.nameAndValue = element.column_name;
} else {
element.nameAndValue = element.column_name + '(' + element.description + ')';
}
});
}
classFieldOptioins.value = res;
});
}

12
src/views/demo/system/geoservermanagement/clound/mapComponent.vue
View File

@ -117,7 +117,9 @@
},
});
}
map.moveLayer(layerName, '');
if (layerName) {
map.moveLayer(layerName, '');
}
};
// 获取乡镇数据
@ -169,7 +171,9 @@
},
});
map.moveLayer('countyLayer');
map.moveLayer(layerName, '');
if (layerName) {
map.moveLayer(layerName, '');
}
}
};
@ -306,6 +310,10 @@
onMounted(() => {
mapboxgl.accessToken = MAPBOX_TOKEN;
map = initMap();
// 县区边界
handlerDealStreet(null);
handlerDealCountry(null);
// handlerLocation([118.30207505530701, 35.30123435040745], 7.848587811931849);
// map.on('load', () => {
// map.flyTo({
// center: [118.30207505530701, 35.30123435040745],

6
src/views/demo/tiankongdi/auditinfo/AuditProgress/index.vue
View File

@ -208,7 +208,7 @@
'yearOptions',
'dataList',
]);
const emits = defineEmits(['auditProgressScreenChange', 'showInfo', 'changeTask', 'openLoading', 'closeLoading']);
const emits = defineEmits(['auditProgressScreenChange', 'showInfo', 'changeTask', 'openLoading', 'closeLoading','getCountList']);
const flowWfDataStore = flowStore();
const userStore = useUserStore()
@ -282,6 +282,10 @@
querysBtn();
})
}
const closeMolder = () => {
querysBtn()
emits('getCountList')
}
</script>
<style lang="less" scoped>

1
src/views/demo/tiankongdi/auditinfo/index.vue
View File

@ -14,6 +14,7 @@
@changeTask="changeTask"
@openLoading="openLoading"
@closeLoading="closeLoading"
@getCountList="getCountList"
/>
<MapList
@changeTask="changeTask"

18
src/views/demo/tiankongdi/curbspotcity/MapList/ShowInfoModal/index.vue
View File

@ -121,7 +121,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-image-preview-group>
@ -142,7 +142,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-image-preview-group>
@ -166,7 +166,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-image-preview-group>
@ -234,7 +234,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-image-preview-group>
@ -281,7 +281,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-image-preview-group>
@ -560,6 +560,14 @@
}
function handlerDealFileName(path){
const regex = /([^/\\]+)(?=\.[^/\\]*$|$)/;
const matchStr = path.match(regex);
if(matchStr?.length){
return matchStr[0];
}
}
function handlerPreviewImage(index,url){
const regex = /([^/\\]+)(?=\.[^/\\]*$|$)/;

20
src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue
View File

@ -98,7 +98,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-descriptions-item>
@ -110,7 +110,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-descriptions-item>
@ -123,7 +123,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-descriptions-item>
@ -176,7 +176,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
</a-descriptions-item>
@ -212,7 +212,7 @@
icon="ion:document-attach-outline"
@click="downLoadFile(item)"
/>
{{ item }}
{{ handlerDealFileName(item) }}
</div>
</template>
<!-- {{ zhenggaifujian }} -->
@ -654,6 +654,16 @@
function onMapboxLoad() {
changeTask();
}
// 附件名称显示处理函数
function handlerDealFileName(path){
const regex = /([^/\\]+)(?=\.[^/\\]*$|$)/;
const matchStr = path.match(regex);
if(matchStr?.length){
return matchStr[0];
}
}
const getLabel = (type, value) => {
let result: any[] = [];
let label = '';