Skip to content

F
founder_vue
Commit 34b5a452 by 米嘉伟
Options

开会问题六条问题解决

parent a60f8622
Showing with 207 additions and 6 deletions
src/views/AllPersonnelBase/dclb.vue
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
: scope.row.taskNumber : scope.row.taskNumber
}} }}
<div <div
v-show="scope.row.personExportRecordGrandchildren && scope.row.personExportRecordGrandchildren !== null" v-show="scope.row.personExportRecordGrandchildren && scope.row.personExportRecordGrandchildren !== null&&scope.row.personExportRecordGrandchildren.length > 0"
class="children-count" class="children-count"
> >
{{ scope.row.personExportRecordGrandchildren ? scope.row.personExportRecordGrandchildren.length : 0 }} {{ scope.row.personExportRecordGrandchildren ? scope.row.personExportRecordGrandchildren.length : 0 }}
...@@ -388,7 +388,178 @@ export default { ...@@ -388,7 +388,178 @@ export default {
currPage2: 1, // 当前在第几页 currPage2: 1, // 当前在第几页
// datahaha: [
// {
// "id": 5,
// "taskNumber": "20211117174241",
// "barcode": "R4301044400002021105001",
// "collectIdcard": 1,
// "picCount": 0,
// "rollCount": 10,
// "plainCount": 10,
// "plamCount": 0,
// "dataType": 1,
// "exportType": 1,
// "exportTime": "2021-11-17T09:42:41.680+0000",
// "status": null,
// "failReason": "",
// "featureStatus": null,
// "declassificationStatus": null,
// "exportName": "同一文件",
// "statusName": null,
// "declassificationName": "脱密",
// "featureName": "特征",
// "collectIdName": "是",
// "sequenceNumber": "5",
// "personExportRecordGrandchildren": [
// ]
// },
// {
// "id": 4,
// "taskNumber": "20211117172016",
// "barcode": "R4301035400002021100020",
// "collectIdcard": 1,
// "picCount": 0,
// "rollCount": 10,
// "plainCount": 10,
// "plamCount": 0,
// "dataType": 1,
// "exportType": 1,
// "exportTime": "2021-11-17T09:20:16.772+0000",
// "status": null,
// "failReason": "",
// "featureStatus": null,
// "declassificationStatus": null,
// "exportName": "同一文件",
// "statusName": null,
// "declassificationName": "脱密",
// "featureName": "特征",
// "collectIdName": "是",
// "sequenceNumber": "6",
// "personExportRecordGrandchildren": [
// {
// "id": 4,
// "taskNumber": "20211117172016",
// "barcode": "R4301035400002021100020",
// "collectIdcard": 1,
// "picCount": 0,
// "rollCount": 10,
// "plainCount": 10,
// "plamCount": 0,
// "dataType": 1,
// "exportType": 1,
// "exportTime": "2021-11-17T09:20:16.772+0000",
// "status": null,
// "failReason": "",
// "featureStatus": null,
// "declassificationStatus": null,
// "exportName": "同一文件",
// "statusName": null,
// "declassificationName": "脱密",
// "featureName": "特征",
// "collectIdName": "是",
// "sequenceNumber": "61"
// }
// ]
// },
// {
// "id": 3,
// "taskNumber": "20211116170544",
// "barcode": "R4301045200002021100110",
// "collectIdcard": 1,
// "picCount": 0,
// "rollCount": 10,
// "plainCount": 10,
// "plamCount": 0,
// "dataType": 1,
// "exportType": 1,
// "exportTime": "2021-11-16T09:05:44.503+0000",
// "status": null,
// "failReason": "",
// "featureStatus": null,
// "declassificationStatus": null,
// "exportName": "同一文件",
// "statusName": null,
// "declassificationName": "脱密",
// "featureName": "特征",
// "collectIdName": "是",
// "sequenceNumber": "7",
// "personExportRecordGrandchildren": [
// {
// "id": 3,
// "taskNumber": "20211116170544",
// "barcode": "R4301045200002021100110",
// "collectIdcard": 1,
// "picCount": 0,
// "rollCount": 10,
// "plainCount": 10,
// "plamCount": 0,
// "dataType": 1,
// "exportType": 1,
// "exportTime": "2021-11-16T09:05:44.503+0000",
// "status": null,
// "failReason": "",
// "featureStatus": null,
// "declassificationStatus": null,
// "exportName": "同一文件",
// "statusName": null,
// "declassificationName": "脱密",
// "featureName": "特征",
// "collectIdName": "是",
// "sequenceNumber": "71"
// }
// ]
// },
// {
// "id": 2,
// "taskNumber": "20211116165827",
// "barcode": "R4301045200002021100110",
// "collectIdcard": 1,
// "picCount": 0,
// "rollCount": 10,
// "plainCount": 10,
// "plamCount": 0,
// "dataType": 1,
// "exportType": 1,
// "exportTime": "2021-11-16T08:58:27.160+0000",
// "status": null,
// "failReason": "",
// "featureStatus": null,
// "declassificationStatus": null,
// "exportName": "同一文件",
// "statusName": null,
// "declassificationName": "脱密",
// "featureName": "特征",
// "collectIdName": "是",
// "sequenceNumber": "8",
// "personExportRecordGrandchildren": [
// {
// "id": 2,
// "taskNumber": "20211116165827",
// "barcode": "R4301045200002021100110",
// "collectIdcard": 1,
// "picCount": 0,
// "rollCount": 10,
// "plainCount": 10,
// "plamCount": 0,
// "dataType": 1,
// "exportType": 1,
// "exportTime": "2021-11-16T08:58:27.160+0000",
// "status": null,
// "failReason": "",
// "featureStatus": null,
// "declassificationStatus": null,
// "exportName": "同一文件",
// "statusName": null,
// "declassificationName": "脱密",
// "featureName": "特征",
// "collectIdName": "是",
// "sequenceNumber": "81"
// }
// ]
// }
// ],
isSelected: false, // 是否批量操作 isSelected: false, // 是否批量操作
...@@ -400,7 +571,7 @@ export default { ...@@ -400,7 +571,7 @@ export default {
isShowTip: false, //批量操作提示 isShowTip: false, //批量操作提示
}; };
}, },
created() { created () {
let w1 = 1920; let w1 = 1920;
let w2 = window.innerWidth; let w2 = window.innerWidth;
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
...@@ -185,7 +185,13 @@ export default { ...@@ -185,7 +185,13 @@ export default {
// 然后移除 // 然后移除
document.body.removeChild(eleLink) document.body.removeChild(eleLink)
this.dialogVisible = false; this.dialogVisible = false;
this.$router.push('/dclb') // this.$router.push('/dclb')
this.$router.push({
path: '/dclb',
query: {
id: 2
}
})
} }
} else { } else {
this.$message.error(response.data.message); this.$message.error(response.data.message);
......
src/views/AllPersonnelBase/modules/dcftpx.vue
...@@ -568,7 +568,13 @@ export default { ...@@ -568,7 +568,13 @@ export default {
// 然后移除 // 然后移除
document.body.removeChild(eleLink) document.body.removeChild(eleLink)
this.dialogVisible = false; this.dialogVisible = false;
this.$router.push('/dclb') // this.$router.push('/dclb')
this.$router.push({
path: '/dclb',
query: {
id: 1
}
})
} }
} else { } else {
this.$message.error(response.data.message); this.$message.error(response.data.message);
......
src/views/drFPTX/Index.vue
...@@ -706,7 +706,7 @@ export default { ...@@ -706,7 +706,7 @@ export default {
onUploadProgress: function (progressEvent) { onUploadProgress: function (progressEvent) {
// this.dialogVisible = true; // this.dialogVisible = true;
console.log(progressEvent, 1); console.log(progressEvent, 1);
that.UploadPercent = ((progressEvent.loaded / 10 * 9.9) / progressEvent.total).toFixed(2) * 100 that.UploadPercent = (((progressEvent.loaded / 10 * 9.9) / progressEvent.total) * 100).toFixed(2)
console.log(that.UploadPercent, 123) console.log(that.UploadPercent, 123)
// Number(event.percent.toFixed()) // Number(event.percent.toFixed())
}, },
......
src/views/drFPTX/RAList.vue
...@@ -461,6 +461,24 @@ ...@@ -461,6 +461,24 @@
label="查询类型" label="查询类型"
:width="width4" :width="width4"
> >
<template slot-scope="scope">
<div
v-if='scope.row.queryType==0'
style="color: #fa9500;"
>{{scope.row.dataTypeName}}</div>
<div
v-if='scope.row.queryType==1'
style="color: #e60012;"
>{{scope.row.dataTypeName }}</div>
<div
v-if='scope.row.queryType==2'
style="color: #00b47a;"
>{{scope.row.dataTypeName}}</div>
<div
v-if='scope.row.queryType==3'
style="color: #055fe7;"
>{{scope.row.dataTypeName }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="barcode" prop="barcode"
...@@ -621,7 +639,7 @@ export default { ...@@ -621,7 +639,7 @@ export default {
fztm, fztm,
fcx, fcx,
}, },
created() { created () {
let w1 = 1920; let w1 = 1920;
let w2 = window.innerWidth; let w2 = window.innerWidth;
......
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