合并冲突

src/App.vue

@@ -6,6 +6,4 @@
 export default {};
 </script>
 
-<style>
-
-</style>
+<style></style>

src/components/Header.vue

@@ -10,7 +10,7 @@
         </el-dropdown-menu>
       </template>
     </el-dropdown>
-    
+
     <!-- <el-badge is-dot class="item">
       <el-button
         class="share-button"
@@ -31,24 +31,28 @@ export default {
   name: "HelloWorld",
   data() {
     return {
-      logo: process.env["VUE_APP_LOGO"] ? require(process.env["VUE_APP_LOGO"]) : require('../assets/img/logo.png'),
-      title: process.env["VUE_APP_TITLE"] ? process.env["VUE_APP_TITLE"] : '沈阳领新智科智能信息系统有限公司',
+      logo: process.env["VUE_APP_LOGO"]
+        ? require(process.env["VUE_APP_LOGO"])
+        : require("../assets/img/logo.png"),
+      title: process.env["VUE_APP_TITLE"]
+        ? process.env["VUE_APP_TITLE"]
+        : "沈阳领新智科智能信息系统有限公司",
       userLogo: require("../assets/img/logo.png"),
     };
   },
-  methods:{
+  methods: {
     // 退出登录
-    logOut(){
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    logOut() {
+      this.$confirm("确定注销并退出系统吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(() => {
-        localStorage.token='';
-        this.$router.push({ path:'/login'});
-      })
-    }
-  }
+        localStorage.token = "";
+        this.$router.push({ path: "/login" });
+      });
+    },
+  },
 };
 </script>
 <style lang="less">
@@ -98,7 +102,7 @@ export default {
     line-height: 48px;
     text-shadow: 0px -1px 0px #215c85;
   }
-  
+
   .item {
     float: right;
     height: 30px;

src/components/Layout.vue

@@ -18,14 +18,14 @@ export default {
     Header,
     NavMenu,
   },
-	created() {
-		get("/admin/etl/tabcolname/query", {}).then(({ code, data }) => {
-			if (code === 200) {
-				localStorage.removeItem('allField')
-				localStorage.setItem('allField', JSON.stringify(data))
-			}
+  created() {
+    get("/admin/etl/tabcolname/query", {}).then(({ code, data }) => {
+      if (code === 200) {
+        localStorage.removeItem("allField");
+        localStorage.setItem("allField", JSON.stringify(data));
+      }
     });
-	},
+  },
 };
 </script>
 
@@ -46,7 +46,7 @@ export default {
     height: 48px;
     line-height: 48px;
     // background: linear-gradient(180deg, #67a9d9 0%, #5ea4d7 42%, #3478a9 100%);
-		background: linear-gradient(180deg, #327E77 0%, #2C9B92 46%, #1E524D 100%);
+    background: linear-gradient(180deg, #327e77 0%, #2c9b92 46%, #1e524d 100%);
   }
   #content-nav-menu {
     position: absolute;

src/components/Pagination/index.vue

@@ -1,53 +1,59 @@
 <template>
   <div class="pagination-container">
-    <el-pagination background layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 30, 50]"
-      :current-page="pagination.pageNumber" :page-size="pagination.pageSize" :total="pagination.total"
-      @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+    <el-pagination
+      background
+      layout="total, sizes, prev, pager, next, jumper"
+      :page-sizes="[10, 20, 30, 50]"
+      :current-page="pagination.pageNumber"
+      :page-size="pagination.pageSize"
+      :total="pagination.total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
   </div>
 </template>
 
 <script>
 // 传递分页参数时，必须使用此格式  v-model:pagination="{ pageNumber: 1, pageSize: 10, total: 0}"
-  export default {
-    name: 'Pagination',
-    props: {
-      pagination: {
-        type: Object,
-        default: {
-          pageNumber: 1,
-          pageSize: 10,
-          total: 0
-        }
-      }
-    },
-    methods: {
-      handleSizeChange(val) {
-        this.$emit('update:pagination', {
-          ...this.pagination,
-          pageSize:val
-        });
-        this.$emit('change')
+export default {
+  name: "Pagination",
+  props: {
+    pagination: {
+      type: Object,
+      // eslint-disable-next-line vue/require-valid-default-prop
+      default: {
+        pageNumber: 1,
+        pageSize: 10,
+        total: 0,
       },
-      handleCurrentChange(val) {
-        this.$emit('update:pagination', {
-          ...this.pagination,
-          pageNumber:val
-        });
-        this.$emit('change')
-      }
-    }
-  }
-
-  
+    },
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.$emit("update:pagination", {
+        ...this.pagination,
+        pageSize: val,
+      });
+      this.$emit("change");
+    },
+    handleCurrentChange(val) {
+      this.$emit("update:pagination", {
+        ...this.pagination,
+        pageNumber: val,
+      });
+      this.$emit("change");
+    },
+  },
+};
 </script>
 
 <style scoped>
-  .pagination-container {
-    /* background: #fff; */
-    padding: 32px 16px;
-  }
+.pagination-container {
+  /* background: #fff; */
+  padding: 32px 16px;
+}
 
-  .pagination-container.hidden {
-    display: none;
-  }
-</style>
+.pagination-container.hidden {
+  display: none;
+}
+</style>

src/components/SideMenu.vue

@@ -30,12 +30,21 @@ export default {
   methods: {},
 };
 </script>
+<style lang="less">
+.sidebar {
+  .el-submenu__title:focus,
+  .el-submenu__title:hover {
+    background: transparent;
+  }
+}
+</style>
 <style lang="less" scoped>
 .sidebar {
   .el-menu-item [class^="el-icon-"] {
     margin-right: 10px;
   }
-  .el-menu-item, .el-submenu {
+  .el-menu-item,
+  .el-submenu {
     height: 48px;
     line-height: 48px;
     font-size: 16px;
@@ -49,7 +58,6 @@ export default {
     i::before {
       width: 22px;
       height: 22px;
-      // color: #528db8;
       color: #2d9b8e;
       display: inline-block;
     }
@@ -64,8 +72,6 @@ export default {
     background: linear-gradient(360deg, #1f534e 0%, #2b978e 57%, #3cbdb2 100%);
     box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25), 0px 1px 0px 0px #cccccc,
       0px 1px 0px 0px #ffffff;
-    // background: linear-gradient(360deg, #3478A9 0%, #60A5D8 57%, #67A9D9 100%);
-    // box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25), 0px 1px 0px 0px #CCCCCC, 0px 1px 0px 0px #FFFFFF;
     i,
     i::before {
       width: 22px;

src/main.js

@@ -4,30 +4,30 @@ import router from "./router";
 import store from "./store";
 import ElementPlus from "element-plus";
 import "element-plus/lib/theme-chalk/index.css";
-import 'dayjs/locale/zh-cn'
-import locale from 'element-plus/lib/locale/lang/zh-cn'
-import "./assets/css/base.css"
-import Pagination from '@/components/Pagination';
-import { getStanderOne } from "@/server/api.js"
-import { getColumnName } from '@/utils/allField.js'
-import { parseTime, resetForm } from '@/utils/costum'
+import "dayjs/locale/zh-cn";
+import locale from "element-plus/lib/locale/lang/zh-cn";
+import "./assets/css/base.css";
+import Pagination from "@/components/Pagination";
+import { getStanderOne } from "@/server/api.js";
+import { getColumnName } from "@/utils/allField.js";
+import { parseTime, resetForm } from "@/utils/costum";
 
-const app = createApp(App)
-app.use(store)
-app.use(router)
-app.use(ElementPlus, { locale })
-app.component('Pagination', Pagination)
-app.config.globalProperties.getStanderOne = getStanderOne
-app.config.globalProperties.getColumnName = getColumnName
-app.config.globalProperties.parseTime = parseTime
-app.config.globalProperties.resetForm = resetForm
+const app = createApp(App);
+app.use(store);
+app.use(router);
+app.use(ElementPlus, { locale });
+app.component("Pagination", Pagination);
+app.config.globalProperties.getStanderOne = getStanderOne;
+app.config.globalProperties.getColumnName = getColumnName;
+app.config.globalProperties.parseTime = parseTime;
+app.config.globalProperties.resetForm = resetForm;
 app.config.globalProperties.msgSuccess = function (msg) {
-	this.$message({ showClose: true, message: msg, type: 'success' })
-}
+  this.$message({ showClose: true, message: msg, type: "success" });
+};
 app.config.globalProperties.msgError = function (msg) {
-	this.$message({ showClose: true, message: msg, type: 'error' })
-}
+  this.$message({ showClose: true, message: msg, type: "error" });
+};
 app.config.globalProperties.msgInfo = function (msg) {
-	this.$message.info(msg)
-}
-app.mount('#app')
+  this.$message.info(msg);
+};
+app.mount("#app");

src/mixins/ListMixin.js

@@ -1,74 +1,85 @@
 import { get, deleteData } from "@/server/api.js";
 export const ListMixin = {
-	data() {
-		return {
-			isShowDialog: '',
-			item: null,
-			pagination: { // 分页参数
-				pageNumber: 1,
-				pageSize: 10,
-				total: 0,
-			},
-			queryParams:{},
-			tableData: [], // 表格数据
-			loading: true, // 表格loading加载
-		}
-	},
-	created() {
-		this.getList()
-	},
-	methods: {
-		// 查询分页列表
-		getList() {
-			this.loading = true
-			get(this.queryTableDataUrl, {...this.pagination, ...this.queryParams})
-				.then(({code, data=[], count=0}) => {
-					if (code === 200) {
-						this.tableData = data || []
-						this.pagination.total = count
-						this.loading = false
-					} else {
-						this.loading = false
-					}
-				}).catch(() => {
-					this.loading = false
-				})
-		},
-		// 监听回调
-		completeCallBack(data) {
-			this.isShowDialog = ''
-			this.item = null
-			this.getList()
-		},
-		// 新增按钮操作
-		handleAdd() {
-			this.isShowDialog = 'edit'
-			this.item = null
-		},
-		// 修改按钮操作
-		handleUpdate(row) {
-			this.isShowDialog = 'edit'
-			this.item = row
-		},
-		// 改变isShowDialog的值
-		changeDialogStatus(data) {
-			this.isShowDialog = data
-		},
-		// 删除数据
-		delHanle(keyName, url) {
-			this.$confirm('是否确认删除"' + keyName + '"的数据项?', '警告', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				return deleteData(url)
-			}).then(() => {
-				this.msgSuccess('删除成功')
-				const totalPage = Math.ceil((this.total - 1) / this.pagination.pageSize)
-				this.pagination.pageNumber = this.pagination.pageNumber > totalPage ? totalPage : this.pagination.pageNumber
-				this.pagination.pageNumber = this.pagination.pageNumber < 1 ? 1 : this.pagination.pageNumber
-				this.getList()
-			}).catch(() => { })
-		},
-	}
-}
+  data() {
+    return {
+      isShowDialog: "",
+      item: null,
+      pagination: {
+        // 分页参数
+        pageNumber: 1,
+        pageSize: 10,
+        total: 0,
+      },
+      queryParams: {},
+      tableData: [], // 表格数据
+      loading: true, // 表格loading加载
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 查询分页列表
+    getList() {
+      this.loading = true;
+      get(this.queryTableDataUrl, { ...this.pagination, ...this.queryParams })
+        .then(({ code, data = [], count = 0 }) => {
+          if (code === 200) {
+            this.tableData = data || [];
+            this.pagination.total = count;
+            this.loading = false;
+          } else {
+            this.loading = false;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    // 监听回调
+    completeCallBack() {
+      this.isShowDialog = "";
+      this.item = null;
+      this.getList();
+    },
+    // 新增按钮操作
+    handleAdd() {
+      this.isShowDialog = "edit";
+      this.item = null;
+    },
+    // 修改按钮操作
+    handleUpdate(row) {
+      this.isShowDialog = "edit";
+      this.item = row;
+    },
+    // 改变isShowDialog的值
+    changeDialogStatus(data) {
+      this.isShowDialog = data;
+    },
+    // 删除数据
+    delHanle(keyName, url) {
+      this.$confirm('是否确认删除"' + keyName + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return deleteData(url);
+        })
+        .then(() => {
+          this.msgSuccess("删除成功");
+          const totalPage = Math.ceil(
+            (this.total - 1) / this.pagination.pageSize
+          );
+          this.pagination.pageNumber =
+            this.pagination.pageNumber > totalPage
+              ? totalPage
+              : this.pagination.pageNumber;
+          this.pagination.pageNumber =
+            this.pagination.pageNumber < 1 ? 1 : this.pagination.pageNumber;
+          this.getList();
+        })
+        .catch(() => {});
+    },
+  },
+};

src/router/index.js

@@ -11,7 +11,8 @@ const routes = [
   {
     path: "/login",
     name: "login",
-    component: () => import(/* webpackChunkName: "about" */ "@/views/login.vue"),
+    component: () =>
+      import(/* webpackChunkName: "about" */ "@/views/login.vue"),
   },
   {
     path: "/404",

src/router/routers.js

@@ -24,7 +24,7 @@ const routes = [
         component: () => import("@/views/system/role"),
       },
     ],
-  }
+  },
 ];
 
 export default routes;

src/server/api.js

@@ -13,33 +13,33 @@ export const post = (url, data) =>
     data,
   });
 export const put = (url, data) =>
-	service.request({
-		url: url,
-		method: "put",
-		data,
-	});
+  service.request({
+    url: url,
+    method: "put",
+    data,
+  });
 export const deleteData = (url, params) =>
-	service.request({
-		url: url,
-		method: "delete",
-		params,
-	});
+  service.request({
+    url: url,
+    method: "delete",
+    params,
+  });
 export const getStanderOne = (params) =>
-	service.request({
-		url: '/admin/etl/stdef/query',
-		method: "get",
-		params,
-	});
+  service.request({
+    url: "/admin/etl/stdef/query",
+    method: "get",
+    params,
+  });
 export const uploadExcel = (param, sourceType) =>
-	service.request({
-		url: '/admin/etl/datatablehead/uploadexcel?taskId=' + sourceType,
-		method: 'post',
-		headers: { 'Content-Type': 'multipart/form-data' },
-		data: param
-	});
+  service.request({
+    url: "/admin/etl/datatablehead/uploadexcel?taskId=" + sourceType,
+    method: "post",
+    headers: { "Content-Type": "multipart/form-data" },
+    data: param,
+  });
 export default {
   get,
   post,
-	put,
-	deleteData
+  put,
+  deleteData,
 };

src/server/request.js

@@ -15,14 +15,17 @@ service.interceptors.request.use(
 
 service.interceptors.response.use(
   (response) => {
-    console.log(code);
     const code = response.data.code;
     if (code === 200) {
       return response.data;
     }
   },
   (error) => {
-    if (error.response && error.response.data && error.response.data.code == 401) {
+    if (
+      error.response &&
+      error.response.data &&
+      error.response.data.code == 401
+    ) {
       location.href = `${location.origin}/#/login`;
     }
     return Promise.reject(error.response.data);

src/server/system/menu.js

@@ -2,8 +2,8 @@ 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 addMenu = (params) => post("/admin/menu/addmenu", params);
 // 修改菜单
-export const updateMenu = (params) =>put('/admin/menu/upmenu', params);
+export const updateMenu = (params) => put("/admin/menu/upmenu", params);
 // 查询菜单详情
-export const getMenuDetails = (params) =>get('/admin/menu/menubyid', params);
+export const getMenuDetails = (params) => get("/admin/menu/menubyid", params);

src/utils/allField.js

@@ -1,29 +1,29 @@
 import { get } from "../server/api.js";
 
 // 获取列名翻译
-export function getColumnName (colName) {
-	let fieldObj = JSON.parse(localStorage.getItem('allField')) || []
-	if (Object.keys(fieldObj).length < 1) {
-		get("/admin/etl/tabcolname/query", {}).then(({ code, data }) => {
-			if (code === 200) {
-				localStorage.removeItem('allField')
-				localStorage.setItem('allField', JSON.stringify(data))
-			}
-		});
-	}
-	let col = colName
-	if (colName.indexOf('-') > -1) col = colName.split('-')[1]
-	fieldObj.forEach(el => {
-		if (col === el['TabColName-ColName'] || col === el['TabColName-ColName']) {
-			col = el['TabColName-TextLabel']
-			return col
-		}
-	});
-	// for (const key in fieldObj) {
-	// 	if (col === key.split('.')[1]) {
-	// 		col = fieldObj[key]
-	// 		return col
-	// 	}
-	// }
-	return col
+export function getColumnName(colName) {
+  let fieldObj = JSON.parse(localStorage.getItem("allField")) || [];
+  if (Object.keys(fieldObj).length < 1) {
+    get("/admin/etl/tabcolname/query", {}).then(({ code, data }) => {
+      if (code === 200) {
+        localStorage.removeItem("allField");
+        localStorage.setItem("allField", JSON.stringify(data));
+      }
+    });
+  }
+  let col = colName;
+  if (colName.indexOf("-") > -1) col = colName.split("-")[1];
+  fieldObj.forEach((el) => {
+    if (col === el["TabColName-ColName"] || col === el["TabColName-ColName"]) {
+      col = el["TabColName-TextLabel"];
+      return col;
+    }
+  });
+  // for (const key in fieldObj) {
+  // 	if (col === key.split('.')[1]) {
+  // 		col = fieldObj[key]
+  // 		return col
+  // 	}
+  // }
+  return col;
 }

src/utils/costum.js

@@ -1,62 +1,66 @@
-
 // 日期格式化
-export function parseTime (time, pattern) {
-	if (arguments.length === 0 || !time) {
-		return null
-	}
-	if (time == '00010101000000') return ''
-	return time.replace(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/g, '$1-$2-$3 $4:$5:$6')
+export function parseTime(time) {
+  if (arguments.length === 0 || !time) {
+    return null;
+  }
+  if (time == "00010101000000") return "";
+  return time.replace(
+    /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/g,
+    "$1-$2-$3 $4:$5:$6"
+  );
 }
 
 // 表单重置
-export function resetForm (refName) {
-	if (this.$refs[refName]) {
-		this.$refs[refName].resetFields()
-	}
+export function resetForm(refName) {
+  if (this.$refs[refName]) {
+    this.$refs[refName].resetFields();
+  }
 }
 
 // 添加日期范围
-export function addDateRange (params, dateRange) {
-	var search = params
-	search.beginTime = ''
-	search.endTime = ''
-	if (dateRange != null && dateRange !== '') {
-		search.beginTime = this.dateRange[0]
-		search.endTime = this.dateRange[1]
-	}
-	return search
+export function addDateRange(params, dateRange) {
+  var search = params;
+  search.beginTime = "";
+  search.endTime = "";
+  if (dateRange != null && dateRange !== "") {
+    search.beginTime = this.dateRange[0];
+    search.endTime = this.dateRange[1];
+  }
+  return search;
 }
 
 // 回显数据字典
-export function selectDictLabel (datas, value) {
-	var actions = []
-	Object.keys(datas).map((key) => {
-		if (datas[key].dictValue === ('' + value)) {
-			actions.push(datas[key].dictLabel)
-			return false
-		}
-	})
-	return actions.join('')
+export function selectDictLabel(datas, value) {
+  var actions = [];
+  Object.keys(datas).map((key) => {
+    if (datas[key].dictValue === "" + value) {
+      actions.push(datas[key].dictLabel);
+      return false;
+    }
+  });
+  return actions.join("");
 }
 
 // 字符串格式化(%s )
-export function sprintf (str) {
-	var args = arguments; var flag = true; var i = 1
-	str = str.replace(/%s/g, function () {
-		var arg = args[i++]
-		if (typeof arg === 'undefined') {
-			flag = false
-			return ''
-		}
-		return arg
-	})
-	return flag ? str : ''
+export function sprintf(str) {
+  var args = arguments;
+  var flag = true;
+  var i = 1;
+  str = str.replace(/%s/g, function () {
+    var arg = args[i++];
+    if (typeof arg === "undefined") {
+      flag = false;
+      return "";
+    }
+    return arg;
+  });
+  return flag ? str : "";
 }
 
 // 转换字符串，undefined,null等转化为""
-export function praseStrEmpty (str) {
-	if (!str || str === 'undefined' || str === 'null') {
-		return ''
-	}
-	return str
+export function praseStrEmpty(str) {
+  if (!str || str === "undefined" || str === "null") {
+    return "";
+  }
+  return str;
 }

src/utils/scroll-to.js

@@ -1,29 +1,40 @@
-Math.easeInOutQuad = function(t, b, c, d) {
-  t /= d / 2
+Math.easeInOutQuad = function (t, b, c, d) {
+  t /= d / 2;
   if (t < 1) {
-    return c / 2 * t * t + b
+    return (c / 2) * t * t + b;
   }
-  t--
-  return -c / 2 * (t * (t - 2) - 1) + b
-}
+  t--;
+  return (-c / 2) * (t * (t - 2) - 1) + b;
+};
 
 // requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
-var requestAnimFrame = (function() {
-  return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
-})()
+var requestAnimFrame = (function () {
+  return (
+    window.requestAnimationFrame ||
+    window.webkitRequestAnimationFrame ||
+    window.mozRequestAnimationFrame ||
+    function (callback) {
+      window.setTimeout(callback, 1000 / 60);
+    }
+  );
+})();
 
 /**
  * Because it's so fucking difficult to detect the scrolling element, just move them all
  * @param {number} amount
  */
 function move(amount) {
-  document.documentElement.scrollTop = amount
-  document.body.parentNode.scrollTop = amount
-  document.body.scrollTop = amount
+  document.documentElement.scrollTop = amount;
+  document.body.parentNode.scrollTop = amount;
+  document.body.scrollTop = amount;
 }
 
 function position() {
-  return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop
+  return (
+    document.documentElement.scrollTop ||
+    document.body.parentNode.scrollTop ||
+    document.body.scrollTop
+  );
 }
 
 /**
@@ -32,27 +43,27 @@ function position() {
  * @param {Function} callback
  */
 export function scrollTo(to, duration, callback) {
-  const start = position()
-  const change = to - start
-  const increment = 20
-  let currentTime = 0
-  duration = (typeof (duration) === 'undefined') ? 500 : duration
-  var animateScroll = function() {
+  const start = position();
+  const change = to - start;
+  const increment = 20;
+  let currentTime = 0;
+  duration = typeof duration === "undefined" ? 500 : duration;
+  var animateScroll = function () {
     // increment the time
-    currentTime += increment
+    currentTime += increment;
     // find the value with the quadratic in-out easing function
-    var val = Math.easeInOutQuad(currentTime, start, change, duration)
+    var val = Math.easeInOutQuad(currentTime, start, change, duration);
     // move the document.body
-    move(val)
+    move(val);
     // do the animation unless its over
     if (currentTime < duration) {
-      requestAnimFrame(animateScroll)
+      requestAnimFrame(animateScroll);
     } else {
-      if (callback && typeof (callback) === 'function') {
+      if (callback && typeof callback === "function") {
         // the animation is done so lets callback
-        callback()
+        callback();
       }
     }
-  }
-  animateScroll()
+  };
+  animateScroll();
 }

src/views/system/index.vue

@@ -1,3 +1,3 @@
 <template>
   <router-view />
-</template>
+</template>

src/views/system/menu/index.vue

@@ -121,9 +121,9 @@ export default {
     // 新增菜单
     handleAdd() {},
     // 修改
-    handleUpdate(item) {},
+    handleUpdate() {},
     // 删除
-    handleDelete(item) {},
+    handleDelete() {},
   },
   mounted() {
     getMenuDetails({ id: 261 }).then((res) => {

src/views/system/role/index.vue

@@ -1,25 +1,19 @@
 <template>
   <div>
-    <SearchTemplate>
-      搜索
-    </SearchTemplate>
-    <ContentContainer>
-      角色管理界面
-    </ContentContainer>
+    <SearchTemplate> 搜索 </SearchTemplate>
+    <ContentContainer> 角色管理界面 </ContentContainer>
   </div>
 </template>
 <script>
-import SearchTemplate from "@/components/SearchTemplate.vue"
-import ContentContainer from "@/components/ContentContainer.vue"
+import SearchTemplate from "@/components/SearchTemplate.vue";
+import ContentContainer from "@/components/ContentContainer.vue";
 export default {
-  components:{
+  components: {
     SearchTemplate,
-    ContentContainer
+    ContentContainer,
   },
-  data(){
-    return{
-      
-    }
-  }
-}
-</script>
+  data() {
+    return {};
+  },
+};
+</script>

src/views/system/user/index.vue

@@ -1,25 +1,19 @@
 <template>
   <div>
-    <SearchTemplate>
-      搜索
-    </SearchTemplate>
-    <ContentContainer>
-      用户管理界面
-    </ContentContainer>
+    <SearchTemplate> 搜索 </SearchTemplate>
+    <ContentContainer> 用户管理界面 </ContentContainer>
   </div>
 </template>
 <script>
-import SearchTemplate from "@/components/SearchTemplate.vue"
-import ContentContainer from "@/components/ContentContainer.vue"
+import SearchTemplate from "@/components/SearchTemplate.vue";
+import ContentContainer from "@/components/ContentContainer.vue";
 export default {
-  components:{
+  components: {
     SearchTemplate,
-    ContentContainer
+    ContentContainer,
   },
-  data(){
-    return{
-      
-    }
-  }
-}
-</script>
+  data() {
+    return {};
+  },
+};
+</script>

vue.config.js

@@ -18,7 +18,7 @@ module.exports = {
     open: true,
     proxy: {
       "/user": {
-				target: process.env.VUE_APP_BASE_URL || 'http://101.201.121.115:8098/', //要跨域的域名 目标地址
+        target: process.env.VUE_APP_BASE_URL || "http://101.201.121.115:8098/", //要跨域的域名 目标地址
         changeOrigin: true, //是否开启跨域  是否更改源路径
         ws: true,
         pathRewrite: {