Merge branch 'develop' of 101.201.121.115:leo/LAPP_AdvancedPlanner_Front into develop

src/mixins/ListMixin.js

@@ -15,7 +15,7 @@ export const ListMixin = {
       loading: true, // 表格loading加载
     };
   },
-  created() {
+  mounted() {
     this.getList();
   },
   methods: {

src/server/request.js

@@ -28,7 +28,7 @@ service.interceptors.response.use(
     ) {
       location.href = `${location.origin}/#/login`;
     }
-    return Promise.reject(error.response.data);
+    return Promise.reject(error.response);
   }
 );
 export default service;

src/server/system/menu.js

@@ -1,9 +1,9 @@
-import { post, put, get } from "../api";
-// 获取菜单树形数据
-export const getTreeMenu = (params) =>get('/admin/menu/menulist', params);
-// 新增菜单
-export const addMenu = (params) => post("/admin/menu/addmenu", params);
-// 修改菜单
-export const updateMenu = (params) => put("/admin/menu/upmenu", params);
-// 查询菜单详情
-export const getMenuDetails = (params) => get("/admin/menu/menubyid", params);
+import { post, put, get } from "../api";
+// 获取菜单树形数据
+export const getTreeMenu = (params) =>get('/admin/base/menu/menulist', params);
+// 新增菜单
+export const addMenu = (params) => post("/admin/base/menu/insertone", params);
+// 修改菜单
+export const updateMenu = (params) => put("/admin/base/menu/updateone", params);
+// 查询菜单详情
+export const getMenuDetails = (params) => get(`/admin/base/menu/selectone/${params}`);

src/views/login.vue

@@ -7,23 +7,23 @@
       <div class="login-form">
         <div class="login-form-item">
           <p class="form-item-img"><img :src="projectImg" /></p>
-          <el-select v-model="formData.workshop" placeholder="请选择">
+          <el-select v-model="formData['User-PlantNr']" placeholder="请选择">
             <el-option
               v-for="item in options"
-              :key="item.pid"
-              :label="item.descr"
-              :value="item.pid"
+              :key="item['Plant-PlantNr']"
+              :label="item['Plant-Name1']"
+              :value="item['Plant-PlantNr']"
             >
             </el-option>
           </el-select>
         </div>
         <div class="login-form-item">
           <p class="form-item-img"><img :src="userImg" /></p>
-          <el-input v-model="formData.userid" placeholder="请输入" />
+          <el-input v-model="formData['User-UserId']" placeholder="请输入" />
         </div>
         <div class="login-form-item">
           <p class="form-item-img"><img :src="passwordImg" /></p>
-          <el-input v-model="formData.password" placeholder="请输入" />
+          <el-input v-model="formData['User-Password']" placeholder="请输入" />
         </div>
       </div>
       <p class="login-btn" @click="onLogin">登录</p>
@@ -75,8 +75,8 @@ export default {
       get("/user/plants").then(({ code, data }) => {
         if (code == 200 && data) {
           this.options = data;
-          if (data[0].pid) {
-            this.formData.workshop = data[0].pid;
+          if (data[0]['Plant-PlantNr']) {
+            this.formData['User-PlantNr'] = data[0]['Plant-PlantNr'];
           }
         }
       });

src/views/system/menu/addOrEdit.vue

@@ -137,12 +137,20 @@
   </el-dialog>
 </template>
 <script>
-import { getTreeMenu } from "@/server/system/menu";
+import { getTreeMenu, getMenuDetails } from "@/server/system/menu";
 import IconSelect from '@/components/IconSelect';
 export default {
   components:{
     IconSelect
   },
+  props: {
+    item: {
+      default: {},
+    },
+    isShowDialog: {
+      default: "configuration",
+    },
+  },
   data() {
     return {
       formData: {},
@@ -183,6 +191,12 @@ export default {
     selected(name){
       console.log(name);
       this.formData.icon=name;
+    },
+    // 获取菜单详情
+    getMenuDetails(){
+      getMenuDetails(261).then((res) => {
+        console.log(res);
+      });
     }
   },
   created(){

src/views/system/menu/index.vue

@@ -25,29 +25,29 @@
         :data="tableData"
         row-key="menu_id"
         border
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }"
       >
         <el-table-column
-          prop="title"
+          prop="Menu-Title"
           label="菜单名称"
           :show-overflow-tooltip="true"
           width="180px"
         />
-        <el-table-column prop="icon" label="图标" align="center" width="100px">
+        <el-table-column prop="Menu-Icon" label="图标" align="center" width="100px">
           <template #default="scope">
             <svg-icon :icon-class="scope.row.icon" />
           </template>
         </el-table-column>
-        <el-table-column prop="path" label="路径" :show-overflow-tooltip="true">
+        <el-table-column prop="Menu-Path" label="路径" :show-overflow-tooltip="true">
           <template #default="scope">
-            <span v-if="scope.row.menu_type == 'A'">{{ scope.row.path }}</span>
-            <span v-else>{{ scope.row.component }}</span>
+            <span v-if="scope.row['Menu-MenuType'] == 'A'">{{ scope.row['Menu-Path'] }}</span>
+            <span v-else>{{ scope.row['Menu-Component'] }}</span>
           </template>
         </el-table-column>
         <el-table-column
           label="创建时间"
           align="center"
-          prop="create_by"
+          prop="Menu-CreateTime"
           width="180"
         />
         <el-table-column
@@ -81,31 +81,28 @@
   </div>
 </template>
 <script>
-import { ListMixin } from "@/mixins/ListMixin";
-import { getMenuDetails } from "@/server/system/menu";
 import AddOrEdit from "./addOrEdit.vue";
+import { getTreeMenu } from "@/server/system/menu";
 export default {
   components: {
     AddOrEdit
   },
-  mixins: [ListMixin],
   data() {
     return {
-      queryTableDataUrl: "/admin/menu/menulist",
       loading: false,
-      isAddOrEdit:false
+      isAddOrEdit:false,
+      tableData:[],
+      queryParams:{}
     };
   },
   methods: {
     // 搜索按钮操作
     handleQuery() {
-      this.pagination.pageNumber = 1;
       this.getList();
     },
     // 重置
     resetQuery(){
       this.queryParams={};
-      this.pagination.pageNumber = 1;
       this.getList();
     },
     // 新增菜单
@@ -116,12 +113,18 @@ export default {
     handleUpdate() {},
     // 删除
     handleDelete() {},
+    // 菜单列表
+    getTreeMenu(){
+      getTreeMenu().then(({code,data=[]})=>{
+        if(code==200){
+          this.tableData=data;
+        }
+      })
+    }
   },
-  mounted() {
-    getMenuDetails({ id: 261 }).then((res) => {
-      console.log(res);
-    });
-  },
+  mounted(){
+    this.getTreeMenu();
+  }
 };
 </script>
 <style lang="less" scoped>