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

ruoyi-ui/src/store/getters.js

@@ -12,8 +12,9 @@ const getters = {
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
   permission_routes: state => state.permission.routes,
-  topbarRouters:state => state.permission.topbarRouters,
-  defaultRoutes:state => state.permission.defaultRoutes,
-  sidebarRouters:state => state.permission.sidebarRouters,
+  topbarRouters: state => state.permission.topbarRouters,
+  defaultRoutes: state => state.permission.defaultRoutes,
+  sidebarRouters: state => state.permission.sidebarRouters,
+  addRoutes: state => state.permission.addRoutes
 }
 export default getters

ruoyi-ui/src/store/modules/permission.js

@@ -37,6 +37,7 @@ const permission = {
           const sdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)
+          // console.log('sidebarRoutes', sidebarRoutes);
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })

ruoyi-ui/src/views/dataEngine/datamodeling/index.vue

@@ -144,7 +144,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push("/datasheet/mysql");
+      this.$router.push("/data/createTable");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -177,7 +177,7 @@ export default {
     },
     handleUpdate(row) {
       this.$router.push({
-        path: "/datasheet/mysql",
+        path: "/data/createTable",
         query: {
           tableName: row.tableName,
           tableComment: row.tableComment,

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

@@ -485,7 +485,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       sessionStorage.removeItem("fid");
-      this.$router.push("system/fromModel/index");
+      this.$router.push("/system/fromModel/index/formBuild");
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -493,7 +493,7 @@ export default {
       sessionStorage.setItem("fid", fId);
       // this.$router.replace("system/fromModel/index");
       this.$router.push({
-        path: "/system/fromModel/index/system/fromModel/index",
+        path: "/system/fromModel/index/formBuild",
         query: { fId },
       });
     },

ruoyi-ui/src/views/dragform/tableList.vue

@@ -86,7 +86,7 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-  
+
     <el-table
       v-loading="loading"
       :data="tableList"
@@ -146,7 +146,6 @@
                   >删除
                 </el-button>
               </el-dropdown-item>
-             
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -224,6 +223,7 @@
 </template>
 <script>
 import { listTable, removeTableList } from "@/api/dragform/tableList";
+import { mapGetters } from "vuex";
 import DictData from "@/components/DictData";
 
 export default {
@@ -274,6 +274,10 @@ export default {
   created() {
     this.getList();
   },
+  computed: {
+    ...mapGetters(["addRoutes"]),
+  },
+
   methods: {
     /** 查询动态格列表 */
     getList() {
@@ -336,6 +340,7 @@ export default {
     //   this.title = "添加动态格";
     // },
     handleAdd() {
+      console.log(this.addRoutes);
       this.$router.push({
         path: "/system/fromModel/index/tableMange",
       });
@@ -387,9 +392,12 @@ export default {
         data.sqlKeys = this.Keys;
       }
       // console.log(data);
-      this.$modal.confirm('是否确认删除动态格编号为"' + data.tIds.join(',') + '"的数据项？')
+      this.$modal
+        .confirm(
+          '是否确认删除动态格编号为"' + data.tIds.join(",") + '"的数据项？'
+        )
         .then(async function () {
-          const res = await removeTableList(data)
+          const res = await removeTableList(data);
           // console.log(res);
         })
         .then(() => {

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

@@ -94,6 +94,7 @@ export default {
         updateForm({
           dfName: "1",
           dfNickname: "1",
+          sqlKey: sessionStorage.getItem("sqlKey") || "",
           dfVueTemplate: values,
           dfHtmlTemplate: editorHtmlJson.toString(),
           dtId: JSON.parse(values).config.tdId,
@@ -107,6 +108,7 @@ export default {
     handCode() {},
   },
   mounted() {
+    sessionStorage.setItem("sqlKey", "");
     const fid = this.$route.query.fId;
 
     if (!fid) return;
@@ -114,10 +116,14 @@ export default {
 
     getForm(fid).then((response) => {
       console.log(response);
+      sessionStorage.setItem("sqlKey", response.data.sqlKey);
       const jsonData = JSON.parse(response.data.dfVueTemplate);
       this.$refs.kfd.handleSetData(jsonData);
     });
   },
+  onUnmounted() {
+    sessionStorage.setItem("sqlKey", "");
+  },
 };
 </script>
 

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

@@ -131,22 +131,6 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-<<<<<<< HEAD
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除
-          </el-button>
-=======
           <el-dropdown>
             <el-button type="warning" plain size="small">
               处理<i class="el-icon-arrow-down el-icon--right"></i>
@@ -171,7 +155,6 @@
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
->>>>>>> 53e53a68 (修改样式和表格删除)
         </template>
       </el-table-column>
     </el-table>