整合代码

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -36,16 +36,18 @@
              </el-select></span>
            </div>
            <div class="custom-table">
              <el-table ref="dataTable" v-loading="isLoading" :data="tableData" :height="tableHeight"
                        border class="cus-table"
                        @select="handleSelection" @cell-click="handleCellClick" @row-click="handleRowClick"
                        @select-all="handleSelectionAll" @selection-change="handleSelectionChange"
                        @sort-change="sortChange"  :header-cell-style="{background:'#FAFAFA',color:'#505050'}">
              <el-table ref="dataTable" v-loading="isLoading" :data="tableData"
                        :header-cell-style="{background:'#FAFAFA',color:'#505050'}"
                        :height="tableHeight" border
                        class="cus-table" @select="handleSelection" @cell-click="handleCellClick"
                        @row-click="handleRowClick" @select-all="handleSelectionAll"
                        @selection-change="handleSelectionChange" @sort-change="sortChange">
                <el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
                <el-table-column v-if="tableData.length != 0" fixed label="序号" type="index" width="55">
                </el-table-column>
                <!--              生命周期-->
                <el-table-column v-for="(item,index) in lcstatusArray" v-if=" lcstatusArray.length !== 0 && !item.hidden"
                <el-table-column v-for="(item,index) in lcstatusArray"
                                 v-if=" lcstatusArray.length !== 0 && !item.hidden"
                                 key="index" :show-overflow-tooltip="true" :sortable="item.sortable"
                                 :width="item.width" align="center" label="生命周期值"
                                 prop="lcstatus">
@@ -75,7 +77,8 @@
                                 align="center">
                </el-table-column>
                <!--               参照数据-->
                <el-table-column v-for="(item,index) in referArray" v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"
                <el-table-column v-for="(item,index) in referArray"
                                 v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"
                                 :key="index"
                                 :label="item.title" :show-overflow-tooltip="true"
                                 :sortable="item.sortable" :width="item.width" align="center"
@@ -108,8 +111,9 @@
          </FormTemplateDialog>
          <!--          修改-->
          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                              :disabledProp="disabledProp" rowOid="rowOid" :templateOid="templateOid" :title="'修改编码信息'"
                              :disabledProp="disabledProp" :templateOid="templateOid" :title="'修改编码信息'"
                              :visible.sync="editvisible"
                              rowOid="rowOid"
                              type="edit" @submit="EditSumbit"></FormTemplateDialog>
          <!--          批量编辑-->
          <!--          <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->

 Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue

@@ -186,6 +186,8 @@
      this.characterEditOldValue = row[column.property];
      if (this.editValueList.includes(row[column.property])) {
        this.$message.warning('请检查字符集是否有重复！')
      } else if (row[column.property] === undefined || row[column.property] === null) {
        this.$message.warning('请检查字符集是否有空值！');
      } else {
        this.editValueList.push(row[column.property]);
      }

 Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue

@@ -186,6 +186,8 @@
      this.characterEditOldValue = row[column.property];
      if (this.editValueList.includes(row[column.property])) {
        this.$message.warning('请检查字符集是否有重复！')
      } else if (row[column.property] === undefined || row[column.property] === null) {
        this.$message.warning('请检查字符集是否有空值！');
      } else {
        this.editValueList.push(row[column.property]);
      }

 Source/UBCS-WEB/src/views/ruleBasic/prefixConfig.vue

@@ -186,6 +186,8 @@
      this.characterEditOldValue = row[column.property];
      if (this.editValueList.includes(row[column.property])) {
        this.$message.warning('请检查字符集是否有重复！')
      } else if (row[column.property] === undefined || row[column.property] === null) {
        this.$message.warning('请检查字符集是否有空值！');
      } else {
        this.editValueList.push(row[column.property]);
      }

 Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue

@@ -186,9 +186,14 @@
      this.characterEditOldValue = row[column.property];
      if (this.editValueList.includes(row[column.property])) {
        this.$message.warning('请检查字符集是否有重复！')
      } else if (row[column.property] === undefined || row[column.property] === null) {
        this.$message.warning('请检查字符集是否有空值！');
      } else {
        this.editValueList.push(row[column.property]);
      }
      // else if (this.editValueList.some(value => value.trim() === '')) {
      //   this.$message.warning('请检查字符集是否有空值！');
      // }
    },
    async getCodeRule() {
      try {
@@ -235,14 +240,17 @@
        this.$message.warning('请填写要添加的值！');
        return; // 判断输入值
      }
      ;
      if (this.editValueList.length != 0) {
        this.$message.warning('请先取消已选择的值！');
        return; // 判断输入值
      }
      ;
      const targetObject = this.characterReleasedList.find(obj => obj.oid === this.select);
      if (!targetObject) {
        return; // 查找对应typeText
      }
      ;
      const codeRuleCharacterVO = {
        codeRuleId: this.select,
        chartType: "charset",

 Source/UBCS-WEB/src/views/statistic/statisticPage.vue

@@ -47,7 +47,7 @@
  </span>
    </el-dialog>
    <!--    echarts组件-->
    <div>
    <div style="margin-top: 15px">
      <lineChart v-for="(item,index) in lineList" :key="index" :chartName="item.menuName"
                 :lineData="item.menuData"></lineChart>
      <pieChart v-for="(item,index) in pieList" :key="index" :chartName="item.menuName"
@@ -225,6 +225,6 @@
}
</script>

<style scoped>
<style scoped lang="scss">

</style>