From 2a7910543684af4661dfddd18856400b409b5992 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 11 Apr 2023 13:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ico=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                            | Bin 4286 -> 4286 bytes
 .../photographicDevice/index.vue              |  56 ++++++++-
 src/views/stritl/chartFiles/radar.vue         | 118 +++++++++---------
 src/views/stritl/index.vue                    |   7 +-
 4 files changed, 119 insertions(+), 62 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index df36fcfb72584e00488330b560ebcf34a41c64c2..d5afe8dde4773b52e772211eb58636a1f1714bd5 100644
GIT binary patch
literal 4286
zcmeHIv2GJV5S>&;qDT-@6e=RoP|{N2Pv8?QVM{hu{@@a&p>&xd5|rtZKfp*xDa{|m
zk_(quqM<-HytlV=x3}^+S>L70TI0K&nVmN?`*u%c55MDM;lErRh#ZQ@TL@Irhfr_h
z<#Q3r)40C_<B?1uzXk(ASJMX9a4ln`t*pE!L-{rtiKgaY*j&pPRm8M6tUYlt5^|_v
z7x*V>sFnA4D1BeU?}zlEhCP&G4PsOg)8Bmkvv4mqMG3L7Uth6q#<iP#Q*@p~Yp$^z
zHtng|h)rKS*TA3iz0D}&j*Cmg>I!o(AK0#mHHI&14}Esc0Wk^=ev*%j!9KGtiyvUm
zX`{~szTUnw_ZWx6IEd$|Q{b<b1M5UShD{&(5}#{1Z#!Hq;8PeUsGIl0v}Wswdloa~
zAa$4zd`{d4w-?j}{+)2Ij5m}U*H7@O#K!q%&)r_wSw{|CaxcJl`&srJc%Mh|&g^`L
z&D}SFPiyX3eB+?&d4z2~wH$Wj9(#xWa_`9L&V{jwVL8W7x0kp>Q1ACxtiQ27o?DM%
zJ?F4p6C=ib$lUgITmEhj*tZtn+@@TRf5Ab24{q`c&PHe4GaTUe*<0pey7&qFsrTu}
zwzhN64RUhU6pJ?EH`&|jv9AkqxG4^?A+5i;7T@~m<L-1G8N=eGKCyPdb5qJl?wAYo
zccsqk-p2ZCw&1&viXZzUZX*Y+SM-V3bv56{LDc=I+_M^*IOsXj8TSk?e%d|g>t)R*
zk8<zD_`GAuKVNToCa9w=_J5jh?|}M|fB2W>um5KG{yNKhi%fen)i*y?UwlzLc&2)E
xq<Z;Y_2QN4>7MG@nd<ouU5NB3db`w0R;sI&<{}wIm$$0Rx#}OtdcP2l`yX${B5D8t

literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 803ca28..3639598 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -7,11 +7,65 @@
       <el-button type="primary">查询</el-button>
       <el-button type="primary">质保延期</el-button>
       <el-button type="primary">导入</el-button>
-      <el-button type="primary">导入模板下载</el-button>
+      <el-button type="primary">模板</el-button>
       <el-button type="primary">导出</el-button>
+      <el-button type="primary">前端分析报告</el-button>
+      <el-button type="primary">G开关</el-button>
+      <el-button type="primary">更新ZB</el-button>
+      <el-button type="primary">I1图像分析</el-button>
+      <el-button type="primary">主动拍照</el-button>
+      <el-button type="primary">传感器数量下发</el-button>
     </div>
     <div class="searchForm">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
+        <el-form-item label="单位:">
+          <el-select v-model="formInline.region" placeholder="活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="DY等级:">
+          <el-select v-model="formInline.region" placeholder="活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="XL名称:">
+          <el-select v-model="formInline.region" placeholder="活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="GT名称:">
+          <el-select v-model="formInline.region" placeholder="活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="质保到期日:">
+          <el-select v-model="formInline.region" placeholder="活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="装置类型:">
+          <el-select v-model="formInline.region" placeholder="活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态:">
+          <el-select v-model="formInline.region" placeholder="活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备编号:">
+          <el-select v-model="formInline.region" placeholder="活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="单位:">
           <el-select v-model="formInline.region" placeholder="活动区域">
             <el-option label="区域一" value="shanghai"></el-option>
diff --git a/src/views/stritl/chartFiles/radar.vue b/src/views/stritl/chartFiles/radar.vue
index 84815d4..82e0d36 100644
--- a/src/views/stritl/chartFiles/radar.vue
+++ b/src/views/stritl/chartFiles/radar.vue
@@ -1,72 +1,72 @@
 <template>
-    <div id="myMidChart" ref="redarChart" :style="boxStyle"></div>
+  <div id="myMidChart" ref="redarChart" :style="boxStyle"></div>
 </template>
 <script>
 export default {
-    props: ['radarName', 'radarValue', 'radarTitle', 'boxStyle'],
-    data() {
-        return {};
-    },
-    mounted() {
-        this.$nextTick(function () {
-            this.drawBar();
-        });
-    },
-    methods: {
-        drawBar() {
-            // 基于准备好的dom，初始化echarts实例
-            var myChart = this.$echarts.init(this.$refs.redarChart);
-            // 绘制图表
-            myChart.setOption({
-                tooltip: {
-                    trigger: 'item'
-                },
-                radar: {
-                    // shape: 'circle',
-                    indicator: this.radarName,
-                    radius: 50
+  props: ["radarName", "radarValue", "radarTitle", "boxStyle"],
+  data() {
+    return {};
+  },
+  mounted() {
+    this.$nextTick(function () {
+      this.drawBar();
+    });
+  },
+  methods: {
+    drawBar() {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = this.$echarts.init(this.$refs.redarChart);
+      // 绘制图表
+      myChart.setOption({
+        tooltip: {
+          trigger: "item",
+        },
+        radar: {
+          // shape: 'circle',
+          indicator: this.radarName,
+          radius: 50,
+        },
+        series: [
+          {
+            type: "radar",
+            name: this.radarTitle,
+            data: [
+              {
+                value: this.radarValue,
+                areaStyle: {
+                  // 单项区域填充样式
+                  normal: {
+                    color: "#37A2FF", // 填充的颜色。[ default: "#000" ]
+                  },
                 },
-                series: [
-                    {
-                        type: 'radar',
-                        name: this.radarTitle,
-                        data: [
-                            {
-                                value: this.radarValue,
-                                areaStyle: {
-                                    // 单项区域填充样式
-                                    normal: {
-                                        color: '#37A2FF' // 填充的颜色。[ default: "#000" ]
-                                    }
-                                }
-                            }
-                        ]
-                    }
-                ]
-            });
-            window.addEventListener('resize', () => {
-                // 第六步，执行echarts自带的resize方法，即可做到让echarts图表自适应
-                myChart.resize();
-            });
-        }
+              },
+            ],
+          },
+        ],
+      });
+      window.addEventListener("resize", () => {
+        // 第六步，执行echarts自带的resize方法，即可做到让echarts图表自适应
+        myChart.resize();
+      });
     },
-    watch: {
-        radarValue(val, old) {
-            this.drawBar();
-        }
+  },
+  watch: {
+    radarValue(val, old) {
+      this.drawBar();
     },
-    beforeDestroy() {
-        /* 页面组件销毁的时候，别忘了移除绑定的监听resize事件，否则的话，多渲染几次
+  },
+  beforeDestroy() {
+    /* 页面组件销毁的时候，别忘了移除绑定的监听resize事件，否则的话，多渲染几次
       容易导致内存泄漏和额外CPU或GPU占用哦*/
-        window.removeEventListener('resize', () => {
-            myChart.resize();
-        });
-    }
+    window.removeEventListener("resize", () => {
+      myChart.resize();
+    });
+  },
 };
 </script>
 <style lang="less">
 #myMidChart {
-    width: 100%;
-    height: 240px;
+  width: 100%;
+  height: 240px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/stritl/index.vue b/src/views/stritl/index.vue
index ed5d86f..e9724f3 100644
--- a/src/views/stritl/index.vue
+++ b/src/views/stritl/index.vue
@@ -316,16 +316,19 @@ export default {
         }
       });
       console.log(obj);
+      this.radarValue = Object.values(obj);
+      console.log(this.radarValue);
+      let max = Math.max(...this.radarValue);
       //对象转化成数组对象
+      console.log(max);
       for (let i in obj) {
         console.log(i);
         this.radarName.push({
           name: i,
+          max: max,
         });
       }
       console.log(this.radarName);
-      this.radarValue = Object.values(obj);
-      console.log(this.radarValue);
     });
   },
 };