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
徐景良 2025-02-27 16:23:34 +08:00
parent 78fde874f6 fed68f9eac
commit d6324198ef
8 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Audit/InfoModal/index.vue
View File

@ -184,6 +184,10 @@
</div> </div>
</div> </div>
<div class="item"> <div class="item">
<div class="label">情况说明：</div>
<div class="item-value" style="flex:2">
<a-input v-model:value="props.infoData.resubmitremark" disabled/>
</div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

2
src/views/demo/audit/approved/index.vue
View File

@ -20,7 +20,7 @@
</template> </template>
</BasicTable> </BasicTable>
<a-modal width="75%" style="top: 30px;" v-model:open="openModal" title="线索审核" :destroyOnClose="true" :footer="null"> <a-modal width="75%" style="top: 30px;" v-model:open="openModal" title="线索审核" :destroyOnClose="true" :footer="null">
<InfoModal :infoData="infoData.info" @handleOk="handleOk" @closeModal="closeModal" :control="false" :type="type"/> <InfoModal :infoData="infoData.info" @handleOk="handleOk" @closeModal="closeModal" :control="false" :type="type" :modalLoading="false"/>
</a-modal> </a-modal>
</PageWrapper> </PageWrapper>
</template> </template>

2
src/views/demo/audit/closed/index.vue
View File

@ -17,7 +17,7 @@
</template> </template>
</BasicTable> </BasicTable>
<a-modal width="75%" style="top: 30px;" v-model:open="openModal" title="线索审核" :destroyOnClose="true" :footer="null"> <a-modal width="75%" style="top: 30px;" v-model:open="openModal" title="线索审核" :destroyOnClose="true" :footer="null">
<InfoModal :infoData="infoData.info" @handleOk="handleOk" @closeModal="closeModal" :control="false" :type="type"/> <InfoModal :infoData="infoData.info" @handleOk="handleOk" @closeModal="closeModal" :control="false" :type="type" :modalLoading="false"/>
</a-modal> </a-modal>
</PageWrapper> </PageWrapper>
</template> </template>

2
src/views/demo/illegalmining/mainapproved/index.vue
View File

@ -20,7 +20,7 @@
</template> </template>
</BasicTable> </BasicTable>
<a-modal width="75%" style="top: 8px;" v-model:open="openModal" title="线索审核" :destroyOnClose="true" :footer="null"> <a-modal width="75%" style="top: 8px;" v-model:open="openModal" title="线索审核" :destroyOnClose="true" :footer="null">
<InfoModal :infoData="infoData.info" @handleOk="handleOk" @closeModal="closeModal" :control="false"/> <InfoModal :infoData="infoData.info" @handleOk="handleOk" @closeModal="closeModal" :control="false" :modalLoading="false"/>
</a-modal> </a-modal>
</PageWrapper> </PageWrapper>
</template> </template>

10
src/views/demo/illegalmining/mainaudit/InfoModal/index.vue
View File

@ -222,6 +222,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="item">
<div class="label">情况说明：</div>
<div class="item-value" style="flex:2">
<a-input v-model:value="props.infoData.resubmitremark" disabled/>
</div>
</div>
<div class="item"></div>
<div class="item"></div>
</div>
<div class="row"> <div class="row">
<div class="item" style="width: 100%;"> <div class="item" style="width: 100%;">
<div class="label">图片：</div> <div class="label">图片：</div>

2
src/views/demo/illegalmining/mainclosed/index.vue
View File

@ -17,7 +17,7 @@
</template> </template>
</BasicTable> </BasicTable>
<a-modal width="75%" style="top: 8px;" v-model:open="openModal" title="线索审核" :destroyOnClose="true" :footer="null"> <a-modal width="75%" style="top: 8px;" v-model:open="openModal" title="线索审核" :destroyOnClose="true" :footer="null">
<InfoModal :infoData="infoData.info" @handleOk="handleOk" @closeModal="closeModal" :control="false"/> <InfoModal :infoData="infoData.info" @handleOk="handleOk" @closeModal="closeModal" :control="false" :modalLoading="false"/>
</a-modal> </a-modal>
</PageWrapper> </PageWrapper>
</template> </template>

11
src/views/sys/exception/Converge.vue
View File

@ -42,7 +42,7 @@
<div class="legend"> <div class="legend">
<div v-if="subject == '非法采矿'" class="button-item router-button" style="position: absolute;top: -50px;width: 200px;left: 0px;background-size: 100% 100%;height: 37px; <div v-if="subject == '非法采矿'" class="button-item router-button" style="position: absolute;top: -50px;width: 200px;left: 0px;background-size: 100% 100%;height: 37px;
font-size: 16px;cursor: pointer" @click="goRouter">汇总表</div> font-size: 16px;cursor: pointer" @click="goRouter">汇总表</div>
<div class="legend-item" v-for="(item, index) in legends" :key="index"> <div :class="`legend-item ${subject == '耕地非粮化'? 'flh-item': ''}`" v-for="(item, index) in legends" :key="index">
<div class="legend-dot" :style="{ background: item.color }"></div> <div class="legend-dot" :style="{ background: item.color }"></div>
<div class="legend-label">{{ item.label }}</div> <div class="legend-label">{{ item.label }}</div>
</div> </div>
@ -287,7 +287,11 @@ watchEffect(() => {
break; break;
case '耕地非粮化': case '耕地非粮化':
title = 'Subject_GDFLH'; title = 'Subject_GDFLH';
defaultColor.value = '#F70303'; legends.value.push({
label: '默认',
color: '#FFFFFF',
});
defaultColor.value = '#FFFFFF';
break; break;
case '重点问题': case '重点问题':
title = 'Subject_ZDWT'; title = 'Subject_ZDWT';
@ -631,6 +635,9 @@ watchEffect(() => {
margin-left: 12px; margin-left: 12px;
} }
} }
.flh-item{
width: 120px;
}
} }
/**图层控制 视频监控**/ /**图层控制 视频监控**/

3
src/views/sys/exception/Converge/SearchComponent.vue
View File

@ -301,6 +301,9 @@
padding: 0px 2px; padding: 0px 2px;
font-size: 14px; font-size: 14px;
position: relative; position: relative;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
&::after { &::after {
content: ''; content: '';
width: 2px; width: 2px;