22

src/api/menuDataApi/deskTop.js

@@ -24,4 +24,18 @@ export const getStuDogSpecies = params =>
 export const getStuDogBirthDateTimePeriod = params =>
   postJson(`${baseUrl}/homePage/getStuDogBirthDateTimePeriod`, params)
 
+export const getDogByType = params =>
+  postJson(`${baseUrl}/homePage/getDogByType`, params)
+
+export const getWorkDogClassificationId = params =>
+  postJson(`${baseUrl}/homePage/getWorkDogClassificationId`, params)
+
+export const getArtisanJwjsxl = params =>
+  postJson(`${baseUrl}/homePage/getArtisanJwjsxl`, params)
+
+export const getArtisanRyfl = params =>
+  postJson(`${baseUrl}/homePage/getArtisanRyfl`, params)
+export const getArtisanToal = params =>
+  postJson(`${baseUrl}/homePage/getArtisanToal`, params)
+
 

src/router/modules/index.js

@@ -29,6 +29,15 @@ export default [
     },
     component: () => import('@/views/Home.vue')
   },
+  // {
+  //   path: '/dataV',
+  //   name: 'dataV',
+  //   meta: {
+  //     title: '工作桌面',
+  //     auth: '5'
+  //   },
+  //   component: () => import('@/views/dataJq/dataV.vue')
+  // },
   {
     path: '/dataV',
     name: 'dataV',
@@ -36,15 +45,6 @@ export default [
       title: '工作桌面',
       auth: '5'
     },
-    component: () => import('@/views/dataJq/dataV.vue')
-  },
-  {
-    path: '/dataVT',
-    name: 'dataVT',
-    meta: {
-      title: '工作桌面',
-      auth: '5'
-    },
     component: () => import('@/views/dataJq/deskTop.vue')
   },
   {

src/views/dataJq/components/StudDog.vue

@@ -589,7 +589,7 @@ export default {
   .breedTitle {
     position: absolute;
     z-index: 188;
-    color: #dce0f2;
+    color: #fff;
     font-size: 17px;
     top: 10px;
     left: 20px;

src/views/dataJq/deskTop.vue

@@ -10,17 +10,32 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd HH:mm:ss"
+          v-if="active != '桌面'"
         >
         </el-date-picker>
       </div>
       <div class="header_logo">
         <img src="@/assets/img/logoTile.png" alt="" />
       </div>
-      <div class="header_weather"></div>
+      <div class="header_weather">
+        <div
+          style="
+            position: absolute;
+            top: 20px;
+            right: 50px;
+            font-size: 20px;
+            color: #fff;
+            cursor: pointer;
+          "
+          @click="getSy"
+        >
+          系统首页
+        </div>
+      </div>
     </div>
     <div class="content">
       <JobDog :timeArr="value1" v-if="active == '工作犬分析'"></JobDog>
-      <StudDog :timeArr="value1" v-if="active == '犬种分析'"></StudDog>
+      <StudDog :timeArr="value1" v-if="active == '种犬分析'"></StudDog>
       <DataV :timeArr="value1" v-if="active == '桌面'"></DataV>
     </div>
     <div class="footer">
@@ -33,7 +48,7 @@
         }"
         v-for="item in menuArr"
         :key="item.name"
-        @click="active = item.name"
+        @click="menuClick(item)"
         :class="{ active: active == item.name }"
       >
         <img
@@ -69,7 +84,7 @@ export default {
           activeImg: require("@/assets/img/left2.png"),
         },
         {
-          name: "犬种分析",
+          name: "种犬分析",
           img: require("@/assets/img/left.png"),
           activeImg: require("@/assets/img/left2.png"),
         },
@@ -89,7 +104,7 @@ export default {
           activeImg: require("@/assets/img/right2.png"),
         },
       ],
-      active: "工作犬分析",
+      active: "桌面",
       value1: [],
     };
   },
@@ -100,6 +115,17 @@ export default {
       zoom("deskBox");
     });
   },
+  methods: {
+    getSy() {
+      this.$router.push("/jqglIndex");
+    },
+    menuClick(item) {
+      this.active = item.name;
+      if(item.name == '桌面') {
+        this.value1 = [];
+      }
+    },
+  },
 };
 </script>
 

src/views/dataJq/mapBox.vue

 <template>
   <div
-    style="position: relative"
+    style="position: relative; height: 100%"
     v-loading="loading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
@@ -18,17 +18,12 @@
     </div>
     <div
       id="on-back"
-      class="back"
+      class="qhBack"
       @click="qhdt"
       title="切换"
       v-show="this.log.length == 1 && userinfo.grade == 'B'"
-    >
-      切换
-    </div>
-    <div
-      id="myEacherForMap"
-      style="width: 66.08333rem; height: 50.3333rem"
     ></div>
+    <div id="myEacherForMap" style="width: 100%; height: 100%"></div>
     <!-- 左下角信息 -->
     <div
       class="infoClass"
@@ -209,7 +204,6 @@ export default {
     } else {
       this.getDatas();
     }
-    console.log(this.userinfo, 22222222);
   },
   methods: {
     qhdt() {
@@ -634,10 +628,26 @@ export default {
 * {
   box-sizing: border-box;
 }
+.qhBack {
+  position: absolute;
+  bottom: 40px;
+  left: 50%;
+  width: 169px;
+  height: 50px;
+  transform: translateX(-50%);
+  z-index: 999;
+  cursor: pointer;
+  color: #fff;
+  font-size: 16px;
+  background: url("~@/assets/img/dtcj.png") 100% no-repeat;
+  &:active {
+    background: url("~@/assets/img/dtcjActive.png") 100% no-repeat;
+  }
+}
 .back {
   position: absolute;
   top: 20px;
-  right: 0;
+  right: 20px;
   color: #fff;
   font-size: 16px;
   z-index: 999;
@@ -645,11 +655,10 @@ export default {
 }
 .infoClass {
   position: absolute;
-  bottom: 10px;
-  left: 0;
+  top: 10px;
+  left: 30px;
   // width: 176px;
   height: 154px;
-  background: #1d3e75;
   border-radius: 5px;
   padding: 12px 16px;
   .topClass {
@@ -699,8 +708,8 @@ export default {
       }
       .right_span {
         font-size: 14px;
-        color: #ffffff;
-        margin-left: 10px;
+        color: #f2a74f;
+        margin-left: 30px;
       }
     }
   }