Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java

@@ -7,102 +7,99 @@ import com.ruoyi.common.utils.StringUtils;
  *
  * @author ruoyi
  */
-public class PageDomain
-{
-    /** 当前记录起始索引 */
+public class PageDomain {
+    /**
+     * 当前记录起始索引
+     */
     private Integer pageNum;
 
-    /** 每页显示记录数 */
+    /**
+     * 每页显示记录数
+     */
     private Integer pageSize;
 
-    /** 排序列 */
+    /**
+     * 排序列
+     */
     private String orderByColumn;
 
-    /** 排序的方向desc或者asc */
+    /**
+     * 排序的方向desc或者asc
+     */
     private String isAsc = "asc";
 
-    /** 分页参数合理化 */
+    /**
+     * 分页参数合理化
+     */
     private Boolean reasonable = true;
 
-    /** 是否进行分页操作 */
+    /**
+     * 是否进行分页操作
+     */
     private Boolean isEnablePaging = true;
 
-    public String getOrderBy()
-    {
-        if (StringUtils.isEmpty(orderByColumn))
-        {
+    public String getOrderBy() {
+        if (StringUtils.isEmpty(orderByColumn)) {
             return "";
         }
         return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
     }
 
-    public Integer getPageNum()
-    {
+    public Integer getPageNum() {
         return pageNum;
     }
 
-    public void setPageNum(Integer pageNum)
-    {
+    public void setPageNum(Integer pageNum) {
         this.pageNum = pageNum;
     }
 
-    public Integer getPageSize()
-    {
+    public Integer getPageSize() {
         return pageSize;
     }
 
-    public void setPageSize(Integer pageSize)
-    {
+    public void setPageSize(Integer pageSize) {
         this.pageSize = pageSize;
     }
 
-    public String getOrderByColumn()
-    {
+    public String getOrderByColumn() {
         return orderByColumn;
     }
 
-    public void setOrderByColumn(String orderByColumn)
-    {
+    public void setOrderByColumn(String orderByColumn) {
         this.orderByColumn = orderByColumn;
     }
 
-    public String getIsAsc()
-    {
+    public String getIsAsc() {
         return isAsc;
     }
 
-    public void setIsAsc(String isAsc)
-    {
-        if (StringUtils.isNotEmpty(isAsc))
-        {
+    public void setIsAsc(String isAsc) {
+        if (StringUtils.isNotEmpty(isAsc)) {
             // 兼容前端排序类型
-            if ("ascending".equals(isAsc))
-            {
+            if ("ascending".equals(isAsc)) {
                 isAsc = "asc";
-            }
-            else if ("descending".equals(isAsc))
-            {
+            } else if ("descending".equals(isAsc)) {
                 isAsc = "desc";
             }
             this.isAsc = isAsc;
         }
     }
 
-    public Boolean getReasonable()
-    {
-        if (StringUtils.isNull(reasonable))
-        {
+    public Boolean getReasonable() {
+        if (StringUtils.isNull(reasonable)) {
             return Boolean.TRUE;
         }
         return reasonable;
     }
 
-    public void setReasonable(Boolean reasonable)
-    {
+    public void setReasonable(Boolean reasonable) {
         this.reasonable = reasonable;
     }
 
     public Boolean isEnablePaging() {
+        if (StringUtils.isNull(isEnablePaging)) {
+            return Boolean.TRUE;
+        }
         return isEnablePaging;
     }
 

ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

@@ -215,7 +215,7 @@ public class GenUtils
      */
     public static String replaceText(String text)
     {
-        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
+        return RegExUtils.replaceAll(text, "(?:若依)", "");
     }
 
     /**

ruoyi-ui/.env.development

@@ -11,10 +11,10 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #数据引擎模块IP
-VUE_APP_BASE_API2 = 'http://192.168.110.76:8099/'
+VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'
 
 #表单引擎模块IP
-VUE_APP_BASE_API3 = 'http://192.168.110.76:8088/'
+VUE_APP_BASE_API3 = 'http://192.168.110.59:8088/'
 
 #流程引擎模块IP
-VUE_APP_BASE_API4 = 'http://192.168.110.76:8055/'
+VUE_APP_BASE_API4 = 'http://192.168.110.59:8055/'

ruoyi-ui/src/components/RightToolbar/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="top-right-btn" :style="style">
     <el-row>
+      <el-tooltip class="item" effect="dark" :content="showCount ? '隐藏统计' : '显示统计'" placement="top" v-if="counts">
+        <el-button size="mini" circle icon="el-icon-data-analysis" @click="toggleCount()" />
+      </el-tooltip>
       <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top" v-if="search">
         <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
       </el-tooltip>
@@ -39,6 +42,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    showCount: {
+      type: Boolean,
+      default: true,
+    },
     columns: {
       type: Array,
     },
@@ -46,6 +53,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    counts: {
+      type: Boolean,
+      default: false,
+    },
     gutter: {
       type: Number,
       default: 10,
@@ -69,6 +80,11 @@ export default {
     }
   },
   methods: {
+    // 统计
+    toggleCount() {
+      console.log(12456)
+      this.$emit("update:showCount", !this.showCount);
+    },
     // 搜索
     toggleSearch() {
       this.$emit("update:showSearch", !this.showSearch);

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

@@ -51,7 +51,7 @@
         </el-date-picker>
       </el-form-item>
       <!-- <el-form-item label="版本状态" prop="processVersion">
-       
+
         <el-select
           v-model="queryParams.processVersion"
           value-key="value"
@@ -484,6 +484,43 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+
+      let endFormData = {
+        // 节点脚本关联表
+        BpmNodeExceptionList: [{
+          id:null,
+          nodeKey: null,           // 节点别名
+          scriptKey: null,         // 脚本别名
+          scriptTriggerType: null  // 脚本触发机制（0:手动 1:自动）
+        }],
+        // 节点操作人 -》 数据传输分两种情况：1.当前节点勾选了指定用户，就需要前端生成一个虚拟的角色编码、以及指定的用户id、真实的角色编码null即可
+        // 2.当前节点根据角色勾选的执行人，就需要存贮真实的角色权限字符 生成一个虚拟的角色编码，其他为null即可
+        // 节点处理人表
+        BpmNodeHandleUser: [{
+          id:null,
+          virtuallyRole: null,  // 前端生成的虚拟角色编码
+          realRole: null,       // 真实的角色编码  [1,2,3]/[1]
+          executeUserNo: null   // 用户编码  [1,2,3]/[1]
+        }],
+        // 所有节点表
+        BpmProcessConfigurationList: [{
+          id:null,
+          nodeKey: null,          // 节点别名
+          nodeName: null,         // 节点名称
+          nodeFormKey: null,      // 节点表单别名
+          nodeProcessKey: null,   // 流程别名
+          nodeType: null,         // 节点类型（判断节点、正常节点。。。）根据字典维护
+          nodeBefor: null,        // 节点前
+          nodeAfter: null,        // 节点后
+          nodeRolePermission: null,// 节点对应的角色权限字符(只存虚拟角色编码)
+          spare1: null,             // 备用列
+          spare2: null,
+          spare3: null,
+          createBy: null,            // 创建者
+          updateBy: null,            // 修改者
+          remark: null              // 节点描述
+        }]
+      }
       this.resetForm("queryForm");
       this.handleQuery();
     },

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

@@ -125,6 +125,11 @@
           >新增</el-button
         >
 
+        <div class="nameipt">
+          <span>表格组名：</span><el-input v-model="groupname" placeholder="请输入表格组名"></el-input>
+          <span class="desc">描述：</span><el-input v-model="groupdescribe" placeholder="请输入相关描述"></el-input>
+        </div>
+
         <el-table
           :data="tableDataList"
           border
@@ -337,6 +342,8 @@ export default {
         theRelateField: "",
         executeOptions: [],
       },
+      groupname: '',
+      groupdescribe: ''
     };
   },
   created() {
@@ -554,4 +561,21 @@ export default {
   display: flex;
   justify-content: center;
 }
+
+::v-deep .el-table{
+  margin-top: 10px;
+}
+.nameipt{
+  display: inline;
+  margin-left: 10px;
+  ::v-deep .el-input--medium .el-input__inner{
+  width: 30%;
+  }
+  ::v-deep .el-input--medium{
+  display: inline;
+  }
+}
+.desc{
+  margin-left: 10px;
+}
 </style>

ruoyi-ui/src/views/system/bpmnPro/components/Panel/components/ElementNormalTask.vue

@@ -113,7 +113,6 @@ export default {
       setIndustryType(getActive(), value);
     },
     async getScriptList() {
-      let res = await listScript({ isEnablePaging: false, scriptType: 0 });
       this.scriptList = res.rows.map((item) => ({
         value: item.scriptKey,
         label: item.scriptName,

ruoyi-ui/src/views/system/tenant/index.vue

@@ -400,9 +400,10 @@ export default {
         ],
         databaseName: [
           { required: true, message: "数据库名不能为空", trigger: "blur" },
+          { validator: this.databaseNameValidator, trigger: "blur"  }
         ],
         tenantAccount: [
-          { required: true, message: "租户账号不能为空", trigger: "change" },
+          { required: true, message: "租户管理员账号不能为空", trigger: "change" },
           { validator: this.tenantAccountValidator, trigger: "blur" },
         ],
         databaseIp: [
@@ -448,6 +449,15 @@ export default {
         callback();
       }
     },
+    // 数据库名称校验规则
+    databaseNameValidator(rule, value, callback){
+      let regex = /^[a-z][a-z0-9]*$/; 
+      if (regex.test(value)) {  
+        callback(); // 输入内容符合规则  
+      } else {  
+        callback(new Error("只能包含小写字母和数字，且以小写字母开头"));
+      }  
+    },
     // 数据源类型改变回调
     dataSourceTypeChange(type) {
       this.$nextTick(() => {
@@ -676,7 +686,7 @@ export default {
         });
       }
       getDataSourceInfo(qar).then((res) => {
-        console.log(res);
+        // console.log(res);
       });
     },
     handleTest() {

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

@@ -63,7 +63,20 @@
             <el-table-column prop="fieldDescription" label="字段描述">
               <template slot-scope="scope">
                 <!-- <el-form-item size="normal" prop="fieldDescription"> -->
-                <el-input v-model="scope.row.fieldDescription"></el-input>
+                <input
+                  :class="{
+                    isNullDesc:
+                      scope.row.fieldDescription == '' &&
+                      scope.row.isShow &&
+                      isInputInvalid
+                        ? true
+                        : false,
+                    ipt: true,
+                  }"
+                  v-model="scope.row.fieldDescription"
+                />
+
+                <!-- <el-input v-model="scope.row.fieldDescription" /> -->
                 <!-- </el-form-item> -->
               </template>
             </el-table-column>
@@ -168,6 +181,11 @@
                 <el-switch v-model="scope.row.isExport"> </el-switch>
               </template>
             </el-table-column>
+            <!-- <el-table-column prop="isCount" label="是否统计">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isCount"> </el-switch>
+              </template>
+            </el-table-column> -->
             <!-- <el-table-column
           label="操作"
           align="center"
@@ -292,7 +310,7 @@
               class="inline-large-button"
               icon="el-icon-plus"
               size="mini"
-              @click="isShowAddData = true"
+              @click="addDataDialog"
             >
               添加数据字段
             </el-button>
@@ -302,22 +320,55 @@
             >
 
             <el-table
-              :data="datacountTable"
+              :data="dragTableStatisticList"
               border
               class="mb10"
               style="width: 100%"
             >
               <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="statisticTitle"
+                label="统计标题"
+                width="83">
+              </el-table-column>
+              <el-table-column
+                prop="statisticField"
+                label="统计数据"
+                width="80">
               </el-table-column>
               <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="statuscode"
+                label="状态码"
+                width="70">
+              </el-table-column> -->
+              <el-table-column
+                prop="statisticDescription"
+                label="统计描述"
+                width="150">
               </el-table-column>
               <el-table-column prop="description" label="描述" width="150">
+              <el-table-column
+                prop="statisticObject"
+                label="统计对象"
+                width="150">
               </el-table-column>
             </el-table>
           </el-tab-pane>
@@ -499,12 +550,37 @@
               :value="item.fieldName"
             >
             </el-option>
+      width="30%">
+
+      <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-option>
           </el-select>
         </el-form-item>
         <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-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-option label="状态" value="status"></el-option> -->
           </el-select>
         </el-form-item>
 
@@ -516,17 +592,22 @@
             v-model="dataCountFormData.statuscode"
             placeholder="请选择状态码"
           >
+<!-- 
+        <el-form-item label="状态码" v-show="dataCountFormData.statisticType === 'status' ">
+          <el-select 
+          v-model="dataCountFormData.statuscode" 
+          placeholder="请选择状态码">
             <el-option label="已完成" value="1"></el-option>
             <el-option label="未完成" value="0"></el-option>
           </el-select>
         </el-form-item>
+        -->
 
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="dataCountFormData.title"></el-input>
+        <el-form-item label="统计描述" prop="statisticDescription">
+          <el-input v-model="dataCountFormData.statisticDescription"></el-input>
         </el-form-item>
-
-        <el-form-item label="描述" prop="description">
-          <el-input v-model="dataCountFormData.description"></el-input>
+        <el-form-item label="统计对象" prop="statisticObject">
+          <el-input v-model="dataCountFormData.statisticObject"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -564,11 +645,12 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { v4 as uuidv4 } from "uuid";
 export default {
   name: "tableMange",
-  dicts: ["sys_time_format"],
+  dicts: ["sys_time_format", "table_statistic_type"],
   props: [],
   components: { Queryfrom, Treeselect },
   data() {
     return {
+      isInputInvalid: false,
       // 修改表格时的menuId
       menuId: "",
       // 修改表格的id
@@ -584,6 +666,7 @@ export default {
       // 当前table唯一标识
       sqlkey: "",
       // 表格的高度
+      tableKey: "",
       // tableHeight: document.documentElement.scrollHeight - 245 + "px",
       tableList: [], //所有表格列表
       tableFieldList: [], // 当前表格字段数据
@@ -640,6 +723,10 @@ export default {
           prop: "isExport",
           label: "是否导出",
         },
+        {
+          prop: "isCount",
+          label: "是否统计",
+        },
       ], //表头列表
 
       // 右侧筛选条件勾选数据
@@ -695,11 +782,12 @@ export default {
       // 数据统计对象
       dataCountFormData: {},
       // 数据统计表格
-      datacountTable: [],
+      dragTableStatisticList: [],
       // 是否切换到数据统计
       menudata: false,
       // 显示添加字段对话框
       isShowAddData: false,
+      dataType : [],
     };
   },
   computed: {
@@ -761,6 +849,10 @@ export default {
     },
   },
   methods: {
+    // 字段描述验证规则
+    // blurval(value){
+    //   this.isInputInvalid = value == '' ?  true : false;
+    // },
     // 树形控件change回调
     treeSelectChange(val) {
       //没有change事件
@@ -786,9 +878,10 @@ export default {
         databaseType: this.databaseType,
         tableName: this.tableName,
       };
-
+      console.log(data);
       // 获取当前表单结构信息
       getListName(data).then((res) => {
+        console.log(res);
         this.tableFieldList = res.map((item, index) => {
           return {
             id: this.tableName + "_" + item.fieldName,
@@ -1269,6 +1362,9 @@ export default {
     },
     // 创建回调
     async createHandle() {
+      console.log(123);
+      this.tableKey = uuidv4();
+      this.isInputInvalid = true;
       this.$refs.formData.validate(async (valid) => {
         if (valid) {
           // 检验表单合法性
@@ -1359,7 +1455,7 @@ export default {
               tId: this.tId,
               dtName: this.formData.menuName,
               // menuId: this.formData.routePath,
-              // tableKey: this.formData.routePath, //  暂定
+              tableKey: this.tableKey, //  暂定
               dtTableName: this.tableName,
               primaryKey: this.formData.primaryKey,
               orderByColumn: this.formData.orderByColumn,
@@ -1404,6 +1500,10 @@ export default {
               res = await addDragTable(data);
             }
 
+            console.log("res", res);
+            if (res.code == 200) {
+              this.countHandle();
+            }
             // 关闭当前页面
             if (this.tId) {
               if (res.code == 200) {
@@ -1500,6 +1600,20 @@ export default {
     tabhandleClick() {
       this.menudata = this.activeName === "datacount" ? true : false;
     },
+    // 添加数据字段对话框
+    async addDataDialog() {
+      this.isShowAddData = true;
+      this.dataType = await this.getDicts("table_statistic_type");
+      this.dataType = this.dataType.data;
+      // console.log(this.dataType)
+    },
+    // 添加数据字段对话框
+    async addDataDialog() {
+      this.isShowAddData = true
+      this.dataType = await this.getDicts("table_statistic_type")
+      this.dataType = this.dataType.data
+      // console.log(this.dataType)
+    },
     // 添加数据字段
     addData() {
       this.dataCountFormData.number = this.datacountTable.length + 1;
@@ -1523,6 +1637,8 @@ export default {
     // 确定统计
     countHandle() {
       if (this.datacountTable.length == 0) {
+    countHandle(){
+      if(this.dragTableStatisticList.length == 0){
         this.$message.warning("请确定统计数据字段");
         return;
       }
@@ -1543,6 +1659,26 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.ipt {
+  height: 36px;
+  line-height: 36px;
+  font-size: 14px;
+  width: 100%;
+  outline: none;
+  text-align: center;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  color: #606266;
+  display: inline-block;
+  border-radius: 4px;
+}
+.isNullDesc {
+  border-color: #ff4949 !important;
+}
+
+.ipt:focus {
+  border-color: #1890ff;
+}
 ::v-deep .right_card {
   min-height: 500px !important;
 }

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -41,7 +41,7 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-            >下载模板
+          >下载模板
           </el-link>
         </div>
       </el-upload>
@@ -52,6 +52,7 @@
     </el-dialog>
     <Queryfrom
       :form-vals="templateInfo.where"
+      :showCount="showCount"
       @getList="getList"
       ref="mychild"
     />
@@ -63,7 +64,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          >新增
+        >新增
         </el-button>
       </el-col>
       <el-col :span="1.5" v-if="false">
@@ -74,7 +75,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          >修改
+        >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -85,7 +86,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          >删除
+        >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -94,7 +95,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="upload.open = true"
-          >导入
+        >导入
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -104,10 +105,11 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          >导出
+        >导出
         </el-button>
       </el-col>
       <right-toolbar
+        :showCount.sync="showCount"
         :showSearch.sync="showSearch"
         @queryTable="pageList"
       ></right-toolbar>
@@ -151,7 +153,7 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
-                  >修改
+                >修改
                 </el-button>
               </el-dropdown-item>
               <el-dropdown-item>
@@ -160,7 +162,7 @@
                   type="text"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
-                  >删除
+                >删除
                 </el-button>
               </el-dropdown-item>
             </el-dropdown-menu>
@@ -209,14 +211,14 @@ import {
   addTableData,
   batchEdit,
 } from "@/api/tablelist/commonTable";
-import { getToken } from "@/utils/auth";
+import {getToken} from "@/utils/auth";
 import Queryfrom from "@/views/tablelist/commonTable/queryfrom.vue";
-import { camelCase } from "@/utils";
-import { inputDisableComplete } from "@/utils/other";
+import {camelCase} from "@/utils";
+import {inputDisableComplete} from "@/utils/other";
 
 export default {
   name: "listInfo",
-  components: { Queryfrom },
+  components: {Queryfrom},
   data() {
     return {
       // 遮罩层
@@ -227,6 +229,8 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
+      // 显示统计
+      showCount: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -253,18 +257,18 @@ export default {
         // 是否更新已经存在的数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API3 + "common/uploadData",
       },
       // 排序方式 默认降序
-      sortState: true,
+      sortOrder: true,
       // 共通查询参数接受子组件的参数
       queryParams: {
         pageNum: 1, // 第几页
         pageSize: 10, // 每页大小
         orderByColumn: "", // 根据某列排序
-        isAsc: this.sortState ? "DESC" : "ASC", // desc（降序）或 asc（升序）
+        isAsc: "", // desc（降序）或 asc（升序）
         // 基本查询参数
         basicMap: {
           tableName: "drag_form",
@@ -363,13 +367,15 @@ export default {
       // 序列化当前查询参数列表
       queryParams && (this.queryParams.queryMap = queryParams.queryMap);
       // 获取当前表单结构信息
-      dragTableInfo({ queryMap: { sqlkey: this.sqlkey } })
+      dragTableInfo({queryMap: {sqlkey: this.sqlkey}})
         .then((res) => {
           // 得到当前模版信息 --- sql columns queryWhere
           this.templateInfo = res.data.resultMap;
           this.queryParams.orderByColumn =
             res.data.resultMap.querySql.orderByColumn;
-          this.queryParams.isAsc = res.data.resultMap.querySql.sortOrder;
+          this.sortOrder = JSON.parse(res.data.resultMap.querySql.sortOrder);
+          // 根据拖拽时设置当前列表排列顺序
+          this.queryParams.isAsc = this.sortOrder ? "DESC" : "ASC"
           this.tableName = this.templateInfo.template.dtTableName;
           // 得到查询条件
           this.queryFromWhere = res.data.resultMap.where;
@@ -415,9 +421,9 @@ export default {
       this.$refs.mychild.pageList(
         row == undefined
           ? {
-              limit: this.queryParams.pageSize,
-              page: this.queryParams.pageNum,
-            }
+            limit: this.queryParams.pageSize,
+            page: this.queryParams.pageNum,
+          }
           : row
       );
     },
@@ -447,7 +453,7 @@ export default {
     handleAdd(row) {
       // this.reset();
       this.defaultValue = {};
-      getInfoBySqlKey(this.sqlkey).then(({ data }) => {
+      getInfoBySqlKey(this.sqlkey).then(({data}) => {
         if (!data || !data.dfVueTemplate) {
           this.$message.error("当前表格未绑定表单!");
           return;
@@ -464,7 +470,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      getInfoBySqlKey(this.sqlkey).then(({ data }) => {
+      getInfoBySqlKey(this.sqlkey).then(({data}) => {
         if (!data || !data.dfVueTemplate) {
           this.$message.error("当前表格未绑定表单!");
           return;
@@ -543,7 +549,8 @@ export default {
           this.$refs.mychild.pageList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -576,7 +583,7 @@ export default {
     importTemplate() {
       this.download(
         process.env.VUE_APP_BASE_API3 +
-          `common/exportTemplate?tableName=${this.tableName}&sqlkey=${this.sqlkey}`,
+        `common/exportTemplate?tableName=${this.tableName}&sqlkey=${this.sqlkey}`,
         {},
         `下载模版名称${new Date().getTime()}.xlsx`
       );
@@ -592,10 +599,10 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
+        response.msg +
+        "</div>",
         "导入结果",
-        { dangerouslyUseHTMLString: true }
+        {dangerouslyUseHTMLString: true}
       );
       this.$refs.mychild.pageList({
         limit: this.queryParams.pageSize,
@@ -643,7 +650,7 @@ export default {
             updateData.conditionMap[this.templateInfo.template?.primaryKey] =
               this.defaultValue[
                 camelCase(this.templateInfo.template?.primaryKey)
-              ];
+                ];
             Object.keys(values).map((k) => {
               updateData.commMap[k] = values[k];
             });

ruoyi-ui/src/views/tablelist/commonTable/queryfrom.vue

@@ -1,6 +1,5 @@
 <template>
-  <div>
-    <div class="cardBox">
+    <div class="cardBox" v-show="showCount">
       <el-card
         shadow="hover"
         :body-style="{ padding: '20px' }"
@@ -31,9 +30,8 @@
           <div class="count">{{ item.count }}</div>
         </div>
       </el-card>
-    </div>
 
-    <el-form
+      <el-form
       :model="queryParams.queryMap"
       ref="queryForm"
       size="small"
@@ -161,8 +159,11 @@
           </span>
         </span>
       </div>
+
     </el-form>
-  </div>
+    </div>
+
+  
 </template>
 
 <script>
@@ -173,6 +174,9 @@ export default {
       type: Array,
       default: () => [],
     },
+    showCount : {
+      type: Boolean,
+    }
   },
   data() {
     return {

ruoyi-ui/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.110.15:8080`,
+        target: `http://192.168.110.59:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''