Skip to content

F
founder_vue
Commit 96b74937 by gao_yingdong
Options

警犬修改

parent 3011de7b
Showing with 625 additions and 71 deletions
src/api/menuDataApi/jobDogManageApi.js
......@@ -71,7 +71,7 @@ export const awaitPdWorkExtract = params =>
export const dogAdd = params =>
postJson(`${baseUrl}/refreshment/dogAdd`, params)
postform(`${baseUrl}/refreshment/dogAdd`, params)
......
src/utils/tableHeaderParams.js
......@@ -349,10 +349,10 @@ export const getGzqfxglAllColumns = () => {
label: "评定单位",
prop: "checkUnit",
},
{
label: "评定结果",
prop: "trainResult",
},
// {
// label: "评定结果",
// prop: "trainResult",
// },
{
label: "主考人",
prop: "checkStaff",
......@@ -411,10 +411,10 @@ export const getGzqfxglAllColumnsSh = () => {
label: "评定单位",
prop: "checkUnit",
},
{
label: "评定结果",
prop: "trainResult",
},
// {
// label: "评定结果",
// prop: "trainResult",
// },
{
label: "主考人",
prop: "checkStaff",
......@@ -486,10 +486,10 @@ export const getGzqfxglDefaultColumns = () => {
label: "工作犬评定日期",
prop: "workdogpdrqStr",
},
{
label: "评定结果",
prop: "trainResult",
},
// {
// label: "评定结果",
// prop: "trainResult",
// },
{
label: "审核状态",
prop: "spFlowStr",
......
src/views/artisanManage/index.vue
......@@ -50,6 +50,13 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="采集区分：" class="elItemClass">
<el-radio-group v-model="formData.queryScope">
<el-radio label="01">我采集</el-radio>
<el-radio label="02">本单位</el-radio>
<el-radio label="03">本辖区</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否警犬技术相关专业：" class="elItemClass">
<el-radio-group v-model="formData.isjwzy">
<el-radio
......@@ -61,6 +68,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div class="queryBtnsClass">
<el-button
......@@ -149,13 +157,13 @@
<el-table-column align="left" label="操作" width="150">
<template slot-scope="scope">
<div>
<el-button type="text" size="small" @click="doDetail(scope.row)">
<el-button type="text" size="small" @click="doDetail(scope.row)">
详情
</el-button>
<el-button
type="text"
size="small"
v-if="userinfo.identitycard == scope.row.xxdjryGmsfhm"
v-if="formData.queryScope != '03'"
@click="editData(scope.row)"
>
补采
......@@ -163,7 +171,7 @@
<el-button
type="text"
size="small"
v-if="userinfo.identitycard == scope.row.xxdjryGmsfhm"
v-if="formData.queryScope != '03'"
@click="deleteData(scope.row)"
>删除
</el-button>
......@@ -282,6 +290,7 @@ export default {
xb: "",
jwjsxl: "",
isjwzy: "",
queryScope: "01",
},
tableLoading: false,
tableData: [],
......@@ -361,6 +370,7 @@ export default {
this.formData.isjwzy = "";
this.formData.personName = "";
this.formData.idNo = "";
this.formData.queryScope = "";
this.getLists(1);
},
......@@ -377,6 +387,7 @@ export default {
isjwzy: this.formData.isjwzy,
personName: this.formData.personName,
idNo: this.formData.idNo,
queryScope: this.formData.queryScope,
};
getArtisanList(params)
.then((res) => {
......@@ -491,6 +502,7 @@ export default {
isjwzy: this.formData.isjwzy,
personName: this.formData.personName,
idNo: this.formData.idNo,
queryScope: this.formData.queryScope,
};
let token = window.sessionStorage.getItem("token");
axios
......
src/views/dataJq/dataV.vue
......@@ -89,9 +89,14 @@
>
<img src="@/assets/img/data/boxTitle.png" alt="" />
<div class="breedTitle">人员分类</div>
<div id="ryfl" class="chartsBox">
<div ref="rymj"></div>
<div ref="ryfj"></div>
<div class="chartsBox">
<div class="breedTitle_btTitle">
<span>类型</span>
<span>占比</span>
<span>数量</span>
</div>
<div style="width: 100%; height: 100%" ref="rymj"></div>
<!-- <div ref="ryfj"></div> -->
</div>
</div>
</div>
......@@ -199,6 +204,129 @@ export default {
},
},
methods: {
//饼图
getVarietyDisOne(data) {
let totalNum = 0;
console.log(data, 222);
data.map((item) => (totalNum += item.value));
let dom = this.$refs.rymj;
if (!dom) return;
let myChart = this.$echarts.init(dom);
let option = {
title: {
text: "带犬人总数",
top: "38%",
left: "24%",
itemGap: 20,
textAlign: "center",
textStyle: {
fontSize: 14,
color: "#D6DBE3",
fontWeight: "100",
},
subtext: data.reduce(function (total, value) {
return total + value.value;
}, 0),
subtextStyle: {
align: "left",
fontSize: 32,
color: "#FFCF5F",
},
},
tooltip: {
backgroundColor: "#fff",
extraCssText: "box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.15);",
padding: [12, 16, 12, 16],
textStyle: {
color: "rgba(0,0,0,0.65)",
},
},
legend: {
orient: "vertial",
itemWidth: 10,
itemHeight: 10,
top: "30%",
right: "10%",
data: data,
formatter: function (name) {
for (var i = 0; i < data.length; i++) {
if (name == data[i].name) {
return (
"{name|" +
name +
"}{amplitude|" +
data[i].amplitude +
"}{value|" +
data[i].value +
"}"
);
}
}
},
textStyle: {
rich: {
name: {
fontSize: 14,
fontWeight: 400,
width: 50,
height: 20,
padding: [0, 0, 0, 5],
color: "#fff",
fontFamily: "Source Han Sans CN-Regular",
},
amplitude: {
fontSize: 14,
fontWeight: 500,
height: 20,
width: 20,
align: "left",
color: "#9CACB7",
padding: [0, 0, 0, 20],
fontFamily: "Source Han Sans CN-Regular",
},
value: {
fontSize: 14,
fontWeight: 500,
height: 20,
width: 20,
align: "left",
color: "#fff",
padding: [0, 0, 0, 35],
fontFamily: "Source Han Sans CN-Regular",
},
},
},
},
color: [
"#2276FC",
"#FFCF5F",
"#EE6F7C",
"#9ED900",
"#44CEF6",
"#8D4BBB",
"#177CB0",
"#955539",
"#DB5A6B",
"#057748",
"#FA8C35",
"#21A675",
"#758A99",
],
series: [
{
type: "pie",
radius: ["36%", "45%"],
center: ["25%", "48%"], // 图形位置
label: {
// 鼠标悬浮具体数据显示
show: false,
},
data: data,
},
],
};
myChart.setOption(option);
},
tabTitle(key) {
debugger;
this.tabNumber = key;
......@@ -438,20 +566,35 @@ export default {
myChart.setOption(option);
},
//横向柱状图
getBarData(xData, yData) {
getBarData(xData, yData,bfb) {
let dom = this.$refs.zytj;
if (!dom) return;
let myChart = this.$echarts.init(dom);
var maxNum = 0;
for (var i = 0; i < yData.length; i++) {
if (yData[i] > maxNum) {
maxNum = yData[i];
}
}
let option = {
grid: {
left: "5%",
right: "5%",
right: "10%",
bottom: "5%",
top: "5%",
containLabel: true,
},
tooltip: {
trigger: "axis",
formatter: (params) => {
return (
params[0].name +
"<br/>" +
params[0].marker +
" " +
params[0].data
);
},
},
xAxis: {
show: false,
......@@ -488,7 +631,7 @@ export default {
axisLabel: {
textStyle: {
color: "#97A3B7",
fontSize: "12",
fontSize: "0",
},
},
data: yData,
......@@ -504,6 +647,7 @@ export default {
position: [10, 4],
color: "#ffffff",
},
itemStyle: {
normal: {
color: "#F3935D",
......@@ -512,6 +656,33 @@ export default {
barWidth: 10,
data: yData,
},
{
type: "bar",
barWidth: 10,
barGap: "-100%",
data: bfb.map(function (item) {
return {
realValue: item,
value: maxNum,
};
}),
label: {
show: true,
position: "right",
distance: 10,
align: "left",
formatter: function (params) {
return params.data.realValue;
},
color: "#ffffff",
fontSize: 12,
},
itemStyle: {
normal: {
color: "rgba(255, 255, 255, 0)",
},
},
},
],
};
myChart.setOption(option);
......@@ -621,24 +792,30 @@ export default {
self.loading4 = false;
if (res.success) {
let result = res.data.rows || [];
let totalNum = 0;
result.map((item) => (totalNum += item.num));
if (result[0] && result[1]) {
self.getPieData(
result[0].name,
parseFloat((result[0].num * 100) / totalNum).toFixed(1),
result[0].num,
self.$refs.rymj,
"#0462FF"
);
self.getPieData(
result[1].name,
parseFloat((result[1].num * 100) / totalNum).toFixed(1),
result[1].num,
self.$refs.ryfj,
"#3AEB5D"
);
}
let data = result.map((e) => ({
name: e.name,
value: e.num,
amplitude: e.amplitude || "0%",
}));
self.getVarietyDisOne(data);
// let totalNum = 0;
// result.map((item) => (totalNum += item.num));
// if (result[0] && result[1]) {
// self.getPieData(
// result[0].name,
// parseFloat((result[0].num * 100) / totalNum).toFixed(1),
// result[0].num,
// self.$refs.rymj,
// "#0462FF"
// );
// self.getPieData(
// result[1].name,
// parseFloat((result[1].num * 100) / totalNum).toFixed(1),
// result[1].num,
// self.$refs.ryfj,
// "#3AEB5D"
// );
// }
}
});
},
......@@ -655,7 +832,8 @@ export default {
let result = res.data.rows || [];
let xData = result.map((e) => e.name);
let yData = result.map((e) => e.num);
self.getBarData(xData, yData);
let amplitude = result.map((e) => e.amplitude);
self.getBarData(xData, yData,amplitude);
}
});
},
......@@ -768,6 +946,19 @@ export default {
padding-top: 16px;
padding-left: 35px;
box-sizing: border-box;
&_btTitle {
position: absolute;
font-size: 14px;
font-family: Source Han Sans CN-Normal, Source Han Sans CN;
font-weight: 400;
color: #31a8f5;
line-height: 24px;
right: 9%;
width: 151px;
top: 32%;
display: flex;
justify-content: space-between;
}
}
#ryfl {
display: flex;
......
src/views/jobDogManage/components/jobDogManageXq.vue
......@@ -40,7 +40,85 @@
}}
</div>
<div class="line" v-show="isSp">
<div class="list-item">
<div v-if="item2.id == 'djxx' || item2.id == 'xlkh'">
<div
class="list-item"
v-show="detailObj[item2.ids].length > 0"
v-for="(items, indexs) in detailObj[item2.ids]"
:key="indexs"
>
<div
v-for="(item, index) in item2.data"
:key="index"
:class="'list line' + item.col"
>
<span
class="zd-name"
v-if="item.title"
v-html="item.title + '：'"
></span>
<span
class="zd-value"
v-if="
item.id == 'workingDogClassificationIdStr#score' ||
item.id == 'trainSubjectStr#trainSubjectGrade'
"
v-html="strReplace(item.id, items)"
></span>
<div
v-else-if="
item.id == 'tbStDogFile1' || item.id == 'tbStDogFile2'
"
>
<el-upload
disabled
action="#"
list-type="picture-card"
multiple
:file-list="items[item.id]"
:auto-upload="false"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
<div class="photoList">
<p :title="file.name">{{ file.name }}</p>
<img
width="146px"
height="146px"
:src="file.url2"
alt=""
/>
<span class="el-upload-list__item-actions">
<span
v-if="
file.name.indexOf('png') >= 0 ||
file.name.indexOf('jpg') >= 0 ||
file.name.indexOf('jpeg') >= 0 ||
file.name.indexOf('pdf') >= 0
"
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@click="handleDownload(file)"
>
<i class="el-icon-download"></i>
</span>
</span>
</div>
</div>
</el-upload>
</div>
<span class="zd-value" v-else v-html="items[item.id]"></span>
</div>
</div>
</div>
<div v-else class="list-item">
<div
v-for="(item, index) in item2.data"
:key="index"
......@@ -245,7 +323,6 @@
</el-form>
</div>
<!--数据检测-->
<el-dialog
:visible.sync="dialogVisible"
......@@ -593,6 +670,7 @@ export default {
{
id: "djxx",
moduleName: "工作犬等级信息",
ids: "tbStDogEvaluations",
data: [
{ title: "工作犬等级", col: "3", id: "trainingLevelIdStr" },
{ title: "评定日期", col: "3", id: "pdrq" },
......@@ -602,7 +680,7 @@ export default {
id: "workingDogClassificationIdStr#score",
},
{
title: "其他材料",
title: "评定材料",
col: "6",
id: "tbStDogFile1",
},
......@@ -620,16 +698,22 @@ export default {
},
{
id: "xlkh",
ids: "tbStDogEvaluationsCheck",
moduleName: "警犬训练考核",
data: [
{ title: "考核单位", col: "3", id: "checkUnitName" },
{ title: "考核单位", col: "3", id: "checkUnitStr" },
{ title: "主考人", col: "3", id: "checkStaff" },
{ title: "考核日期", col: "3", id: "checkDate" },
{ title: "评定等级", col: "3", id: "pdtraininglevelidStr" },
{ title: "考核日期", col: "3", id: "pdrqStr" },
{ title: "评定等级", col: "3", id: "trainingLevelIdStr" },
{
title: "考核科目及成绩",
col: "5",
id: "trainSubjectStr#trainSubjectGrade",
id: "workingDogClassificationIdStr#score",
},
{
title: "评定材料",
col: "6",
id: "tbStDogFile1",
},
],
},
......@@ -1362,6 +1446,32 @@ export default {
e.url = e.zpnr;
e.url2 = e.zpnr;
});
if (this.detailObj.tbStDogEvaluations.length > 0) {
this.detailObj.tbStDogEvaluations.forEach((item) => {
item.tbStDogFile1.forEach((e) => {
e.name = e.filename;
if (e.zpnr) {
e.url = e.zpnr;
e.url2 = e.zpnr;
} else {
e.url2 = require("@/assets/img/excel.png");
}
});
});
}
if (this.detailObj.tbStDogEvaluationsCheck.length > 0) {
this.detailObj.tbStDogEvaluationsCheck.forEach((item) => {
item.tbStDogFile1.forEach((e) => {
e.name = e.filename;
if (e.zpnr) {
e.url = e.zpnr;
e.url2 = e.zpnr;
} else {
e.url2 = require("@/assets/img/excel.png");
}
});
});
}
} else {
loading.close();
}
......
src/views/jobDogManage/index.vue
......@@ -52,6 +52,13 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="采集区分：" class="elItemClass">
<el-radio-group v-model="formData.queryScope">
<el-radio label="01">我采集</el-radio>
<el-radio label="02">本单位</el-radio>
<el-radio label="03">本辖区</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div class="queryBtnsClass">
<el-button
......@@ -144,7 +151,7 @@
v-if="
scope.row.spstatus != '01' &&
scope.row.spstatus != '02' &&
userinfo.identitycard == scope.row.xxdjryGmsfhm
formData.queryScope != '03'
"
>
修改
......@@ -156,14 +163,11 @@
v-if="
scope.row.spstatus != '01' &&
scope.row.spstatus != '02' &&
userinfo.identitycard == scope.row.xxdjryGmsfhm
formData.queryScope != '03'
"
>删除
</el-button>
<el-button
type="text"
size="small"
@click="xqData(scope.row)"
<el-button type="text" size="small" @click="xqData(scope.row)"
>详情
</el-button>
</div>
......@@ -273,6 +277,7 @@ export default {
trainingUnit: "",
pxrq: "",
spFlow: "",
queryScope: "01",
},
tableLoading: false,
......@@ -347,6 +352,7 @@ export default {
this.formData.pxrq = "";
this.formData.trainingUnit = "";
this.formData.spFlow = "";
this.formData.queryScope = "";
this.getLists(1);
},
......@@ -361,6 +367,7 @@ export default {
pxrq: this.formData.pxrq,
trainingUnit: this.formData.trainingUnit,
spFlow: this.formData.spFlow,
queryScope: this.formData.queryScope,
};
getJobDogList(params)
.then((res) => {
......@@ -479,6 +486,7 @@ export default {
pxrq: this.formData.pxrq,
trainingUnit: this.formData.trainingUnit,
spFlow: this.formData.spFlow,
queryScope: this.formData.queryScope,
};
let token = window.sessionStorage.getItem("token");
axios
......
src/views/jobDogRefreshment/components/jobDogManageSp.vue
......@@ -40,7 +40,85 @@
}}
</div>
<div class="line" v-show="isSp">
<div class="list-item">
<div v-if="item2.id == 'djxx' || item2.id == 'xlkh'">
<div
class="list-item"
v-show="detailObj[item2.ids].length > 0"
v-for="(items, indexs) in detailObj[item2.ids]"
:key="indexs"
>
<div
v-for="(item, index) in item2.data"
:key="index"
:class="'list line' + item.col"
>
<span
class="zd-name"
v-if="item.title"
v-html="item.title + '：'"
></span>
<span
class="zd-value"
v-if="
item.id == 'workingDogClassificationIdStr#score' ||
item.id == 'trainSubjectStr#trainSubjectGrade'
"
v-html="strReplace(item.id, items)"
></span>
<div
v-else-if="
item.id == 'tbStDogFile1' || item.id == 'tbStDogFile2'
"
>
<el-upload
disabled
action="#"
list-type="picture-card"
multiple
:file-list="items[item.id]"
:auto-upload="false"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
<div class="photoList">
<p :title="file.name">{{ file.name }}</p>
<img
width="146px"
height="146px"
:src="file.url2"
alt=""
/>
<span class="el-upload-list__item-actions">
<span
v-if="
file.name.indexOf('png') >= 0 ||
file.name.indexOf('jpg') >= 0 ||
file.name.indexOf('jpeg') >= 0 ||
file.name.indexOf('pdf') >= 0
"
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@click="handleDownload(file)"
>
<i class="el-icon-download"></i>
</span>
</span>
</div>
</div>
</el-upload>
</div>
<span class="zd-value" v-else v-html="items[item.id]"></span>
</div>
</div>
</div>
<div v-else class="list-item">
<div
v-for="(item, index) in item2.data"
:key="index"
......@@ -657,6 +735,7 @@ export default {
{
id: "djxx",
moduleName: "工作犬等级信息",
ids: "tbStDogEvaluations",
data: [
{ title: "工作犬等级", col: "3", id: "trainingLevelIdStr" },
{ title: "评定日期", col: "3", id: "pdrq" },
......@@ -690,15 +769,21 @@ export default {
{
id: "xlkh",
moduleName: "警犬训练考核",
ids: "tbStDogEvaluationsCheck",
data: [
{ title: "考核单位", col: "3", id: "checkUnitName" },
{ title: "考核单位", col: "3", id: "checkUnitStr" },
{ title: "主考人", col: "3", id: "checkStaff" },
{ title: "考核日期", col: "3", id: "checkDate" },
{ title: "评定等级", col: "3", id: "pdtraininglevelidStr" },
{ title: "考核日期", col: "3", id: "pdrqStr" },
{ title: "评定等级", col: "3", id: "trainingLevelIdStr" },
{
title: "考核科目及成绩",
col: "5",
id: "trainSubjectStr#trainSubjectGrade",
id: "workingDogClassificationIdStr#score",
},
{
title: "评定材料",
col: "6",
id: "tbStDogFile1",
},
],
},
......@@ -1431,6 +1516,32 @@ export default {
e.url = e.zpnr;
e.url2 = e.zpnr;
});
if (this.detailObj.tbStDogEvaluations.length > 0) {
this.detailObj.tbStDogEvaluations.forEach((item) => {
item.tbStDogFile1.forEach((e) => {
e.name = e.filename;
if (e.zpnr) {
e.url = e.zpnr;
e.url2 = e.zpnr;
} else {
e.url2 = require("@/assets/img/excel.png");
}
});
});
}
if (this.detailObj.tbStDogEvaluationsCheck.length > 0) {
this.detailObj.tbStDogEvaluationsCheck.forEach((item) => {
item.tbStDogFile1.forEach((e) => {
e.name = e.filename;
if (e.zpnr) {
e.url = e.zpnr;
e.url2 = e.zpnr;
} else {
e.url2 = require("@/assets/img/excel.png");
}
});
});
}
} else {
loading.close();
}
......
src/views/poDogInfoManage/index.vue
......@@ -39,6 +39,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="采集区分：" class="elItemClass">
<el-radio-group v-model="formData.queryScope">
<el-radio label="01">我采集</el-radio>
<el-radio label="02">本单位</el-radio>
<el-radio label="03">本辖区</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div class="queryBtnsClass">
<el-button
......@@ -130,7 +137,7 @@
type="text"
size="small"
@click="editData(scope.row)"
v-if="userinfo.identitycard == scope.row.xxdjryGmsfhm"
v-if="formData.queryScope != '03'"
>
补采
</el-button>
......@@ -138,7 +145,7 @@
type="text"
size="small"
@click="deleteData(scope.row)"
v-if="userinfo.identitycard == scope.row.xxdjryGmsfhm"
v-if="formData.queryScope != '03'"
>删除
</el-button>
</div>
......@@ -231,6 +238,7 @@ export default {
dna: "",
trainingUnit: "",
speciesId: "",
queryScope: "01",
},
tableLoading: false,
......@@ -306,6 +314,7 @@ export default {
this.formData.dna = "";
this.formData.speciesId = "";
this.formData.trainingUnit = "";
this.formData.queryScope = "";
this.getLists(1);
},
......@@ -319,6 +328,7 @@ export default {
dna: this.formData.dna,
speciesId: this.formData.speciesId,
trainingUnit: this.formData.trainingUnit,
queryScope: this.formData.queryScope,
};
dogQuery(params)
.then((res) => {
......@@ -427,6 +437,7 @@ export default {
dna: this.formData.dna,
speciesId: this.formData.speciesId,
trainingUnit: this.formData.trainingUnit,
queryScope: this.formData.queryScope,
};
let token = window.sessionStorage.getItem("token");
axios
......
src/views/poDogJobManage/index.vue
......@@ -95,6 +95,13 @@
placeholder="请输入带犬人员"
></el-input>
</el-form-item>
<el-form-item label="采集区分：" class="elItemClass">
<el-radio-group v-model="formData.queryScope">
<el-radio label="01">我采集</el-radio>
<el-radio label="02">本单位</el-radio>
<el-radio label="03">本辖区</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div class="queryBtnsClass">
<el-button
......@@ -182,7 +189,7 @@
<el-button
type="text"
size="small"
v-if="userinfo.identitycard == scope.row.xxdjryGmsfhm"
v-if="formData.queryScope != '03'"
@click="editData(scope.row)"
>
补采
......@@ -190,7 +197,7 @@
<el-button
type="text"
size="small"
v-if="userinfo.identitycard == scope.row.xxdjryGmsfhm"
v-if="formData.queryScope != '03'"
@click="deleteData(scope.row)"
>删除
</el-button>
......@@ -307,6 +314,7 @@ export default {
trainingLevelId: "",
speciesId: "",
jsrymc: "",
queryScope: "01",
},
tableLoading: false,
tableData: [],
......@@ -387,6 +395,7 @@ export default {
this.formData.trainingLevelId = "";
this.formData.speciesId = "";
this.formData.jsrymc = "";
this.formData.queryScope = "";
this.getLists(1);
},
......@@ -404,6 +413,7 @@ export default {
trainingLevelId: this.formData.trainingLevelId,
speciesId: this.formData.speciesId,
jsrymc: this.formData.jsrymc,
queryScope: this.formData.queryScope,
};
getPoDogJobList(params)
.then((res) => {
......@@ -497,7 +507,7 @@ export default {
},
// 详情
doDetail(row) {
this.$router.push({
this.$router.push({
name: "poDogJobManageDetail",
query: {
id: row.id,
......@@ -559,6 +569,7 @@ export default {
trainingLevelId: this.formData.trainingLevelId,
speciesId: this.formData.speciesId,
jsrymc: this.formData.jsrymc,
queryScope: this.formData.queryScope,
};
let token = window.sessionStorage.getItem("token");
axios
......
src/views/poDogRetireManage/index.vue
......@@ -43,6 +43,13 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="采集区分：" class="elItemClass">
<el-radio-group v-model="formData.queryScope">
<el-radio label="01">我采集</el-radio>
<el-radio label="02">本单位</el-radio>
<el-radio label="03">本辖区</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div class="queryBtnsClass">
<el-button
......@@ -134,7 +141,7 @@
v-if="
scope.row.spstatus != '01' &&
scope.row.spstatus != '02' &&
userinfo.identitycard == scope.row.xxdjryGmsfhm
formData.queryScope != '03'
"
>
修改
......@@ -146,14 +153,11 @@
v-if="
scope.row.spstatus != '01' &&
scope.row.spstatus != '02' &&
userinfo.identitycard == scope.row.xxdjryGmsfhm
formData.queryScope != '03'
"
>删除
</el-button>
<el-button
type="text"
size="small"
@click="xqData(scope.row)"
<el-button type="text" size="small" @click="xqData(scope.row)"
>详情
</el-button>
</div>
......@@ -261,6 +265,7 @@ export default {
trainingUnit: "",
pxrq: "",
spFlow: "",
queryScope: "01",
},
tableLoading: false,
......@@ -335,6 +340,7 @@ export default {
this.formData.pxrq = "";
this.formData.trainingUnit = "";
this.formData.spFlow = "";
this.formData.queryScope = "";
this.getLists(1);
},
......@@ -349,6 +355,7 @@ export default {
pxrq: this.formData.pxrq,
trainingUnit: this.formData.trainingUnit,
spFlow: this.formData.spFlow,
queryScope: this.formData.queryScope,
};
dogQuery(params)
.then((res) => {
......@@ -467,6 +474,7 @@ export default {
pxrq: this.formData.pxrq,
trainingUnit: this.formData.trainingUnit,
spFlow: this.formData.spFlow,
queryScope: this.formData.queryScope,
};
let token = window.sessionStorage.getItem("token");
axios
......
src/views/tyshManage/components/jobDogManagetyXq.vue
......@@ -40,7 +40,85 @@
}}
</div>
<div class="line" v-show="isSp">
<div class="list-item">
<div v-if="item2.id == 'djxx' || item2.id == 'xlkh'">
<div
class="list-item"
v-show="detailObj[item2.ids].length > 0"
v-for="(items, indexs) in detailObj[item2.ids]"
:key="indexs"
>
<div
v-for="(item, index) in item2.data"
:key="index"
:class="'list line' + item.col"
>
<span
class="zd-name"
v-if="item.title"
v-html="item.title + '：'"
></span>
<span
class="zd-value"
v-if="
item.id == 'workingDogClassificationIdStr#score' ||
item.id == 'trainSubjectStr#trainSubjectGrade'
"
v-html="strReplace(item.id, items)"
></span>
<div
v-else-if="
item.id == 'tbStDogFile1' || item.id == 'tbStDogFile2'
"
>
<el-upload
disabled
action="#"
list-type="picture-card"
multiple
:file-list="items[item.id]"
:auto-upload="false"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
<div class="photoList">
<p :title="file.name">{{ file.name }}</p>
<img
width="146px"
height="146px"
:src="file.url2"
alt=""
/>
<span class="el-upload-list__item-actions">
<span
v-if="
file.name.indexOf('png') >= 0 ||
file.name.indexOf('jpg') >= 0 ||
file.name.indexOf('jpeg') >= 0 ||
file.name.indexOf('pdf') >= 0
"
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@click="handleDownload(file)"
>
<i class="el-icon-download"></i>
</span>
</span>
</div>
</div>
</el-upload>
</div>
<span class="zd-value" v-else v-html="items[item.id]"></span>
</div>
</div>
</div>
<div v-else class="list-item">
<div
v-for="(item, index) in item2.data"
:key="index"
......@@ -595,6 +673,7 @@ export default {
{
id: "djxx",
moduleName: "工作犬等级信息",
ids: "tbStDogEvaluations",
data: [
{ title: "工作犬等级", col: "3", id: "trainingLevelIdStr" },
{ title: "评定日期", col: "3", id: "pdrq" },
......@@ -1373,6 +1452,19 @@ export default {
e.url = e.zpnr;
e.url2 = e.zpnr;
});
if (this.detailObj.tbStDogEvaluations.length > 0) {
this.detailObj.tbStDogEvaluations.forEach((item) => {
item.tbStDogFile1.forEach((e) => {
e.name = e.filename;
if (e.zpnr) {
e.url = e.zpnr;
e.url2 = e.zpnr;
} else {
e.url2 = require("@/assets/img/excel.png");
}
});
});
}
} else {
loading.close();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment