Merge remote-tracking branch 'origin/master'

src/views/data-visible/image-identification/index.vue

@@ -59,12 +59,21 @@
                 <div style="font-weight: bold;color:green">2020-08-08 12:31</div>
               </descriptions-item>
             </descriptions>
+            <descriptions
+              label-position="top"
+              label-width="80px"
+              style="margin-left: 30px"
+            >
+              <descriptions-item label="当前状态" value="">
+                <div style="font-weight: bold;color:green">正常</div>
+              </descriptions-item>
+            </descriptions>
           </el-row>
           <el-row style="margin-top: 100px">
             <el-col v-for="(item,index) in images" :key="index" :span="6" style="text-align: center">
               <div style="font-weight: bold;">{{ item.step }}</div>
               <el-image
-                style="width: 240px; height: 180px;margin: 10px auto"
+                style="width: 200px; height: 200px;margin: 10px auto"
                 :src="item.url"
                 :preview-src-list="srcList"
               />
@@ -79,10 +88,10 @@
 <script>
 import { getAllDeviceModel } from '@/api/equipment-management/equipment-instance'
 import { getAllInstanceByDeviceTypeId } from '@/api/data-visible/dashboard'
-import step1 from '@/assets/step1.jpeg'
-import step2 from '@/assets/step2.jpeg'
-import step3 from '@/assets/step3.jpeg'
-import step4 from '@/assets/step4.jpeg'
+import step1 from '@/assets/step1.png'
+import step2 from '@/assets/step2.png'
+import step3 from '@/assets/step3.png'
+import step4 from '@/assets/step4.png'
 
 export default {
   name: 'ImageIdentification',