冲突问题处理

ruoyi-ui/src/views/tableMange/index.vue

@@ -325,35 +325,34 @@
               class="mb10"
               style="width: 100%"
             >
-              <el-table-column prop="number" label="序号" width="50">
+              <!-- <el-table-column prop="number" label="序号" width="50"> -->
               style="width: 100%">
               <el-table-column
                 type="index"
                 label="序号"
                 width="50"
                 class-name="allowDrag"
-                >
+              >
               </el-table-column>
-              <el-table-column prop="datafield" label="数据字段" width="80">
+              <!-- <el-table-column prop="datafield" label="数据字段" width="80"> -->
               <el-table-column
                 prop="statisticTitle"
                 label="统计标题"
-                width="83">
+                width="83"
+              >
               </el-table-column>
               <el-table-column
                 prop="statisticField"
                 label="统计数据"
-                width="80">
+                width="80"
+              >
               </el-table-column>
-              <el-table-column prop="type" label="类型" width="50">
-              <el-table-column
-                prop="statisticType"
-                label="统计类型"
-                width="50">
+              <!-- <el-table-column prop="type" label="类型" width="50"> -->
+              <el-table-column prop="statisticType" label="统计类型" width="50">
               </el-table-column>
               <el-table-column prop="statuscode" label="状态码" width="70">
               </el-table-column>
-              <el-table-column prop="title" label="标题" width="83">
+              <!-- <el-table-column prop="title" label="标题" width="83"> -->
               <!-- <el-table-column
                 prop="statuscode"
                 label="状态码"
@@ -362,13 +361,15 @@
               <el-table-column
                 prop="statisticDescription"
                 label="统计描述"
-                width="150">
+                width="150"
+              >
               </el-table-column>
-              <el-table-column prop="description" label="描述" width="150">
+              <!-- <el-table-column prop="description" label="描述" width="150"> -->
               <el-table-column
                 prop="statisticObject"
                 label="统计对象"
-                width="150">
+                width="150"
+              >
               </el-table-column>
             </el-table>
           </el-tab-pane>
@@ -537,7 +538,7 @@
       :visible.sync="isShowAddData"
       width="30%"
     >
-      <el-form label-width="100px" :model="dataCountFormData">
+      <!-- <el-form label-width="100px" :model="dataCountFormData">
         <el-form-item label="数据字段">
           <el-select
             v-model="dataCountFormData.datafield"
@@ -550,49 +551,55 @@
               :value="item.fieldName"
             >
             </el-option>
-      width="30%">
+      width="30%"> -->
 
-      <el-form 
-      label-width="100px" 
-      :model="dataCountFormData">
+      <el-form label-width="100px" :model="dataCountFormData">
         <el-form-item label="统计标题" prop="statisticTitle">
           <el-input v-model="dataCountFormData.statisticTitle"></el-input>
         </el-form-item>
 
         <el-form-item label="统计数据">
-          <el-select 
-          v-model="dataCountFormData.statisticField" 
-          placeholder="请选择统计字段">
-            <el-option 
-            v-for="item in dataArr"
-            :key="item.id"
-            :label="item.fieldName" 
-            :value="item.fieldName">
+          <el-select
+            v-model="dataCountFormData.statisticField"
+            placeholder="请选择统计字段"
+          >
+            <el-option
+              v-for="item in dataArr"
+              :key="item.id"
+              :label="item.fieldName"
+              :value="item.fieldName"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="类型">
+        <!-- <el-form-item label="类型">
           <el-select v-model="dataCountFormData.type" placeholder="请选择类型">
             <el-option label="数量" value="num"></el-option>
-            <el-option label="状态" value="status"></el-option>
+            <el-option label="状态" value="status"></el-option> -->
         <el-form-item label="统计类型">
-          <el-select 
-          v-model="dataCountFormData.statisticType" 
-          placeholder="请选择统计类型">
-            <el-option v-for="item in dataType" :key="item.dictCode" :label="item.dictLabel" :value="item.dictLabel"></el-option>
+          <el-select
+            v-model="dataCountFormData.statisticType"
+            placeholder="请选择统计类型"
+          >
+            <el-option
+              v-for="item in dataType"
+              :key="item.dictCode"
+              :label="item.dictLabel"
+              :value="item.dictLabel"
+            ></el-option>
             <!-- <el-option label="状态" value="status"></el-option> -->
           </el-select>
         </el-form-item>
 
-        <el-form-item
+        <!-- <el-form-item
           label="状态码"
           v-show="dataCountFormData.type === 'status'"
         >
           <el-select
             v-model="dataCountFormData.statuscode"
             placeholder="请选择状态码"
-          >
-<!-- 
+          > -->
+        <!-- 
         <el-form-item label="状态码" v-show="dataCountFormData.statisticType === 'status' ">
           <el-select 
           v-model="dataCountFormData.statuscode" 
@@ -787,7 +794,7 @@ export default {
       menudata: false,
       // 显示添加字段对话框
       isShowAddData: false,
-      dataType : [],
+      dataType: [],
     };
   },
   computed: {
@@ -1609,9 +1616,9 @@ export default {
     },
     // 添加数据字段对话框
     async addDataDialog() {
-      this.isShowAddData = true
-      this.dataType = await this.getDicts("table_statistic_type")
-      this.dataType = this.dataType.data
+      this.isShowAddData = true;
+      this.dataType = await this.getDicts("table_statistic_type");
+      this.dataType = this.dataType.data;
       // console.log(this.dataType)
     },
     // 添加数据字段
@@ -1635,10 +1642,10 @@ export default {
       this.dataCountFormData = {};
     },
     // 确定统计
+    // countHandle() {
+    //   if (this.datacountTable.length == 0) {
     countHandle() {
-      if (this.datacountTable.length == 0) {
-    countHandle(){
-      if(this.dragTableStatisticList.length == 0){
+      if (this.dragTableStatisticList.length == 0) {
         this.$message.warning("请确定统计数据字段");
         return;
       }