LY 工作票统计 平级显示

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -39,6 +39,7 @@ import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 /**
  * 工作票Controller
@@ -71,32 +72,36 @@ public class TJobticketController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(TJobticket tJobticket) {
         startPage();
-        List<TJobticket> list = tJobticketService.selectTJobticketList(tJobticket);
-        //查询续票
-        if (list.size() >0) {
-            //线程池
-            ExecutorService executorService = Executors.newFixedThreadPool(list.size());
-            final CountDownLatch latch = new CountDownLatch(list.size()); //相同线程数量的计数
-            for (TJobticket t : list
-            ) {
-                executorService.execute(() -> {
-                    //续票列表 -- 业务模块
-                    if ("10".equals(t.getXpxp())) {
-                        List<TJobticket> cList = tJobticketMapper.selectTJobticketChildren(t);
-                        t.setChildren(cList);
-                    }
-                    latch.countDown(); //线程计数
-                });
-            }
-            try {
-                latch.await(); //线程计数完毕后继续执行
-            } catch (InterruptedException e) {
-                e.printStackTrace();
+        if (tJobticket.getTableType() == 1) {
+            List<TJobticket> list = tJobticketService.selectTJobticketList(tJobticket);
+            //查询续票
+            if (list.size() > 0) {
+                //线程池
+                ExecutorService executorService = Executors.newFixedThreadPool(list.size());
+                final CountDownLatch latch = new CountDownLatch(list.size()); //相同线程数量的计数
+                for (TJobticket t : list
+                ) {
+                        executorService.submit(() -> {
+                        //续票列表 -- 业务模块
+                        if ("10".equals(t.getXpxp())) {
+                            List<TJobticket> cList = tJobticketMapper.selectTJobticketChildren(t);
+                            t.setChildren(cList);
+                        }
+                        latch.countDown(); //线程计数
+                    });
+                }
+                try {
+                    latch.await(); //线程计数完毕后继续执行
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                executorService.shutdown();
             }
-            executorService.shutdown();
+            return getDataTable(list);
+        } else {
+            List<TJobticket> list = tJobticketService.selectTJobticketList(tJobticket);
+            return getDataTable(list);
         }
-
-        return getDataTable(list);
     }
 
     //情况统计
@@ -183,7 +188,7 @@ public class TJobticketController extends BaseController {
     @Log(title = "工作票", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TJobticket tJobticket) {
-        if (tJobticket.getXpxp()!=null && tJobticket.getXpxp().equals("12")) {
+        if (tJobticket.getXpxp() != null && tJobticket.getXpxp().equals("12")) {
             int i = tJobticketMapper.countXp(tJobticket);
             logger.info("预约票数量:" + i);
             if (i >= 10) {
@@ -225,8 +230,8 @@ public class TJobticketController extends BaseController {
         List<SysDictData> book_user_unit = iSysDictTypeService.selectDictDataByType("book_user_unit");
         //批量插入时 需要查询数据库是否有重复数据 若果有 就不新增
         for (int i = 0; i < dto.size(); i++) {
-            if (StringUtils.isEmpty(dto.get(i).getGczyxkzh()) && StringUtils.isEmpty(dto.get(i).getDhzyxkzh()) && StringUtils.isEmpty(dto.get(i).getXzkjxkzh()) &&StringUtils.isEmpty(dto.get(i).getMbzyxkzh()) &&StringUtils.isEmpty(dto.get(i).getWhgzxkzh()) ) {
-                noCount ++;
+            if (StringUtils.isEmpty(dto.get(i).getGczyxkzh()) && StringUtils.isEmpty(dto.get(i).getDhzyxkzh()) && StringUtils.isEmpty(dto.get(i).getXzkjxkzh()) && StringUtils.isEmpty(dto.get(i).getMbzyxkzh()) && StringUtils.isEmpty(dto.get(i).getWhgzxkzh())) {
+                noCount++;
                 continue;
             }
             TJobticket tJobticket = new TJobticket();
@@ -283,7 +288,7 @@ public class TJobticketController extends BaseController {
 
             contentUserUnit.delete(0, contentUserUnit.length());
         }
-        return AjaxResult.success("成功导入" + nosanmeCount + "条数据，" +"\n"+ "未导入重复" + sameCount + "条数据！"+"\n" + "未填写票号" + noCount + "条数据！");
+        return AjaxResult.success("成功导入" + nosanmeCount + "条数据，" + "\n" + "未导入重复" + sameCount + "条数据！" + "\n" + "未填写票号" + noCount + "条数据！");
     }
 
     /**
@@ -322,10 +327,10 @@ public class TJobticketController extends BaseController {
     @Log(title = "工作票状态", businessType = BusinessType.UPDATE)
     @PutMapping("/status")
     public AjaxResult editStatus(@RequestBody TJobticket tJobticket) {
-        if ("18".equals(tJobticket.getZypzt()) ) {
+        if ("18".equals(tJobticket.getZypzt())) {
             //批量
             return toAjax(tJobticketMapper.updateTJobticketStatus(tJobticket));
-        }else {
+        } else {
             //单个
             return toAjax(tJobticketService.updateTJobticket(tJobticket));
         }

master/src/main/java/com/ruoyi/project/ehs/domain/TJobticket.java

@@ -24,8 +24,10 @@ public class TJobticket extends BaseEntity
 
     private List<TJobticket> children;
 
+    private int tableType;
+
     /** 装置 */
-    @Excel(name = "装置名称", dictType = "PLANT_DIVIDE")
+//    @Excel(name = "装置名称", dictType = "PLANT_DIVIDE")
     private String plantCode;
 
     /** 开票日期 */
@@ -42,7 +44,6 @@ public class TJobticket extends BaseEntity
     private String qfbz;
 
     /** 签发人 */
-    @Excel(name = "签发人")
     private String qfr;
 
     /** 新票/续票 */
@@ -74,7 +75,7 @@ public class TJobticket extends BaseEntity
     private String mbzyxkzh;
 
     /** 高处作业许可证号 */
-    @Excel(name = "高处作业许可证号")
+    @Excel(name = "高处作业许可证号", dictType = "GCZYJB")
     private String gczyxkzh;
 
     /** 高处作业级别 */
@@ -119,7 +120,7 @@ public class TJobticket extends BaseEntity
     private String wcxxbh;
 
     /** 未撤销状态 */
-    @Excel(name = "未撤销状态")
+    @Excel(name = "未撤销状态",dictType = "TICKED_WCXZT")
     private String wcxzt;
 
 
@@ -524,6 +525,14 @@ public class TJobticket extends BaseEntity
         this.tag = tag;
     }
 
+    public int getTableType() {
+        return tableType;
+    }
+
+    public void setTableType(int tableType) {
+        this.tableType = tableType;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java

@@ -43,8 +43,7 @@ public class SysJobServiceImpl implements ISysJobService
     @PostConstruct
     public void init() throws SchedulerException, TaskException
     {
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-        executorService.execute(() -> {
+        new Thread(() -> {
             try {
                 scheduler.clear();
             } catch (SchedulerException e) {
@@ -61,9 +60,7 @@ public class SysJobServiceImpl implements ISysJobService
                     e.printStackTrace();
                 }
             }
-        });
-        executorService.shutdown();
-
+        },"初始化定时器").start();
     }
 
     /**

master/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java

@@ -41,15 +41,13 @@ public class SysConfigServiceImpl implements ISysConfigService
     @PostConstruct
     public void init()
     {
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-        executorService.execute(() -> {
+        new Thread(() -> {
             List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
             for (SysConfig config : configsList)
             {
                 redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
             }
-        });
-        executorService.shutdown();
+        },"初始化参数到缓存").start();
     }
 
     /**

master/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java

@@ -40,16 +40,14 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @PostConstruct
     public void init()
     {
-        ExecutorService executorService = Executors.newFixedThreadPool(2);
-        executorService.execute(() -> {
+        new Thread(() -> {
             List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
             for (SysDictType dictType : dictTypeList)
             {
                 List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
                 DictUtils.setDictCache(dictType.getDictType(), dictDatas);
             }
-        });
-        executorService.shutdown();
+        },"初始化字典到缓存").start();
     }
 
     /**

master/src/main/resources/mybatis/ehs/TJobticketMapper.xml

@@ -118,14 +118,19 @@
             <if test="userMg != null ">and user_mg = #{userMg}</if>
             <if test="userUnit != null ">and user_unit = #{userUnit}</if>
             <if test="tag != null and tag != '' ">and tag = #{tag}</if>
-            <choose>
-                <when test="xpxp == '12'">
-                    and xpxp = #{xpxp}
-                </when>
-                <otherwise>
-                    and xpxp = 10
-                </otherwise>
-            </choose>
+            <if test="tableType == 1 ">
+                <choose>
+                    <when test="xpxp == '12'">
+                        and xpxp = #{xpxp}
+                    </when>
+                    <otherwise>
+                        and xpxp = 10
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="tableType == 2 ">
+                <if test="xpxp != null and xpxp != '' ">and xpxp = #{xpxp}</if>
+            </if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

ui/src/views/ehs/jobticket/index.vue

@@ -16,28 +16,17 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('签发班组')" prop="qfbz">
-        <el-select v-model="queryParams.qfbz" :placeholder="$t('请选择') + $t('签发班组')" clearable size="small"
+      <el-form-item :label="$t('新票/续票')" prop="xpxp">
+        <el-select v-model="queryParams.xpxp" :placeholder="$t('请选择') + $t('新票/续票')" clearable size="small"
                    @change="handleQuery">
           <el-option
-            v-for="dict in qfbzOptions"
+            v-for="dict in xpxpOptions"
             :key="dict.dictValue"
             :label="dict.dictLabel"
             :value="dict.dictValue"
           />
         </el-select>
       </el-form-item>
-            <el-form-item :label="$t('新票/续票')" prop="xpxp">
-              <el-select v-model="queryParams.xpxp" :placeholder="$t('请选择') + $t('新票/续票')" clearable size="small"
-                         @change="handleQuery">
-                <el-option
-                  v-for="dict in xpxpOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
       <el-form-item label="延期许可证号" prop="yqxkzh">
         <el-input
           v-model="queryParams.yqxkzh"
@@ -162,15 +151,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="检查/存档人" prop="jccdr">
-        <el-input
-          v-model="queryParams.jccdr"
-          placeholder="请输入检查/存档人"
-          clearable
-          size="small" @input="handleQuery"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="未撤销项编号" prop="wcxxbh">
         <el-input
           v-model="queryParams.wcxxbh"
@@ -271,10 +252,17 @@
         >{{ $t('数据分析') }}
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-radio-group v-model="tableType" @input="getList">
+          <el-radio-button label="1">树形列表</el-radio-button>
+          <el-radio-button label="2">平级列表</el-radio-button>
+        </el-radio-group>
+      </el-col>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="jobticketList"
+    <el-table v-if="tableType == 1" v-loading="loading" :data="jobticketList"
               :height="clientHeight" border :cell-style="myclass"
               row-key="id"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@@ -286,16 +274,123 @@
           <span>{{ parseTime(scope.row.kprq, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('签发时间')" align="center" prop="qfsj" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('签发班组')" align="center" prop="qfbz" :formatter="qfbzFormat"/>
       <el-table-column :label="$t('新票/续票')" align="center" prop="xpxp" width="100" :formatter="xpxpFormat"/>
-      <el-table-column :label="$t('延期许可证号')" align="center"  sortable="custom" prop="yqxkzh" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('延期许可证号')" align="center" sortable="custom" prop="yqxkzh" width="100"
+                       :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('危害工作许可证号')" align="center" sortable="custom" prop="whgzxkzh" width="100"
                        :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('动火作业许可证号')" align="center" sortable="custom" prop="dhzyxkzh" width="100"
                        :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('火票级别')" align="center" sortable="custom" prop="hpjb" :formatter="hpjbFormat"/>
-      <el-table-column :label="$t('限制空间许可证号')" align="center" sortable="custom" prop="xzkjxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('限制空间许可证号')" align="center" sortable="custom" prop="xzkjxkzh"
+                       :show-overflow-tooltip="true"/>
+      <el-table-column label="盲板作业许可证号" align="center" sortable="custom" prop="mbzyxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column label="高处作业许可证号" align="center" sortable="custom" prop="gczyxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column label="高处作业级别" align="center" sortable="custom" prop="gczyjb" :formatter="gczyjbFormat"/>
+      <el-table-column :label="$t('工作内容')" align="center" prop="content" width="300" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('BYC负责单位/联系人')" align="center" prop="byclxr" width="100"
+                       :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('施工单位')" align="center" prop="sgdw" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('联系人')" align="center" prop="lxr" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('联系电话')" align="center" prop="lxdh" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('销票时间')" align="center" prop="xpsj" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.xpsj, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('作业票状态')" align="center" prop="zypzt" width="200" :formatter="zypztFormat">
+        <template slot-scope="scope" v-if="scope.row.zypzt != null">
+          <el-dropdown placement="bottom" trigger="click">
+            <span class="el-dropdown-link">
+              <span style=" font-size: 13px" v-if="scope.row.zypzt==10">{{ "作业票未销" }}</span>
+               <span style=" font-size: 13px" v-if="scope.row.zypzt==18">{{ "作业票收回，作业票关闭" }}</span>
+                <span style="font-size: 13px" v-if="scope.row.zypzt==16">{{ "作业票延期" }}</span>
+                 <span style="font-size: 13px" v-if="scope.row.zypzt==20">{{ "作业票作废" }}</span>
+              <i class="el-icon-caret-bottom"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item @click.native="statusChange(10, scope.row)">{{ $t('作业票未销') }}</el-dropdown-item>
+              <el-dropdown-item @click.native="statusChange(18, scope.row)">{{ $t('作业票关闭，作业票收回') }}</el-dropdown-item>
+              <el-dropdown-item @click.native="statusChange(16, scope.row)">{{ $t('作业票延期') }}</el-dropdown-item>
+              <el-dropdown-item @click.native="statusChange(20, scope.row)">{{ $t('作业票作废') }}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('检查/存档人')" align="center" prop="jccdr" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('未撤销项编号')" align="center" prop="wcxxbh" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('未撤销状态')" align="center" prop="wcxzt" :formatter="wcxztFormat">
+        <template slot-scope="scope" v-if="scope.row.wcxzt != null">
+          <el-dropdown placement="bottom" trigger="click">
+            <span class="el-dropdown-link">
+              <span style=" font-size: 13px" v-if="scope.row.wcxzt==10">{{ "有" }}</span>
+               <span style=" font-size: 13px" v-if="scope.row.wcxzt==12">{{ "无" }}</span>
+              <i class="el-icon-caret-bottom"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item @click.native="wcxztYOU(0, scope.row)">{{ $t('有') }}</el-dropdown-item>
+              <el-dropdown-item @click.native="wcxztWU(0, scope.row)">{{ $t('无') }}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('撤销时间')" align="center" prop="cxsj" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.cxsj, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('索引')" align="center" prop="tag" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作')" align="center" fixed="right" width="160"
+                       class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ehs:jobticket:edit']"
+          >{{ $t('修改') }}
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ehs:jobticket:remove']"
+          >{{ $t('删除') }}
+          </el-button>
+          <el-button
+            v-if="scope.row.xpxp=='10'"
+            size="mini"
+            type="text"
+            icon="el-icon-date"
+            @click="handlePostpone(scope.row)"
+            v-hasPermi="['ehs:jobticket:add']"
+          >{{ $t('延期') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table v-else v-loading="loading" :data="jobticketList"
+              :height="clientHeight" border :cell-style="myclass"
+              @sort-change="sortList"
+    >
+      <el-table-column :label="$t('开票日期')" align="center" prop="kprq" width="125">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.kprq, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('新票/续票')" align="center" prop="xpxp" width="100" :formatter="xpxpFormat"/>
+      <el-table-column :label="$t('延期许可证号')" align="center" sortable="custom" prop="yqxkzh" width="100"
+                       :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('危害工作许可证号')" align="center" sortable="custom" prop="whgzxkzh" width="100"
+                       :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('动火作业许可证号')" align="center" sortable="custom" prop="dhzyxkzh" width="100"
+                       :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('火票级别')" align="center" sortable="custom" prop="hpjb" :formatter="hpjbFormat"/>
+      <el-table-column :label="$t('限制空间许可证号')" align="center" sortable="custom" prop="xzkjxkzh"
+                       :show-overflow-tooltip="true"/>
       <el-table-column label="盲板作业许可证号" align="center" sortable="custom" prop="mbzyxkzh" :show-overflow-tooltip="true"/>
       <el-table-column label="高处作业许可证号" align="center" sortable="custom" prop="gczyxkzh" :show-overflow-tooltip="true"/>
       <el-table-column label="高处作业级别" align="center" sortable="custom" prop="gczyjb" :formatter="gczyjbFormat"/>
@@ -384,7 +479,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total>0"
       :total="total"
@@ -395,7 +489,8 @@
     />
 
     <!-- 添加或修改工作票对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="700px" :close-on-click-modal="false" append-to-body >
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="700px" :close-on-click-modal="false"
+               append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item :label="$t('开票日期')" prop="kprq">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -572,7 +667,8 @@
       </div>
     </el-dialog>
     <!-- 用户导入对话框 -->
-    <el-dialog v-dialogDrag :title="upload.title" :visible.sync="upload.open" width="400px" :close-on-click-modal="false" append-to-body>
+    <el-dialog v-dialogDrag :title="upload.title" :visible.sync="upload.open" width="400px"
+               :close-on-click-modal="false" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -701,7 +797,7 @@ import {listSpecYlrq} from "@/api/sems/specYlrq";
 
 export default {
   name: "Jobticket",
-  components: {FireData, Treeselect,StatusData},
+  components: {FireData, Treeselect, StatusData},
   data() {
     return {
       //新票新增
@@ -773,9 +869,11 @@ export default {
         url: process.env.VUE_APP_BASE_API + "/ehs/jobticket/importData"
       },
       // 查询参数
+      tableType: 1,
       queryParams: {
+        tableType: 1,
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 100,
         plantCode: null,
         kprq: null,
         startDate: null,
@@ -1050,8 +1148,9 @@ export default {
     /** 查询工作票列表 */
     getList() {
       this.loading = true;
+      this.queryParams.tableType = this.tableType
       listJobticket(this.queryParams).then(response => {
-        this.jobticketList=[]
+        this.jobticketList = []
         this.jobticketList = response.rows;
         this.total = response.total;
         this.loading = false;

ui/src/views/invoice/bookingworkticket/index.vue

@@ -144,7 +144,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="cancelQuery"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="bookingworkticketList" ref="multipleTable" class="table-fixed"
+    <el-table v-loading="loading" :data="bookingworkticketList" ref="multipleTable"
               :span-method="mergeMethod" @selection-change="handleSelectionChange" :height="clientHeight" border
               :row-key="getRowKey">
       <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
@@ -152,9 +152,9 @@
                        :show-overflow-tooltip="true"/>
       <el-table-column label="作业区域单元" align="center" prop="bookingworkticket.workArea" width="100"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="楼层位置" align="center" prop="bookingworkticket.floorLocation" width="100"
+      <el-table-column label="楼层位置" align="center" prop="bookingworkticket.floorLocation" width="80"
                        :formatter="floorLocationFormat"/>
-      <el-table-column label="用户主管" align="center" prop="bookingworkticket.userMgName" width="100"
+      <el-table-column label="用户主管" align="center" prop="bookingworkticket.userMgName" width="60"
                        :show-overflow-tooltip="true"/>
       <el-table-column label=" 预约作业日期" align="center" prop="workStartTime" width="90">
         <template slot-scope="scope">
@@ -181,8 +181,8 @@
           <span>{{ parseTime(scope.row.bookingworkticket.createdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="预约状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat"/>
-      <el-table-column label="票号" align="center" prop="reservationNumber">
+      <el-table-column label="预约状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
+      <el-table-column label="票号" align="center" width="30" prop="reservationNumber">
         <template slot-scope="scope">
           <span>  {{ scope.row.reservationNumber }}</span>
           <el-button
@@ -195,14 +195,14 @@
           ></el-button>
         </template>
       </el-table-column>
-      <el-table-column label="危害工作许可证号" align="center" prop="whgzxkzh" :show-overflow-tooltip="true"/>
-      <el-table-column label="动火作业许可证号" align="center" prop="dhzyxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column label="危害工作许可证号" align="center" prop="whgzxkzh" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="动火作业许可证号" align="center" prop="dhzyxkzh" width="100" :show-overflow-tooltip="true"/>
       <el-table-column label="火票级别" align="center" prop="hpjb" width="50" :formatter="hpjbFormat"/>
-      <el-table-column label="限制空间许可证号" align="center" prop="xzkjxkzh" :show-overflow-tooltip="true"/>
-      <el-table-column label="盲板作业许可证号" align="center" prop="mbzyxkzh" :show-overflow-tooltip="true"/>
-      <el-table-column label="高处作业许可证号" align="center" prop="gczyxkzh" :show-overflow-tooltip="true"/>
-      <el-table-column label="高处作业级别" align="center" prop="gczyjb" :formatter="gczyjbFormat"/>
-      <el-table-column label="延期许可证号" align="center" prop="yqxkzh" :show-overflow-tooltip="true"/>
+      <el-table-column label="限制空间许可证号" align="center" prop="xzkjxkzh" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="盲板作业许可证号" align="center" prop="mbzyxkzh" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="高处作业许可证号" align="center" prop="gczyxkzh" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="高处作业级别" align="center" prop="gczyjb" width="50" :formatter="gczyjbFormat"/>
+      <el-table-column label="延期许可证号" align="center" prop="yqxkzh" width="100" :show-overflow-tooltip="true"/>
       <el-table-column label="索引" align="center" prop="tag" width="60" :show-overflow-tooltip="true"/>
       <el-table-column label="开票" align="center" fixed="right" width="90">
         <template slot-scope="scope">
@@ -228,7 +228,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding ">
         <template slot-scope="scope">
 <!--          <el-button-->
 <!--            v-if="scope.row.bookingworkticket.status== 0"-->
@@ -1559,14 +1559,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.table-fixed {
-  /deep/ .el-table__fixed-right {
-    height: 100% !important; //设置高优先，以覆盖内联样式
-  }
 
-  /deep/ .el-table__fixed {
-    height: 100% !important; //设置高优先，以覆盖内联样式
-  }
-}
 </style>
 

ui/src/views/login.vue

@@ -158,8 +158,8 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/image/CPMS20210107.jpg");
-  //background-image: url("../assets/image/cpms-test.jpg");
+  //background-image: url("../assets/image/CPMS20210107.jpg");
+  background-image: url("../assets/image/cpms-test.jpg");
   background-size: cover;
 }
 .title {