南昌市物联网技防平台-前端
zengh
2021-02-05 d567a0a023ff72d2dc58a9bb8dd2e08cb3aaac1f
整体修改
5 files modified
46 ■■■■ changed files
src/page/index/logo.vue 3 ●●●●● patch | view | raw | blame | history
src/views/clientManagement/clientManagement.vue 10 ●●●● patch | view | raw | blame | history
src/views/home/home.vue 6 ●●●● patch | view | raw | blame | history
src/views/realTimePolice/real.vue 15 ●●●●● patch | view | raw | blame | history
src/views/realTimePolice/realHistory.vue 12 ●●●● patch | view | raw | blame | history
src/page/index/logo.vue
@@ -72,6 +72,9 @@
                <el-input disabled="true" v-model="form.alarmTime" autocomplete="off"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-form-item label="报警内容" >
src/views/clientManagement/clientManagement.vue
@@ -152,8 +152,8 @@
              label: "到期时间",
              prop: "releaseTimeRange",
              type: "datetime",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              searchRange: true,
              searchSpan: 5,
              hide: true,
@@ -272,7 +272,7 @@
              prop: "stime",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width: 130
            }, {
              label: "到期时间",
@@ -280,14 +280,14 @@
              type: "datetime",
              slot: true,
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width: 150
            }, {
              label: "最后上传时间",
              prop: "heartbeat",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width: 130
            },
src/views/home/home.vue
@@ -1,6 +1,6 @@
<!--
 * @Descripttion:
 * @version:
 * @Descripttion:
 * @version:
 * @Author: song
 * @Date: 2021-01-26 08:56:33
 * @LastEditors: song
@@ -8,7 +8,7 @@
-->
<template>
  <iframe v-show="iframeState" id="show-iframe" frameborder=0 name="showHere" scrolling=auto
          src="http://s16s652780.51mypc.cn/bigScreen/view/1349193280059879426"></iframe>
          src="https://s16s652780.51mypc.cn/bigScreen/view/1349193280059879426"></iframe>
</template>
<script>
src/views/realTimePolice/real.vue
@@ -37,21 +37,18 @@
        <el-button
          size="small"
          type="primary"
          icon="el-icon-search"
          @click="getBZdata"
          >本周
        </el-button>
        <el-button
          size="small"
          type="primary"
          icon="el-icon-search"
          @click="getBYdata"
          >本月
        </el-button>
        <el-button
          size="small"
          type="primary"
          icon="el-icon-search"
          @click="getQBdata"
          >全部
        </el-button>
@@ -346,16 +343,16 @@
            label: "报警时间",
            type: "datetime",
            width: 130,
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
            prop: "alarmTime"
          },
          {
            label: "报警时间",
            prop: "releaseTimeRange",
            type: "datetime",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
            searchRange: true,
            searchSpan: 5,
            hide: true,
@@ -391,8 +388,8 @@
          {
            label: "接警时间",
            type: "datetime",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
            width: 130,
            prop: "jjTime"
          },
src/views/realTimePolice/realHistory.vue
@@ -81,16 +81,16 @@
              label: "报警时间",
              type: "datetime",
              width:130,
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              prop: "alarmTime",
            },
            {
              label: "报警时间",
              prop: "releaseTimeRange",
              type: "datetime",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              searchRange: true,
              searchSpan: 5,
              hide: true,
@@ -120,8 +120,8 @@
            }, {
              label: "接警时间",
              type: "datetime",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width:130,
              prop: "jjTime",
            }, {