ll
liukangdong
2024-11-29 cb0f941c9c554403c5b75cd27d642683eba8b675
ll
已修改10个文件
384 ■■■■ 文件已修改
admin/src/components/common/CommonHeader.vue 106 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/index.vue 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/api/index.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/router/index.js 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/EnergyConsum.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/FireFighting.vue 137 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/LogisticsCenter.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/LogisticsEfficiency.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/SecurityControl.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/TaskEfficiency.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/common/CommonHeader.vue
@@ -12,6 +12,7 @@
          <div class="item" @click="getHeaderNav('1')">消控中心</div>
          <div class="item" @click="getHeaderNav('2')">能管中心</div>
          <div class="item" @click="getHeaderNav('3')">驾驶舱</div>
          <!-- <div class="item" @click="handleTest">测试</div> -->
        </div>
        <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
      </div>
@@ -31,26 +32,26 @@
      </div>
    </div>
    <!-- 修改密码 -->
      <GlobalAlertWindow title="修改密码" :visible.sync="visible.changePwd"
        :showClose="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')"
        :showCancel="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')" @confirm="confirmChangePwd"
        @close="visible.changePwd = false">
        <el-form :model="changePwdData.form" ref="changePwdDataForm" :rules="changePwdData.rules">
          <el-form-item label="原始密码" prop="oldPwd" required>
            <el-input v-model="changePwdData.form.oldPwd" type="password" placeholder="请输入原始密码" maxlength="30"
              show-password></el-input>
          </el-form-item>
          <el-form-item label="新密码" prop="newPwd" required>
            <el-input v-model="changePwdData.form.newPwd" type="password" placeholder="请输入新密码,密码需包含字母、数字及特殊字符中的至少两种"
              maxlength="20" show-password></el-input>
          </el-form-item>
          <!-- <div style="font-size: 12px;color:#999999">密码需包含字母、数字及特殊字符中的至少两种</div> -->
          <el-form-item label="确认新密码" prop="confirmPwd" required>
            <el-input v-model="changePwdData.form.confirmPwd" type="password" placeholder="请再次输入新密码" maxlength="20"
              show-password></el-input>
          </el-form-item>
        </el-form>
      </GlobalAlertWindow>
    <GlobalAlertWindow title="修改密码" :visible.sync="visible.changePwd"
      :showClose="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')"
      :showCancel="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')" @confirm="confirmChangePwd"
      @close="visible.changePwd = false">
      <el-form :model="changePwdData.form" ref="changePwdDataForm" :rules="changePwdData.rules">
        <el-form-item label="原始密码" prop="oldPwd" required>
          <el-input v-model="changePwdData.form.oldPwd" type="password" placeholder="请输入原始密码" maxlength="30"
            show-password></el-input>
        </el-form-item>
        <el-form-item label="新密码" prop="newPwd" required>
          <el-input v-model="changePwdData.form.newPwd" type="password" placeholder="请输入新密码,密码需包含字母、数字及特殊字符中的至少两种"
            maxlength="20" show-password></el-input>
        </el-form-item>
        <!-- <div style="font-size: 12px;color:#999999">密码需包含字母、数字及特殊字符中的至少两种</div> -->
        <el-form-item label="确认新密码" prop="confirmPwd" required>
          <el-input v-model="changePwdData.form.confirmPwd" type="password" placeholder="请再次输入新密码" maxlength="20"
            show-password></el-input>
        </el-form-item>
      </el-form>
    </GlobalAlertWindow>
  </div>
</template>
@@ -114,7 +115,7 @@
  },
  mounted() {
    // needChangePwd 0 : 默认密码需要修改,1 不需要
    if (userInfo &&(!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
    if (userInfo && (!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
      this.visible.changePwd = true
    }
  },
@@ -164,6 +165,67 @@
        window.open(res, "_blank")
      })
    },
    handleTest() {
      const myWindow = window.open('https://10.50.250.253/portal/ui/index?componentId=dfe&componentMenuId=process_apply')
      setTimeout(() => {
        const params = {
          componentId: 'dfe',
          componentMenuId: 'process_apply',
          callback: {
            method: 'dealTlncMsg', argument: {
              "msgId": "98c256b9-aaff-11ef-8347-fa163ee2c57c",
              "moduleId": "dfeFlowTodoModuleId",
              "msgTitle": "请及时处理13856591439发起的请假申请",
              "msgStatus": "0",
              "msgCreateTime": "今天 15:33",
              "msgCreateTimeIso": "2024-11-25T15:33:42.000+08:00",
              "serverTime": 1732531014591,
              "menuCode": "process_apply",
              "msgStatusStr": "待处理",
              "comId": "dfe",
              "userId": "13856591439",
              "extendNoShow": "{\"processInstanceId\":\"98a57fe0-aaff-11ef-8347-fa163ee2c57c\",\"processId\":\"process_dabcfdd39f1b6f46d36a9f4ff6ce1080\",\"param\":{\"sourceType\":\"todo\",\"modelCode\":\"tb_leave_dfe_for_dfe_runtime\",\"processNodeId\":\"UserTask_dde7d83377343a2d5fa1f60c23b023ef\",\"taskId\":\"98c256b9-aaff-11ef-8347-fa163ee2c57c\"},\"process.param.appId\":\"32ca8770-6f85-11ec-b5a3-991864da52a6\",\"appId\":\"32ca8770-6f85-11ec-b5a3-991864da52a6\",\"name\":\"请假申请\",\"taskId\":\"98c256b9-aaff-11ef-8347-fa163ee2c57c\",\"taskNodeId\":\"UserTask_dde7d83377343a2d5fa1f60c23b023ef\",\"url\":\"/dfe-form/process/tlnc/apply\"}",
              "targetComId": "dfe",
              "moduleName": "流程待办",
              "tid": "99cad778-aaff-11ef-9dbf-ff08ba71965c",
              "msgEndTime": null,
              "msgEndTimeIso": "",
              "picUrl": "",
              "extendJson": "{\"key1\":\"请及时处理陈鸿飞发起的请假申请\"}",
              "extendParam": null,
              "extendCascade": null,
              "createUser": "13856591439",
              "webCascadeUrl": null,
              "h5CascadeUrl": null,
              "cascadeTodoOpenType": null,
              "cascadeSourceConfigId": null,
              "h5Url": "/h5/pages/form-page/form-page?returnPath=-1&appId=32ca8770-6f85-11ec-b5a3-991864da52a6&taskId=98c256b9-aaff-11ef-8347-fa163ee2c57c&processNodeId=UserTask_dde7d83377343a2d5fa1f60c23b023ef&modelCode=tb_leave_dfe_for_dfe_runtime&type=flowHandle&component=form-apply&_sn=true",
              "segmentId": "dfe-form",
              "lastUsers": "陈鸿飞",
              "currentUsers": "陈鸿飞",
              "todoTypeCode": "dfe@@tlnc_placeholder_tlnc@@dfeFlowTodoModuleId",
              "currentUserIds": "13856591439",
              "lastUserIds": "13856591439",
              "msgDesc": null,
              "widgetUrl": null,
              "detailType": null,
              "widgetWidth": null,
              "widgetHeight": null,
              "userIdList": null,
              "statusName": null,
              "arriveTime": null,
              "stayTime": null,
              "todoType": null,
              "cascadePort": null,
              "openMode": null
            }
          },
          msgType: 'tlnc'
        }
        let argus = JSON.stringify(params)
        myWindow.postMessage('{"method":"goToApp","argument":' + argus + '}', '*')
      }, 3000)
    },
    // 确定修改密码
    confirmChangePwd() {
      if (this.isWorking.changePwd) {
@@ -186,7 +248,7 @@
        })
          .then(() => {
            this.$tip.apiSuccess('修改成功')
            this.$store.commit('setUserInfo', {needChangePwd: 1})
            this.$store.commit('setUserInfo', { needChangePwd: 1 })
            this.visible.changePwd = false
          })
          .catch(e => {
admin/src/views/index.vue
@@ -133,7 +133,7 @@
        <div class="task">
          <div class="header df_sb">
            <div class="home_title df">
              <span>待办事项</span>
              <span @click="handleTest">待办事项</span>
              <span class="num" v-if="taskTotal">{{ taskTotal }}</span>
            </div>
            <div class="df_ac more" @click="jumpPage('/task/index')">
@@ -257,11 +257,73 @@
    setInterval(() => {
      this.updateDate()
    }, 1000 * 60 * 60)
  },
  mounted() {
    this.initData()
  },
  methods: {
    handleTest() {
      const myWindow = window.open('https://10.50.250.253/portal/ui/index?componentId=dfe&componentMenuId=process_apply')
      setTimeout(() => {
        const params = {
          componentId: 'dfe',
          componentMenuId: 'process_apply',
          callback: {
            method: 'dealTlncMsg', argument: {
              "msgId": "98c256b9-aaff-11ef-8347-fa163ee2c57c",
              "moduleId": "dfeFlowTodoModuleId",
              "msgTitle": "请及时处理13856591439发起的请假申请",
              "msgStatus": "0",
              "msgCreateTime": "今天 15:33",
              "msgCreateTimeIso": "2024-11-25T15:33:42.000+08:00",
              "serverTime": 1732531014591,
              "menuCode": "process_apply",
              "msgStatusStr": "待处理",
              "comId": "dfe",
              "userId": "13856591439",
              "extendNoShow": "{\"processInstanceId\":\"98a57fe0-aaff-11ef-8347-fa163ee2c57c\",\"processId\":\"process_dabcfdd39f1b6f46d36a9f4ff6ce1080\",\"param\":{\"sourceType\":\"todo\",\"modelCode\":\"tb_leave_dfe_for_dfe_runtime\",\"processNodeId\":\"UserTask_dde7d83377343a2d5fa1f60c23b023ef\",\"taskId\":\"98c256b9-aaff-11ef-8347-fa163ee2c57c\"},\"process.param.appId\":\"32ca8770-6f85-11ec-b5a3-991864da52a6\",\"appId\":\"32ca8770-6f85-11ec-b5a3-991864da52a6\",\"name\":\"请假申请\",\"taskId\":\"98c256b9-aaff-11ef-8347-fa163ee2c57c\",\"taskNodeId\":\"UserTask_dde7d83377343a2d5fa1f60c23b023ef\",\"url\":\"/dfe-form/process/tlnc/apply\"}",
              "targetComId": "dfe",
              "moduleName": "流程待办",
              "tid": "99cad778-aaff-11ef-9dbf-ff08ba71965c",
              "msgEndTime": null,
              "msgEndTimeIso": "",
              "picUrl": "",
              "extendJson": "{\"key1\":\"请及时处理陈鸿飞发起的请假申请\"}",
              "extendParam": null,
              "extendCascade": null,
              "createUser": "13856591439",
              "webCascadeUrl": null,
              "h5CascadeUrl": null,
              "cascadeTodoOpenType": null,
              "cascadeSourceConfigId": null,
              "h5Url": "/h5/pages/form-page/form-page?returnPath=-1&appId=32ca8770-6f85-11ec-b5a3-991864da52a6&taskId=98c256b9-aaff-11ef-8347-fa163ee2c57c&processNodeId=UserTask_dde7d83377343a2d5fa1f60c23b023ef&modelCode=tb_leave_dfe_for_dfe_runtime&type=flowHandle&component=form-apply&_sn=true",
              "segmentId": "dfe-form",
              "lastUsers": "陈鸿飞",
              "currentUsers": "陈鸿飞",
              "todoTypeCode": "dfe@@tlnc_placeholder_tlnc@@dfeFlowTodoModuleId",
              "currentUserIds": "13856591439",
              "lastUserIds": "13856591439",
              "msgDesc": null,
              "widgetUrl": null,
              "detailType": null,
              "widgetWidth": null,
              "widgetHeight": null,
              "userIdList": null,
              "statusName": null,
              "arriveTime": null,
              "stayTime": null,
              "todoType": null,
              "cascadePort": null,
              "openMode": null
            }
          },
          msgType: 'tlnc'
        }
        let argus = JSON.stringify(params)
        myWindow.postMessage('{"method":"goToApp","argument":' + argus + '}', '*')
      }, 3000)
    },
    SubSuccess(str) {
      this[str] = false
      this.getTaskList()
screen/src/api/index.js
@@ -45,6 +45,11 @@
export const getFightingDeviceY = (data) => {
  return request('visitsAdmin/cloudService/board/api/fightingAdmin/yearDeviceData', data)
}
// 告警信息
export const getFighalarmDataList = (data) => {
  return request('visitsAdmin/cloudService/board/api/fightingAdmin/alarmDataList', data)
}
// 场内调度看板 今日月台完成订单统计
export const cnplatformGroupFinish = (data) => {
screen/src/router/index.js
@@ -13,10 +13,10 @@
      component: () => import('../views/PlatformCall.vue')
    },
    {
      path: '/EnergyConsum', // 能耗看板 - 绿色低碳运营
      path: '/EnergyConsum', // 能耗看板 - 安泰智慧物流园区-绿色低碳运营
      name: 'EnergyConsum',
      meta: {
        title: '能耗看板'
        title: '安泰智慧物流园区-绿色低碳运营'
      },
      component: () => import('../views/EnergyConsum.vue')
    },
@@ -24,7 +24,7 @@
      path: '/LogisticsEfficiency', // 物流运行调度看板- 调度能效
      name: 'LogisticsEfficiency',
      meta: {
        title: '物流运行调度看板'
        title: '安泰智慧物流园区-调度能效跟踪'
      },
      component: () => import('../views/LogisticsEfficiency.vue')
    },
@@ -32,15 +32,15 @@
      path: '/SecurityControl',  // 安防管控大屏 -
      name: 'SecurityControl',
      meta: {
        title: '安防管控大屏'
        title: '安泰智慧物流园区-安防智能监测'
      },
      component: () => import('../views/SecurityControl.vue')
    },
    {
      path: '/LogisticsCenter', //库制管理看板-物流中心
      path: '/LogisticsCenter', //全省物流在途-物流中心
      name: 'LogisticsCenter',
      meta: {
        title: '库制管理看板'
        title: '全省物流在途'
      },
      component: () => import('../views/LogisticsCenter.vue')
    },
@@ -48,7 +48,7 @@
      path: '/FireFighting', //消防监控
      name: 'FireFighting',
      meta: {
        title: '消防监控'
        title: '安泰智慧物流园区-消防态势监控'
      },
      component: () => import('../views/FireFighting.vue')
    },
@@ -56,7 +56,7 @@
      path: '/TaskEfficiency', //场内调度看板 -作业能效
      name: 'TaskEfficiency',
      meta: {
        title: '场内调度看板'
        title: '安泰智慧物流园区-作业效能统筹'
      },
      component: () => import('../views/TaskEfficiency.vue')
    },
screen/src/views/EnergyConsum.vue
@@ -3,7 +3,7 @@
    <div class="main_app">
      <img src="@/assets/images/bg_main_app.png" class="main_bg" alt="" />
      <div class="main_header">
        <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
        <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
        <div class="title">安泰智慧物流园区-绿色低碳运营</div>
        <div class="time_wrap">
          <span class="date">{{ date }}</span>
@@ -241,7 +241,7 @@
            </div>
            <div v-if="data3 && data3.length > 0" class="list">
              <template v-for="item, i in data3">
                <div v-if="i < 6" class="line" >
                <div v-if="i < 6" class="line">
                  <div class="top"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
                  <div class="id_card">{{ item.carNo }}</div>
                  <div class="wrap">
@@ -656,6 +656,16 @@
  getData4()
  getData5()
  getData6()
  setInterval(() => {
    getData4()
  }, 1000 * 60)
  setInterval(() => {
    getData1()
    getData2()
    getData3()
    getData5()
    getData6()
  }, 1000 * 60 * 60)
})
screen/src/views/FireFighting.vue
@@ -35,12 +35,12 @@
                  <div class="swiper-wrapper">
                    <div class="line_wrap one-swiper-slide swiper-slide" v-for="(item, i) in dataList1">
                      <div class="line">
                        <span class="item name">{{ item.deviceTypeName }}</span>
                        <span class="item">{{ item.statusTotal }}</span>
                        <span class="item">{{ item.alarmNum }}</span>
                        <span class="item">{{ item.shieldNum }}</span>
                        <span class="item">{{ item.errNum }}</span>
                        <span class="item">{{ item.offlineNum }}</span>
                        <span class="item name">{{ item.typeName }}</span>
                        <span class="item">{{ item.totalDeviceNum || 0 }}</span>
                        <span class="item">{{ item.alarmDeviceNum || 0 }}</span>
                        <span class="item">{{ item.shieldDeviceNum || 0 }}</span>
                        <span class="item">{{ item.errDeviceNum || 0 }}</span>
                        <span class="item">{{ item.offlineDeviceNum || 0 }}</span>
                      </div>
                      <div class="separate"></div>
                    </div>
@@ -117,7 +117,7 @@
                <img src="@/assets/images/FireFighting/xiaofang_ic_pingbi@2x.png" alt="">
                <div class="content">
                  <div class="name">屏蔽</div>
                  <div class="num num5">{{ dataList4.shieldDeviceNum }}</div>
                  <div class="num num5">{{ dataList4.shieldDeviceNum || 0 }}</div>
                </div>
              </div>
            </div>
@@ -253,14 +253,14 @@
                <img src="@/assets/images/FireFighting/ic_tibao@2x.png" alt="">
                <div class="content">
                  <div class="name">提报隐患数</div>
                  <div class="num"><span>{{ dataList4.todayDangerNum }}</span>个</div>
                  <div class="num"><span>{{ dataList4.dangerTotalNum }}</span>个</div>
                </div>
              </div>
              <div class="item">
                <img src="@/assets/images/FireFighting/ic_chuli@2x.png" alt="">
                <div class="content">
                  <div class="name">处理隐患数</div>
                  <div class="num"><span class="today">{{ dataList4.dealDangerNum }}</span>个</div>
                  <div class="num"><span class="today">{{ dataList4.dangerDealedNum }}</span>个</div>
                </div>
              </div>
            </div>
@@ -278,22 +278,28 @@
                  <div class="content">
                    <div class="header">
                      <div class="time">
                        <span>{{ item.time }}</span>
                        <span class="status">处理中</span>
                        <span>{{ item.alarmTime }}</span>
                        <span class="status" v-if="item.handleStatus == 1">已核实</span>
                        <span class="status" v-else-if="item.handleStatus == 2">未核实</span>
                        <span class="status" v-else-if="item.handleStatus == 3">核实中</span>
                        <span v-else class="status">未核实</span>
                      </div>
                      <div class="have_time">已经发生<span>1</span>分钟</div>
                      <div class="have_time">已经发生{{ item.haveTime }}</div>
                    </div>
                    <div class="wrap">
                      <div class="title">
                        <img class="xf" src="@/assets/images/FireFighting/ic_gaojing_red@2x.png" alt="">
                        <span>{{ item.name }}</span>
                        <span>{{ item.alarmTypeName }}</span>
                      </div>
                      <div class="title">
                        <img class="addr" src="@/assets/images/FireFighting/xiaofang_ic_weizhi@2x.png" alt="">
                        <span>{{ item.addr }}</span>
                        <span>{{ item.regionName }}</span>
                      </div>
                    </div>
                  </div>
                </div>
                <div v-if="dataList7.length == 0" style="margin-top: 100px;" class="empty_wrap">
                  <img src="@/assets/images/default_empty.png" alt="">
                </div>
              </div>
            </div>
@@ -309,6 +315,8 @@
import VScaleScreen from 'v-scale-screen'
import FirePercent from '@/components/FirePercent.vue'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import * as echarts from 'echarts'
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
@@ -318,6 +326,7 @@
  getFightingcenterData,
  getFightingDeAlarm,
  getFightingDeviceY,
  getFighalarmDataList
} from '@/api'
const colors = ['#FEAF01', '#01ABFE', '#51F9E4']
@@ -335,7 +344,7 @@
const initWatergage = () => {
  const myChart = echarts.init(document.getElementById('watergage'))
  var data_value = 2
  var data_value = 1
  const option = {
    barMaxWidth: 3,
    polar: {
@@ -699,22 +708,22 @@
}
const dataList1 = ref([])
const getData1 = () => {
  getFightingDeAlarm().then(res => {
    dataList1.value = res.data
    loopFn1()
  })
}
// const getData1 = () => {
//   getFightingDeAlarm().then(res => {
//     dataList1.value = res.data
//     loopFn1()
//   })
// }
const policeColors = ['#01D9FE', '#FE5501', '#0193FE', '#28F0C4']
const dataList2 = ref([])
const getData2 = () => {
  let temp = []
  temp.push({ name: '真实报警数', num: 10, rate: 20 })
  temp.push({ name: '误报警数', num: 30, rate: 60 })
  temp.push({ name: '已解除', num: 20, rate: 40 })
  temp.push({ name: '处理中', num: 8, rate: 16 })
  dataList2.value = temp
  return
  // let temp = []
  // temp.push({ name: '真实报警数', num: 10, rate: 20 })
  // temp.push({ name: '误报警数', num: 30, rate: 60 })
  // temp.push({ name: '已解除', num: 20, rate: 40 })
  // temp.push({ name: '处理中', num: 8, rate: 16 })
  // dataList2.value = temp
  // return
  getFightingalarmData().then(res => {
    const result = res.data || {}
    let temp = []
@@ -737,10 +746,15 @@
  var myChart = echarts.init(document.querySelector('.echart2'))
  // 生成数据和日期
  // 示例数据
  const data1 = dataList3.value.map(i => i.alarmNum)
  const data1 = dataList3.value.map(i => i.realNum)
  const data2 = dataList3.value.map(i => i.processingNum)
  const data3 = dataList3.value.map(i => i.liftNum)
  const data4 = dataList3.value.map(i => i.errNum)
  const months = dataList3.value.map(i => {
    console.log('i.startDate', i.startDate.substring(5, 7))
    return i.startDate.substring(5, 7) + '月'
  }
  )
  const option = {
    legend: {
      x: "center",
@@ -774,10 +788,10 @@
      borderColor: "rgba(219, 230, 255, 0.8)",
    },
    xAxis: {
      data: dataList3.value.map(i => i.monthStr),
      data: months,
      axisLabel: {
        color: "#FFFFFF", // X 轴文字设为白色
        fontSize: 14,
        fontSize: 13,
      },
      axisLine: {
        lineStyle: {
@@ -886,6 +900,8 @@
const getData4 = () => {
  getFightingcenterData().then(res => {
    dataList4.value = res.data || {}
    dataList1.value = res.data.deviceTypeList
    loopFn1()
  })
}
const dataList5 = ref({}) // 维保
@@ -902,17 +918,25 @@
}
const dataList7 = ref([])
const getData7 = () => {
  dataList7.value = [
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
    { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  ]
  getFighalarmDataList().then(res => {
    dataList7.value = res.data || []
    dataList7.value = dataList7.value.map(item => {
      item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.alarmTime).getTime()).format('H小时m分钟')
      return item
    })
  })
  // dataList7.value = [
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  //   { name: '消防告警', addr: '厂区门口', time: '2022-02-02' },
  // ]
  loopFn2()
}
@@ -943,16 +967,40 @@
}
onMounted(() => {
  getData1()
  // getData1()
  getData2()
  getData3()
  getData4()
  getData5()
  getData6()
  // getData6()
  getData7()
  setInterval(() => {
    getData2()
    getData3()
    getData4()
    // getData6()
    getData7()
  }, 60 * 1000)
  setInterval(() => {
    getData5()
  }, 60 * 60 * 1000)
  initWatergage()
  initLiquidlevel()
  // setInterval(() => {
  //   getData4()
  // }, 1000 * 60)
  // setInterval(() => {
  //   getData1()
  //   getData2()
  //   getData3()
  //   getData5()
  //   getData6()
  // }, 1000 * 60 * 60)
})
@@ -1468,6 +1516,7 @@
        overflow: hidden;
        margin-top: 15px;
        scrollbar-width: none;
        .item {
          display: flex;
          font-size: 13px;
screen/src/views/LogisticsCenter.vue
@@ -3,8 +3,8 @@
    <div class="main_app">
      <img src="@/assets/images/LogisticsCenter/bg@2x.png" class="main_bg" alt="" />
      <div class="main_header">
        <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
        <div class="title">安徽中烟物流中心运行大屏</div>
        <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
        <div class="title">全省物流在途</div>
        <div class="time_wrap">
          <span class="date">{{ date }}</span>
          <span class="week">{{ week }}</span>
screen/src/views/LogisticsEfficiency.vue
@@ -3,7 +3,7 @@
    <div class="main_app">
      <img src="@/assets/images/energy_ef/bg@2x.png" class="main_bg" alt="" />
      <div class="main_header">
        <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
        <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
        <div class="title">安泰智慧物流园区-调度能效跟踪</div>
        <div class="time_wrap">
          <span class="date">{{ date }}</span>
screen/src/views/SecurityControl.vue
@@ -3,7 +3,7 @@
    <div class="main_app">
      <img src="@/assets/images/SecurityControl/bg@2x.png" class="main_bg" alt="" />
      <div class="main_header">
        <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
        <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
        <div class="title">安泰智慧物流园区-安防智能监测</div>
        <div class="time_wrap">
          <span class="date">{{ date }}</span>
@@ -367,8 +367,12 @@
                    </div>
                  </div>
                </div>
                <div v-if="warningList.length == 0" class="empty_wrap">
                  <img src="@/assets/images/default_empty.png" alt="">
                </div>
              </div>
            </div>
          </div>
        </div>
@@ -988,11 +992,20 @@
  getData1()
  getData2()
  getData3()
  // getData4()
  getData5()
  getWarning()
  setInterval(() => {
    getData1()
    getData2()
    getData3()
    getWarning()
  }, 1000 * 60)
  // initEchart1()
  setInterval(() => {
    getData5()
  }, 1000 * 60 * 60)
})
@@ -1575,10 +1588,11 @@
    margin-right: 20px;
    /* one-swiper */
    .one_swiper_wrap{
    .one_swiper_wrap {
      height: 140px;
      overflow: hidden;
    }
    .list {
      height: 204px;
      overflow: hidden;
screen/src/views/TaskEfficiency.vue
@@ -3,7 +3,7 @@
    <div class="main_app">
      <img src="@/assets/images/FireFighting/bg@2x.png" class="main_bg" alt="" />
      <div class="main_header">
        <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
        <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
        <div class="title">安泰智慧物流园区-作业效能统筹</div>
        <div class="time_wrap">
          <span class="date">{{ date }}</span>
@@ -277,6 +277,9 @@
                      <!-- <div class="status">处理中</div> -->
                    </div>
                  </div>
                </div>
                <div v-if="data7.length == 0" class="empty_wrap" style="margin-top: 50px;">
                  <img src="@/assets/images/default_empty.png" alt="">
                </div>
              </div>
            </div>
@@ -824,6 +827,15 @@
  getData6()
  getData7()
  setInterval(() => {
    getData1()
    getData2()
    getData3()
    getData4()
    getData5()
    getData6()
    getData7()
  }, 1000 * 60)
  // initEchart1()
  // initEchart2()
  // initEchart3()