From 99d456ac9ddaf300ae7d8d2e404f5ad0d426bf80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Wed, 27 Jan 2021 16:19:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E6=B3=95=E6=A3=80=E6=9F=A5=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmVideos/index.vue |   2 +-
 src/views/alarmVideos/model.vue |  60 +++++-----
 src/views/plcStatus.vue         | 194 ++++++++++++++++----------------
 3 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/src/views/alarmVideos/index.vue b/src/views/alarmVideos/index.vue
index 2441e99..7126bb0 100644
--- a/src/views/alarmVideos/index.vue
+++ b/src/views/alarmVideos/index.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-    import Model from "./model.vue"
+import Model from "./model.vue"
 export default {
     name: "historyMonitoring",
     components: {
diff --git a/src/views/alarmVideos/model.vue b/src/views/alarmVideos/model.vue
index 4402a04..0521fbf 100644
--- a/src/views/alarmVideos/model.vue
+++ b/src/views/alarmVideos/model.vue
@@ -63,40 +63,40 @@
     }
 </style>
 <script>
-    export default {
-        props: ['visible', 'vid'],
-        watch: {
-            //监听并接收父组件的visible并赋值给isShow（子组件接收父组件props传过来的值时不能起一样的类名，会报重复定义的错）
-            visible: function (newVal) {
-                this.isShow = newVal;  //newVal即是visible
-                // newVal && this.showConfirm(); //newVal存在的话执行showConfirm函数
-            },
-            vid: function (newVal) {
-                console.log(newVal)
-                console.log(1111111)
-                this.video = newVal
-                this.$nextTick(() => {   //this.$nextTick解决不能在表单渲染之前赋值的报错问题
+export default {
+    props: ['visible', 'vid'],
+    watch: {
+        //监听并接收父组件的visible并赋值给isShow（子组件接收父组件props传过来的值时不能起一样的类名，会报重复定义的错）
+        visible: function (newVal) {
+            this.isShow = newVal;  //newVal即是visible
+            // newVal && this.showConfirm(); //newVal存在的话执行showConfirm函数
+        },
+        vid: function (newVal) {
+            console.log(newVal)
+            console.log(1111111)
+            this.video = newVal
+            this.$nextTick(() => {   //this.$nextTick解决不能在表单渲染之前赋值的报错问题
 
-                })
+            })
 
-            },
-        },
-        data() {
-            return {
-                isShow: false,
-                confirmLoading: false,
-                video: '',
-            };
         },
-        mounted() {
-            console.log('mounted执行了')
+    },
+    data() {
+        return {
+            isShow: false,
+            confirmLoading: false,
+            video: '',
+        };
+    },
+    mounted() {
+        console.log('mounted执行了')
+    },
+    methods: {
+        handleCancel() {
+            this.$emit('close', false, '')
         },
-        methods: {
-            handleCancel() {
-                this.$emit('close', false, '')
-            },
 
-        },
-    };
+    },
+};
 </script>
 
diff --git a/src/views/plcStatus.vue b/src/views/plcStatus.vue
index eb59e7d..5282fa0 100644
--- a/src/views/plcStatus.vue
+++ b/src/views/plcStatus.vue
@@ -19,109 +19,109 @@
 
 
 <script>
-    const columns = [
-        {
-            title: '序号',
-            // dataIndex: 'id',
-            customRender: (text, record, index) => {
-                return (
-                    (1 - 1) * 10 + index + 1
-                )
+const columns = [
+    {
+        title: '序号',
+        // dataIndex: 'id',
+        customRender: (text, record, index) => {
+            return (
+                (1 - 1) * 10 + index + 1
+            )
+        }
+    },
+    {
+        title: 'PLCID',
+        dataIndex: 'plcId',
+    },
+    {
+        title: '状态',
+        dataIndex: 'status',
+        scopedSlots: {customRender: 'status'}
+    },
+    {
+        title: '异常时间',
+        dataIndex: 'time',
+    },
+    {
+        title: '操作',
+        dataIndex: 'action',
+        scopedSlots: {customRender: 'action'}
+    },
+];
+export default {
+    data() {
+        return {
+            pageNum: 1,
+            pageSize: 10,
+            data: [],
+            pagination: {
+                total: 0,
+                current: 1,
+                defaultPageSize: 10, // 默认每页显示数量
+                showTotal: total => `共 ${total} 条数据`, // 显示总数
+                showSizeChanger: true, // 显示可改变每页数量
+                pageSizeOptions: ['10', '20', '30'],
+                onShowSizeChange: (current, pageSize) => this.pageSize = pageSize // 改变每页数量时更新显示
+            },
+            loading: false,
+            columns,
+            visible: false,
+            modelType: '',
+            modelData: [],
+        };
+    },
+    computed: {},
+    mounted() {
+        this.handleGetCameraIoList()
+    },
+    methods: {
+        handleGetCameraIoList(pagination) {
+            console.log(pagination)
+            if (pagination) {
+                this.pagination.current = pagination.current;
+                this.pagination.pageSize = pagination.pageSize;
+                this.pageNum = pagination.current;
+                this.pageSize = pagination.pageSize;
             }
+            this.request();
         },
-        {
-            title: 'PLCID',
-            dataIndex: 'plcId',
-        },
-        {
-            title: '状态',
-            dataIndex: 'status',
-            scopedSlots: {customRender: 'status'}
-        },
-        {
-            title: '异常时间',
-            dataIndex: 'time',
-        },
-        {
-            title: '操作',
-            dataIndex: 'action',
-            scopedSlots: {customRender: 'action'}
-        },
-    ];
-    export default {
-        data() {
-            return {
-                pageNum: 1,
-                pageSize: 10,
-                data: [],
-                pagination: {
-                    total: 0,
-                    current: 1,
-                    defaultPageSize: 10, // 默认每页显示数量
-                    showTotal: total => `共 ${total} 条数据`, // 显示总数
-                    showSizeChanger: true, // 显示可改变每页数量
-                    pageSizeOptions: ['10', '20', '30'],
-                    onShowSizeChange: (current, pageSize) => this.pageSize = pageSize // 改变每页数量时更新显示
-                },
-                loading: false,
-                columns,
-                visible: false,
-                modelType: '',
-                modelData: [],
-            };
-        },
-        computed: {},
-        mounted() {
-            this.handleGetCameraIoList()
-        },
-        methods: {
-            handleGetCameraIoList(pagination) {
-                console.log(pagination)
-                if (pagination) {
-                    this.pagination.current = pagination.current;
-                    this.pagination.pageSize = pagination.pageSize;
-                    this.pageNum = pagination.current;
-                    this.pageSize = pagination.pageSize;
+        request() {
+            this.$api.httpApi.disPlcList({
+                data: {
+                    page: this.pageNum,
+                    size: this.pageSize,
                 }
-                this.request();
-            },
-            request() {
-                this.$api.httpApi.disPlcList({
-                    data: {
-                        page: this.pageNum,
-                        size: this.pageSize,
-                    }
-                }).then(res => {
-                    const pagination = {...this.pagination};
-                    pagination.total = res.data.total;
-                    this.data = res.data;
-                    this.pagination = pagination;
-                    res.data.list.forEach((value, index) => {
-                        value.pageNumber = this.pagination.current
-                    });
-                }).catch(err => {
-
+            }).then(res => {
+                const pagination = {...this.pagination};
+                pagination.total = res.data.total;
+                this.data = res.data;
+                this.pagination = pagination;
+                res.data.list.forEach((value, index) => {
+                    value.pageNumber = this.pagination.current
                 });
-            },
-            reconnection(data) {
-                console.log(data.streetId)
-                var id = data.streetId
-                this.$axios.get('/plc/tcp', {
-                    params: {id: id}
-                }).then(res => {
-                    if (res.code == 200) {
-                        this.$message.success('连接成功');
-                        this.handleGetStreetList()
-                    } else {
-                        this.$message.error('连接失败');
-                    }
-                }).catch(err => {
+            }).catch(err => {
 
-                })
-            }
+            });
         },
-        components: {}
-    };
+        reconnection(data) {
+            console.log(data.streetId)
+            var id = data.streetId
+            this.$axios.get('/plc/tcp', {
+                params: {id: id}
+            }).then(res => {
+                if (res.code == 200) {
+                    this.$message.success('连接成功');
+                    this.handleGetStreetList()
+                } else {
+                    this.$message.error('连接失败');
+                }
+            }).catch(err => {
+
+            })
+        }
+    },
+    components: {}
+};
 </script>
 <style lang="scss" scoped>
     .button-box {