修改了人员统计三个页面相关界面和逻辑,增加照片,服务器路径不确定

This commit is contained in:
廖德云 2025-02-16 00:17:48 +08:00 committed by liaody
parent cc6681cfb5
commit b3630f9992
6 changed files with 1522 additions and 1578 deletions

95
package-lock.json generated
View File

@ -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"
}
}
}
}

View File

@ -98,17 +98,17 @@
}); });
/*生产环境 begin */ /*生产环境 begin */
// loginApi({ loginApi({
// username: un, username: un,
// password: pw, password: pw,
// ip: getDeviceIp() ip: getDeviceIp()
/*生产环境 end */ /*生产环境 end */
/*开发环境 begin */ /*开发环境 begin */
localLoginApi({ // localLoginApi({
username: username.value, // username: username.value,
password: password.value, // password: password.value,
captcha: 'app' // captcha: 'app'
/*开发环境 end */ /*开发环境 end */
}).then((loginres) => { }).then((loginres) => {
if (loginres.success) { if (loginres.success) {

View File

@ -1,44 +1,46 @@
<template> <template>
<view> <view>
<scroll-view :scroll-x="true" :scroll-y="true"> <scroll-view :scroll-x="true" :scroll-y="true">
<view style="padding: 10px 10px 10px 10px;"> <view style="padding: 10px 10px 10px 10px">
<uni-title title="基本信息" type="h1" color="blue"></uni-title> <uni-title title="基本信息" type="h1" color="blue"></uni-title>
<yjly-row-cell :cellData="cellData" :rowDataCount="3"></yjly-row-cell> <uni-row>
<uni-col :span="18"><yjly-row-cell :cellData="cellData" :rowDataCount="2"></yjly-row-cell></uni-col>
<uni-col :span="6">
<view class="img">
<image :src="'https://10.75.166.6/jeecg-boot/sys/common/static/'+imgUrl"></image>
</view>
</uni-col>
</uni-row>
<yjly-row-cell :cellData="cellData1" :rowDataCount="3"></yjly-row-cell>
<uni-title title="年度绩效考核" type="h1" color="blue"></uni-title> <uni-title title="年度绩效考核" type="h1" color="blue"></uni-title>
<uni-row> <uni-row>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">序号</view>
序号
</view>
</uni-col> </uni-col>
<uni-col :span="10"> <uni-col :span="10">
<view class="titleStyle"> <view class="titleStyle">绩效考核年份</view>
绩效考核年份
</view>
</uni-col> </uni-col>
<uni-col :span="10"> <uni-col :span="10">
<view class="titleStyle"> <view class="titleStyle">绩效考核成绩</view>
绩效考核成绩
</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<uni-row> <uni-row>
<view v-for="(item,index) in jxkhxxList"> <view v-for="(item, index) in jxkhxxList">
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{index+1}} {{ index + 1 }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="10"> <uni-col :span="10">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.nf}} {{ item.nf }}
</view> </view>
</uni-col><uni-col :span="10"> </uni-col>
<uni-col :span="10">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.khcj+"---"+item.khcj_dictText}} {{ item.khcj + '---' + item.khcj_dictText }}
</view> </view>
</uni-col> </uni-col>
</view> </view>
@ -46,44 +48,38 @@
<uni-title title="工作简历" type="h1" color="blue"></uni-title> <uni-title title="工作简历" type="h1" color="blue"></uni-title>
<uni-row> <uni-row>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">起始时间</view>
起始时间
</view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">终止时间</view>
终止时间
</view>
</uni-col> </uni-col>
<uni-col :span="11"> <uni-col :span="11">
<view class="titleStyle"> <view class="titleStyle">工作职务</view>
工作职务
</view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5">
<view class="titleStyle"> <view class="titleStyle">岗位职务</view>
岗位职务
</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<uni-row> <uni-row>
<view v-for="(item,index) in gzjlList"> <view v-for="(item, index) in gzjlList">
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.kssj}} {{ item.kssj }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.jssj}} {{ item.jssj }}
</view> </view>
</uni-col><uni-col :span="11"> </uni-col>
<uni-col :span="11">
<view class="dataStyle2" ref="dataView"> <view class="dataStyle2" ref="dataView">
{{item.jlms}} {{ item.jlms }}
</view> </view>
</uni-col><uni-col :span="5"> </uni-col>
<uni-col :span="5">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.jlms2}} {{ item.jlms2 }}
</view> </view>
</uni-col> </uni-col>
</view> </view>
@ -92,64 +88,54 @@
<uni-title title="学历信息" type="h1" color="blue"></uni-title> <uni-title title="学历信息" type="h1" color="blue"></uni-title>
<uni-row> <uni-row>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">类别</view>
类别
</view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">毕业院校</view>
毕业院校
</view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">所学专业</view>
所学专业
</view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">学历</view>
学历
</view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">学位</view>
学位
</view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">毕业时间</view>
毕业时间
</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<uni-row> <uni-row>
<view v-for="(item,index) in xlxxList"> <view v-for="(item, index) in xlxxList">
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.xllb}} {{ item.xllb }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.byyx}} {{ item.byyx }}
</view> </view>
</uni-col><uni-col :span="4"> </uni-col>
<uni-col :span="4">
<view class="dataStyle2" ref="dataView"> <view class="dataStyle2" ref="dataView">
{{item.sxzy}} {{ item.sxzy }}
</view>
</uni-col><uni-col :span="4">
<view class="dataStyle1">
{{item.qdxl}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.qdxw}} {{ item.qdxl }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.bytime}} {{ item.qdxw }}
</view>
</uni-col>
<uni-col :span="4">
<view class="dataStyle1">
{{ item.bytime }}
</view> </view>
</uni-col> </uni-col>
</view> </view>
@ -157,54 +143,46 @@
<uni-title title="取证信息" type="h1" color="blue"></uni-title> <uni-title title="取证信息" type="h1" color="blue"></uni-title>
<uni-row> <uni-row>
<uni-col :span="6"> <uni-col :span="6">
<view class="titleStyle"> <view class="titleStyle">证书名称</view>
证书名称
</view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5">
<view class="titleStyle"> <view class="titleStyle">证书等级</view>
证书等级
</view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5">
<view class="titleStyle"> <view class="titleStyle">取证时间</view>
取证时间
</view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5">
<view class="titleStyle"> <view class="titleStyle">复审时间</view>
复审时间
</view>
</uni-col> </uni-col>
<uni-col :span="3"> <uni-col :span="3">
<view class="titleStyle"> <view class="titleStyle">备注</view>
备注
</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<uni-row> <uni-row>
<view v-for="(item,index) in zjtzList"> <view v-for="(item, index) in zjtzList">
<uni-col :span="6"> <uni-col :span="6">
<view class="dataStyle2" ref="dataView"> <view class="dataStyle2" ref="dataView">
{{item.zjmc}} {{ item.zjmc }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.zsdj}} {{ item.zsdj }}
</view> </view>
</uni-col><uni-col :span="5"> </uni-col>
<uni-col :span="5">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.fzrq}} {{ item.fzrq }}
</view> </view>
</uni-col><uni-col :span="5"> </uni-col>
<uni-col :span="5">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.fssj}} {{ item.fssj }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="3"> <uni-col :span="3">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.bz}} {{ item.bz }}
</view> </view>
</uni-col> </uni-col>
</view> </view>
@ -213,54 +191,46 @@
<uni-title title="家庭信息" type="h1" color="blue"></uni-title> <uni-title title="家庭信息" type="h1" color="blue"></uni-title>
<uni-row> <uni-row>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">称谓</view>
称谓
</view>
</uni-col> </uni-col>
<uni-col :span="3"> <uni-col :span="3">
<view class="titleStyle"> <view class="titleStyle">姓名</view>
姓名
</view>
</uni-col> </uni-col>
<uni-col :span="6"> <uni-col :span="6">
<view class="titleStyle"> <view class="titleStyle">出生年月</view>
出生年月
</view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="titleStyle"> <view class="titleStyle">政治面貌</view>
政治面貌
</view>
</uni-col> </uni-col>
<uni-col :span="7"> <uni-col :span="7">
<view class="titleStyle"> <view class="titleStyle">工作单位及职务</view>
工作单位及职务
</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<uni-row> <uni-row>
<view v-for="(item,index) in zyjtcyList"> <view v-for="(item, index) in zyjtcyList">
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.ybrgx}} {{ item.ybrgx }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="3"> <uni-col :span="3">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.gxname}} {{ item.gxname }}
</view> </view>
</uni-col><uni-col :span="6"> </uni-col>
<uni-col :span="6">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.cstime}} {{ item.cstime }}
</view> </view>
</uni-col><uni-col :span="4"> </uni-col>
<uni-col :span="4">
<view class="dataStyle1"> <view class="dataStyle1">
{{item.cyzzmm}} {{ item.cyzzmm }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="7"> <uni-col :span="7">
<view class="dataStyle2" ref="dataView"> <view class="dataStyle2" ref="dataView">
{{item.cygzdw}} {{ item.cygzdw }}
</view> </view>
</uni-col> </uni-col>
</view> </view>
@ -268,301 +238,281 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
</template> </template>
<script setup> <script setup>
import { import { onReady, onLoad } from '@dcloudio/uni-app';
onReady, import { reactive, ref, onMounted } from 'vue';
onLoad import { queryGzjlByRyLdhth, queryQzqkByRyLdhth, queryJtzycyByRyLdhth, queryXlxxByRyLdhth, queryGbxxByRyLdhth, queryZyzgdjByRyLdhth, queryJxkhByRyLdhth } from '@/api/renyuan.js';
} from '@dcloudio/uni-app'; import { useStore } from '@/store';
import { const tempCellData = ref({
reactive, title: '',
ref, value: '',
onMounted titleSpan: 4,
} from 'vue'; valueSpan: 4
import { });
queryGzjlByRyLdhth, const ldhth = ref('');
queryQzqkByRyLdhth, const imgUrl = ref('');
queryJtzycyByRyLdhth, const renyuanData = ref({});
queryXlxxByRyLdhth, const cellData = ref([]);
queryGbxxByRyLdhth, const cellData1 = ref([]);
queryZyzgdjByRyLdhth,
queryJxkhByRyLdhth
} from '@/api/renyuan.js'
import {
useStore
} from '@/store';
const tempCellData = ref({
"title": "",
"value": "",
"titleSpan": 4,
"valueSpan": 4
})
const ldhth = ref("")
const renyuanData = ref({})
const cellData = ref([])
const gzjlList = ref([]) // -
const zjtzList = ref([]) // -
const zyjtcyList = ref([]) // -
const xlxxList = ref([]) // -
const gbxxList = ref([]) // -
const zyzgdjList = ref([]) // -
const jxkhxxList = ref([]) // -
const gzjlList = ref([]); // -
const zjtzList = ref([]); // -
const zyjtcyList = ref([]); // -
const xlxxList = ref([]); // -
const gbxxList = ref([]); // -
const zyzgdjList = ref([]); // -
const jxkhxxList = ref([]); // -
function getChildTable() { function getChildTable() {
console.log(ldhth.value) console.log(ldhth.value);
queryJxkhByRyLdhth({ queryJxkhByRyLdhth({
"ldhth": ldhth.value ldhth: ldhth.value
}).then((res) => {
// console.log(res);
jxkhxxList.value = res.result.records
// console.log(jxkhxxList.value)
}).catch((err) => {
console.log(err);
}) })
.then((res) => {
// console.log(res);
jxkhxxList.value = res.result.records;
// console.log(jxkhxxList.value)
})
.catch((err) => {
console.log(err);
});
queryGbxxByRyLdhth({ queryGbxxByRyLdhth({
"ldhth": ldhth.value ldhth: ldhth.value
}).then((res) => { })
.then((res) => {
// console.log(res); // console.log(res);
gbxxList.value = res gbxxList.value = res;
// console.log(gbxxList.value) // console.log(gbxxList.value)
}).catch((err) => {
console.log(err);
}) })
.catch((err) => {
console.log(err);
});
queryZyzgdjByRyLdhth({ queryZyzgdjByRyLdhth({
"ldhth": ldhth.value ldhth: ldhth.value
}).then((res) => { })
.then((res) => {
// console.log(res); // console.log(res);
zyzgdjList.value = res zyzgdjList.value = res;
// console.log(zyzgdjList.value) // console.log(zyzgdjList.value)
}).catch((err) => {
console.log(err);
}) })
.catch((err) => {
console.log(err);
});
queryGzjlByRyLdhth({ queryGzjlByRyLdhth({
"ldhth": ldhth.value ldhth: ldhth.value
}).then((res) => { })
.then((res) => {
// console.log(res); // console.log(res);
if (res.length > 0) { if (res.length > 0) {
gzjlList.value = res gzjlList.value = res;
} }
}).catch((err) => {
console.log(err);
}) })
.catch((err) => {
console.log(err);
});
queryQzqkByRyLdhth({ queryQzqkByRyLdhth({
"ldhth": ldhth.value ldhth: ldhth.value
}).then((res) => { })
.then((res) => {
// console.log(res); // console.log(res);
if (res.length > 0) { if (res.length > 0) {
zjtzList.value = res zjtzList.value = res;
} }
}).catch((err) => {
console.log(err);
}) })
.catch((err) => {
console.log(err);
});
queryJtzycyByRyLdhth({ queryJtzycyByRyLdhth({
"ldhth": ldhth.value ldhth: ldhth.value
}).then((res) => { })
.then((res) => {
// console.log(res); // console.log(res);
if (res.length > 0) { if (res.length > 0) {
zyjtcyList.value = res zyjtcyList.value = res;
} }
}).catch((err) => {
console.log(err);
}) })
.catch((err) => {
console.log(err);
});
queryXlxxByRyLdhth({ queryXlxxByRyLdhth({
"ldhth": ldhth.value ldhth: ldhth.value
}).then((res) => { })
.then((res) => {
if (res.success) { if (res.success) {
xlxxList.value = [] xlxxList.value = [];
if (res.result.records.length > 0) { if (res.result.records.length > 0) {
var rress = res.result.records var rress = res.result.records;
// console.log(rress); // console.log(rress);
for (let i = 0; i < rress.length; i++) { for (let i = 0; i < rress.length; i++) {
if (rress[i].onexl == 1 & rress[i].zgxl == 1) { if ((rress[i].onexl == 1) & (rress[i].zgxl == 1)) {
rress[i].xllb = "第一学历" rress[i].xllb = '第一学历';
xlxxList.value.push(JSON.parse(JSON.stringify(rress[i]))) xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])));
// console.log(xlxxList.value) // console.log(xlxxList.value)
rress[i].xllb = "最高学历" rress[i].xllb = '最高学历';
xlxxList.value.push(JSON.parse(JSON.stringify(rress[i]))) xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])));
// console.log(xlxxList.value) // console.log(xlxxList.value)
} }
if (rress[i].onexl == 1 & rress[i].zgxl != 1) { if ((rress[i].onexl == 1) & (rress[i].zgxl != 1)) {
rress[i].xllb = "第一学历" rress[i].xllb = '第一学历';
xlxxList.value.push(rress[i]) xlxxList.value.push(rress[i]);
} }
if (rress[i].onexl != 1 & rress[i].zgxl == 1) { if ((rress[i].onexl != 1) & (rress[i].zgxl == 1)) {
rress[i].xllb = "最高学历" rress[i].xllb = '最高学历';
xlxxList.value.push(rress[i]) xlxxList.value.push(rress[i]);
} }
} }
} }
} }
// adjustFontSize() // adjustFontSize()
}).catch((err) => { })
.catch((err) => {
console.log(err); console.log(err);
}) });
} }
function getJbxx() {
function getJbxx() {
cellData.value.push({ cellData.value.push({
"title": "姓名", title: '姓名',
"value": renyuanData.value.xm, value: renyuanData.value.xm,
"titleSpan": 3, titleSpan: 6,
"valueSpan": 3, valueSpan: 6,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData.value.push({ cellData.value.push({
"title": "性别", title: '性别',
"value": renyuanData.value.xb_dictText, value: renyuanData.value.xb_dictText,
"titleSpan": 3, titleSpan: 6,
"valueSpan": 4, valueSpan: 6,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData.value.push({ cellData.value.push({
"title": "出生年月", title: '出生年月',
"value": renyuanData.value.cssj, value: renyuanData.value.cssj,
"titleSpan": 4, titleSpan: 6,
"valueSpan": 4, valueSpan: 6,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData.value.push({ cellData.value.push({
"title": "民族", title: '民族',
"value": renyuanData.value.mz, value: renyuanData.value.mz,
"titleSpan": 3, titleSpan: 6,
"valueSpan": 3, valueSpan: 6,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData.value.push({ cellData.value.push({
"title": "籍贯", title: '籍贯',
"value": renyuanData.value.jg, value: renyuanData.value.jg,
"titleSpan": 3, titleSpan: 6,
"valueSpan": 5, valueSpan: 6,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData.value.push({ cellData.value.push({
"title": "出生地", title: '出生地',
"value": renyuanData.value.csd, value: renyuanData.value.csd,
"titleSpan": 3, titleSpan: 6,
"valueSpan": 4, valueSpan: 6,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData.value.push({ cellData.value.push({
"title": "工作时间", title: '工作时间',
"value": renyuanData.value.cjgzsj, value: renyuanData.value.cjgzsj,
"titleSpan": 4, titleSpan: 6,
"valueSpan": 5, valueSpan: 6,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData.value.push({ cellData.value.push({
"title": "政治面貌", title: '现专业',
"value": renyuanData.value.zzmm === "群众" ? renyuanData.value.zzmm : renyuanData.value.zzmm + value: '',
renyuanData.value.jrsj, titleSpan: 6,
"titleSpan": 4, valueSpan: 6,
"valueSpan": 4, class: 'dataStyle1'
"class": "dataStyle1" });
})
cellData.value.push({ cellData.value.push({
"title": "现专业", title: '政治面貌',
"value": "", value: renyuanData.value.zzmm === '群众' ? renyuanData.value.zzmm : renyuanData.value.zzmm + renyuanData.value.jrsj,
"titleSpan": 3, titleSpan: 4,
"valueSpan": 8, valueSpan: 8,
"class": "dataStyle" class: 'dataStyle1'
}) });
cellData.value.push({ cellData.value.push({
"title": "用工形式", title: '用工形式',
"value": renyuanData.value.rylb1_dictText, value: renyuanData.value.rylb1_dictText,
"titleSpan": 4, titleSpan: 4,
"valueSpan": 5, valueSpan: 8,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData.value.push({
"title": "健康状况",
"value": "",
"titleSpan": 4,
"valueSpan": 4,
"class": "dataStyle"
})
cellData.value.push({
"title": "所在单位",
"value": renyuanData.value.orgCode_dictText,
"titleSpan": 4,
"valueSpan": 6,
"class": "dataStyle"
})
cellData.value.push({
"title": "专业技术资格",
"value": gbxxList.value.zc === 0 ? "/" : gbxxList.value.zc + gbxxList.value.zcsj,
"titleSpan": 5,
"valueSpan": 7,
"class": "dataStyle1"
})
cellData.value.push({
"title": "职业资格等级",
"value": zyzgdjList.value.ztgz === "0" ? "/" : zyzgdjList.value.ztgz + zyzgdjList.value.ztgzdj,
"titleSpan": 5,
"valueSpan": 7,
"class": "dataStyle"
})
cellData.value.push({
"title": "",
"value": "",
"titleSpan": 0,
"valueSpan": 0,
"class": "dataStyle"
})
cellData.value.push({ cellData1.value.push({
"title": "职务(岗位)", title: '所在单位',
"value": gbxxList.value.zw, value: renyuanData.value.orgCode_dictText,
"titleSpan": 5, titleSpan: 4,
"valueSpan": 7, valueSpan: 8,
"class": "dataStyle" class: 'dataStyle'
}) });
cellData1.value.push({
title: '专业技术资格',
value: gbxxList.value.zc === 0 ? '/' : gbxxList.value.zc + gbxxList.value.zcsj,
titleSpan: 4,
valueSpan: 8,
class: 'dataStyle'
});
cellData1.value.push({
title: '',
value: '',
titleSpan: 0,
valueSpan: 0,
class: 'dataStyle'
});
cellData.value.push({ cellData1.value.push({
"title": "职位级别", title: '职业资格等级',
"value": gbxxList.value.zwcj, value: zyzgdjList.value.ztgz === '0' ? '/' : zyzgdjList.value.ztgz + zyzgdjList.value.ztgzdj,
"titleSpan": 5, titleSpan: 4,
"valueSpan": 7, valueSpan: 4,
"class": "dataStyle" class: 'dataStyle1'
}) });
cellData.value.push({ cellData1.value.push({
"title": "", title: '职务(岗位)',
"value": "", value: gbxxList.value.zw,
"titleSpan": 0, titleSpan: 4,
"valueSpan": 0, valueSpan: 4,
"class": "dataStyle" class: 'dataStyle1'
}) });
}
onLoad((e) => { cellData1.value.push({
title: '职位级别',
value: gbxxList.value.zwcj,
titleSpan: 4,
valueSpan: 4,
class: 'dataStyle'
});
}
onLoad((e) => {
renyuanData.value = JSON.parse(decodeURIComponent(e.data)); renyuanData.value = JSON.parse(decodeURIComponent(e.data));
ldhth.value = renyuanData.value.ldhth imgUrl.value = renyuanData.value.zplj;
getChildTable() console.log(imgUrl.value, renyuanData.value);
setTimeout(function() { ldhth.value = renyuanData.value.ldhth;
getJbxx() getChildTable();
setTimeout(function () {
getJbxx();
}, 500); }, 500);
});
})
</script> </script>
<style scoped> <style scoped>
.renyuanInfo { .renyuanInfo {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;8 vb
right: 0; right: 0;0
top: 0; top: 0;
height: 98vh; height: 98vh;
width: 900px; width: 900px;
@ -571,25 +521,22 @@
flex-direction: row; flex-direction: row;
font-size: 18px; font-size: 18px;
color: #fff; color: #fff;
} }
.titleStyle { .titleStyle {
font-size: 12px; font-size: 12px;
color: #747474; color: #747474;
line-height: 35px; line-height: 35px;
height: 35px; height: 35px;
background: #F2F9FC; background: #f2f9fc;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
border-left: 1px solid #919191; border-left: 1px solid #919191;
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
; }
;
}
/* 内容样式 */
.dataStyle {
/* 内容样式 */
.dataStyle {
font-size: 14px; font-size: 14px;
color: #00007f; color: #00007f;
line-height: 25px; line-height: 25px;
@ -602,12 +549,10 @@
text-align: center; text-align: center;
word-wrap: break-word; word-wrap: break-word;
overflow-wrap: break-word; overflow-wrap: break-word;
}
} /* 内容样式 */
.dataStyle1 {
/* 内容样式 */
.dataStyle1 {
max-font-size: 14px; max-font-size: 14px;
/* 最大字体限制 */ /* 最大字体限制 */
min-font-size: 10px; min-font-size: 10px;
@ -624,11 +569,10 @@
text-align: center; text-align: center;
word-wrap: break-word; word-wrap: break-word;
overflow-wrap: break-word; overflow-wrap: break-word;
}
} /* 内容样式 */
.dataStyle2 {
/* 内容样式 */
.dataStyle2 {
font-size: 12px; font-size: 12px;
color: #00007f; color: #00007f;
line-height: 15px; line-height: 15px;
@ -641,5 +585,20 @@
text-align: center; text-align: center;
word-wrap: break-word; word-wrap: break-word;
overflow-wrap: break-word; overflow-wrap: break-word;
} }
.img {
font-size: 12px;
color: #00007f;
line-height: 150px;
height: 154px;
font-weight: 500;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #919191;
border-right: 1px solid #919191;
border-left: 1px solid #919191;
text-align: center;
word-wrap: break-word;
overflow-wrap: break-word;
}
</style> </style>

View File

@ -1,22 +1,23 @@
<template> <template>
<view> <view>
<view class="container" id="top1"> <view class="container" id="top1">
<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx"> <uni-row style="margin-bottom: 10px">
<uni-col :span="5"><uni-title :title="'选择单位'" align="left" type="h4"></uni-title></uni-col> <uni-col><uni-title :title="'选择单位'" align="left" type="h4"></uni-title></uni-col>
<uni-col :span="19"> <uni-col>
<trq-depart-select v-model="selectedOrgCode" returnCodeOrID="orgCode" <trq-depart-select v-model="selectedOrgCode" returnCodeOrID="orgCode" @change="onOrgCodeChange"></trq-depart-select>
@change="onOrgCodeChange"></trq-depart-select>
</uni-col> </uni-col>
</uni-row> </uni-row>
<uni-row style="margin-bottom: 10px">
<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx"> <uni-col><uni-title :title="'选择字段'" align="left" type="h4"></uni-title></uni-col>
<uni-col :span="5"><uni-title :title="'选择字段'" align="left" type="h4"></uni-title></uni-col> <uni-col :span="12">
<uni-col :span="19"> <uni-data-select v-model="selectedField" :localdata="fieldList" @change="onFieldChange"></uni-data-select>
<uni-data-select v-model="selectedField" :localdata="fieldList"
@change="onFieldChange"></uni-data-select>
</uni-col> </uni-col>
</uni-row> </uni-row>
<uni-row style="margin-bottom: 20px">
<uni-col v-if="dictCode === 'gzrlzy'"><uni-title :title="'字典项'" align="left" type="h4"></uni-title></uni-col>
<uni-col v-if="dictCode === 'gzrlzy'"><cxc-szcx-dictSelect :dictCode="dictCode" v-model="dictData"></cxc-szcx-dictSelect></uni-col>
</uni-row>
</view> </view>
<!-- ECharts图表 --> <!-- ECharts图表 -->
<view class="chart-container"> <view class="chart-container">
@ -26,56 +27,74 @@
<!-- 翻页按钮 --> <!-- 翻页按钮 -->
<view style="display: flex; justify-content: center; margin-top: 10px"> <view style="display: flex; justify-content: center; margin-top: 10px">
<button @click="prevPage" :disabled="currentPage === 1" size="mini">上一页</button> <button @click="prevPage" :disabled="currentPage === 1" size="mini">上一页</button>
<button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value" <button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value" size="mini">下一页</button>
size="mini">下一页</button>
</view> </view>
<!-- 数据表格 --> <!-- 数据表格 -->
<uni-row style="margin-top: 10px; margin-left: 30rpx; margin-right: 30rpx" v-if="personnelList.length > 0"> <uni-row style="margin-top: 10px; margin-left: 20px; margin-right: 20px" v-if="personnelList.length > 0">
<uni-col :span="3"> <uni-col :span="2">
<view class="titleStyle">序号</view> <view class="titleStyle">序号</view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="4">
<view class="titleStyle">姓名</view> <view class="titleStyle">姓名</view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5">
<view class="titleStyle">基层单位</view> <view class="titleStyle">基层单位</view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5" v-if="selectedField.value !== 'zjmc'">
<view class="titleStyle">基层班组</view>
</uni-col>
<uni-col :span="5" v-else>
<view class="titleStyle">岗位</view>
</uni-col>
<uni-col :span="4">
<view class="titleStyle">年龄</view> <view class="titleStyle">年龄</view>
</uni-col> </uni-col>
<uni-col :span="6"> <uni-col :span="4">
<view class="titleStyle">操作</view> <view class="titleStyle">操作</view>
</uni-col> </uni-col>
</uni-row> </uni-row>
<scroll-view scroll-y :style="{ height: bottomHeight + 'px' }"> <scroll-view scroll-y :style="{ height: bottomHeight + 'px' }">
<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx"> <uni-row style="margin-bottom: 10px; margin-left: 20px; margin-right: 20px; font-size: 12px">
<view v-for="(item, index) in personnelList"> <view v-for="(item, index) in personnelList">
<uni-col :span="3"> <uni-col :span="2">
<view class="dataStyle"> <view class="dataStyle">
{{ index + 1 }} {{ index + 1 }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle">
{{ item.xm }} {{ item.xm }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5">
<view class="dataStyle"> <view class="dataStyle1">
{{ item.jcdw }}
</view>
</uni-col>
<uni-col :span="5" v-if="selectedField.value != 'zjmc'">
<view class="dataStyle1">
{{ item.jcxd }} {{ item.jcxd }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="4" v-else>
<view class="dataStyle">
{{ item.sdgw }}
</view>
</uni-col>
<uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle">
{{ item.nl }} {{ item.nl }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="6">
<uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle">
<button size="mini" type="primary" @click="detail(item)">详情</button> <span @click="detail(item)">详情</span>
<!-- <button size="mini" type="primary" @click="detail(item)">详情</button> -->
</view> </view>
</uni-col> </uni-col>
</view> </view>
@ -85,36 +104,30 @@
</template> </template>
<script setup> <script setup>
import { import { ref, reactive, onMounted, computed } from 'vue';
ref, import * as echarts from 'echarts/dist/echarts.min'; // EChartsH5
reactive, import { cxcRyDatAstatistics, cxcRyDatAstatisticsCertificate, cxcRyDatAstatisticsDetails } from '@/api/renyuan.js';
onMounted,
computed
} from 'vue';
import * as echarts from 'echarts';
import {
cxcRyDatAstatistics,
cxcRyDatAstatisticsCertificate,
cxcRyDatAstatisticsDetails
} from '@/api/renyuan.js';
// tableData // tableData
const bottomHeight = ref(0); const bottomHeight = ref(0);
// //
const chart = ref(null); const chart = ref(null);
const chartDataCount = ref(0); const chartDataCount = ref(0);
const fieldList = ref([{ const fieldList = ref([
{
text: '取证情况', text: '取证情况',
value: 'zjmc', value: 'zjmc',
isDict: false, isDict: false,
dictCode: 'gzrlzy' dictCode: 'gzrlzy',
dictData: ['输气工', '采气工']
}, },
{ {
text: '岗位类别', text: '岗位类别',
value: 'gwlb', value: 'gwlb',
isDict: false, isDict: false,
dictCode: '' dictCode: ''
}, { },
{
text: '性别', text: '性别',
value: 'xb', value: 'xb',
isDict: true, isDict: true,
@ -132,45 +145,46 @@
isDict: true, isDict: true,
dictCode: 'mz' dictCode: 'mz'
} }
]); // ]); //
const dictCode = ref(''); const dictCode = ref('');
const fieldisDict = ref(true); const dictData = ref([]);
const fieldisDict = ref(true);
const selectedOrgCode = ref(''); // orgCode const selectedOrgCode = ref(''); // orgCode
const selectedOrgCodeLabel = ref('请选择单位'); // const selectedOrgCodeLabel = ref('请选择单位'); //
const selectedField = ref(''); // const selectedField = ref(''); //
const selectedFieldLabel = ref('请选择字段'); // const selectedFieldLabel = ref('请选择字段'); //
const orgCodeGroupData = ref([]); //orgcode const orgCodeGroupData = ref([]); //orgcode
const chartData = ref({}); // const chartData = ref({}); //
const personnelList = ref([]); // initChart const personnelList = ref([]); // initChart
const fieldValues = ref([]); // const fieldValues = ref([]); //
const fieldTexts = ref([]); // const fieldTexts = ref([]); //
const chartOption = ref({}); const chartOption = ref({});
const chartTitle = computed(() => { const chartTitle = computed(() => {
return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计'; return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计';
}); });
// //
const pageSize = ref(3); // const pageSize = ref(3); //
const currentPage = ref(1); // const currentPage = ref(1); //
function detail(record) { function detail(record) {
// console.log(record) // console.log(record)
uni.navigateTo({ uni.navigateTo({
url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record)) url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
}); });
} }
onMounted(() => {
onMounted(() => {
// #ifdef APP
getHeight(); getHeight();
// #endif
});
// #ifdef APP
const getHeight = () => { });
const getHeight = () => {
// //
const systemInfo = uni.getSystemInfoSync(); const systemInfo = uni.getSystemInfoSync();
const screenHeight = systemInfo.screenHeight; const screenHeight = systemInfo.screenHeight;
@ -186,27 +200,27 @@
bottomHeight.value = screenHeight - topComponentsHeight - 415; bottomHeight.value = screenHeight - topComponentsHeight - 415;
}) })
.exec(); .exec();
}; };
// #endif
// ECharts length departChange // ECharts length departChange
// //
const initChart = () => { const initChart = () => {
setTimeout(async () => { setTimeout(async () => {
if (!chart.value) return; if (!chart.value) return;
const myChart = await chart.value.init(echarts); const myChart = await chart.value.init(echarts);
myChart.setOption(chartOption.value); myChart.setOption(chartOption.value);
}, 300); }, 300);
}; };
const prevPage = () => { const prevPage = () => {
if (currentPage.value > 1) { if (currentPage.value > 1) {
currentPage.value--; currentPage.value--;
} }
updateChart(chartData.value); updateChart(chartData.value);
}; };
const nextPage = () => { const nextPage = () => {
if (currentPage.value * pageSize.value < chartDataCount.value) { if (currentPage.value * pageSize.value < chartDataCount.value) {
currentPage.value++; currentPage.value++;
// //
@ -215,9 +229,9 @@
updateChart(chartData.value); updateChart(chartData.value);
// const tempChartData = temp.slice(startIndex, endIndex); // const tempChartData = temp.slice(startIndex, endIndex);
} }
}; };
// option // option
const getChartOption = (ChartData) => { const getChartOption = (ChartData) => {
// let temp = JSON.parse(JSON.stringify(tempchartData[0].children)); // let temp = JSON.parse(JSON.stringify(tempchartData[0].children));
// chartDataCount.value = temp.length; // chartDataCount.value = temp.length;
// //
@ -297,7 +311,8 @@
show: false //线 show: false //线
} }
}, },
yAxis: [{ yAxis: [
{
show: true, show: true,
boundaryGap: false, //线 boundaryGap: false, //线
type: 'value', type: 'value',
@ -321,7 +336,8 @@
axisLine: { axisLine: {
show: false //线 show: false //线
} }
}], }
],
series: seriesData, series: seriesData,
legend: { legend: {
@ -338,10 +354,10 @@
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
}; };
// //
const updateChart = (tempchartData) => { const updateChart = (tempchartData) => {
// //
setTimeout(async () => { setTimeout(async () => {
if (!chart.value) return; if (!chart.value) return;
@ -368,10 +384,10 @@
// updateChart(updateData); // updateChart(updateData);
}); });
}, 300); }, 300);
}; };
// //
// //
function findRyByOrgCode(treeData, targetOrgCode) { function findRyByOrgCode(treeData, targetOrgCode) {
// console.log(treeData, targetOrgCode); // console.log(treeData, targetOrgCode);
for (const node of treeData) { for (const node of treeData) {
// //
@ -385,15 +401,15 @@
} }
} }
return null; return null;
} }
/** /**
* 从echart图标的树状数据中根据 orgCode 获取节点及其子节点数据 * 从echart图标的树状数据中根据 orgCode 获取节点及其子节点数据
* @param {Array} treeData 树状数据 * @param {Array} treeData 树状数据
* @param {string} targetOrgCode 目标 orgCode * @param {string} targetOrgCode 目标 orgCode
* @returns {Object|null} 匹配的节点及其子节点数据未找到返回 null * @returns {Object|null} 匹配的节点及其子节点数据未找到返回 null
*/ */
function findNodeByOrgCode(treeData, targetOrgCode) { function findNodeByOrgCode(treeData, targetOrgCode) {
// console.log(treeData, targetOrgCode); // console.log(treeData, targetOrgCode);
for (const node of treeData) { for (const node of treeData) {
// //
@ -407,16 +423,13 @@
} }
} }
return null; return null;
} }
//fieldValue //fieldValue
function collectUniqueKeyFieldValues(tree) { function collectUniqueKeyFieldValues(tree) {
const uniqueMap = new Map(); const uniqueMap = new Map();
tree.forEach((item) => { tree.forEach((item) => {
const { const { fieldValue, fieldText } = item;
fieldValue,
fieldText
} = item;
const key = `${fieldValue}-${fieldText}`; const key = `${fieldValue}-${fieldText}`;
if (!uniqueMap.has(key)) { if (!uniqueMap.has(key)) {
@ -429,10 +442,10 @@
const result = Array.from(uniqueMap.values()); const result = Array.from(uniqueMap.values());
return result; return result;
} }
// //
class OrgCodeMapper { class OrgCodeMapper {
constructor(data) { constructor(data) {
// //
this.orgCodeToOrgTextMap = {}; this.orgCodeToOrgTextMap = {};
@ -448,20 +461,20 @@
findOrgText(orgCode) { findOrgText(orgCode) {
return this.orgCodeToOrgTextMap[orgCode]; return this.orgCodeToOrgTextMap[orgCode];
} }
} }
// //
// const result = findNodeByOrgCode(echartData, "A01A01A01A01"); // const result = findNodeByOrgCode(echartData, "A01A01A01A01");
// console.log(result); // console.log(result);
/** /**
* 转换数据为支持钻取的ECharts格式 * 转换数据为支持钻取的ECharts格式
* @param {Array} data 原始数据 * @param {Array} data 原始数据
* @param {string} selectOrgCode 当前选择的组织编码 * @param {string} selectOrgCode 当前选择的组织编码
* @returns {Object} 包含当前层级数据和子节点信息的对象 符合echart的格式 * @returns {Object} 包含当前层级数据和子节点信息的对象 符合echart的格式
*/ */
//----------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------
function transformData(selectOrgCode, data) { function transformData(selectOrgCode, data) {
const nodes = new Map(); const nodes = new Map();
//fieldValue data[] fieldValue //fieldValue data[] fieldValue
fieldValues.value = collectUniqueKeyFieldValues(data); fieldValues.value = collectUniqueKeyFieldValues(data);
@ -490,8 +503,7 @@
// console.log(entry); // console.log(entry);
hierarchy.forEach((code) => { hierarchy.forEach((code) => {
// console.log(code); // console.log(code);
let tempOrgText = orgMapper.findOrgText(code) === undefined ? '' : orgMapper.findOrgText( let tempOrgText = orgMapper.findOrgText(code) === undefined ? '' : orgMapper.findOrgText(code);
code);
// console.log(tempOrgText); // console.log(tempOrgText);
if (!nodes.has(code)) { if (!nodes.has(code)) {
nodes.set(code, { nodes.set(code, {
@ -574,13 +586,13 @@
// console.log(root); // console.log(root);
// formatTree(root); // formatTree(root);
// }); // });
} }
//----------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------
// orgCode children deepseek // orgCode children deepseek
const groupByOrgCode = (orgCode, data) => { const groupByOrgCode = (orgCode, data) => {
// //
const filteredData = data.filter((item) => item.orgCode.startsWith(orgCode)); const filteredData = data.filter((item) => item.orgCode.startsWith(orgCode));
@ -622,11 +634,7 @@
orgCode: orgCode, orgCode: orgCode,
orgText: orgMapper.findOrgText(orgCode), orgText: orgMapper.findOrgText(orgCode),
fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => { fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => {
const { const { fieldText, orgCode, orgText } = groupedByFieldValue[fieldValue] || {};
fieldText,
orgCode,
orgText
} = groupedByFieldValue[fieldValue] || {};
return { return {
fieldValue: fieldValue, fieldValue: fieldValue,
fieldText: fieldText, fieldText: fieldText,
@ -668,21 +676,21 @@
// console.log('', result); // console.log('', result);
return result; return result;
}; };
// then filter // then filter
const fetchStatisticsData = async () => { const fetchStatisticsData = async () => {
if (!selectedOrgCode.value || !selectedField.value) return; if (!selectedOrgCode.value || !selectedField.value) return;
let res = []; let res = [];
chartData.value = []; chartData.value = [];
try { try {
if (selectedField.value === 'zjmc') {
if (selectedField.value === "zjmc") { console.log(dictCode.value);
console.log(dictCode.value)
res = await cxcRyDatAstatisticsCertificate({ res = await cxcRyDatAstatisticsCertificate({
orgCode: selectedOrgCode.value, orgCode: selectedOrgCode.value,
field: selectedField.value, field: selectedField.value,
dictCode: dictCode.value, dictCode: dictCode.value,
fieldisDict: fieldisDict.value fieldisDict: fieldisDict.value,
typeOfWorkList: dictData.value
}); });
} else { } else {
res = await cxcRyDatAstatistics({ res = await cxcRyDatAstatistics({
@ -720,10 +728,10 @@
} catch (error) { } catch (error) {
console.error('获取统计数据失败:', error); console.error('获取统计数据失败:', error);
} }
}; };
// delimiter // delimiter
const fetchPersonnelList = async (ldhthList) => { const fetchPersonnelList = async (ldhthList) => {
personnelList.value = []; personnelList.value = [];
try { try {
const res = await cxcRyDatAstatisticsDetails({ const res = await cxcRyDatAstatisticsDetails({
@ -736,19 +744,19 @@
} catch (error) { } catch (error) {
console.error('获取人员列表失败:', error); console.error('获取人员列表失败:', error);
} }
}; };
// //
const onOrgCodeChange = (e, data) => { const onOrgCodeChange = (e, data) => {
personnelList.value = [] personnelList.value = [];
selectedOrgCode.value = e; selectedOrgCode.value = e;
// console.log(data.value.title); // console.log(data.value.title);
selectedOrgCodeLabel.value = data.value.title; selectedOrgCodeLabel.value = data.value.title;
fetchStatisticsData(); fetchStatisticsData();
}; };
const onFieldChange = (e) => { const onFieldChange = (e) => {
personnelList.value = [] personnelList.value = [];
// console.log(e); // console.log(e);
try { try {
selectedField.value = e; selectedField.value = e;
@ -766,54 +774,52 @@
//TODO handle the exception //TODO handle the exception
console.log(error); console.log(error);
} }
}; };
const onChartClick = (e) => { const onChartClick = (e) => {
personnelList.value = [] personnelList.value = [];
const { const { ldhth } = chartData.value;
ldhth
} = chartData.value;
if (ldhth && ldhth.length > 0) { if (ldhth && ldhth.length > 0) {
fetchPersonnelList(ldhth); fetchPersonnelList(ldhth);
} }
}; };
</script> </script>
<style scoped> <style scoped>
/* 颜色变量 */ /* 颜色变量 */
:root { :root {
--primary-blue: #409eff; --primary-blue: #409eff;
--deep-blue: #2c7be5; --deep-blue: #2c7be5;
--light-blue: #ecf5ff; --light-blue: #ecf5ff;
--gradient-start: #6b8cff; --gradient-start: #6b8cff;
--gradient-end: #4364f7; --gradient-end: #4364f7;
--hover-blue: #66b1ff; --hover-blue: #66b1ff;
} }
/* 全局容器 */ /* 全局容器 */
.container { .container {
margin: 10rpx 10rpx; margin: 10px 10px;
padding: 10rpx; padding: 10px;
background: linear-gradient(145deg, #f5f9ff, var(--light-blue)); background: linear-gradient(145deg, #f5f9ff, var(--light-blue));
border-radius: 24rpx; border-radius: 12px;
box-shadow: 0 8rpx 24rpx rgba(64, 158, 255, 0.15); box-shadow: 0 4px 12px rgba(64, 158, 255, 0.15);
border: 2rpx solid rgba(64, 158, 255, 0.1); border: 1px solid rgba(64, 158, 255, 0.1);
} }
/* 图表容器 */ /* 图表容器 */
.chart-container { .chart-container {
height: 250px; height: 250px;
margin: 20rpx 0; margin: 10px 0;
border-radius: 24rpx; border-radius: 12px;
overflow: hidden; overflow: hidden;
background: #ffffff; background: #ffffff;
box-shadow: 0 8rpx 32rpx rgba(64, 158, 255, 0.12); box-shadow: 0 4px 16px rgba(64, 158, 255, 0.12);
border: 2rpx solid rgba(64, 158, 255, 0.08); border: 1px solid rgba(64, 158, 255, 0.08);
} }
/* 表格标题行 */ /* 表格标题行 */
.titleStyle { .titleStyle {
font-size: 12px; font-size: 10px;
color: #747474; color: #747474;
line-height: 30px; line-height: 30px;
height: 30px; height: 30px;
@ -822,15 +828,11 @@
vertical-align: middle; vertical-align: middle;
border-left: 1px solid #919191; border-left: 1px solid #919191;
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
} }
/* 内容样式 */ /* 内容样式 */
.dataStyle { .dataStyle {
max-font-size: 14px; font-size: 10px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 12px;
color: #00007f; color: #00007f;
line-height: 30px; line-height: 30px;
height: 30px; height: 30px;
@ -840,71 +842,83 @@
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
border-left: 1px solid #919191; border-left: 1px solid #919191;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
/* 内容样式 */
/* 滚动区域 */ .dataStyle1 {
scroll-view { font-size: 8px;
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;
}
/* 滚动区域 */
scroll-view {
background: #ffffff; background: #ffffff;
border-radius: 0 0 16rpx 16rpx; border-radius: 0 0 8px 8px;
box-shadow: 0 8rpx 24rpx rgba(0, 35, 111, 0.08); box-shadow: 0 4px 12px rgba(0, 35, 111, 0.08);
} }
/* 输入框聚焦效果 */ /* 输入框聚焦效果 */
.trq-depart-select:focus-within { .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); border-color: var(--primary-blue);
} }
/* 加载动画优化 */ /* 加载动画优化 */
@keyframes fadeIn { @keyframes fadeIn {
from { from {
opacity: 0; opacity: 0;
transform: translateY(20rpx); transform: translateY(10px);
} }
to { to {
opacity: 1; opacity: 1;
transform: translateY(0); transform: translateY(0);
} }
} }
.container>* { .container > * {
animation: fadeIn 0.6s cubic-bezier(0.23, 1, 0.32, 1); animation: fadeIn 0.6s cubic-bezier(0.23, 1, 0.32, 1);
} }
/* 自定义滚动条美化 */ /* 自定义滚动条美化 */
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 8rpx; width: 4px;
background: rgba(64, 158, 255, 0.05); background: rgba(64, 158, 255, 0.05);
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background: linear-gradient(45deg, var(--primary-blue), var(--deep-blue)); background: linear-gradient(45deg, var(--primary-blue), var(--deep-blue));
border-radius: 12rpx; border-radius: 6px;
border: 2rpx solid white; border: 1px solid white;
} }
/* 筛选行间距优化 */ /* 筛选行间距优化 */
.filter-row { .filter-row {
margin: 30rpx 0; margin: 15px 0;
padding: 20rpx 0; padding: 10px 0;
border-radius: 16rpx; border-radius: 8px;
} }
/* 响应式调整优化 */ /* 响应式调整优化 */
@media (max-width: 768px) { @media (max-width: 768px) {
.chart-container { .chart-container {
height: 250px; height: 250px;
border-radius: 20rpx; border-radius: 10px;
}
} }
}
/* 数据行高亮效果 */ /* 数据行高亮效果 */
.data-row:nth-child(even) { .data-row:nth-child(even) {
background: rgba(236, 245, 255, 0.3); background: rgba(236, 245, 255, 0.3);
} }
.data-row:hover { .data-row:hover {
box-shadow: 0 4rpx 12rpx rgba(64, 158, 255, 0.1); box-shadow: 0 4rpx 12rpx rgba(64, 158, 255, 0.1);
} }
</style> </style>

View File

@ -1,198 +1,220 @@
<template> <template>
<view> <view class="container" id="top1">
<scroll-view :scroll-y="true" style="height: 100vh;">
<uni-card> <uni-card>
<view> <view>
<uni-row> <uni-row>
<uni-col :span="11"><uni-title title="姓名 " align="left" type="h5"></uni-title></uni-col> <uni-col :span="11"><uni-title title="姓名 " align="left" type="h5"></uni-title></uni-col>
<uni-col :span="11" :push="2"><uni-title title="劳动合同号" align="left" <uni-col :span="11" :push="2"><uni-title title="劳动合同号" align="left" type="h5"></uni-title></uni-col>
type="h5"></uni-title></uni-col>
</uni-row> </uni-row>
<uni-row> <uni-row>
<uni-col :span="11"><uni-easyinput v-model="xm" suffixIcon="search" clearable <uni-col :span="11"><uni-easyinput v-model="xm" suffixIcon="search" clearable placeholder="姓名模糊查询" @change="Search" @iconClick="Search" /></uni-col>
placeholder="姓名模糊查询" @change="Search" @iconClick="Search" /></uni-col>
<uni-col :span="11" :push="2"> <uni-col :span="11" :push="2">
<uni-easyinput v-model="ldhth" suffixIcon="search" clearable placeholder="劳动合同号模糊查询" <uni-easyinput v-model="ldhth" suffixIcon="search" clearable placeholder="劳动合同号模糊查询" @change="Search" @iconClick="Search" />
@change="Search" @iconClick="Search" />
</uni-col> </uni-col>
</uni-row> </uni-row>
</view> </view>
<view style="margin-bottom: 10rpx;"> <view style="margin-bottom: 10rpx">
<uni-row> <uni-row>
<uni-col :span="24"><uni-title title="所属单位" align="left" type="h5"></uni-title></uni-col> <uni-col :span="24"><uni-title title="所属单位" align="left" type="h5"></uni-title></uni-col>
</uni-row> </uni-row>
<uni-row> <uni-row>
<uni-col :span="24"> <uni-col :span="24">
<trq-depart-select v-model="departID" returnCodeOrID="orgCode" <trq-depart-select v-model="departID" returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
@change="departChange"></trq-depart-select>
</uni-col> </uni-col>
</uni-row> </uni-row>
</view> </view>
</uni-card> </uni-card>
</view>
<uni-card> <uni-card>
<zb-table :show-header="true" :highlight="true" :columns="column" :stripe="true" :fit="false" <!-- 数据表格 -->
:border="true" :data="ryDataList" @detail="detail"></zb-table>
<uni-pagination :current="current" :pagerCount="pages" :total="total" prev-text="前一页" next-text="后一页" <uni-row v-if="ryDataList.length > 0">
:show-icon="false" @change="pagechange" /> <uni-col :span="3">
<view> <view class="titleStyle">序号</view>
<text class="example-info">当前页{{ current }}数据总量{{ total }}每页数据{{ pageSize }}</text> </uni-col>
<uni-col :span="5">
<view class="titleStyle">姓名</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">性别</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">年龄</view>
</uni-col>
<uni-col :span="6">
<view class="titleStyle">操作</view>
</uni-col>
</uni-row>
<scroll-view scroll-y :style="{ height: bottomHeight + 'px' }">
<uni-row>
<view v-for="(item, index) in ryDataList">
<uni-col :span="3">
<view class="dataStyle">
{{ index + 1 }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.xm }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.xb_dictText }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.nl }}
</view>
</uni-col>
<uni-col :span="6">
<view class="dataStyle">
<button size="mini" type="primary" @click="detail(item)">详情</button>
</view>
</uni-col>
</view>
</uni-row>
<view class="pagination">
<uni-pagination :current="current" :pagerCount="5" :total="total" prev-text="前一页" next-text="后一页" :show-icon="false" @change="pagechange" />
</view> </view>
</uni-card>
</scroll-view> </scroll-view>
</uni-card>
</view>
</template> </template>
<script setup> <script setup>
import { import { onReady, onLoad } from '@dcloudio/uni-app';
onReady, import { reactive, ref, onMounted } from 'vue';
onLoad import { useStore } from '@/store';
import { queryDepByCode, queryZbDepByLdhth } from '@/api/depart.js';
import { queryRenyuanByDepartID } from '@/api/renyuan.js';
let xm = ref('');
let ldhth = ref('');
let departID = ref(''); //ID
const ryDataList = ref([]);
} from '@dcloudio/uni-app'; const bottomHeight = ref(0);
import { let status = ref('');
reactive, let contentText = reactive({
ref,
onMounted
} from 'vue';
import {
useStore
} from '@/store';
import {
queryDepByCode,
queryZbDepByLdhth
} from '@/api/depart.js'
import {
queryRenyuanByDepartID
} from '@/api/renyuan.js'
let xm = ref("")
let ldhth = ref("")
let departID = ref("") //ID
const ryDataList = ref([])
let status = ref("")
let contentText = reactive({
contentdown: '点击查看更多', contentdown: '点击查看更多',
contentrefresh: '加载中', contentrefresh: '加载中',
contentnomore: '没有更多' contentnomore: '没有更多'
}) });
let pageNo = ref(1) let pageNo = ref(1);
let pageSize = ref(10) let pageSize = ref(10);
let total = ref(0) let total = ref(0);
let pages = ref(0) let pages = ref(0);
let current = ref(0) let current = ref(0);
let params = reactive({ let params = reactive({
pageNo: pageNo, pageNo: pageNo,
pageSize: pageSize pageSize: pageSize
});
onLoad((e) => {});
onMounted((e) => {
// #ifdef APP
getHeight();
// #endif
departID.value = '';
getRenyuanByDepID();
});
// #ifdef APP
const getHeight = () => {
//
const systemInfo = uni.getSystemInfoSync();
const screenHeight = systemInfo.screenHeight;
//
const query = uni.createSelectorQuery();
//
query
.select('#top1')
.boundingClientRect((rect1) => {
//
const topComponentsHeight = rect1.height;
//
bottomHeight.value = screenHeight - topComponentsHeight - 415;
}) })
let column = ref([{ .exec();
label: '序号', };
width: 60, // #endif
type: 'index',
color: 'blue',
align: 'center'
},
{ function detail(record) {
name: 'xm',
label: '姓名',
width: 70,
align: 'center'
},
{
name: 'xb_dictText',
label: '性别',
align: 'center',
width: 60
},
{
name: 'nl',
label: '年龄',
align: 'center',
width: 60
},
{
name: 'operation',
type: 'operation',
width: 60,
fixed: true,
label: '操作',
align: 'center',
renders: [{
name: '详情',
func: 'detail',
size: 'mini'
}]
}
])
onLoad((e) => {
})
onMounted((e) => {
departID.value = ""
getRenyuanByDepID()
})
function detail(record) {
// console.log(record) // console.log(record)
uni.navigateTo({ uni.navigateTo({
url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record)) url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
}) });
} }
function pagechange(e) { function pagechange(e) {
current.value = e.current current.value = e.current;
pageNo.value = e.current pageNo.value = e.current;
let params = { let params = {
pageNo: pageNo.value, pageNo: pageNo.value,
pageSize: pageSize.value, pageSize: pageSize.value,
current: current.value current: current.value
}; };
if (departID.value.length <= 9) { if (departID.value.length <= 9) {
params.orgCode = departID.value params.orgCode = departID.value;
} else { } else {
params.jcxd_code = departID.value params.jcxd_code = departID.value;
} }
getRenyuanByDepID(params) getRenyuanByDepID(params);
} }
function departChange(e, data) { function departChange(e, data) {
departID.value = e departID.value = e;
let params = { let params = {
pageNo: pageNo.value, pageNo: pageNo.value,
pageSize: pageSize.value, pageSize: pageSize.value,
current: current.value current: current.value
}; };
console.log(e) console.log(e);
if (e.length <= 9) { if (e.length <= 9) {
params.orgCode = departID.value params.orgCode = departID.value;
} else { } else {
params.jcxd_code = departID.value params.jcxd_code = departID.value;
} }
getRenyuanByDepID(params) getRenyuanByDepID(params);
} }
function getRenyuanByDepID(queryParm) { function getRenyuanByDepID(queryParm) {
ryDataList.value = [] // ryDataList.value = [];
console.log(queryParm) console.log(queryParm);
queryRenyuanByDepartID(queryParm).then((res) => { if (departID.value.length <= 6) {
console.log(res) console.log(123242353);
uni.showToast({
title: '全厂数据较多,请选 下一层级...',
icon: 'none',
duration: 1000
});
return;
}
if (queryParm) {
queryRenyuanByDepartID(queryParm)
.then((res) => {
console.log(res);
if (res.success) { if (res.success) {
ryDataList.value = res.result.records ryDataList.value = res.result.records;
total.value = res.result.total total.value = res.result.total;
pages.value = res.result.pages pages.value = res.result.pages;
current.value = res.result.current current.value = res.result.current;
} }
}).catch((err) => {
console.log(err);
}) })
.catch((err) => {
console.log(err);
});
} }
}
function Search() { function Search() {
ryDataList.value = []; ryDataList.value = [];
let queryParm = { let queryParm = {
pageNo: pageNo.value, pageNo: pageNo.value,
@ -207,22 +229,69 @@
if (ldhth.value !== '') { if (ldhth.value !== '') {
queryParm.ldhth = '*' + ldhth.value + '*'; queryParm.ldhth = '*' + ldhth.value + '*';
} }
console.log(queryParm) console.log(queryParm);
queryRenyuanByDepartID(queryParm).then((res) => { queryRenyuanByDepartID(queryParm)
.then((res) => {
if (res.success) { if (res.success) {
ryDataList.value = res.result.records ryDataList.value = res.result.records;
total.value = res.result.total total.value = res.result.total;
pages.value = res.result.pages pages.value = res.result.pages;
} }
}).catch((err) => {
console.log(err);
}) })
} .catch((err) => {
console.log(err);
});
}
</script> </script>
<style scoped> <style scoped>
.uni-group { /* 全局容器 */
.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; display: flex;
align-items: center; 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;
}
</style> </style>

View File

@ -1,9 +1,9 @@
<template> <template>
<uni-row> <uni-row>
<view v-for="(item,index) in data"> <view v-for="(item, index) in data">
<uni-col :span="item.titleSpan"> <uni-col :span="item.titleSpan">
<view class="titleStyle"> <view class="titleStyle">
{{item.title}} {{ item.title }}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="item.valueSpan"> <uni-col :span="item.valueSpan">
@ -11,34 +11,34 @@
{{ doEmptyString(item.value) }} {{ doEmptyString(item.value) }}
</view> </view>
</uni-col> </uni-col>
</view> </view>
</uni-row> </uni-row>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
// //
cellData: { cellData: {
type: Object, type: Object,
default: () => [{ default: () => [
title: "", {
value: "", title: '',
value: '',
titleSpan: 4, titleSpan: 4,
valueSpan: 4 valueSpan: 4
}] }
]
}, },
// title value // title value
rowDataCount: { rowDataCount: {
type: Number, type: Number,
default: 3 default: 3
} }
}, },
data() { data() {
return { return {
data: [] data: []
} };
}, },
watch: { watch: {
cellData: { cellData: {
@ -46,9 +46,10 @@
immediate: true, immediate: true,
handler(val) { handler(val) {
let totalSpan = 0; let totalSpan = 0;
for (var i = 0; i < val.length; i++) { // 24 for (var i = 0; i < val.length; i++) {
// 24
if ((i + 1) % this.rowDataCount != 0) { if ((i + 1) % this.rowDataCount != 0) {
totalSpan = totalSpan + val[i].titleSpan + val[i].valueSpan totalSpan = totalSpan + val[i].titleSpan + val[i].valueSpan;
} else { } else {
val[i].valueSpan = 24 - totalSpan - val[i].titleSpan; val[i].valueSpan = 24 - totalSpan - val[i].titleSpan;
totalSpan = 0; totalSpan = 0;
@ -63,34 +64,31 @@
/// ///
doEmptyString(obj) { doEmptyString(obj) {
let str = '/'; let str = '/';
if (typeof(obj) == "undefined" || (obj) === null || (obj) === '') { if (typeof obj == 'undefined' || obj === null || obj === '' || obj === 'Na' || obj === 'N' || obj === '0') {
return str; return str;
} }
return obj + ''; return obj + '';
} }
}
} }
};
</script> </script>
<style scoped> <style scoped>
/* 标签样式 */ /* 标签样式 */
.titleStyle { .titleStyle {
font-size: 12px; font-size: 12px;
color: #747474; color: #747474;
line-height: 30px; line-height: 30px;
height: 30px; height: 30px;
background: #F2F9FC; background: #f2f9fc;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
border-left: 1px solid #919191; border-left: 1px solid #919191;
border-right: 1px solid #919191; border-right: 1px solid #919191;
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
; }
}
/* 内容样式 */
.dataStyle {
/* 内容样式 */
.dataStyle {
font-size: 14px; font-size: 14px;
color: #00007f; color: #00007f;
line-height: 35px; line-height: 35px;
@ -101,11 +99,10 @@
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
/* 内容样式 */
.dataStyle1 {
/* 内容样式 */
.dataStyle1 {
font-size: 12px; font-size: 12px;
color: #00007f; color: #00007f;
line-height: 15px; line-height: 15px;
@ -116,5 +113,5 @@
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
</style> </style>