Главная Обзор Помощь
Регистрация Вход
yf_zd
/
cropland
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

bug修复

yf_zd 4 лет назад
Родитель
aa4f9a714f
Сommit
c2fa289deb
18 измененных файлов с 587 добавлено и 59 удалено
Разделённый вид Показать статистику Diff
  1. BIN
      dist.zip
  2. 306 13
      src/assets/icon/demo_index.html
  3. 53 7
      src/assets/icon/iconfont.css
  4. 1 1
      src/assets/icon/iconfont.js
  5. 84 0
      src/assets/icon/iconfont.json
  6. BIN
      src/assets/icon/iconfont.ttf
  7. BIN
      src/assets/icon/iconfont.woff
  8. BIN
      src/assets/icon/iconfont.woff2
  9. 41 27
      src/components/index.vue
  10. 1 1
      src/pages/plantGuard/equipManage/equipManage.vue
  11. 7 4
      src/pages/plantGuard/plantProtection/base.vue
  12. 30 3
      src/pages/plantGuard/plantProtection/baseComponents/bzyTabPhoto.vue
  13. 16 0
      src/pages/plantGuard/plantProtection/baseComponents/cbdTabPhoto.vue
  14. 10 1
      src/pages/plantGuard/plantProtection/equipCtrls/bzyctrl.vue
  15. 10 1
      src/pages/plantGuard/plantProtection/equipCtrls/cbdctrl.vue
  16. 9 0
      src/pages/plantGuard/plantProtection/equipCtrls/qxzctrl.vue
  17. 9 0
      src/pages/plantGuard/plantProtection/equipCtrls/scdctrl.vue
  18. 10 1
      src/pages/plantGuard/plantProtection/equipCtrls/xycbctrl.vue

BIN
dist.zip
Просмотреть файл


+ 306 - 13
src/assets/icon/demo_index.html
Просмотреть файл 

@@ -2,7 +2,7 @@
 
 <html>
 
 <head>
 
   <meta charset="utf-8"/>
 
-  <title>IconFont Demo</title>
 
+  <title>iconfont Demo</title>
 
   <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
 
   <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
 
   <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
 
@@ -13,10 +13,33 @@
 
   <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
 
   <!-- 代码高亮 -->
 
   <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
 
+  <style>
 
+    .main .logo {
 
+      margin-top: 0;
 
+      height: auto;
 
+    }
 
+
 
+    .main .logo a {
 
+      display: flex;
 
+      align-items: center;
 
+    }
 
+
 
+    .main .logo .sub-title {
 
+      margin-left: 0.5em;
 
+      font-size: 22px;
 
+      color: #fff;
 
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
 
+      -webkit-background-clip: text;
 
+      -webkit-text-fill-color: transparent;
 
+    }
 
+  </style>
 
 </head>
 
 <body>
 
   <div class="main">
 
-    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">&#xe86b;</a></h1>
 
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
 
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
 
+      
+    </a></h1>
 
     <div class="nav-tabs">
 
       <ul id="tabs" class="dib-box">
 
         <li class="dib active"><span>Unicode</span></li>
 
@@ -32,6 +55,78 @@
 
           <ul class="icon_lists dib-box">
 
           
             <li class="dib">
 
+              <span class="icon iconfont">&#xe6c8;</span>
 
+                <div class="name">定点巡查</div>
 
+                <div class="code-name">&amp;#xe6c8;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6b1;</span>
 
+                <div class="name">模型管理</div>
 
+                <div class="code-name">&amp;#xe6b1;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6c4;</span>
 
+                <div class="name">日志</div>
 
+                <div class="code-name">&amp;#xe6c4;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6cc;</span>
 
+                <div class="name">设备报验</div>
 
+                <div class="code-name">&amp;#xe6cc;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6d6;</span>
 
+                <div class="name">形象</div>
 
+                <div class="code-name">&amp;#xe6d6;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6d7;</span>
 
+                <div class="name">BIM</div>
 
+                <div class="code-name">&amp;#xe6d7;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6d8;</span>
 
+                <div class="name">预警</div>
 
+                <div class="code-name">&amp;#xe6d8;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6dc;</span>
 
+                <div class="name">水质</div>
 
+                <div class="code-name">&amp;#xe6dc;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6ca;</span>
 
+                <div class="name">供应商审核</div>
 
+                <div class="code-name">&amp;#xe6ca;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6d3;</span>
 
+                <div class="name">实名</div>
 
+                <div class="code-name">&amp;#xe6d3;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6d5;</span>
 
+                <div class="name">用户</div>
 
+                <div class="code-name">&amp;#xe6d5;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
+              <span class="icon iconfont">&#xe6b2;</span>
 
+                <div class="name">视频物联</div>
 
+                <div class="code-name">&amp;#xe6b2;</div>
 
+              </li>
 
+          
+            <li class="dib">
 
               <span class="icon iconfont">&#xe752;</span>
 
                 <div class="name">inbox-1</div>
 
                 <div class="code-name">&amp;#xe752;</div>
 
@@ -506,24 +601,20 @@
 
 
           <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
 
           <ul>
 
-            <li>兼容性最好，支持 IE6+，及所有现代浏览器。</li>
 
             <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
 
-            <li>但是因为是字体，所以不支持多色。只能使用平台里单色的图标，就算项目里有多色图标也会自动去色。</li>
 
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
 
           </ul>
 
           <blockquote>
 
-            <p>注意：新版 iconfont 支持多色图标，这些多色图标在 Unicode 模式下将不能使用，如果有需求建议使用symbol 的引用方式</p>
 
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
 
           </blockquote>
 
           <p>Unicode 使用步骤如下：</p>
 
           <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
 
 <pre><code class="language-css"
 
 >@font-face {
 
   font-family: 'iconfont';
 
-  src: url('iconfont.eot');
 
-  src: url('iconfont.eot?#iefix') format('embedded-opentype'),
 
-      url('iconfont.woff2') format('woff2'),
 
-      url('iconfont.woff') format('woff'),
 
-      url('iconfont.ttf') format('truetype'),
 
-      url('iconfont.svg#iconfont') format('svg');
 
+  src: url('iconfont.woff2?t=1622876999330') format('woff2'),
 
+       url('iconfont.woff?t=1622876999330') format('woff'),
 
+       url('iconfont.ttf?t=1622876999330') format('truetype');
 
 }
 
 </code></pre>
 
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
 
@@ -550,6 +641,114 @@
 
         <ul class="icon_lists dib-box">
 
           
           <li class="dib">
 
+            <span class="icon iconfont icon-dingdianxuncha"></span>
 
+            <div class="name">
 
+              定点巡查
 
+            </div>
 
+            <div class="code-name">.icon-dingdianxuncha
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-moxingguanli"></span>
 
+            <div class="name">
 
+              模型管理
 
+            </div>
 
+            <div class="code-name">.icon-moxingguanli
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-rizhi"></span>
 
+            <div class="name">
 
+              日志
 
+            </div>
 
+            <div class="code-name">.icon-rizhi
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-shebeibaoyan"></span>
 
+            <div class="name">
 
+              设备报验
 
+            </div>
 
+            <div class="code-name">.icon-shebeibaoyan
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-xingxiang"></span>
 
+            <div class="name">
 
+              形象
 
+            </div>
 
+            <div class="code-name">.icon-xingxiang
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-BIM"></span>
 
+            <div class="name">
 
+              BIM
 
+            </div>
 
+            <div class="code-name">.icon-BIM
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-yujing"></span>
 
+            <div class="name">
 
+              预警
 
+            </div>
 
+            <div class="code-name">.icon-yujing
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-shuizhi"></span>
 
+            <div class="name">
 
+              水质
 
+            </div>
 
+            <div class="code-name">.icon-shuizhi
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-gongyingshangshenhe"></span>
 
+            <div class="name">
 
+              供应商审核
 
+            </div>
 
+            <div class="code-name">.icon-gongyingshangshenhe
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-shiming"></span>
 
+            <div class="name">
 
+              实名
 
+            </div>
 
+            <div class="code-name">.icon-shiming
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-yonghu2"></span>
 
+            <div class="name">
 
+              用户
 
+            </div>
 
+            <div class="code-name">.icon-yonghu2
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
+            <span class="icon iconfont icon-shipinwulian"></span>
 
+            <div class="name">
 
+              视频物联
 
+            </div>
 
+            <div class="code-name">.icon-shipinwulian
 
+            </div>
 
+          </li>
 
+          
+          <li class="dib">
 
             <span class="icon iconfont icon-inbox-1"></span>
 
             <div class="name">
 
               inbox-1
 
@@ -1259,10 +1458,8 @@
 
         <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
 
         <p>与 Unicode 使用方式相比，具有如下特点：</p>
 
         <ul>
 
-          <li>兼容性良好，支持 IE8+，及所有现代浏览器。</li>
 
           <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
 
           <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
 
-          <li>不过因为本质上还是使用的字体，所以多色图标还是不支持的。</li>
 
         </ul>
 
         <p>使用步骤如下：</p>
 
         <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
 
@@ -1282,6 +1479,102 @@
 
           
             <li class="dib">
 
                 <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-dingdianxuncha"></use>
 
+                </svg>
 
+                <div class="name">定点巡查</div>
 
+                <div class="code-name">#icon-dingdianxuncha</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-moxingguanli"></use>
 
+                </svg>
 
+                <div class="name">模型管理</div>
 
+                <div class="code-name">#icon-moxingguanli</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-rizhi"></use>
 
+                </svg>
 
+                <div class="name">日志</div>
 
+                <div class="code-name">#icon-rizhi</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-shebeibaoyan"></use>
 
+                </svg>
 
+                <div class="name">设备报验</div>
 
+                <div class="code-name">#icon-shebeibaoyan</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-xingxiang"></use>
 
+                </svg>
 
+                <div class="name">形象</div>
 
+                <div class="code-name">#icon-xingxiang</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-BIM"></use>
 
+                </svg>
 
+                <div class="name">BIM</div>
 
+                <div class="code-name">#icon-BIM</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-yujing"></use>
 
+                </svg>
 
+                <div class="name">预警</div>
 
+                <div class="code-name">#icon-yujing</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-shuizhi"></use>
 
+                </svg>
 
+                <div class="name">水质</div>
 
+                <div class="code-name">#icon-shuizhi</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-gongyingshangshenhe"></use>
 
+                </svg>
 
+                <div class="name">供应商审核</div>
 
+                <div class="code-name">#icon-gongyingshangshenhe</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-shiming"></use>
 
+                </svg>
 
+                <div class="name">实名</div>
 
+                <div class="code-name">#icon-shiming</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-yonghu2"></use>
 
+                </svg>
 
+                <div class="name">用户</div>
 
+                <div class="code-name">#icon-yonghu2</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
+                  <use xlink:href="#icon-shipinwulian"></use>
 
+                </svg>
 
+                <div class="name">视频物联</div>
 
+                <div class="code-name">#icon-shipinwulian</div>
 
+            </li>
 
+          
+            <li class="dib">
 
+                <svg class="icon svg-icon" aria-hidden="true">
 
                   <use xlink:href="#icon-inbox-1"></use>
 
                 </svg>
 
                 <div class="name">inbox-1</div>

Разница между файлами не показана из-за своего большого размера
+ 53 - 7
src/assets/icon/iconfont.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/assets/icon/iconfont.js


+ 84 - 0
src/assets/icon/iconfont.json
Просмотреть файл 

@@ -6,6 +6,90 @@
 
   "description": "",
 
   "glyphs": [
 
     {
 
+      "icon_id": "18621423",
 
+      "name": "定点巡查",
 
+      "font_class": "dingdianxuncha",
 
+      "unicode": "e6c8",
 
+      "unicode_decimal": 59080
 
+    },
 
+    {
 
+      "icon_id": "18438526",
 
+      "name": "模型管理",
 
+      "font_class": "moxingguanli",
 
+      "unicode": "e6b1",
 
+      "unicode_decimal": 59057
 
+    },
 
+    {
 
+      "icon_id": "18563203",
 
+      "name": "日志",
 
+      "font_class": "rizhi",
 
+      "unicode": "e6c4",
 
+      "unicode_decimal": 59076
 
+    },
 
+    {
 
+      "icon_id": "18655289",
 
+      "name": "设备报验",
 
+      "font_class": "shebeibaoyan",
 
+      "unicode": "e6cc",
 
+      "unicode_decimal": 59084
 
+    },
 
+    {
 
+      "icon_id": "18735859",
 
+      "name": "形象",
 
+      "font_class": "xingxiang",
 
+      "unicode": "e6d6",
 
+      "unicode_decimal": 59094
 
+    },
 
+    {
 
+      "icon_id": "18735861",
 
+      "name": "BIM",
 
+      "font_class": "BIM",
 
+      "unicode": "e6d7",
 
+      "unicode_decimal": 59095
 
+    },
 
+    {
 
+      "icon_id": "18735863",
 
+      "name": "预警",
 
+      "font_class": "yujing",
 
+      "unicode": "e6d8",
 
+      "unicode_decimal": 59096
 
+    },
 
+    {
 
+      "icon_id": "18772645",
 
+      "name": "水质",
 
+      "font_class": "shuizhi",
 
+      "unicode": "e6dc",
 
+      "unicode_decimal": 59100
 
+    },
 
+    {
 
+      "icon_id": "18655271",
 
+      "name": "供应商审核",
 
+      "font_class": "gongyingshangshenhe",
 
+      "unicode": "e6ca",
 
+      "unicode_decimal": 59082
 
+    },
 
+    {
 
+      "icon_id": "18735854",
 
+      "name": "实名",
 
+      "font_class": "shiming",
 
+      "unicode": "e6d3",
 
+      "unicode_decimal": 59091
 
+    },
 
+    {
 
+      "icon_id": "18735868",
 
+      "name": "用户",
 
+      "font_class": "yonghu2",
 
+      "unicode": "e6d5",
 
+      "unicode_decimal": 59093
 
+    },
 
+    {
 
+      "icon_id": "18438528",
 
+      "name": "视频物联",
 
+      "font_class": "shipinwulian",
 
+      "unicode": "e6b2",
 
+      "unicode_decimal": 59058
 
+    },
 
+    {
 
       "icon_id": "19135742",
 
       "name": "inbox-1",
 
       "font_class": "inbox-1",

BIN
src/assets/icon/iconfont.ttf
Просмотреть файл


BIN
src/assets/icon/iconfont.woff
Просмотреть файл


BIN
src/assets/icon/iconfont.woff2
Просмотреть файл


+ 41 - 27
src/components/index.vue
Просмотреть файл 

@@ -113,7 +113,7 @@
 
             :class="{'active':item.name==currLeftMenuId}"
 
             @click="leftMenuClick(item,index)"
 
           >
 
-            <i :class="['iconfont', iconimgs[item.id]]"></i>
 
+            <i :class="['iconfont', iconimgs[item.pur_id]]"></i>
 
             <div>{{item.name}}</div>
 
           </li>
 
         </ul>
 
@@ -176,28 +176,33 @@ export default {
 
       currTopMenuId: '农林植保',
 
       currLeftMenuId: '设备列表',
 
       iconimgs: {
 
-        "1": '',
 
-        "2": 'icon-inbox-1',
 
-        "3": 'icon-inbox-1',
 
-        "4": 'icon-inbox-1',
 
-        "5": 'icon-inbox-1',
 
-        "6": 'icon-inbox-1',
 
-        "7": 'icon-inbox-1',
 
-        "8": 'icon-inbox-1',
 
-        "9": 'icon-inbox-1',
 
-        "10": 'icon-inbox-1',
 
-        "11": 'icon-inbox-1',
 
-        "12": 'icon-inbox-1',
 
-        "13": 'icon-inbox-1',
 
-        "14": 'icon-yonghu1',
 
-        "15": 'icon-xitong',
 
-        "16": 'icon-zhuti_tiaosepan_o',
 
+        "1": 'icon-dingdianxuncha',
 
+        "2": 'icon-dingdianxuncha',
 
+        "100": 'icon-dingdianxuncha',
 
+        "3": 'icon-shipinwulian',
 
+        "4": 'icon-shipinwulian',
 
+        "5": 'icon-yujing',
 
+        "101": 'icon-yujing',
 
+        "6": 'icon-yujing',
 
+        "7": 'icon-shebeibaoyan',
 
+        "8": 'icon-xingxiang',
 
+        "9": 'icon-rizhi',
 
+        "10": 'icon-shuizhi',
 
+        "102": 'icon-shuizhi',
 
+        "11": 'icon-shuizhi',
 
+        "12": 'icon-rizhi',
 
+        "13": 'icon-rizhi',
 
+        "14": 'icon-1',
 
+        "15": 'icon-1',
 
+        "16": 'icon-yen-2',
 
         "17": 'icon-inbox-1',
 
         "18": 'icon-inbox-1',
 
         "19": 'icon-inbox-1',
 
-        "20": 'icon-pin-2',
 
-        "21": 'icon-1',
 
-        "22": 'icon-chongzhi',
 
+        "20": 'icon-yonghu2',
 
+        "21": 'icon-yonghu2',
 
+        "22": 'icon-moxingguanli',
 
+        "23": 'icon-shiming',
 
+        "24": 'icon-BIM',
 
       },
 
       //动态标签
 
       // menuTabs:[{ "path": "/plantGuard/base", "name": "设备列表", "par": "农林植保", "order": 0 } ],
 
@@ -343,10 +348,14 @@ export default {
 
               if (nextTab) {
 
                 activeName = nextTab.name;
 
                 this.$router.push({ path: nextTab.path });
 
-                this.leftMenuList = this.menuList[nextTab.order].children;
 
+                this.menuList.forEach((item)=>{
 
+                  if(item.name == nextTab.par){
 
+                    this.leftMenuList = item.children;
 
+                    sessionStorage.setItem("leftMenuList", JSON.stringify(item.children));
 
+                  }
 
+                })
 
                 this.currTopMenuId=nextTab.par;
 
                 this.currLeftMenuId=nextTab.name;
 
-                sessionStorage.setItem("leftMenuList", JSON.stringify(this.menuList[nextTab.order].children));
 
                 sessionStorage.setItem("currLeftMenuId", nextTab.name);
 
               }
 
             }
 
@@ -361,11 +370,15 @@ export default {
 
       console.log('tab')
 
       console.log(tab)
 
       this.$router.push({path: this.menuTabs[tab.index].path})
 
-      this.leftMenuList = this.menuList[this.menuTabs[tab.index].order].children;
 
+      this.menuList.forEach((item)=>{
 
+        if(item.name == this.menuTabs[tab.index].par){
 
+          this.leftMenuList = item.children;
 
+          sessionStorage.setItem("leftMenuList", JSON.stringify(item.children));
 
+        }
 
+      })
 
       this.menuTabsValue = this.menuTabs[tab.index].name
 
       this.currTopMenuId=this.menuTabs[tab.index].par;
 
       this.currLeftMenuId=this.menuTabs[tab.index].name;
 
-      sessionStorage.setItem("leftMenuList", JSON.stringify(this.menuList[this.menuTabs[tab.index].order].children));
 
       sessionStorage.setItem("currLeftMenuId", this.menuTabs[tab.index].name);
 
     
     },
 
@@ -412,14 +425,14 @@ export default {
 
                 item.children = [{
 
                   "name": "植保示范点",
 
                   "path": "base",
 
-                  "id": "100"
 
+                  "pur_id": "100"
 
                 }]
 
               }
 
               if(item.name == '灾害预警'){
 
                 item.children = [{
 
                   "name": "预警示范点",
 
                   "path": "disasterWarn",
 
-                  "id": "101"
 
+                  "pur_id": "101"
 
                 }]
 
               }
 
 
@@ -427,7 +440,7 @@ export default {
 
                 item.children = [{
 
                   "name": "灌溉示范点",
 
                   "path": "irrigate",
 
-                  "id": "102"
 
+                  "pur_id": "102"
 
                 }]
 
               }
 
               
@@ -694,6 +707,7 @@ export default {
 
       line-height: .275rem;
 
       i{
 
         font-size: .325rem;
 
+        line-height: 27px;
 
       }
 
     }
 
     li:hover {

+ 1 - 1
src/pages/plantGuard/equipManage/equipManage.vue
Просмотреть файл 

@@ -60,7 +60,7 @@
 
                   <img src="@/assets/images/equipdistribute/scdIconOn.png" />
 
                 </template>
 
                 <template v-if="item.device_type_id == '3'">
 
-                  <img src="@/assets/images/equipdistribute/cbdIconOn.png" />>
 
+                  <img src="@/assets/images/equipdistribute/cbdIconOn.png" />
 
                 </template>
 
                 <template v-if="item.device_type_id == '4'">
 
                   <img src="@/assets/images/equipdistribute/znxyOn.png" />

+ 7 - 4
src/pages/plantGuard/plantProtection/base.vue
Просмотреть файл 

@@ -961,8 +961,8 @@ export default {
 
       this.currSelectType = item.type;
 
       this.currSelectSite = index;
 
       this.detailsShow = ''
 
-      this.searchEquipVal = ''
 
-      this.getEquipList(item.type)
 
+      this.queryInfo.type = item.type
 
+      this.getEquipList()
 
     },
 
     mouseOve(index,item){
 
       this.equipStyleLeft = this.$refs.tabsRef0[0].clientWidth*index
 
@@ -1000,13 +1000,13 @@ export default {
 
           break;
 
       }
 
     },
 
-    getEquipList(type) {
 
+    getEquipList() {
 
       this.equipListloading = true;
 
       this.$axios({
 
         method: "POST",
 
         url: "/api/api_gateway?method=home.homes.equip_map_location",
 
         data: this.qs.stringify({
 
-          equip_type: type,
 
+          equip_type: this.queryInfo.type,
 
           device_id: this.searchEquipVal,
 
           user_id:this.user_id
 
         }),
 
@@ -1053,6 +1053,9 @@ export default {
 
           console.log(this.equipListCurr);
 
           
           // 普通标注
 
+          if(this.markers){
 
+            this.map.remove(this.markers)
 
+          }
 
           for (var i = 0; i < this.equipListCurr.length; i += 1) {
 
             var title = this.equipListCurr[i].device_name || '设备'+this.equipListCurr[i].device_id
 
             var marker = new AMap.Marker({

+ 30 - 3
src/pages/plantGuard/plantProtection/baseComponents/bzyTabPhoto.vue
Просмотреть файл 

@@ -12,7 +12,9 @@
 
       </div>
 
       <div class="photos" v-viewer>
 
           <div v-for="i in photoList" :key="i.addtime">
 
-              <img :src="i.addr" alt="">
 
+              <div class="photo">
 
+                <img :src="i.addr" alt />
 
+              </div>
 
               <div class="time">{{i.addtime*1000|formatTime}}</div>
 
           </div>
 
       </div>
 
@@ -56,6 +58,22 @@ export default {
 
         this.delBtnState = false;
 
       }
 
     },
 
+    equipBtnControl(cmd) {
 
+      this.$axios({
 
+        method: "POST",
 
+        url:
 
+          "/api/api_gateway?method=forecast.send_control.admin_device_control",
 
+        data: this.qs.stringify({
 
+          cmd,
 
+          device_type_id: 7,
 
+          d_id: this.d_id,
 
+        }),
 
+      }).then((res) => {
 
+        if (res.data.message == "") {
 
+          this.$message.success("指令下发成功!");
 
+        }
 
+      });
 
+    },
 
     lookmore(){
 
       this.$store.commit('setData',{
 
         name:'bzy_photo_id',
 
@@ -119,8 +137,17 @@ export default {
 
         max-width: 33.3333%;
 
         min-width: 33.3333%;
 
         text-align: center;
 
-        img{
 
-            width: 90%;
 
+        .photo{
 
+          width: 220px;
 
+          height: 170px;
 
+          position: relative;
 
+          overflow: hidden;
 
+          img{
 
+            height: 100%;
 
+          position: absolute;
 
+          left: 50%;
 
+          transform: translate(-50%);
 
+          }
 
         }
 
         .time{
 
           color: #04d5e8;

+ 16 - 0
src/pages/plantGuard/plantProtection/baseComponents/cbdTabPhoto.vue
Просмотреть файл 

@@ -182,6 +182,22 @@ export default {
 
         }
 
       }
 
     },
 
+    equipBtnControl(cmd) {
 
+      this.$axios({
 
+        method: "POST",
 
+        url:
 
+          "/api/api_gateway?method=forecast.send_control.admin_device_control",
 
+        data: this.qs.stringify({
 
+          cmd,
 
+          device_type_id: 7,
 
+          d_id: this.d_id,
 
+        }),
 
+      }).then((res) => {
 
+        if (res.data.message == "") {
 
+          this.$message.success("指令下发成功!");
 
+        }
 
+      });
 
+    },
 
     lookmore() {
 
       this.$store.commit('setData',{
 
         name:'cbd_photo_id',

+ 10 - 1
src/pages/plantGuard/plantProtection/equipCtrls/bzyctrl.vue
Просмотреть файл 

@@ -297,9 +297,18 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 
 // 时间input框
 
 /deep/.el-date-editor.el-input, 
 /deep/.el-date-editor.el-input__inner{
 
-  width: 177px;
 
+  width: 120px;
 
 }
 
 .timeSet{
 
   margin-bottom: 13px;
 
 }
 
+/deep/.el-slider__input{
 
+  width: 103px;
 
+}
 
+/deep/.el-input-number--small .el-input-number__decrease, /deep/.el-input-number--small .el-input-number__increase{
 
+  width: 26px;
 
+}
 
+/deep/.el-slider__runway.show-input{
 
+  margin-right: 119px;
 
+}
 
 </style>

+ 10 - 1
src/pages/plantGuard/plantProtection/equipCtrls/cbdctrl.vue
Просмотреть файл 

@@ -296,6 +296,15 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 
 // 时间input框
 
 /deep/.el-date-editor.el-input, 
 /deep/.el-date-editor.el-input__inner{
 
-  width: 177px;
 
+  width: 120px;
 
+}
 
+/deep/.el-slider__input{
 
+  width: 103px;
 
+}
 
+/deep/.el-input-number--small .el-input-number__decrease, /deep/.el-input-number--small .el-input-number__increase{
 
+  width: 26px;
 
+}
 
+/deep/.el-slider__runway.show-input{
 
+  margin-right: 119px;
 
 }
 
 </style>

+ 9 - 0
src/pages/plantGuard/plantProtection/equipCtrls/qxzctrl.vue
Просмотреть файл 

@@ -159,4 +159,13 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 
   width: 100%;
 
   line-height: 22px;
 
 }
 
+/deep/.el-slider__input{
 
+  width: 103px;
 
+}
 
+/deep/.el-input-number--small .el-input-number__decrease, /deep/.el-input-number--small .el-input-number__increase{
 
+  width: 26px;
 
+}
 
+/deep/.el-slider__runway.show-input{
 
+  margin-right: 119px;
 
+}
 
 </style>

+ 9 - 0
src/pages/plantGuard/plantProtection/equipCtrls/scdctrl.vue
Просмотреть файл 

@@ -224,4 +224,13 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 
 /deep/.el-date-editor.el-input__inner{
 
   width: 177px;
 
 }
 
+/deep/.el-slider__input{
 
+  width: 103px;
 
+}
 
+/deep/.el-input-number--small .el-input-number__decrease, /deep/.el-input-number--small .el-input-number__increase{
 
+  width: 26px;
 
+}
 
+/deep/.el-slider__runway.show-input{
 
+  margin-right: 119px;
 
+}
 
 </style>

+ 10 - 1
src/pages/plantGuard/plantProtection/equipCtrls/xycbctrl.vue
Просмотреть файл 

@@ -224,6 +224,15 @@ activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 
 // 时间input框
 
 /deep/.el-date-editor.el-input, 
 /deep/.el-date-editor.el-input__inner{
 
-  width: 177px;
 
+  width: 120px;
 
+}
 
+/deep/.el-slider__input{
 
+  width: 103px;
 
+}
 
+/deep/.el-input-number--small .el-input-number__decrease, /deep/.el-input-number--small .el-input-number__increase{
 
+  width: 26px;
 
+}
 
+/deep/.el-slider__runway.show-input{
 
+  margin-right: 119px;
 
 }
 
 </style>