新修改添加页面

batman

2023-03-10 e2d556803e3138732ffde7d3d07b0a4a9b0b7f0a

新修改添加页面

 src/api/intellectInspectSystem/inspectIndex/index.ts

对比新文件
@@ -0,0 +1,14 @@
import request from '/@/utils/request';

export function inspectIndexApi() {
    return {
        //
        getListExcepOrderByPage: (data: object) => {
            return request({
                url: import.meta.env.VITE_API_URL + `/SafeCheck/abnormalWorkOrder/select/listExcepOrderByPage`,
                method: 'post',
                data: data
            });
        },
    };
}

 src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue

文件已删除

 src/views/intellectInspect/inspectIndex/components/sum.vue

文件已删除

 src/views/intellectInspect/inspectIndex/index.vue

文件已删除

 src/views/intellectInspect/inspectIndex2/index.vue

@@ -183,6 +183,7 @@
import { ElTable } from 'element-plus';
import { FormInstance, FormRules, ElMessage } from 'element-plus';
import { inspectRecordApi } from '/@/api/intellectInspectSystem/inspectRecord';
import { inspectIndexApi } from '/@/api/intellectInspectSystem/inspectIndex'
import { useRouter } from 'vue-router';
import * as echarts from 'echarts'
import inspectRecordDialog from './components/inspectRecordDialog.vue';
@@ -323,6 +324,7 @@
        // 页面载入时执行方法
        onMounted(() => {
            getInspectRecord();
            getListExcepOrder();
            getDayData();
            getDepartmentData();
            initXjLine()
@@ -509,7 +511,7 @@
            myChart.resize();
          });
        }
        // 分页获取工作时段列表
        // 分页获取
        const getInspectRecord = async () => {
            const data = { pageSize: state.pageSize, pageIndex: state.pageIndex };
            let res = await inspectRecordApi().getInspectRecordByIndex(data);
@@ -522,6 +524,19 @@
                    message: res.data.msg
                });
            }
        };
        // 分页获取
        const getListExcepOrder = async () => {
          const data = { pageSize: state.pageSize, pageIndex: state.pageIndex };
          let res = await inspectIndexApi().getListExcepOrderByPage(data);
          if (res.data.code === '200') {
            console.log(res.data,'res')
          } else {
            ElMessage({
              type: 'warning',
              message: res.data.msg
            });
          }
        };
        //获取部门
        const getDepartmentData = async () => {
@@ -872,7 +887,6 @@
    line-height: 34px;
    top: 0;
    right: 20px;
    z-index: 99999;
  }
  .topChart{
    .chart-item{

 src/views/specialWorkSystem/specialIndex/components/videoDetail.vue

@@ -1,5 +1,44 @@
<template>
  <el-dialog v-model="videoDetailDialog" title="实时监控" width="80%" center>
  <el-dialog v-model="videoDetailDialog" title="动火作业编号00001 实时监测详情" width="80%" center>
    <div style="margin-bottom: 20px">
      <el-button type="warning">人工录入警报信息</el-button>
    </div>
    <div class="info">
<!--      <video class="video-cont" autoplay src="https://www.bilibili.com/video/BV1UM411s7Ey/?vd_source=7700e61a97bad6ca1f7c0ecb9768d682" controls></video>-->
      <iframe class="video-cont" src="https://www.bilibili.com/video/BV1UM411s7Ey/?vd_source=7700e61a97bad6ca1f7c0ecb9768d682"></iframe>
      <div class="right-info">
        <div class="info-item">
          <div class="info-tit">
            基础信息
          </div>
          <div class="content">
            <div>作业编号: <span>0000001</span></div>
            <div>作业部门: <span>有机化工</span></div>
            <div>作业人员: <span>王大壮（持证）</span></div>
            <div>开始时间: <span>2023-03-09 14:00:45</span></div>
            <div>结束时间: <span>2023-03-09 17:05:45</span></div>
            <div class="checkBtn">查看作业票</div>
            <div class="checkBtn">查看审批流</div>
          </div>
        </div>
        <div class="info-item">
          <div class="info-tit">
            警报信息
          </div>
          <div class="content">
            <div>设备IA自动识别警报:
              <div>无</div>
            </div>
            <div>人工录入警报信息:
              <div>无</div>
            </div>
            <div>现场检查不合格项:
              <div>1、除动火人和监护人有无其他人员在场：有信息化人员在场</div>
            </div>
          </div>
        </div>
      </div>
    </div>

  </el-dialog>
</template>
@@ -40,5 +79,49 @@
</script>

<style scoped lang="scss">
  .info{
    width: 100%;
    display: flex;
    align-items: flex-start;
    justify-content: space-between;

    .video-cont{
      width: calc(70% - 20px);
      height: 60vh;
      margin-right: 20px;
    }
    .right-info{
      width: 30%;

      .info-item{
        width: 100%;
        margin-bottom: 10px;

        &:last-of-type{
          margin-bottom: 0;
        }

        .info-tit{
          width: 100%;
          padding: 6px 0;
          text-align: center;
          background: #59ddf7;
          border-radius: 4px;
          margin-bottom: 10px;
        }
        .content{
          width: 100%;
          div{
            width: 100%;
            font-size: 14px;
            margin-bottom: 4px;
          }
          .checkBtn{
            color: #409eff;
            cursor: pointer;
          }
        }
      }
    }
  }
</style>

 src/views/system/user/component/userDialog.vue

@@ -4,7 +4,7 @@
            <el-form :model="userForm" size="default" ref="userRef" :rules="userFormRules" label-width="90px">
                <el-row :gutter="35">
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="disabled">
                        <el-form-item label="用户名">
                        <el-form-item label="用户名" prop="username">
                            <el-input v-model.trim="userForm.username" :disabled="disabled" placeholder="" clearable></el-input>
                        </el-form-item>
                    </el-col>