15 最终版

3 years ago · d4b9405de9
parent b8434958cd
commit d4b9405de9
11 changed files with 1226 additions and 232 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -7,13 +7,17 @@
    "build": "vue-cli-service build"
  },
  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
    "core-js": "^3.6.5",
    "echart": "^0.1.3",
    "echarts": "^4.8.0",
    "element-ui": "^2.15.6",
    "exceljs": "^4.3.0",
    "file-saver": "^2.0.5",
+    "less-loader": "^6.0.0",
    "live2d-widget": "^3.1.4",
+    "node-sass": "^4.14.1",
+    "sass-loader": "^7.1.0",
    "v-charts": "^1.19.0",
    "vue": "^2.6.11",
    "vue-router": "^3.2.0",
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@ -5,13 +5,22 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title>国防科大请销假系统</title>
    <title><%= htmlWebpackPlugin.options.title %></title>
+
 </head>
 <body>
 <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
+        Please enable it to continue.</strong>
 </noscript>
+<script type="text/javascript">
+    window._AMapSecurityConfig = {
+        securityJsCode: '1693fdbadccd80bf26e85ad55f947215',
+    }
+</script>
 <div id="app"></div>
+
 <!-- built files will be auto injected -->
 </body>
 </html>
--- a/src/main.js
+++ b/src/main.js
@ -9,6 +9,7 @@ import VCharts from 'v-charts'
 Vue.use(VCharts)
 Vue.config.productionTip = false

+
 new Vue({
  router,
  store,
--- a/src/router/index.js
+++ b/src/router/index.js
@ -18,6 +18,7 @@ import GetComment from "../views/GetComment"
 import DataAnalysis from "../views/DataAnalysis";
 import StudentAnalysis from "../views/StudentAnalysis";
 import RegisterApplication from "../views/RegisterApplication";
+import AMap from "../views/AMap";


 Vue.use(VueRouter)
@ -59,6 +60,11 @@ const routes = [
        name: "学生请假数据分析",
        component: StudentAnalysis
      },
+      {
+        path: "/user/student/:id/aMap",
+        name: "外出查查",
+        component: AMap
+      }

    ]
  },
@ -120,14 +126,16 @@ const routes = [
        path: "/user/outer/:id/registerApplication",
        name: "注册申请审批",
        component: RegisterApplication
-      }
+      },
+
    ]
  },
  {
    path: '/noAuthority',
    name: "无权限",
    component: NoAuthority
-  }
+  },
+

 ]

--- a/src/views/AMap.vue
+++ b/src/views/AMap.vue
@ -0,0 +1,36 @@
+<template>
+  <div>
+    <iframe id="mobsf"
+            frameborder="0" scrolling="no"
+            src="https://map.baidu.com/search/%E9%95%BF%E6%B2%99%E5%B8%82/@12573169,3258221.75,12z?querytype=s&da_src=shareurl&wd=%E9%95%BF%E6%B2%99&c=1&src=0&pn=0&sug=0&l=8&b=(11885167.325861586,2839554.975477234;12824971.19424195,3276416.92991967)&from=webmap&biz_forward=%7B%22scaler%22:2,%22styles%22:%22pl%22%7D&device_ratio=2"
+            style="position:absolute;top:180px;left: 220px;right:0px;bottom:100px;"></iframe>
+  </div>
+</template>
+
+
+<script>
+export default {
+  data() {
+    return {}
+  },
+  mounted() {
+    /**
+     * iframe-宽高自适应显示
+     */
+    function changeMobsfIframe() {
+      const mobsf = document.getElementById('mobsf');
+      const deviceWidth = document.body.clientWidth;
+      const deviceHeight = document.body.clientHeight;
+      mobsf.style.width = (Number(deviceWidth) - 320) + 'px'; //数字是页面布局宽度差值
+      mobsf.style.height = (Number(deviceHeight) - 180) + 'px'
+      //mobsf.style.height = (Number(deviceHeight)-64) + 'px'; //数字是页面布局高度差
+    }
+
+    changeMobsfIframe()
+
+    window.onresize = function () {
+      changeMobsfIframe()
+    }
+  }
+}
+</script>
--- a/src/views/StudentUserIndex.vue
+++ b/src/views/StudentUserIndex.vue
@ -20,6 +20,7 @@
          <el-menu-item index="appForm">填写申请表单</el-menu-item>
          <el-menu-item index="setComment">匿名评论</el-menu-item>
          <el-menu-item index="studentAnalysis">我的请假数据分析</el-menu-item>
+          <el-menu-item index="aMap">外出查查</el-menu-item>
        </el-menu>
      </el-aside>

--- a/src/views/TeacherApplication.vue
+++ b/src/views/TeacherApplication.vue
@ -100,24 +100,22 @@ export default {
    agree(id) {
      const _this = this
      let userid = window.location.pathname.split('/')[3];
-      axios.get('http://localhost:8181/leaveDetail/agreeUpdate/' + id).then(function (resp) {
-        this.$message({
+      axios.get('http://localhost:8181/leaveDetail/agreeUpdate/' + id)
+      _this.$message({
        message: '已同意',
        type: 'success'
      });
      window.location.href = "/user/teacher/" + userid + "/history";
-      })
    },
    disagree(row) {
      const _this = this
      let userid = window.location.pathname.split('/')[3];
-      axios.get('http://localhost:8181/leaveDetail/disagreeUpdate/' + id).then(function (resp) {
-        this.$message({
+      axios.get('http://localhost:8181/leaveDetail/disagreeUpdate/' + id)
+      _this.$message({
        message: '已拒绝',
        type: 'success'
      });
      window.location.href = "/user/teacher/" + userid + "/history";
-      })
    },
    allAgree() {
      let arrLength = this.$refs.multipleTable.selection.length;
--- a/src/views/~@/styles/scss/_global.scss
+++ b/src/views/~@/styles/scss/_global.scss
@ -0,0 +1 @@
+$themeTextColor: #efefef;
--- a/vue.config.js
+++ b/vue.config.js
@ -0,0 +1,14 @@
+module.exports = {
+    configureWebpack: {
+        externals: {
+            'AMap': 'AMap' // 表示CDN引入的高德地图
+        }
+    },
+    css: {
+        loaderOptions: {
+            sass: {
+                data: `@import "~@/styles/scss/_global.scss";`
+            }
+        }
+    }
+}