Skip to content

广
广东建设用地-前端
提交 fd3977e5 authored 作者: gjx's avatar gjx
浏览文件
操作

整体ui样式风格修改

上级 e1d15170
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 291 行增加 和 254 行删除
src/assets/images/title_bg.png
查看替换文件 @ e1d15170 浏览文件 @ fd3977e5
src/assets/images/title_bg.png

4.5 KB | W: | H:

src/assets/images/title_bg.png

7.5 KB | W: | H:

src/assets/images/title_bg.png
src/assets/images/title_bg.png
src/assets/images/title_bg.png
src/assets/images/title_bg.png
  • 2-up
  • Swipe
  • Onion skin
src/components/SimpleMenu/src/index.less
浏览文件 @ fd3977e5
......@@ -3,20 +3,20 @@
.@{prefix-cls} {
&-dark&-vertical .@{simple-prefix-cls}__parent {
background-color: #F7F7F7;
// background-color: @white;
color: #000;
> .@{prefix-cls}-submenu-title {
background-color: #F7F7F7;
// background-color: @white;
color: #000;
}
}
&-dark&-vertical .@{simple-prefix-cls}__children,
&-dark&-popup .@{simple-prefix-cls}__children {
background-color: #F7F7F7;
// background-color: @white;
color: #000;
> .@{prefix-cls}-submenu-title {
background-color: #F7F7F7;
// background-color: @white;
color: #000;
}
}
......
src/components/customComponent/dkForm.vue
浏览文件 @ fd3977e5
......@@ -175,6 +175,9 @@
ifShow: ({ values }) => {
return values.tdsyqrlx == '4' ? false : true;
},
dynamicRules: () => {
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true }];
},
},
{
label: '企业名称',
......@@ -251,6 +254,15 @@
updateSchema({
label: '统一社会信用代码',
field: 'qrGsyyzzh',
dynamicRules: () => {
return [
{
pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/,
message: '工商营业执照号格式有误',
required: true,
},
];
},
});
updateSchema({
label: '企业名称',
......@@ -262,6 +274,9 @@
updateSchema({
label: '身份证号码',
field: 'qrGsyyzzh',
dynamicRules: () => {
return [{ pattern: /^\d{15}|(\d{17}(\d|x|X))$/, message: '身份证格式有误', required: true }];
},
});
updateSchema({
label: '自然人姓名',
......@@ -273,6 +288,15 @@
updateSchema({
label: '统一社会信用代码',
field: 'qrGsyyzzh',
dynamicRules: () => {
return [
{
pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/,
message: '工商营业执照号格式有误',
required: true,
},
];
},
});
updateSchema({
label: '政府名称',
......@@ -303,6 +327,9 @@
ifShow: ({ values }) => {
return values.qrTdsyqrlx == '4' ? false : true;
},
dynamicRules: () => {
return [{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true }];
},
},
{
label: '企业名称',
......@@ -652,6 +679,11 @@
label: '统一社会信用代码',
field: 'gsyyzzh',
show: true,
dynamicRules: () => {
return [
{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true },
];
},
});
updateSchema({
label: '企业名称',
......@@ -668,6 +700,9 @@
updateSchema({
label: '身份证号码',
field: 'gsyyzzh',
dynamicRules: () => {
return [{ pattern: /^\d{15}|(\d{17}(\d|x|X))$/, message: '身份证格式有误', required: true }];
},
show: true,
});
updateSchema({
......@@ -686,6 +721,11 @@
label: '统一社会信用代码',
field: 'gsyyzzh',
show: true,
dynamicRules: () => {
return [
{ pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/, message: '工商营业执照号格式有误', required: true },
];
},
});
updateSchema({
label: '政府名称',
......
src/layouts/default/header/components/user-dropdown/index.vue
浏览文件 @ fd3977e5
......@@ -296,7 +296,7 @@
}
.active {
background-color: #62a8d1;
background-color: @primary-color;
border-bottom: 3px solid #ffbd04;
font-weight: bold;
}
......
src/layouts/default/sider/MixSider.vue
浏览文件 @ fd3977e5
......@@ -430,7 +430,7 @@
transition: all 0.3s ease;
&:hover {
// color: @white;
color: @white;
}
// &:hover,
&--active {
......@@ -557,8 +557,14 @@
box-shadow: 0 0 4px 0 rgba(28, 36, 56, 0.15);
}
}
// .jeecg-menu-dark.jeecg-menu-vertical .jeecg-menu-item-active:not(.jeecg-menu-submenu),.jeecg-menu-dark.jeecg-menu-vertical .jeecg-menu-item:hover{
// background-color:#EDEDED!important;
// color:#2B7DBC!important;
// }
.jeecg-menu-item:hover {
// background-color:#EDEDED!important;
color: #2b7dbc !important;
}
.jeecg-menu-item-active {
> div {
color: #2b7dbc !important;
}
}
</style>
src/views/dashboard/workbench/components/DynamicInfo.vue
浏览文件 @ fd3977e5
......@@ -259,7 +259,7 @@
.title-move {
margin-left: 80%;
color: #0f91ed;
color: @primary-color;
cursor: pointer;
}
}
......@@ -285,7 +285,7 @@
.listRadio {
display: inline-block;
background-color: #1ca4ff;
background-color: @primary-color;
border-radius: 50%;
width: 8px;
height: 8px;
......
src/views/xcjd/Supervise/components/lookData.vue
浏览文件 @ fd3977e5
<template>
<div style="width: 95%;margin:0 auto;margin-top: 30px;">
<div style="width: 99%; margin: 0 auto; margin-top: 10px">
<!--引用表格-->
<BasicTable @register="registerTable">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="router.back()" v-auth="'dkdc-tbz-zltb'">返回</a-button>
<a-button type="primary" v-if="route.query.type === 'edit'" @click="handleAdd"
v-auth="'dkdc-tbz-zltb'">新增</a-button>
<a-button type="primary" v-if="route.query.type === 'edit'" @click="handleAdd" v-auth="'dkdc-tbz-zltb'">新增</a-button>
</template>
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
......@@ -14,97 +13,95 @@
</BasicTable>
</div>
</template>
<script lang="ts" name="xcjd-Supervise-LookData" setup>
import { BasicTable, TableAction, TableActionType } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { useRouter, useRoute } from 'vue-router';
import { useMessage } from '/@/hooks/web/useMessage';
import { lookDatacolumns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
import { getXcjdList, SetDel,getImportUrl, getExportUrl } from './api';
// import { useModal } from '/@/components/Modal';
import { ref } from "vue";
//注册model
// const [registerModal, { openModal }] = useModal();
// let isEdit = ref(true)
let router = useRouter();
let route = useRoute();
const { createMessage } = useMessage();
import { BasicTable, TableAction, TableActionType } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { useRouter, useRoute } from 'vue-router';
import { useMessage } from '/@/hooks/web/useMessage';
import { lookDatacolumns, searchFormSchema, useSuspectsData, useCategoryData } from './data';
import { getXcjdList, SetDel, getImportUrl, getExportUrl } from './api';
// import { useModal } from '/@/components/Modal';
import { ref } from 'vue';
//注册model
// const [registerModal, { openModal }] = useModal();
// let isEdit = ref(true)
let router = useRouter();
let route = useRoute();
const { createMessage } = useMessage();
//注册table数据
const { tableContext } = useListPage({
tableProps: {
title: '现场监督-现场监督-现场监督列表',
api: getXcjdList,
columns:lookDatacolumns,
canResize: false,
//定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
rowKey: 'wrdkid',
// rowSelection: { type: 'radio' },
// clickToRowSelect: true,
useSearchForm: false,
showIndexColumn: true,
// formConfig: {
// labelWidth: 120,
// schemas: searchFormSchema,
// autoSubmitOnEnter: true,
// showAdvancedButton: false,
// },
actionColumn: {
width: 120,
fixed: 'right'
},
beforeFetch(params) {
if (route.query.wrdkid) {
params.wrdkid = route.query.wrdkid;
} else {
createMessage.error('内容错误，请返回重试')
}
},
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//删除事件
async function handleDelete(record) {
await SetDel({xcjdId:record.id})
reload();
}
//编辑事件
function handleLook(record) {
router.push(`/xcjd/Supervise/LookData/look?xcjdId=${record.id}`)
}
//编辑事件
function handleAdd() {
router.push(`/xcjd/Supervise/LookData/form?wrdkid=${route.query.wrdkid}`)
}
/**
* 操作栏
*/
function getTableAction(record) {
if (route.query.type === 'edit') {
return [
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
//注册table数据
const { tableContext } = useListPage({
tableProps: {
title: '现场监督-现场监督-现场监督列表',
api: getXcjdList,
columns: lookDatacolumns,
canResize: false,
//定义rowSelection的类型，默认是checkbox多选，可以设置成radio单选
rowKey: 'wrdkid',
// rowSelection: { type: 'radio' },
// clickToRowSelect: true,
useSearchForm: false,
showIndexColumn: true,
// formConfig: {
// labelWidth: 120,
// schemas: searchFormSchema,
// autoSubmitOnEnter: true,
// showAdvancedButton: false,
// },
actionColumn: {
width: 120,
fixed: 'right',
},
{
label: '查看',
onClick: handleLook.bind(null, record),
beforeFetch(params) {
if (route.query.wrdkid) {
params.wrdkid = route.query.wrdkid;
} else {
createMessage.error('内容错误，请返回重试');
}
},
];
} else if (route.query.type === 'look') {
return [
{
label: '查看',
onClick: handleLook.bind(null, record),
},
];
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//删除事件
async function handleDelete(record) {
await SetDel({ xcjdId: record.id });
reload();
}
//编辑事件
function handleLook(record) {
router.push(`/xcjd/Supervise/LookData/look?xcjdId=${record.id}`);
}
//编辑事件
function handleAdd() {
router.push(`/xcjd/Supervise/LookData/form?wrdkid=${route.query.wrdkid}`);
}
/**
* 操作栏
*/
function getTableAction(record) {
if (route.query.type === 'edit') {
return [
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
{
label: '查看',
onClick: handleLook.bind(null, record),
},
];
} else if (route.query.type === 'look') {
return [
{
label: '查看',
onClick: handleLook.bind(null, record),
},
];
}
}
}
</script>
<style scoped></style>
\ No newline at end of file
src/views/xcjd/xccy/components/cyList.vue
浏览文件 @ fd3977e5
<template>
<div style="width: 95%;margin:0 auto;margin-top: 30px;">
<!--引用表格-->
<BasicTable @register="registerTable">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="router.back()" v-auth="'dkdc-tbz-zltb'">返回</a-button>
<a-button type="primary" @click="handleAddAndEdit({})" v-auth="'dkdc-tbz-zltb'">采样</a-button>
</template>
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
</BasicTable>
</div>
<cyModal @register="registerModal" @sumbitTable="sumbitTable" />
<div>
<!--引用表格-->
<BasicTable @register="registerTable">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" @click="router.back()" v-auth="'dkdc-tbz-zltb'">返回</a-button>
<a-button type="primary" @click="handleAddAndEdit({})" v-auth="'dkdc-tbz-zltb'">采样</a-button>
</template>
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
</BasicTable>
</div>
<cyModal @register="registerModal" @sumbitTable="sumbitTable" />
</template>
<script lang="ts" name="xcjd-Sampling-cyList" setup>
import { BasicTable, TableAction, } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { useRouter, useRoute } from 'vue-router';
import { useMessage } from '/@/hooks/web/useMessage';
import { lookDatacolumns } from './data';
import { getCyxxList, SetDel, setAdd, addSuccess } from './api';
import { useModal } from '/@/components/Modal';
import cyModal from "./cyModal.vue";
import { ref } from "vue";
//注册model
const [registerModal, { openModal, closeModal }] = useModal();
// let isEdit = ref(true)
let router = useRouter();
let route = useRoute();
const { createMessage } = useMessage();
import { BasicTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { useRouter, useRoute } from 'vue-router';
import { useMessage } from '/@/hooks/web/useMessage';
import { lookDatacolumns } from './data';
import { getCyxxList, SetDel, setAdd, addSuccess } from './api';
import { useModal } from '/@/components/Modal';
import cyModal from './cyModal.vue';
import { ref } from 'vue';
//注册model
const [registerModal, { openModal, closeModal }] = useModal();
// let isEdit = ref(true)
let router = useRouter();
let route = useRoute();
const { createMessage } = useMessage();
//注册table数据
const { tableContext } = useListPage({
//注册table数据
const { tableContext } = useListPage({
tableProps: {
title: '现场监督-现场采样-采样样点',
api: getCyxxList,
columns: lookDatacolumns,
canResize: false,
rowKey: 'id',
useSearchForm: false,
showIndexColumn: true,
actionColumn: {
width: 150,
fixed: 'right'
},
beforeFetch(params) {
if (route.query.xccyId) {
params.xccyId = route.query.xccyId;
} else {
createMessage.error('内容错误，请返回重试')
}
},
title: '现场监督-现场采样-采样样点',
api: getCyxxList,
columns: lookDatacolumns,
canResize: false,
rowKey: 'id',
useSearchForm: false,
showIndexColumn: true,
actionColumn: {
width: 150,
fixed: 'right',
},
beforeFetch(params) {
if (route.query.xccyId) {
params.xccyId = route.query.xccyId;
} else {
createMessage.error('内容错误，请返回重试');
}
},
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//删除事件
async function handleDelete(record) {
await SetDel({ id: record.id })
await addSuccess({xccyId:record.xccyId})
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
//删除事件
async function handleDelete(record) {
await SetDel({ id: record.id });
await addSuccess({ xccyId: record.xccyId });
reload();
}
//查看
function handleLook(record) {
router.push(`/xcjd/xccy/cyList/look?ydxxId=${record.id}`)
}
//新增*编辑事件
function handleAddAndEdit(record) {
}
//查看
function handleLook(record) {
router.push(`/xcjd/xccy/cyList/look?ydxxId=${record.id}`);
}
//新增*编辑事件
function handleAddAndEdit(record) {
openModal(true, {
...record,
xccyId: route.query.xccyId,
ydlx: route.query.ydlx,
})
...record,
xccyId: route.query.xccyId,
ydlx: route.query.ydlx,
});
// router.push(`/xcjd/Supervise/LookData/form?wrdkid=${route.query.wrdkid}`)
}
// 提交事件
async function sumbitTable(val) {
}
// 提交事件
async function sumbitTable(val) {
// 获取modal传参 保存到表格里面
val.smtdmc = '四面图(东)'
val.smtnmc = '四面图(南)'
val.smtxmc = '四面图(西)'
val.smtbmc = '四面图(北)'
val.xchczptmc = '现场核查人员自拍图'
val.gpszbtmc = 'GPS设备坐标图'
val.yxtmc = '岩芯图'
val.smtdmc = '四面图(东)';
val.smtnmc = '四面图(南)';
val.smtxmc = '四面图(西)';
val.smtbmc = '四面图(北)';
val.xchczptmc = '现场核查人员自拍图';
val.gpszbtmc = 'GPS设备坐标图';
val.yxtmc = '岩芯图';
await setAdd(val)
await setAdd(val);
if (val.status == 1) {
await addSuccess({xccyId:val.xccyId})
await addSuccess({ xccyId: val.xccyId });
}
closeModal()
reload()
}
/**
* 操作栏
*/
function getTableAction(record) {
closeModal();
reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
// 判断数据来源显示按钮 没有找到控制字段 待优化
if (record.status == 0) {
return [
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
{
label: '编辑',
onClick: handleAddAndEdit.bind(null, record),
},
{
label: '查看',
onClick: handleLook.bind(null, record),
},
];
return [
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
{
label: '编辑',
onClick: handleAddAndEdit.bind(null, record),
},
{
label: '查看',
onClick: handleLook.bind(null, record),
},
];
} else if (record.status == 1) {
return [
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
{
label: '查看',
onClick: handleLook.bind(null, record),
},
];
return [
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
{
label: '查看',
onClick: handleLook.bind(null, record),
},
];
}
}
}
</script>
<style scoped></style>
\ No newline at end of file
src/views/xcjd/xccy/components/cyModal.vue
浏览文件 @ fd3977e5
<template>
<BasicModal :useWrapper="true" width="60%" @register="registerModal" @ok="ok(1)" v-bind="$attrs" title="选择">
<BasicForm @register="registerForm">
</BasicForm>
<template #centerFooter>
<a-button type="primary" @click="ok(0)">暂存</a-button>
</template>
</BasicModal>
<BasicModal :useWrapper="true" @register="registerModal" @ok="ok(1)" v-bind="$attrs" title="选择">
<BasicForm @register="registerForm"> </BasicForm>
<template #centerFooter>
<a-button type="primary" @click="ok(0)">暂存</a-button>
</template>
</BasicModal>
</template>
<script lang="ts" setup>
import { BasicModal, useModalInner } from '/@/components/Modal';
import { defineEmits } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './data'
const emit = defineEmits(['sumbitTable'])
import { BasicModal, useModalInner } from '/@/components/Modal';
import { defineEmits } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './data';
const emit = defineEmits(['sumbitTable']);
const [registerForm, { resetFields, setFieldsValue, getFieldsValue, updateSchema, validate }] = useForm({
const [registerForm, { resetFields, setFieldsValue, getFieldsValue, updateSchema, validate }] = useForm({
labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
......@@ -27,33 +26,32 @@ const [registerForm, { resetFields, setFieldsValue, getFieldsValue, updateSchema
baseRowStyle: { width: '100%' },
//表单布局属性，支持（vertical,horizontal），默认为horizontal
layout: 'horizontal',
});
const [registerModal, { setModalProps, closeModal }] = useModalInner((data) => {
});
const [registerModal, { setModalProps, closeModal }] = useModalInner((data) => {
resetFields();
console.log(data);
setFieldsValue({
...data,
...data,
});
})
});
async function ok(type) {
await validate()
let fromData = getFieldsValue()
fromData.status = type
emit('sumbitTable', fromData)
}
defineExpose({
async function ok(type) {
await validate();
let fromData = getFieldsValue();
fromData.status = type;
emit('sumbitTable', fromData);
}
defineExpose({
// save,
})
});
</script>
<style scoped>
/** 时间和数字输入框样式 */
:deep(.ant-input-number) {
/** 时间和数字输入框样式 */
:deep(.ant-input-number) {
width: 100%;
}
}
:deep(.ant-picker) {
:deep(.ant-picker) {
width: 100%;
}
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论