Quellcode durchsuchen

Merge branch 'smswb_dev' of http://39.106.8.246:3003/web/wanda-bm-guide into smswb_dev

zhulizhen1111 vor 4 Jahren
Ursprung
Commit
a64cf18dc3
3 geänderte Dateien mit 1275 neuen und 1222 gelöschten Zeilen
  1. 1206 1172
      src/views/room/index.vue
  2. 68 49
      src/views/room/room4.vue
  3. 1 1
      vue.config.js

Datei-Diff unterdrückt, da er zu groß ist
+ 1206 - 1172
src/views/room/index.vue


+ 68 - 49
src/views/room/room4.vue

@@ -1,76 +1,95 @@
 <template>
   <div class="compute-item">
     <div ref="tableBox4" class="compute-table">
-      <el-table
-        :border="true"
-        v-loading="loading"
-        :max-height="tableMaxHeight"
-        :data="table4"
-        style="width: 100%"
-        @row-click="innerTable"
-        :header-cell-style="{background:'rgba(245,246,247,1)',fontFamily:'MicrosoftYaHei',color:'rgba(100,108,115,1)',lineHeight:'16px',fontSize:'12px'}"
-      >
+      <el-table :data="table4" :border="true" style="width: 100%" @row-click="innerTable">
         <el-table-column type="index" label="序号" width="60" :index="indexMethod"></el-table-column>
-        <el-table-column prop label="设备名称" show-overflow-tooltip resizable min-width="360">
-          <template slot-scope="{row}">{{row.sbmc||'--'}}</template>
+        <el-table-column prop="sbmc" label="设备名称" show-overflow-tooltip resizable min-width="100">
+          <template slot-scope="{row}">{{row.sbmc || '--'}}</template>
         </el-table-column>
-        <el-table-column prop label="位置名称" show-overflow-tooltip resizable min-width="120">
-          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        <el-table-column prop="matters" label="位置名称" width="240" show-overflow-tooltip resizable>
+          <template slot-scope="{row}">{{row.wzjc || '--'}}</template>
         </el-table-column>
-        <el-table-column prop label="问题描述" show-overflow-tooltip resizable min-width="120">
-          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        <el-table-column
+          prop="description"
+          label="问题描述"
+          show-overflow-tooltip
+          resizable
+          min-width="340"
+        >
+          <template slot-scope="{row}">{{row.description || '--'}}</template>
         </el-table-column>
-        <el-table-column prop label="工单编号" show-overflow-tooltip resizable min-width="120">
-          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        <el-table-column
+          prop="description"
+          label="工单编号"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">
+            <div
+              v-if="row.wonum"
+              @click.stop="staff(row)"
+              style="cursor:pointer;color: #0091ff;"
+            >{{row.wonum}}</div>
+            <div v-else>{{'--'}}</div>
+          </template>
         </el-table-column>
-        <el-table-column prop label="修报来源" show-overflow-tooltip resizable min-width="120">
-          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        <el-table-column
+          prop="description"
+          label="报修来源"
+          show-overflow-tooltip
+          resizable
+          min-width="340"
+        >
+          <template slot-scope="{row}">{{row.bxfwlymc || '--'}}</template>
         </el-table-column>
-        <el-table-column prop label="执行人" show-overflow-tooltip resizable min-width="120">
-          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        <el-table-column
+          prop="description"
+          label="执行人"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">{{row.lead || '--'}}</template>
         </el-table-column>
-        <el-table-column prop label="要求完成时间" show-overflow-tooltip resizable min-width="120">
-          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        <el-table-column prop="reportdate" label="要求完成时间" width="140">
+          <template slot-scope="{row}">{{row.schedfinish?formatterTime(row.schedfinish): '--'}}</template>
         </el-table-column>
-        <el-table-column prop label="实际完工时间" show-overflow-tooltip resizable min-width="120">
-          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        <el-table-column prop="sjjssj" label="实际完工时间" width="140">
+          <template slot-scope="{row}">{{row.wotjyssj?formatterTime(row.wotjyssj): '--'}}</template>
         </el-table-column>
-                <el-table-column prop label="设备内码" show-overflow-tooltip resizable width="80">
-          <template slot-scope="{row}">{{row.location||'--'}}</template>
+        <el-table-column prop="assetnum" label="设备内码" show-overflow-tooltip resizable width="80">
+          <template slot-scope="{row}">{{row.assetnum || '--'}}</template>
         </el-table-column>
-               <el-table-column prop label="位置内码" show-overflow-tooltip resizable min-width="120">
-          <template slot-scope="{row}">{{row.matters||'--'}}</template>
+        <el-table-column
+          prop="description"
+          label="位置内码"
+          show-overflow-tooltip
+          resizable
+          min-width="80"
+        >
+          <template slot-scope="{row}">{{row.location || '--'}}</template>
         </el-table-column>
-        <el-table-column prop label="保修照片" show-overflow-tooltip resizable width="80">
+        <el-table-column prop="brand" label="报修照片" width="80">
           <template slot-scope="{row}">
             <div
-              v-if="row.glsmsImage"
+              v-if="row.repair_photos_num"
               style="cursor:pointer;color: #0091ff;"
-              @click.stop="clickPic(row.glsmsImage)"
-            >{{row.glsmsImage.length+'张'}}</div>
+              @click.stop="clickPic(row.repair_photos_num)"
+            >{{row.repair_photos_num.length+'张'}}</div>
             <div v-else>{{'--'}}</div>
           </template>
         </el-table-column>
-        <el-table-column prop label="完工照片" show-overflow-tooltip resizable width="80">
+        <el-table-column prop="brand" label="完工照片" width="80">
           <template slot-scope="{row}">
             <div
-              v-if="row.glsmsImage"
+              v-if="row.finish_photos_num"
               style="cursor:pointer;color: #0091ff;"
-              @click.stop="clickPic(row.glsmsImage)"
-            >{{row.glsmsImage.length+'张'}}</div>
+              @click.stop="clickPic(row.finish_photos_num)"
+            >{{row.finish_photos_num.length+'张'}}</div>
             <div v-else>{{'--'}}</div>
           </template>
         </el-table-column>
-
-        <!-- <el-table-column prop label='填报时间' show-overflow-tooltip resizable width='130'>
-                    <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
-        </el-table-column>-->
-        <!-- <el-table-column prop label='验收时间' show-overflow-tooltip width='130' resizable>
-                    <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
-                </el-table-column>
-                <el-table-column prop label='工单编号' show-overflow-tooltip resizable width='80'>
-                    <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
-        </el-table-column>-->
       </el-table>
     </div>
     <pic-large ref="picLargeOpen"></pic-large>
@@ -93,8 +112,7 @@
 // import Select from '@/components/Select/Select.vue'
 import { Select } from "meri-design";
 import moment from "moment";
-import { number_format } from "@/utils/format.js";
-
+import { formatterTime,number_format } from "@/utils/format.js";
 export default {
   props: ["table4", "total", "page", "size", "loading"],
   data() {
@@ -103,6 +121,7 @@ export default {
       value1: "",
       searVal: "",
       number_format,
+      formatterTime,
       tableMaxHeight: 0,
       imgUrl: []
     };

+ 1 - 1
vue.config.js

@@ -5,7 +5,7 @@ module.exports = {
         proxy: {
             "/data": {
                 target: "http://60.205.177.43",
-                //target: "http://10.199.143.126",
+                // target: "http://10.199.143.126",
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,