修改禅道已知bug

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -39,22 +39,22 @@
             <!--            </div>-->
             <a-card :bordered="false" class="box-clause" style="margin-top: 20px"
                     v-for="(item,index) in dataSource">
-              <div class="table-operator-admin">
+              <!--              <div class="table-operator-admin">-->
-                <div class="operator-text" v-if="item.id" :class="{'operator-text-feed':index == 0 ? true:false}"
+              <!--                <div class="operator-text" v-if="item.id" :class="{'operator-text-feed':index == 0 ? true:false}"-->
-                     style="font-size: 16px">
+              <!--                     style="font-size: 16px">-->
-                  {{$t('engineer')+item.createBy+$t('feedbackResults')}}
+              <!--                  {{$t('engineer')+item.createBy+$t('feedbackResults')}}-->
-                </div>
+              <!--                </div>-->
-                <div class="text-results" v-if="item.id">
+              <!--                <div class="text-results" v-if="item.id">-->
-                  {{$t('complianceResults')}}：{{item.complianceResultName}}
+              <!--                  {{$t('complianceResults')}}：{{item.complianceResultName}}-->
-                </div>
+              <!--                </div>-->
-              </div>
+              <!--              </div>-->
               <div class="table-operator-admin-right">
                 <div @click="fileExportClick" v-if="index == 0" class="operator-text-index">
                   <a-icon type="export" :rotate="-90"/>
                   {{$t('fileExport')}}
                 </div>
+                <!--                style="margin-left: 18px"-->
                 <a-table
-                  style="margin-left: 18px"
                   ref="table"
                   size="middle"
                   :loading="loading"
@@ -96,8 +96,8 @@
       return {
         queryParam: {},
         dataSource: [],
-        userInfoQuery:{},
+        userInfoQuery: {},
-        administrators:false,
+        administrators: false,
         url: {
           list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
           exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip'
@@ -106,6 +106,44 @@
         loading: false,
 
         columns: [
+          {
+            title: this.$t('engineer'),
+            dataIndex: 'createBy',
+            align: 'center',
+            width: 160,
+            ellipsis: true,
+            customRender: (value, row, index) => {
+              const obj = {
+                children: value,
+                attrs: {}
+              }
+              if (index === 0) {
+                obj.attrs.rowSpan = row.indexData
+              } else {
+                obj.attrs.rowSpan = 0
+              }
+              return obj
+            }
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResultName',
+            align: 'center',
+            width: 160,
+            ellipsis: true,
+            customRender: (value, row, index) => {
+              const obj = {
+                children: value,
+                attrs: {}
+              }
+              if (index === 0) {
+                obj.attrs.rowSpan = row.indexData
+              } else {
+                obj.attrs.rowSpan = 0
+              }
+              return obj
+            }
+          },
           {
             title: this.$t('relevantSections'),
             dataIndex: 'relatedSection',
@@ -190,6 +228,18 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource && this.dataSource.length > 0) {
+              this.dataSource.forEach(val => {
+                if (val.lawsTechnologyEvaluationResultEOList && val.lawsTechnologyEvaluationResultEOList.length > 0) {
+                  val.lawsTechnologyEvaluationResultEOList.forEach(ol => {
+                    ol.indexData = val.lawsTechnologyEvaluationResultEOList.length
+                    ol.complianceResultName = val.complianceResultName
+                    ol.createBy = val.createBy
+                  })
+                }
+              })
+            }
+            console.log(this.dataSource)
             if (this.dataSource.length == 0) {
               this.dataSource.push({
                 name: ''
@@ -353,9 +403,10 @@
 
   .table-operator-admin-right {
     float: left;
-    width: calc(100% - 240px);
+    width: 100%;
     text-align: right;
-    border-left: 1px solid #e8e8e8;
+    margin-bottom: 20px;
+    /*border-left: 1px solid #e8e8e8;*/
   }
 
   .operator-text-index {