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

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -34,6 +34,8 @@
 
     .scrollbar-wrapper {
       overflow-x: hidden !important;
+      padding-bottom: 50px !important;
+      box-sizing: border-box;
     }
 
     .el-scrollbar__bar.is-vertical {

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

@@ -46,9 +46,9 @@
             row-key="id"
             :max-height="tableHeight"
           >
-            <!-- 
-              
-              :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" 
+            <!--
+
+              :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
             -->
             >
             <el-table-column
@@ -278,10 +278,10 @@
     <el-dialog title="效果预览" :visible.sync="isShowPreview" width="50%">
       <el-row :gutter="10" class="mb8">
         <el-col :span="18">
-          <el-input placeholder="请输入" clearable />
+          <el-input placeholder="请输入" clearable/>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span=6>
           <el-button
             type="primary"
             icon="el-icon-search"

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

@@ -145,19 +145,18 @@
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
                   >修改</el-button
-                ></el-dropdown-item
-              >
-              <el-dropdown-item
-                ><el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  >删除</el-button
-                >
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
+                ></el-dropdown-item>
+                <el-dropdown-item
+                  ><el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)"
+                    >删除</el-button
+                  >
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -366,8 +365,7 @@ export default {
           // 得到查询条件
           this.queryFromWhere = res.data.resultMap.where;
           //  得到当前列表信息
-          let test = JSON.parse(this.templateInfo.template.dtColumnName);
-          this.columns = this.columnsHandler(test);
+          this.columns = this.columnsHandler(this.templateInfo.template.dtColumnName);
         })
         .finally((fes) => {
           if (this.templateInfo == {}) return;
@@ -467,7 +465,7 @@ export default {
         Object.assign(this.defaultValue, row);
         this.jsonData = JSON.parse(data.dfVueTemplate);
         this.open = true;
-        this.title = "修改信息";
+        this.title = "修改信息123";
         this.form.password = this.initPassword;
         this.$nextTick(() => {
           this.$refs.addFromRef.setData(row);
@@ -673,4 +671,6 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+
+</style>