diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 392b1ea..0000000 --- a/package-lock.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "name": "cxc-szcx-uniapp-master", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "dependencies": { - "@dcloudio/uni-ui": "^1.5.6", - "base-64": "^1.0.0", - "dayjs": "^1.11.13", - "echarts": "^5.6.0" - } - }, - "node_modules/@dcloudio/uni-ui": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.6.tgz", - "integrity": "sha512-jmb98PasFvZkrIDXGh94GbdWg2/jyhgs1HUG+bU8eyL7Ltias/5XBz4q8w9RXyWUfqepJRqapPA2IIQpLCuTIg==", - "license": "Apache-2.0" - }, - "node_modules/base-64": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz", - "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" - }, - "node_modules/dayjs": { - "version": "1.11.13", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" - }, - "node_modules/echarts": { - "version": "5.6.0", - "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz", - "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", - "license": "Apache-2.0", - "dependencies": { - "tslib": "2.3.0", - "zrender": "5.6.1" - } - }, - "node_modules/tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", - "license": "0BSD" - }, - "node_modules/zrender": { - "version": "5.6.1", - "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz", - "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", - "license": "BSD-3-Clause", - "dependencies": { - "tslib": "2.3.0" - } - } - }, - "dependencies": { - "@dcloudio/uni-ui": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.6.tgz", - "integrity": "sha512-jmb98PasFvZkrIDXGh94GbdWg2/jyhgs1HUG+bU8eyL7Ltias/5XBz4q8w9RXyWUfqepJRqapPA2IIQpLCuTIg==" - }, - "base-64": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz", - "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==" - }, - "dayjs": { - "version": "1.11.13", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" - }, - "echarts": { - "version": "5.6.0", - "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz", - "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", - "requires": { - "tslib": "2.3.0", - "zrender": "5.6.1" - } - }, - "tslib": { - "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", - "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" - }, - "zrender": { - "version": "5.6.1", - "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz", - "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", - "requires": { - "tslib": "2.3.0" - } - } - } -} diff --git a/pages/login/login.vue b/pages/login/login.vue index a67ea93..a3df2cb 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -98,17 +98,17 @@ }); /*生产环境 begin */ - // loginApi({ - // username: un, - // password: pw, - // ip: getDeviceIp() - /*生产环境 end */ + loginApi({ + username: un, + password: pw, + ip: getDeviceIp() + /*生产环境 end */ - /*开发环境 begin */ - localLoginApi({ - username: username.value, - password: password.value, - captcha: 'app' + /*开发环境 begin */ + // localLoginApi({ + // username: username.value, + // password: password.value, + // captcha: 'app' /*开发环境 end */ }).then((loginres) => { if (loginres.success) { diff --git a/pages/views/renliziyuan/renyuanxinxi/detail.vue b/pages/views/renliziyuan/renyuanxinxi/detail.vue index d223072..18e4e42 100644 --- a/pages/views/renliziyuan/renyuanxinxi/detail.vue +++ b/pages/views/renliziyuan/renyuanxinxi/detail.vue @@ -1,44 +1,46 @@ \ No newline at end of file +/* 内容样式 */ +.dataStyle2 { + font-size: 12px; + color: #00007f; + line-height: 15px; + height: 30px; + font-weight: 500; + text-align: center; + vertical-align: middle; + border-bottom: 1px solid #919191; + border-left: 1px solid #919191; + text-align: center; + word-wrap: break-word; + overflow-wrap: break-word; +} +.img { + height: 154px; + border: 1px solid #ccc; /* 仅用于展示容器范围，可根据需要移除 */ + display: flex; + justify-content: center; /* 水平居中 */ + align-items: center; /* 垂直居中 */ + overflow: hidden; /* 防止图片溢出容器 */ +} + diff --git a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue index b07f190..bba70ec 100644 --- a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue +++ b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue @@ -1,86 +1,112 @@ @@ -91,7 +117,7 @@ onMounted, computed } from 'vue'; - import * as echarts from 'echarts'; + import * as echarts from 'echarts/dist/echarts.min'; // 引入ECharts的H5版本 import { cxcRyDatAstatistics, cxcRyDatAstatisticsCertificate, @@ -107,14 +133,15 @@ text: '取证情况', value: 'zjmc', isDict: false, - dictCode: 'gzrlzy' + dictCode: 'gzrlzy', }, { text: '岗位类别', value: 'gwlb', isDict: false, dictCode: '' - }, { + }, + { text: '性别', value: 'xb', isDict: true, @@ -135,6 +162,8 @@ ]); // 字段列表 const dictCode = ref(''); + const dictData = ref(''); + const showPopup = ref(null); const fieldisDict = ref(true); const selectedOrgCode = ref(''); // 当前选择的单位 orgCode @@ -164,11 +193,15 @@ } onMounted(() => { - // #ifdef APP + getHeight(); - // #endif + }); - // #ifdef APP + + const dictChange = (e) => { + console.log(e) + dictData.value = e + } const getHeight = () => { // 获取屏幕高度 @@ -188,7 +221,7 @@ .exec(); }; - // #endif + // 初始化 ECharts length departChange // 初始化图表 const initChart = () => { @@ -675,14 +708,15 @@ let res = []; chartData.value = []; try { - - if (selectedField.value === "zjmc") { - console.log(dictCode.value) + if (selectedField.value === 'zjmc') { + console.log(dictCode.value); + console.log(dictData.value); res = await cxcRyDatAstatisticsCertificate({ orgCode: selectedOrgCode.value, field: selectedField.value, dictCode: dictCode.value, - fieldisDict: fieldisDict.value + fieldisDict: fieldisDict.value, + typeOfWorkList: dictData.value }); } else { res = await cxcRyDatAstatistics({ @@ -740,7 +774,7 @@ // 事件处理 const onOrgCodeChange = (e, data) => { - personnelList.value = [] + personnelList.value = []; selectedOrgCode.value = e; // console.log(data.value.title); selectedOrgCodeLabel.value = data.value.title; @@ -748,7 +782,8 @@ }; const onFieldChange = (e) => { - personnelList.value = [] + + personnelList.value = []; // console.log(e); try { selectedField.value = e; @@ -761,6 +796,9 @@ fieldisDict.value = element.isDict; } } + if (selectedField.value === 'zjmc') { + showPopup.value.open() + } fetchStatisticsData(); } catch (error) { //TODO handle the exception @@ -769,7 +807,7 @@ }; const onChartClick = (e) => { - personnelList.value = [] + personnelList.value = []; const { ldhth } = chartData.value; @@ -791,29 +829,29 @@ /* 全局容器 */ .container { - margin: 10rpx 10rpx; - padding: 10rpx; + margin: 10px 10px; + padding: 10px; background: linear-gradient(145deg, #f5f9ff, var(--light-blue)); - border-radius: 24rpx; - box-shadow: 0 8rpx 24rpx rgba(64, 158, 255, 0.15); - border: 2rpx solid rgba(64, 158, 255, 0.1); + border-radius: 12px; + box-shadow: 0 4px 12px rgba(64, 158, 255, 0.15); + border: 1px solid rgba(64, 158, 255, 0.1); } /* 图表容器 */ .chart-container { height: 250px; - margin: 20rpx 0; - border-radius: 24rpx; + margin: 10px 0; + border-radius: 12px; overflow: hidden; background: #ffffff; - box-shadow: 0 8rpx 32rpx rgba(64, 158, 255, 0.12); - border: 2rpx solid rgba(64, 158, 255, 0.08); + box-shadow: 0 4px 16px rgba(64, 158, 255, 0.12); + border: 1px solid rgba(64, 158, 255, 0.08); } /* 表格标题行 */ .titleStyle { - font-size: 12px; + font-size: 10px; color: #747474; line-height: 30px; height: 30px; @@ -826,11 +864,21 @@ /* 内容样式 */ .dataStyle { - max-font-size: 14px; - /* 最大字体限制 */ - min-font-size: 10px; - /* 最小字体限制 */ - font-size: 12px; + font-size: 10px; + color: #00007f; + line-height: 30px; + height: 30px; + font-weight: 500; + text-align: center; + vertical-align: middle; + border-bottom: 1px solid #919191; + border-left: 1px solid #919191; + text-overflow: ellipsis; + } + + /* 内容样式 */ + .dataStyle1 { + font-size: 8px; color: #00007f; line-height: 30px; height: 30px; @@ -845,13 +893,13 @@ /* 滚动区域 */ scroll-view { background: #ffffff; - border-radius: 0 0 16rpx 16rpx; - box-shadow: 0 8rpx 24rpx rgba(0, 35, 111, 0.08); + border-radius: 0 0 8px 8px; + box-shadow: 0 4px 12px rgba(0, 35, 111, 0.08); } /* 输入框聚焦效果 */ .trq-depart-select:focus-within { - box-shadow: 0 0 0 4rpx rgba(64, 158, 255, 0.2); + box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2); border-color: var(--primary-blue); } @@ -859,7 +907,7 @@ @keyframes fadeIn { from { opacity: 0; - transform: translateY(20rpx); + transform: translateY(10px); } to { @@ -874,28 +922,28 @@ /* 自定义滚动条美化 */ ::-webkit-scrollbar { - width: 8rpx; + width: 4px; background: rgba(64, 158, 255, 0.05); } ::-webkit-scrollbar-thumb { background: linear-gradient(45deg, var(--primary-blue), var(--deep-blue)); - border-radius: 12rpx; - border: 2rpx solid white; + border-radius: 6px; + border: 1px solid white; } /* 筛选行间距优化 */ .filter-row { - margin: 30rpx 0; - padding: 20rpx 0; - border-radius: 16rpx; + margin: 15px 0; + padding: 10px 0; + border-radius: 8px; } /* 响应式调整优化 */ @media (max-width: 768px) { .chart-container { height: 250px; - border-radius: 20rpx; + border-radius: 10px; } } diff --git a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue index 94914d7..a483030 100644 --- a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue +++ b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue @@ -1,228 +1,297 @@ \ No newline at end of file +/* 全局容器 */ +.container { + margin: 10rpx 10rpx; + padding: 10rpx; + background: linear-gradient(145deg, #ffaaff, var(--light-blue)); + border-radius: 24rpx; + box-shadow: 0 8rpx 24rpx rgba(64, 158, 255, 0.15); + border: 2rpx solid rgba(64, 158, 255, 0.1); +} +.uni-group { + display: flex; + align-items: center; +} +.titleStyle { + font-size: 12px; + color: #747474; + line-height: 30px; + height: 30px; + background: #f2f9fc; + text-align: center; + vertical-align: middle; + border-left: 1px solid #919191; + border-bottom: 1px solid #919191; +} + +/* 内容样式 */ +.dataStyle { + font-size: 12px; + color: #00007f; + line-height: 30px; + height: 30px; + font-weight: 500; + text-align: center; + vertical-align: middle; + border-bottom: 1px solid #919191; + border-left: 1px solid #919191; + text-overflow: ellipsis; +} +/* 内容样式 */ +.pagination { + font-size: 16px; + color: #00007f; + line-height: 30px; + height: 30px; + font-weight: 500; + text-align: center; + vertical-align: middle; + text-overflow: ellipsis; +} + diff --git a/uni_modules/yjly-row-cell/components/yjly-row-cell/yjly-row-cell.vue b/uni_modules/yjly-row-cell/components/yjly-row-cell/yjly-row-cell.vue index 61652c2..56af547 100644 --- a/uni_modules/yjly-row-cell/components/yjly-row-cell/yjly-row-cell.vue +++ b/uni_modules/yjly-row-cell/components/yjly-row-cell/yjly-row-cell.vue @@ -1,9 +1,9 @@ \ No newline at end of file +/* 内容样式 */ +.dataStyle1 { + font-size: 10px; + color: #00007f; + line-height: 15px; + height: 30px; + font-weight: 500; + text-align: center; + vertical-align: middle; + border-bottom: 1px solid #919191; + text-overflow: ellipsis; + overflow: hidden; +} +