修改UAT提出的问题

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -846,11 +846,11 @@
           }
 
           .text-field-right {
-            width: calc(66.6% - 130px);
+            width: calc(100% - 130px);
             display: inline-block;
             font-size: 14px;
             text-overflow: ellipsis;
-            white-space: nowrap;
+            white-space: pre-wrap;
             word-break: break-word;
             overflow: hidden;
             float: left;

jero-web/src/views/documentManage/tags/dialog/DicList.vue

@@ -26,6 +26,7 @@
       </div>
       <div class="dic-list-table">
         <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict"
+                    :record="record"
                     @deleteDict="deleteDict" :total="total" :queryParams="queryParams" @selected="selectedKeys"
                     @ok="ok"></list-table>
         <tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record"

jero-web/src/views/documentManage/tags/dialog/ListTable.vue

@@ -1,30 +1,30 @@
 <template>
-    <div class="list-table">
+  <div class="list-table">
-      <a-table :data-source="tableData" :scroll="{x: 900}"
+    <a-table :data-source="tableData" :scroll="{x: 900}"
-               :columns="columns" rowKey="id"
+             :columns="columns" rowKey="id"
-               :components="drag(columns,'columns')"
+             :components="drag(columns,'columns')"
-               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+             :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-               :pagination="false"
+             :pagination="false"
-               class="tag-con-table">
+             class="tag-con-table">
 
-        <template slot="action" slot-scope="text, record">
+      <template slot="action" slot-scope="text, record">
-          <a class="action-edit" href="javascript:;" @click="actionEdit(record)" v-has="'bqnrzdpzxlbj'">{{$t('edit')}}</a>
+        <a class="action-edit" href="javascript:;" @click="actionEdit(record)" v-has="'bqnrzdpzxlbj'">{{$t('edit')}}</a>
-          <a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dictItem:logicDelete'">{{$t('delete')}}</a>
+        <a class="action-delete" href="javascript:;" @click="onDelete(record)" v-has="'dictItem:logicDelete'">{{$t('delete')}}</a>
-        </template>
+      </template>
-      </a-table>
+    </a-table>
-      <div class="page" v-if="tableData.length > 0">
+    <div class="page" v-if="tableData.length > 0">
-        <a-pagination
+      <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+        :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
+        show-quick-jumper
-          show-size-changer
+        show-size-changer
-          :current="queryParams.pageNo"
+        :current="queryParams.pageNo"
-          :page-size.sync="queryParams.pageSize"
+        :page-size.sync="queryParams.pageSize"
-          :total="total"
+        :total="total"
-          @change="onChangePage"
+        @change="onChangePage"
-          @showSizeChange="SizeChange"
+        @showSizeChange="SizeChange"
-        />
+      />
-      </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -32,115 +32,140 @@
 
   export default {
     name: 'listTable',
-    props:{
+    props: {
-      tableData:Array,
+      tableData: Array,
-      total:Number,
+      total: Number,
-      queryParams: Object
+      queryParams: Object,
+      record: Object
     },
-    mixins:[ResizeHeader, ResizeColumnProvide],
+    mixins: [ResizeHeader, ResizeColumnProvide],
-    data(){
+    data() {
-      return{
+      return {
         // tableData:[],
-        selectedRowKeys:[],
+        selectedRowKeys: [],
         // total:0,
         // queryParams:{
         //   pageNo:1,
         //   pageSize:10
         // },   //搜索条件
-        columns: [
+        columnsAll: [
           {
             title: this.$t('name'),
             dataIndex: 'itemText',
             key: 'itemText',
-            align: "left",
+            align: 'left',
             ellipsis: true,
-            width: 100,
+            width: 100
           },
           {
             title: this.$t('enName'),
-            align: "left",
+            align: 'left',
             width: 100,
             ellipsis: true,
-            dataIndex: 'enName',
+            dataIndex: 'enName'
+          },
+          {
+            title: this.$t('statisticalNodes'),
+            align: 'left',
+            dataIndex: 'statNode',
+            ellipsis: true,
+            width: 100
           },
           {
             title: this.$t('describe'),
-            align: "left",
+            align: 'left',
             width: 100,
             ellipsis: true,
-            dataIndex: 'description',
+            dataIndex: 'description'
           },
           {
             title: this.$t('operation'),
             dataIndex: 'action',
-            scopedSlots: {customRender: 'action'},
+            scopedSlots: { customRender: 'action' },
-            align: "left",
+            align: 'left',
             width: 170
           }
         ],
-        dataFlag:false
+        dataFlag: false
       }
     },
     mounted() {
       // this.loadData()
+      console.log(this.record)
     },
-    methods:{
+    computed: {
-      //获取列表数据
+      columns() {
-      loadData(){
+        let columnsAll = JSON.parse(JSON.stringify(this.columnsAll))
-        this.dataFlag=false
+        if (this.record.id != '1513417672023441409') {
-        let params={
+          for (let i = 0; i < columnsAll.length; i++) {
-          ...this.queryParams,
+            if (columnsAll[i].dataIndex == 'statNode') {
-          dictId:this.record.id
+              columnsAll.splice(i, 1)
+              i--
+            }
+          }
         }
-        getAction(`sys/dictItem/page`,params).then(res=>{
+        return columnsAll
-          if(res.success){
+      }
-            this.tableData=[...res.result.records]
+    },
-            this.dataFlag=true
+    methods: {
+      //获取列表数据
+      loadData() {
+        this.dataFlag = false
+        let params = {
+          ...this.queryParams,
+          dictId: this.record.id
+        }
+        getAction(`sys/dictItem/page`, params).then(res => {
+          if (res.success) {
+            this.tableData = [...res.result.records]
+            this.dataFlag = true
           }
         })
       },
       //编辑
-      actionEdit(val){
+      actionEdit(val) {
-        this.$emit('editDict',val,true)
+        this.$emit('editDict', val, true)
       },
       //删除
-      onDelete(val){
+      onDelete(val) {
-        this.$emit('deleteDict',val.id,true)
+        this.$emit('deleteDict', val.id, true)
       },
       onSelectChange(selectedRowKeys) {
-        this.selectedRowKeys = selectedRowKeys;
+        this.selectedRowKeys = selectedRowKeys
-        this.$emit('selected',this.selectedRowKeys)
+        this.$emit('selected', this.selectedRowKeys)
       },
 
       //点击页数
-      onChangePage(page,pageSize){
+      onChangePage(page, pageSize) {
         this.queryParams.pageNo = page
-        this.$emit('ok',this.queryParams)
+        this.$emit('ok', this.queryParams)
         // this.loadData()
       },
       //一页显示条数
-      SizeChange(page,pageSize){
+      SizeChange(page, pageSize) {
         this.queryParams.pageSize = pageSize
-        this.queryParams.pageNo=1
+        this.queryParams.pageNo = 1
-        this.$emit('ok',this.queryParams)
+        this.$emit('ok', this.queryParams)
 
         // this.loadData()
-      },
+      }
     }
   }
 </script>
 
 <style lang="less" scoped>
-  .list-table{
+  .list-table {
-    .tag-con-table{
+    .tag-con-table {
-      .action-edit{
+      .action-edit {
         margin-right: 5px;
       }
-      .action-delete{
+
-        color:red;
+      .action-delete {
+        color: red;
       }
     }
-    .page{
+
+    .page {
       margin-top: 20px;
       text-align: right;
     }

jero-web/src/views/projectManagement/components/certificationActivity.vue

@@ -310,7 +310,7 @@
         myChart.on('click', (params) => {
           console.log(params)
           let query = {
-            title: params.seriesName,
+            title: params.seriesName+'-'+params.name,
             projectLibraryId: this.$route.query.id
           }
           if (params.seriesName === this.$t('certificationTaskConfirmation')) {

jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue

@@ -295,6 +295,13 @@
         visible: false,
         queryParam: {},
         columnsAll: [
+          {
+            title: this.$t('statisticalNodes'),
+            align: 'left',
+            dataIndex: 'statNode',
+            ellipsis: true,
+            width: 100
+          },
           {
             title: this.$t('areaOfResponsibility'),
             align: 'left',

jero-web/src/views/projectManagement/components/regulatoryCompliance.vue

@@ -150,21 +150,21 @@
           let query = {}
           if (params.seriesName == this.$t('regulatoryTaskConfirmation')) {
             query = {
-              title: params.seriesName,
+              title: params.seriesName+'-'+params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryFGTaskToConfirmStatistics',
               status: params.data.status
             }
           } else if (params.seriesName == this.$t('designCompliance')) {
             query = {
-              title: params.seriesName,
+              title: params.seriesName+'-'+params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryDesignStatistics',
               status: params.data.status
             }
           } else if (params.seriesName == this.$t('verifyCompliance')) {
             query = {
-              title: params.seriesName,
+              title: params.seriesName+'-'+params.name,
               projectLibraryId: this.$route.query.id,
               operatorType: 'queryVerifyStatistics',
               status: params.data.status