Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend

src/components/Headerlogin.vue

@@ -4,7 +4,7 @@
       <div class="navlogo">
         <router-link to="/" style="color: black"><img class="logimg" src="../assets/log.png"/>
         <p class="logochinesetitle">中国荒漠主要植物群落调查</p>
-            <p class="logoenglishtitle">A survey of the main plant communities in deserts of China</p></router-link>
+            <p class="logoenglishtitle">Survey of the main plant communities in deserts of China</p></router-link>
       </div>
       <div class="projecttit">
         <p class="pro1" @mouseover="lineenter1" @mouseout="lineout1">

src/components/Headerold1.vue

@@ -365,11 +365,11 @@ export default {
     color: #ffffff;
   }
   .deng {
-    padding-left: 53px;
+    /*padding-left: 53px;*/
-    position: absolute;
+    /*position: absolute;*/
-    right: 213px;
+    /*right: 213px;*/
     display: inline-block;
-    width: 28px;
+    /*width: 28px;*/
     margin-left: 0;
   }
   .zhuc {

src/components/Headerres.vue

@@ -4,7 +4,7 @@
       <div class="navlogo">
         <router-link to="/" style="color: black"><img class="logimg" src="../assets/log.png"/>
         <p class="logochinesetitle">中国荒漠主要植物群落调查</p>
-            <p class="logoenglishtitle">A survey of the main plant communities in deserts of China</p></router-link>
+            <p class="logoenglishtitle">Survey of the main plant communities in deserts of China</p></router-link>
       </div>
       `<div class="projecttit">
         <p class="pro1" @mouseover="lineenter1" @mouseout="lineout1">

src/router/index.js

@@ -26,6 +26,11 @@ const routes = [
       requireAuth: true
     }
   },
+  {
+    path: '/forgetpassord',
+    name: 'forgetpassord',
+    component: () => import(/* webpackChunkName: "about" */ '../views/user/ForgetPassord.vue')
+  },
   {
     path: '/login',
     name: 'Login',

src/views/displayed/EconomicPlant.vue

@@ -207,6 +207,18 @@ export default {
         console.log(_this.point)
         _this.addMarker(_this.point)
       }
+      for (var j = 0; j < _this.tableData2.length; j++) {
+        console.log('lat:' + _this.tableData2[j].lat)
+        _this.point = [_this.tableData2[j].lon, _this.tableData2[j].lat]
+        console.log(_this.point)
+        _this.addMarker(_this.point)
+      }
+      for (var k = 0; k < _this.tableData3.length; k++) {
+        console.log('lat:' + _this.tableData3[k].lat)
+        _this.point = [_this.tableData3[k].lon, _this.tableData3[k].lat]
+        console.log(_this.point)
+        _this.addMarker(_this.point)
+      }
       console.log(_this.tableData1)
     }).catch(function (error) {
       alert(error)

src/views/index/Index2.vue

@@ -22,7 +22,7 @@
           <button class="button" @click="advantagemap"><img class="iconimg" src="../../../public/static/image/06.png"/><span class="icontext text1">优势灌木子数据库</span></button>
           <button class="button" @click="dna"><img class="iconimg" src="../../../public/static/image/D.png"/><span class="icontext text1">DNA数据库</span></button>
           <button class="button1" @click="communityCharacteristics"><img class="iconimg" src="../../../public/static/image/05.png"/><span class="icontext text1">中国荒漠植物群落特征子数据库</span></button>
-          <button class="button1" @click="typee"><img class="iconimg" src="../../../public/static/image/07.png"/><span class="icontext">类型子数据库</span></button>
+          <button class="button1"><img class="iconimg" src="../../../public/static/image/07.png"/><span class="icontext">类型子数据库</span></button>
           <button class="button1" @click="habitatt"><img class="iconimg" src="../../../public/static/image/08.png"/><span class="icontext text1">生境子数据库</span></button>
           <button class="button1" @click="constructiveSpecies"><img class="iconimg" src="../../../public/static/image/jian.png"/><span class="icontext text1">建群种特征子数据库</span></button>
           <button class="button1" @click="rareBank"><img class="iconimg" src="../../../public/static/image/09.png"/><span class="icontext text1">珍稀濒危植物群落子数据库</span></button>
@@ -526,6 +526,7 @@ export default {
         // path: '/test'
       })
     },
+    // 类型子数据库
     // typee () {
     //   this.$router.push({
     //     path: '/displayed/type'

src/views/reveal/SampletreesReveal.vue

@@ -37,11 +37,15 @@
 <!--          <div class="echarttitle2"><p class="ecshujv">乔木物种分布</p></div>-->
 <!--          <div class="echdata2">Tree species distribution</div>-->
           <el-col :xs="21" :sm="21" :md="21" :lg="21" :xl="21" class="realechart">
-            <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="background-color: #ffffff;position: relative">
+            <el-col class="backimg" :xs="24" :sm="24" :md="24" :lg="24" :xl="24" style="background-color: #ffffff;position: relative">
-              <img style="position: absolute;z-index: 100;top: 0px;right: 0" src="../../../public/static/image/echBG.jpg">
+<!--              <img style="position: absolute;z-index: 100;top: 0px;right: 0" src="../../../public/static/image/echBG.jpg">-->
-              <div class="middleshape"></div>
+<!--              <div class="middleshape"></div>-->
-              <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8" class="echarts1" id="findingsEcharts"></el-col>
+              <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8" class="echarts1" id="findingsEcharts">
-              <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" class="echarts2" id="typicalspecies"></el-col>
+<!--                <div class="middleshapeit"></div>-->
+              </el-col>
+              <div class="middleshapeit"></div>
+              <el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11" class="echarts2" id="typicalspecies">
+              </el-col>
             </el-col>
           </el-col>
         </el-col>
@@ -721,10 +725,11 @@ export default {
     height: 500px;
     position: absolute;
     top: 0px;
-    right: 31px;
+    right: 0px;
     z-index: 99;
     background-color: #ffffff;
     display: inline-block;
+    background: url("../../../public/static/image/echBG.jpg") no-repeat right top;
   }
   .gisname {
     width: 257px;
@@ -747,6 +752,16 @@ export default {
     bottom: 0;
     z-index: 99;
   }
+  .middleshapeit {
+    width: 13px;
+    height: 540px;
+    background-color: #f3f6fb;
+    /*background-color: red;*/
+    position: absolute;
+    left: 500px;
+    top: 0;
+    z-index: 999;
+  }
   .newtit{
     position: absolute;
     top: 158px;

src/views/user/ForgetPassord.vue

@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <el-row>
+      <div><Headernew></Headernew></div>
+    </el-row>
+    <div class="addtask">
+      <div class="breadcrumb" style="padding-top: 20px;padding-left: 10px">
+        <el-breadcrumb separator-class="el-icon-arrow-right">
+          <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+          <el-breadcrumb-item>用户管理</el-breadcrumb-item>
+          <el-breadcrumb-item>忘记密码</el-breadcrumb-item>
+        </el-breadcrumb>
+      </div>
+      <div class="from">
+        <el-form ref="form" :model="form" label-width="80px">
+          <el-form-item label="邮箱">
+              <el-input style="display: inline-block;width: 438px;margin-right: 80px" v-model="form.email" clearable></el-input>
+            <el-button style="display: inline-block;width: 200px" type="primary" @click="obtain">获取验证码</el-button>
+            </el-form-item>
+            <el-form-item label="验证码">
+              <el-input v-model="form.verification_code" clearable></el-input>
+            </el-form-item>
+          <el-form-item label="新密码">
+              <el-input v-model="form.password" clearable></el-input>
+            </el-form-item>
+            <el-form-item>
+            <el-button type="primary" @click="onSubmit">提交</el-button>
+            <el-button>取消</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import Headernew from '../../../src/components/Headernew.vue'
+
+export default {
+  components: {
+    Headernew
+  },
+  data () {
+    return {
+      id: this.$route.query.id,
+      form: {
+        verification_code: '',
+        password: '',
+        email: ''
+      }
+    }
+  },
+  created () {
+  },
+  methods: {
+    onSubmit () {
+      var _this = this
+      console.log(_this.form.file)
+      axios({
+        method: 'post',
+        url: this.GLOBAL.baseURL + '/forget/password/',
+        data: {
+          verification_code: _this.form.verification_code,
+          password: _this.form.password,
+          email: _this.form.email
+        }
+      }).then(function (response) {
+        if (response.data.status === '1') {
+          _this.$alert(response.data.message)
+          _this.$router.push({
+            path: '/login'
+          })
+        } else {
+          _this.$alert(response.data.message)
+        }
+        // eslint-disable-next-line handle-callback-err
+      }).catch(
+      )
+    },
+    obtain () {
+      var _this = this
+      console.log(_this.form.file)
+      console.log(_this.email)
+      axios({
+        method: 'get',
+        url: this.GLOBAL.baseURL + '/forget/password/',
+        params: {
+          email: _this.form.email
+        }
+      }).then(function (response) {
+        if (response.data.status === '1') {
+          _this.$alert(response.data.message)
+          // _this.$router.push({
+          //   path: '/login'
+          // })
+        } else {
+          _this.$alert(response.data.message)
+        }
+        // eslint-disable-next-line handle-callback-err
+      }).catch(
+      )
+    }
+  }
+}
+</script>
+
+<style scoped>
+  * {
+    margin: 0;
+    padding: 0;
+  }
+
+  .from {
+    width: 800px;
+    margin: 0 auto;
+    margin-top: 50px;
+  }
+
+  .breadcrumb {
+    margin-top: 100px;
+  }
+
+  .addtask {
+    width: 80%;
+    background-color: #f5f5f5;
+    text-align: center;
+    margin: 0 auto;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+    min-height: 800px;
+  }
+
+  .tasktitle {
+    margin-top: 60px;
+    font-size: 20px;
+    text-align: left;
+    margin-left: 10%;
+  }
+
+  .from .el-form-item {
+    margin-top: 40px;
+  }
+
+  .el-form-item .el-button {
+    width: 200px;
+    height: 40px;
+  }
+</style>

src/views/user/Loginnew.vue

@@ -152,6 +152,8 @@ export default {
     },
     resetForm (formName) {
       this.$refs[formName].resetFields()
+      this.$router.push('/forgetpassord')
+      console.log('忘记密码')
     }
   }
 }

src/views/user/ResetPassword.vue

@@ -1,15 +1,14 @@
 <template>
   <div>
-<!--    <div>-->
+    <el-row>
-<!--      <Header></Header>-->
+      <div><Headernew></Headernew></div>
-<!--    </div>-->
+    </el-row>
-    <div style="position: absolute;top: 0;left: 250px;border-bottom: 1px solid #14cfb2;"><Headernew></Headernew></div>
     <div class="addtask">
       <div class="breadcrumb" style="padding-top: 20px;padding-left: 10px">
         <el-breadcrumb separator-class="el-icon-arrow-right">
           <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-          <el-breadcrumb-item>用户管理</el-breadcrumb-item>
+          <el-breadcrumb-item :to="{ path: '/userinfo' }">用户管理</el-breadcrumb-item>
-          <el-breadcrumb-item>重置密码</el-breadcrumb-item>
+          <el-breadcrumb-item>修改密码</el-breadcrumb-item>
         </el-breadcrumb>
       </div>
       <div class="from">
@@ -22,7 +21,7 @@
             </el-form-item>
             <el-form-item>
             <el-button type="primary" @click="onSubmit">提交</el-button>
-            <el-button>取消</el-button>
+            <el-button @click="cancel">取消</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -73,6 +72,9 @@ export default {
         // eslint-disable-next-line handle-callback-err
       }).catch(
       )
+    },
+    cancel () {
+      this.$router.push('/userinfo')
     }
   }
 }