diff --git a/src/views/examinemanage/control/index.vue b/src/views/examinemanage/control/index.vue index e7a5727..bfaf3a3 100644 --- a/src/views/examinemanage/control/index.vue +++ b/src/views/examinemanage/control/index.vue @@ -104,11 +104,11 @@ {{row.standardFlag === '1' ? '达标' : '未达标' }} - + - + - + diff --git a/src/views/examinemanage/control/index.vue b/src/views/examinemanage/control/index.vue index e7a5727..bfaf3a3 100644 --- a/src/views/examinemanage/control/index.vue +++ b/src/views/examinemanage/control/index.vue @@ -104,11 +104,11 @@ {{row.standardFlag === '1' ? '达标' : '未达标' }} - + - + - + diff --git a/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue b/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue index 7be5c5e..712b9a5 100644 --- a/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue +++ b/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue @@ -59,10 +59,9 @@ color: scope.row.reachStandard == '0' ? 'red' : scope.row.reachStandard == '1' ? 'lime' : '', }" > - 未评价 - - {{ scope.row.reachStandard == '0' ? '不达标' : scope.row.reachStandard == '1' ? '达标' : '' }} - + 未填报 + 无法评价 + {{row.reachStandard === '1'? '达标' : '未达标' }} diff --git a/src/views/examinemanage/control/index.vue b/src/views/examinemanage/control/index.vue index e7a5727..bfaf3a3 100644 --- a/src/views/examinemanage/control/index.vue +++ b/src/views/examinemanage/control/index.vue @@ -104,11 +104,11 @@ {{row.standardFlag === '1' ? '达标' : '未达标' }} - + - + - + diff --git a/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue b/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue index 7be5c5e..712b9a5 100644 --- a/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue +++ b/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue @@ -59,10 +59,9 @@ color: scope.row.reachStandard == '0' ? 'red' : scope.row.reachStandard == '1' ? 'lime' : '', }" > - 未评价 - - {{ scope.row.reachStandard == '0' ? '不达标' : scope.row.reachStandard == '1' ? '达标' : '' }} - + 未填报 + 无法评价 + {{row.reachStandard === '1'? '达标' : '未达标' }} diff --git a/src/views/floodControlStandard/index.vue b/src/views/floodControlStandard/index.vue index 783a223..a829375 100644 --- a/src/views/floodControlStandard/index.vue +++ b/src/views/floodControlStandard/index.vue @@ -56,7 +56,7 @@ const activeName=ref('todo') let isFlag = ref(1); const IsTrue = reactive([ - { label: "达标", value: 1}, + { label: "达标", value: 1 }, { label: "未达标", value: 0 }, ]); //动态组件 diff --git a/src/views/examinemanage/control/index.vue b/src/views/examinemanage/control/index.vue index e7a5727..bfaf3a3 100644 --- a/src/views/examinemanage/control/index.vue +++ b/src/views/examinemanage/control/index.vue @@ -104,11 +104,11 @@ {{row.standardFlag === '1' ? '达标' : '未达标' }} - + - + - + diff --git a/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue b/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue index 7be5c5e..712b9a5 100644 --- a/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue +++ b/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue @@ -59,10 +59,9 @@ color: scope.row.reachStandard == '0' ? 'red' : scope.row.reachStandard == '1' ? 'lime' : '', }" > - 未评价 - - {{ scope.row.reachStandard == '0' ? '不达标' : scope.row.reachStandard == '1' ? '达标' : '' }} - + 未填报 + 无法评价 + {{row.reachStandard === '1'? '达标' : '未达标' }} diff --git a/src/views/floodControlStandard/index.vue b/src/views/floodControlStandard/index.vue index 783a223..a829375 100644 --- a/src/views/floodControlStandard/index.vue +++ b/src/views/floodControlStandard/index.vue @@ -56,7 +56,7 @@ const activeName=ref('todo') let isFlag = ref(1); const IsTrue = reactive([ - { label: "达标", value: 1}, + { label: "达标", value: 1 }, { label: "未达标", value: 0 }, ]); //动态组件 diff --git a/src/views/floodControlStandard/tableDalgo.vue b/src/views/floodControlStandard/tableDalgo.vue index 0d35cb2..4dc390e 100644 --- a/src/views/floodControlStandard/tableDalgo.vue +++ b/src/views/floodControlStandard/tableDalgo.vue @@ -39,18 +39,12 @@ > 选择文件 -
- {{ typeList.iSstandardFlag? '达标' : '未达标' }} -
-
- {{ IsStandFlag1 >= 0 ? (IsStandText = 1) : (IsStandText = 0) }} - {{ IsStandFlag1 >= 0 ? '达标' : '未达标' }} +
+ 未填报 + 无法评价 + {{ + typeList.data.standardFlag === 1 ? '达标' : '未达标' + }}
{{ FormList[i.key] }} @@ -82,9 +76,10 @@ function ChangeClick(v,m) { typeList.iSstandardFlag = null; if (v == 'realMB') { - console.log('object1', m * 1 - FormList.value.targetMB * 1); IsStandFlag1.value = m * 1 - FormList.value.targetMB * 1; } + if (IsStandFlag1.value >= 0 ) typeList.data.standardFlag = 1 + else typeList.data.standardFlag = 0 } const fileList1 = ref([]); function handlePreview(file) { @@ -109,11 +104,11 @@ } }); const itemUpdateFieldRequestList = [ - { id: typeList.data['MB-id'], realValue: FormList.value.realMB, standardFlag: IsStandFlag1.value >= 0 ? 1 : 0 }, + { id: typeList.data['MB-id'], realValue: FormList.value.realMB, standardFlag: typeList.data.standardFlag }, ]; FormList.value = { itemDataType: typeList.itemDataType, - standardFlag: typeList.iSstandardFlag || IsStandText.value, + standardFlag: typeList.data.standardFlag, itemUpdateFieldRequestList, fileSaveRequestList, performanceEvaluateId: typeList.data.performanceEvaluateId, diff --git a/src/views/examinemanage/control/index.vue b/src/views/examinemanage/control/index.vue index e7a5727..bfaf3a3 100644 --- a/src/views/examinemanage/control/index.vue +++ b/src/views/examinemanage/control/index.vue @@ -104,11 +104,11 @@ {{row.standardFlag === '1' ? '达标' : '未达标' }} - + - + - + diff --git a/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue b/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue index 7be5c5e..712b9a5 100644 --- a/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue +++ b/src/views/financialperformance/publicsatisfaction/publicsatisfaction.vue @@ -59,10 +59,9 @@ color: scope.row.reachStandard == '0' ? 'red' : scope.row.reachStandard == '1' ? 'lime' : '', }" > - 未评价 - - {{ scope.row.reachStandard == '0' ? '不达标' : scope.row.reachStandard == '1' ? '达标' : '' }} - + 未填报 + 无法评价 + {{row.reachStandard === '1'? '达标' : '未达标' }} diff --git a/src/views/floodControlStandard/index.vue b/src/views/floodControlStandard/index.vue index 783a223..a829375 100644 --- a/src/views/floodControlStandard/index.vue +++ b/src/views/floodControlStandard/index.vue @@ -56,7 +56,7 @@ const activeName=ref('todo') let isFlag = ref(1); const IsTrue = reactive([ - { label: "达标", value: 1}, + { label: "达标", value: 1 }, { label: "未达标", value: 0 }, ]); //动态组件 diff --git a/src/views/floodControlStandard/tableDalgo.vue b/src/views/floodControlStandard/tableDalgo.vue index 0d35cb2..4dc390e 100644 --- a/src/views/floodControlStandard/tableDalgo.vue +++ b/src/views/floodControlStandard/tableDalgo.vue @@ -39,18 +39,12 @@ > 选择文件 -
- {{ typeList.iSstandardFlag? '达标' : '未达标' }} -
-
- {{ IsStandFlag1 >= 0 ? (IsStandText = 1) : (IsStandText = 0) }} - {{ IsStandFlag1 >= 0 ? '达标' : '未达标' }} +
+ 未填报 + 无法评价 + {{ + typeList.data.standardFlag === 1 ? '达标' : '未达标' + }}
{{ FormList[i.key] }} @@ -82,9 +76,10 @@ function ChangeClick(v,m) { typeList.iSstandardFlag = null; if (v == 'realMB') { - console.log('object1', m * 1 - FormList.value.targetMB * 1); IsStandFlag1.value = m * 1 - FormList.value.targetMB * 1; } + if (IsStandFlag1.value >= 0 ) typeList.data.standardFlag = 1 + else typeList.data.standardFlag = 0 } const fileList1 = ref([]); function handlePreview(file) { @@ -109,11 +104,11 @@ } }); const itemUpdateFieldRequestList = [ - { id: typeList.data['MB-id'], realValue: FormList.value.realMB, standardFlag: IsStandFlag1.value >= 0 ? 1 : 0 }, + { id: typeList.data['MB-id'], realValue: FormList.value.realMB, standardFlag: typeList.data.standardFlag }, ]; FormList.value = { itemDataType: typeList.itemDataType, - standardFlag: typeList.iSstandardFlag || IsStandText.value, + standardFlag: typeList.data.standardFlag, itemUpdateFieldRequestList, fileSaveRequestList, performanceEvaluateId: typeList.data.performanceEvaluateId, diff --git a/src/views/floodControlStandard/todoDon.vue b/src/views/floodControlStandard/todoDon.vue index 6468437..606d253 100644 --- a/src/views/floodControlStandard/todoDon.vue +++ b/src/views/floodControlStandard/todoDon.vue @@ -6,16 +6,14 @@ -
- - - - + + +