合并地址

build/index.js

@@ -9,7 +9,7 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
 
   run(`vue-cli-service build ${args}`)
 
-  const port = 9526
+  const port = 8080
   const publicPath = config.publicPath
 
   var connect = require('connect')

src/views/system/menu/index.vue

@@ -166,6 +166,7 @@
                 是否外链
               </span>
               <el-radio-group v-model="form.isFrame">
+              debugger
                 <el-radio label="0">是</el-radio>
                 <el-radio label="1">否</el-radio>
               </el-radio-group>
@@ -392,6 +393,7 @@ export default {
     handleAdd(row) {
       this.reset();
       this.getTreeselect();
+      debugger
       if (row != null && row.menuId) {
         this.form.parentId = row.menuId;
       } else {
@@ -412,7 +414,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
-      getMenu(row.menuId).then(response => {
+      getMenu(Number(row.id)).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改菜单";
@@ -422,7 +424,7 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.menuId != undefined) {
+          if (this.form.id != undefined) {
             updateMenu(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -441,7 +443,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function() {
-        return delMenu(row.menuId);
+        return delMenu(row.id);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

src/views/system/role/index.vue

@@ -99,7 +99,7 @@
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <el-table-column label="角色编号" prop="roleSort" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />

vue.config.js

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