客户需求优化(页面

mark

2022-09-30 f530bb1a7288c10b0731deea7f7b2864ebc98a92

客户需求优化(页面

 src/api/report.ts

@@ -65,7 +65,7 @@

/**
 * 
 * 数据推送 设备信息维护
 * 数据上传 设备信息维护
查询设备
 */
export const getDevicesList = (query: any) => {

 src/router/index.js

@@ -135,7 +135,7 @@
    name: "dataPush",
    component: () => import(/* webpackChunkName: "about" */ "../views/dataPush"),
    meta: {
      title: "数据推送"
      title: "数据上传"
    }
  },
  {

 src/views/dataPush/components/alarmPush.vue

@@ -9,11 +9,11 @@
        :default-sort="{ prop: 'createTime', order: 'descending' }"
      >
        <el-table-column prop="alarmDate" label="报警日期" show-overflow-tooltip></el-table-column>
        <el-table-column prop="channelName" label="设备的真实报警通道名称" show-overflow-tooltip></el-table-column>
        <el-table-column prop="channelName" label="通道名称" show-overflow-tooltip></el-table-column>
        <el-table-column prop="alarmType" label="报警类型" show-overflow-tooltip></el-table-column>
        <el-table-column prop="alarmAction" label="报警动作" show-overflow-tooltip></el-table-column>
        <el-table-column prop="channelCode" label="设备的真实报警通道编码" show-overflow-tooltip></el-table-column>
        <el-table-column prop="alarmImage" label="报警/销警图片url" show-overflow-tooltip></el-table-column>
        <el-table-column prop="channelCode" label="通道编码" show-overflow-tooltip></el-table-column>
        <el-table-column prop="alarmImage" label="图片地址" show-overflow-tooltip></el-table-column>
        <el-table-column prop="state" label="上报结果" show-overflow-tooltip>
          <template slot-scope="scope">
            <div v-if="scope.row.state == 0" class="status green">失败</div>

 src/views/dataPush/components/point.vue

@@ -115,7 +115,7 @@
              :picker-options="{
                start: '00:00',
                step: '00:30',
                end: ruleForm.EndTime ? ruleForm.EndTime : '23:30',
                end: ruleForm.EndTime ? ruleForm.EndTime : '24:00',
                maxTime: ruleForm.EndTime
              }"
            >
@@ -131,7 +131,7 @@
              :picker-options="{
                start: ruleForm.StartTime ? ruleForm.StartTime : '00:00',
                step: '00:30',
                end: '23:30',
                end: '24:00',
                minTime: ruleForm.StartTime
              }"
            >
@@ -230,7 +230,7 @@
      dataList: [],
      tip: 1, // 区分保存还是编辑 但是现在没有编辑
      rules: {
        CameraName: [{ required: true, message: "请选择设备名称", trigger: "change" }],
        CameraName: [{ required: true, message: "请选择点位名称", trigger: "change" }],
        ChannelCode: [{ required: true, message: "请输入报警通道编码", trigger: "blur" }],
        CompanyCode: [{ required: true, message: "请输入企业编码", trigger: "blur" }],
        Sceneslist: [{ type: "array", required: true, message: "请选择推送场景", trigger: "change" }],

 src/views/manageCenter/index.vue

@@ -322,7 +322,7 @@
        },

        {
          name: "数据推送",
          name: "数据上传",
          icon: "/images/manageCenter/push.png",
          openPath: "/dataPush",
          path: "/dataPush",