详情页改动

gassafety-web/package-lock.json

@@ -8286,6 +8286,11 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
     },
+    "moment": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",

gassafety-web/src/views/workOrder/basicsInfo/detail.vue

@@ -65,9 +65,9 @@
               <el-form-item label="下发时间:" prop="allotTime">
                 <font>{{form.allotTime}}</font>
               </el-form-item>
-              <el-form-item label="接收时间:" prop="actualTime">
+              <!-- <el-form-item label="接收时间:" prop="actualTime">
                 <font>{{form.actualTime}}</font>
-              </el-form-item>
+              </el-form-item> -->
           </el-form>
           <div id="marbox" style="width: 700px;height: 250px;float: left;margin-top: -35px; border: 1px solid rgb(218, 213, 213);">
             <div style="width: 100%;height: 100%" id="container"></div>
@@ -131,11 +131,11 @@
                 </div>
             </el-upload> -->
               <div style="float: left;margin-left: 50px;" >
-                <el-image :src="form.pictureUrl1" fit="cover" v-if="form.pictureUrl2 != null"  style="width: 100px;height: 100px;">
+                <el-image :src="form.pictureUrl1" :preview-src-list="srcList" fit="cover"   v-if="form.pictureUrl1 != null"   style="width: 100px;height: 100px;margin-left: 15px;">
                 </el-image>
-                <el-image :src="form.pictureUrl2" fit="cover"  v-if="form.pictureUrl2 != null"   style="width: 100px;height: 100px;">
+                <el-image :src="form.pictureUrl2" :preview-src-list="srcList" fit="cover"  v-if="form.pictureUrl2 != null"   style="width: 100px;height: 100px;margin-left: 15px;">
                 </el-image>
-                <el-image :src="form.pictureUrl3" fit="cover"  v-if="form.pictureUrl3 != null"   style="width: 100px;height: 100px;">
+                <el-image :src="form.pictureUrl3" :preview-src-list="srcList" fit="cover"  v-if="form.pictureUrl3 != null"   style="width: 100px;height: 100px;margin-left: 15px;">
                 </el-image>
               </div>
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;" >
@@ -271,7 +271,6 @@ export default {
       getBasicsInfo (){
         getBasicsInfo(this.orderId).then(response =>{
           this.form = response.data;
-          console.log(response.data,"fdsfdsa======")
           this.active = parseInt(response.data.orderStatus) + 1;
           if(this.form.deviceInfoList.length>0){
             this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]);

gassafety-web/src/views/workOrder/workorder/workorder.vue

-<template>
-  <div class="app-container workorder">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="登录地址" prop="ipaddr">
-        <el-input
-          v-model="queryParams.ipaddr"
-          placeholder="请输入登录地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-
-    </el-form>
-
-    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
-
-    <el-table
-      v-loading="loading"
-      :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
-      style="width: 100%;"
-    >
-      <el-table-column label="序号" type="index" align="center">
-        <template slot-scope="scope">
-          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
-      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="浏览器" align="center" prop="browser" />
-      <el-table-column label="操作系统" align="center" prop="os" />
-      <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.loginTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleForceLogout(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
-          >强退</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" /> -->
-  </div>
-</template>
-
-<script>
-import { list, forceLogout } from "@/api/monitor/online";
-
-export default {
-  name: "Online",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      list: [],
-      pageNum: 1,
-      pageSize: 10,
-      // 查询参数
-      queryParams: {
-        ipaddr: undefined,
-        userName: undefined
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询登录日志列表 */
-    getList() {
-      this.loading = true;
-      list(this.queryParams).then(response => {
-        this.list = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 强退按钮操作 */
-    handleForceLogout(row) {
-      this.$confirm('是否确认强退名称为"' + row.userName + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return forceLogout(row.tokenId);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("强退成功");
-        }).catch(() => {});
-    }
-  }
-};
-</script>
-<style>
-  .workorder .pagination-container[data-v-72233bcd] {
-    background: #fff;
-    padding: 0;
-}
-.workorder .pagination-container {
-    position: relative;
-    height: 25px;
-    margin-bottom: 10px;
-    margin-top: 15px;
-    padding: 0 !important;
-}
-.workorder .pagination-container .el-pagination {
-    left: 0;
-    position: absolute;
-}
-.workorder .el-pagination {
-    white-space: nowrap;
-    padding: 0;
-    color: #303133;
-    font-weight: bold;
-}
-</style>