Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt

Your Name

2022-07-04 b5069cc8ebdb8bc51f1b45f0c49a7e385490a32a

 src/views/specialWorkSystem/workPlan/workReservation/index.vue

@@ -35,7 +35,7 @@
               </div>
            </div>
         </el-col>
         <el-col :span="6">
         <el-col :span="6" class="topBtns">
            <div class="grid-content topInfo">
               <div style="margin-right: 20px"><el-button type="primary" plain>查询历史</el-button></div>
               <div><el-button type="success" @click="dialogFormVisible = true">新增预约</el-button></div>
@@ -44,25 +44,25 @@
      </el-row>
      <el-row>
         <el-table :data="tableData" border style="width: 100%">
            <el-table-column prop="id" label="编号" width="180" />
            <el-table-column prop="time" label="预约时间" width="180" />
            <el-table-column prop="department" label="预约部门" />
            <el-table-column prop="dirtyWork" label="动土作业" width="180" />
            <el-table-column prop="fireWork" label="动火作业" width="180" />
            <el-table-column prop="hangWork" label="吊装作业" />
            <el-table-column prop="spaceWork" label="受限空间作业" width="180" />
            <el-table-column prop="cut" label="断路" width="180" />
            <el-table-column prop="id" label="编号" width="120" />
            <el-table-column prop="time" label="预约时间" width="150" />
            <el-table-column prop="department" label="预约部门" width="180" />
            <el-table-column prop="dirtyWork" label="动土作业" width="100" />
            <el-table-column prop="fireWork" label="动火作业" width="100" />
            <el-table-column prop="hangWork" label="吊装作业" width="100" />
            <el-table-column prop="spaceWork" label="受限空间作业"/>
            <el-table-column prop="cut" label="断路"/>
            <el-table-column prop="high" label="高处" />
            <el-table-column prop="block" label="盲板抽堵" width="180" />
            <el-table-column prop="tempUse" label="临时用电" width="180" />
            <el-table-column fixed label="操作">
            <el-table-column prop="block" label="盲板抽堵"/>
            <el-table-column prop="tempUse" label="临时用电"/>
            <el-table-column fixed="right" label="操作">
               <template #default>
                  <el-button link type="primary" size="small">操作</el-button>
               </template>
            </el-table-column>
         </el-table>
      </el-row>
      <el-dialog v-model="dialogFormVisible" title="Shipping address">
      <el-dialog v-model="dialogFormVisible" title="新增预约">
         <el-form :model="reservationForm">
            <el-form-item label="我的当前部门" :label-width="formLabelWidth">
               <el-input v-model="reservationForm.department" placeholder="" />
@@ -87,8 +87,8 @@
         </el-form>
         <template #footer>
           <span class="dialog-footer">
            <el-button @click="dialogFormVisible = false">取消</el-button>
            <el-button type="primary" @click="dialogFormVisible = false">确认</el-button>
            <el-button @click="dialogFormVisible = false" size="default">取消</el-button>
            <el-button type="primary" @click="dialogFormVisible = false" size="default">确认</el-button>
           </span>
         </template>
      </el-dialog>
@@ -205,7 +205,6 @@
            renderMenu,
            searchTime,
            typeValue,
            defaultTime,
            reserveOptions,
            tableData,
            dialogFormVisible,
@@ -222,12 +221,20 @@
   .home-container {
      overflow: hidden;
      padding: 20px 40px;
      .el-row{
         margin-bottom: 20px;
      }
      .el-row:last-child {
         margin-bottom: 0;
      }
      .el-col{
         display: flex;
         align-items: center;
         margin: 40px 0 20px;
      }
      .grid-content{
         align-items: center;
         min-height: 36px;
      }

      .topInfo{
@@ -249,6 +256,10 @@
            flex: 1;
         }
      }
      .topBtns{
         display: flex;
         justify-content: right;
      }
      .el-button--text {
         margin-right: 15px;
      }