ll
liukangdong
2025-03-03 c87112aa6bfe824f5052f366893749af28b14354
ll
已修改11个文件
160 ■■■■■ 文件已修改
admin/src/components/business/OperaHiddenDangerWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/empower.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/smsEmail.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/trainTime.vue 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/visitEvent.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/operation/danger/record.vue 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/operation/serviceCar/apprRecord.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/statistics/platformStatic.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/login/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/task/vDangetAppr.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pda/pages/index/queueup.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -127,7 +127,7 @@
                </div>
                <div class="line">
                  <div class="company">
                    {{ item.createUserName }} {{ item.companyName }}
                    {{ item.createUserName }}
                    <div style="display: inline" v-if="index == logList.length-1">
                      (<span class="status-green" v-if="model.status==1">已处理</span>
                      <span class="status-blue" v-if="model.status==0">待处理</span>
admin/src/views/business/empower.vue
@@ -173,7 +173,8 @@
    },
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = ''
      this.searchForm = {}
      this.time = []
      // this.changeRadio('0')
      this.search()
    }
admin/src/views/business/smsEmail.vue
@@ -122,6 +122,7 @@
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = ''
      // this.changeRadio('0')
      this.searchForm = {}
      this.time = []
      this.search()
    },
admin/src/views/business/trainTime.vue
@@ -86,17 +86,18 @@
  },
  methods: {
    changeRadio(e) {
      this.searchForm.radio = e
      if (e === '0') {
        this.searchForm.startTimeStart = timeForMat(0)[0]
        this.searchForm.startTimeEnd = timeForMat(0)[1]
        this.searchForm.sendStartDate = timeForMat(0)[0]
        this.searchForm.sendEndDate = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTimeStart = timeForMat(6)[0]
        this.searchForm.startTimeEnd = timeForMat(6)[1]
        this.searchForm.sendStartDate = timeForMat(6)[0]
        this.searchForm.sendEndDate = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTimeStart = timeForMat(29)[0]
        this.searchForm.startTimeEnd = timeForMat(29)[1]
        this.searchForm.sendStartDate = timeForMat(29)[0]
        this.searchForm.sendEndDate = timeForMat(29)[1]
        this.time = timeForMat(29)
      }
      this.search()
@@ -106,40 +107,14 @@
        this.searchForm.startTimeStart = e[0]
        this.searchForm.startTimeEnd = e[1]
        this.searchForm.radio = null
        this.search()
      }
    },
    changeRadio1(e) {
      if (e === '0') {
        this.searchForm.endTimeStart = timeForMat(0)[0]
        this.searchForm.endTimeEnd = timeForMat(0)[1]
        this.time1 = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.endTimeStart = timeForMat(6)[0]
        this.searchForm.endTimeEnd = timeForMat(6)[1]
        this.time1 = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.endTimeStart = timeForMat(29)[0]
        this.searchForm.endTimeEnd = timeForMat(29)[1]
        this.time1 = timeForMat(29)
      }
      this.search()
    },
    seleTime1(e) {
      if (e && e.length > 1) {
        this.searchForm.endTimeStart = e[0]
        this.searchForm.endTimeEnd = e[1]
        this.searchForm.radio1 = null
        this.time = [e[0], e[1]]
        this.search()
      }
    },
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm = {}
      this.time = []
      this.time1 = []
      this.searchForm.radio = ''
      this.searchForm.radio1 = '0'
      // this.changeRadio('0')
      this.search()
    }
  }
admin/src/views/business/visitEvent.vue
@@ -155,8 +155,7 @@
    reset () {
      this.$refs.searchForm.resetFields()
      this.time = []
      this.searchForm.radio = '0'
      this.changeRadio('0')
      this.searchForm = {}
      this.search()
    }
  }
admin/src/views/operation/danger/record.vue
@@ -6,28 +6,22 @@
        <el-input v-model="searchForm.memberName" placeholder="请输入姓名" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="提报人组织" prop="companyName">
        <el-input v-model="searchForm.companyName" placeholder="请输入" clearable @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.companyName" placeholder="请输入" clearable
          @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="责任部门" prop="dutyCompanyName">
        <el-input v-model="searchForm.dutyCompanyName" placeholder="请输入责任部门" clearable @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.dutyCompanyName" placeholder="请输入责任部门" clearable
          @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="隐患区域" prop="areaId">
        <el-select v-model="searchForm.areaId" placeholder="请选择隐患区域" clearable  @change="search">
          <el-option
              v-for="item in areaList"
              :key="item.id"
              :label="item.name"
              :value="item.id">
          <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="隐患类型" prop="cateId">
        <el-select v-model="searchForm.cateId" placeholder="请选择隐患类型" clearable @change="search">
          <el-option
              v-for="item in cateList"
              :key="item.id"
              :label="item.name"
              :value="item.id">
          <el-option v-for="item in cateList" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
@@ -39,17 +33,9 @@
        </el-select>
      </el-form-item>
      <el-form-item label="提报时间" prop="startTime">
        <el-date-picker
            @change="seleTime"
            v-model="time"
            @keypress.enter.native="search"
            type="datetimerange"
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
            :default-time="['00:00:00', '23:59:59']"
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期">
        <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
          format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
          range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
@@ -65,15 +51,12 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:hiddendanger:create', 'business:hiddendanger:exportExcel']">
        <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']" @click="handleEdit">新建</el-button></li>
        <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']" @click="handleEx">导出</el-button></li>
        <li><el-button type="primary" icon="el-icon-plus" v-permissions="['business:hiddendanger:create']"
            @click="handleEdit">新建</el-button></li>
        <li><el-button type="primary" v-permissions="['business:hiddendanger:exportExcel']"
            @click="handleEx">导出</el-button></li>
      </ul>
      <el-table
          v-loading="isWorking.search"
          :data="tableData.list"
          stripe
          @selection-change="handleSelectionChange"
      >
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="dutyCompanyName" show-overflow-tooltip label="责任部门" min-width="150px"></el-table-column>
        <el-table-column prop="areaName" label="隐患区域" show-overflow-tooltip min-width="150px"></el-table-column>
@@ -89,22 +72,16 @@
          </template>
        </el-table-column>
        <el-table-column prop="editDate" label="操作时间" min-width="150px"></el-table-column>
        <el-table-column
            label="操作"
            min-width="180"
            fixed="right"
        >
        <el-table-column label="操作" min-width="180" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaHiddenDangerWindow.open('隐患随手拍详情',row)" >查看详情</el-button>
            <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:hiddendanger:delete']">删除</el-button>
            <el-button type="text" icon="el-icon-edit"
              @click="$refs.OperaHiddenDangerWindow.open('隐患随手拍详情', row)">查看详情</el-button>
            <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
              v-permissions="['business:hiddendanger:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination
          @size-change="handleSizeChange"
          @current-change="handlePageChange"
          :pagination="tableData.pagination"
      >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
    <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange"/>
@@ -225,9 +202,11 @@
    },
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = '0'
      this.changeRadio('0')
      // this.search()
      this.searchForm = {}
      this.time = []
      // this.searchForm.radio = '0'
      // this.changeRadio('0')
      this.search()
    }
  }
}
admin/src/views/operation/serviceCar/apprRecord.vue
@@ -263,9 +263,11 @@
    },
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = '0'
      this.changeRadio('0')
      // this.search()
      this.searchForm = {}
      this.time = []
      // this.searchForm.radio = '0'
      // this.changeRadio('0')
      this.search()
    }
  }
}
admin/src/views/statistics/platformStatic.vue
@@ -159,10 +159,11 @@
    },
    clear() {
      this.filters = {
        selDate: []
        // selDate: []
        fastdate: '0'
      }
      this.getList()
      // this.changeRadio('0')
      // this.getList()
      this.changeRadio('0')
    },
    handleSizeChange(capacity) {
      this.pagination.pageSize = capacity
h5/pages/login/login.vue
@@ -41,7 +41,7 @@
    export default {
        data() {
            return {
                code: '11'
                code: ''
            }
        },
        onLoad(option) {
h5/pages/staff/task/vDangetAppr.vue
@@ -98,7 +98,7 @@
                        </view>
                        <view class="line">
                            <view class="company">
                                {{ item.createUserName }} {{ item.companyName }}
                                {{ item.createUserName }}
                                <view style="display: inline" v-if="index == flowList.length - 1">
                                    (
                                    <span v-if="info.status == 1">已同意</span>
@@ -843,7 +843,7 @@
    }
    .main_app {
        background-color: #fff;
        background-color: #f7f7f7;
        padding-bottom: 0;
        position: relative;
@@ -864,7 +864,9 @@
                    display: flex;
                    margin-bottom: 48rpx;
                    position: relative;
                    &:nth-last-child(1){
                        margin-bottom: 0;
                    }
                    .separate {
                        position: absolute;
                        width: 4rpx;
@@ -1021,6 +1023,9 @@
        }
        .module_list {
            background-color: #fff;
            margin: 0 -30rpx;
            padding: 0 30rpx;
            .title {
                font-weight: 600;
                font-size: 32rpx;
@@ -1070,8 +1075,9 @@
        .status_wrap {
            position: relative;
            padding: 30rpx 0;
            padding: 30rpx;
            background-color: #fff;
            margin: 0 -30rpx;
            .name {
                font-weight: 600;
                font-size: 32rpx;
@@ -1151,7 +1157,7 @@
            .status {
                position: absolute;
                right: -30rpx;
                right: 0rpx;
                top: 0;
                height: 60rpx;
                line-height: 60rpx;
pda/pages/index/queueup.vue
@@ -35,7 +35,7 @@
            <text>{{ item.carCodeFront.slice(2) }}</text>
          </view>
          <view class="status" v-if="item.signDate"
            >签到时间:{{ item.signDate.slice(11, 16) }}</view
            >签到时间:{{ item.signDate.slice(5, 16) }}</view
          >
        </view>
        <view class="line" v-if="item.billCode">