From d4b02a28b53d935b40514d26d0884038a0b296f7 Mon Sep 17 00:00:00 2001
From: hh <292475944@qq.com>
Date: Fri, 18 Dec 2020 08:40:09 +0800
Subject: [PATCH] up

---
 src/api/work/order.js                         |   7 +
 src/views/fault/activityWarning/index.vue     |   2 +-
 .../workOrderManage/orderList/detail.vue      |  81 +++++
 src/views/workOrderManage/orderList/index.vue | 284 ++++--------------
 4 files changed, 154 insertions(+), 220 deletions(-)
 create mode 100644 src/views/workOrderManage/orderList/detail.vue

diff --git a/src/api/work/order.js b/src/api/work/order.js
index d9c4354..28e14c1 100644
--- a/src/api/work/order.js
+++ b/src/api/work/order.js
@@ -7,3 +7,10 @@ export function list(params) {
     params
   });
 }
+
+// 获取工单详情
+export function info(id) {
+  return request({
+    url: `/system/work/${id}`,
+  });
+}
diff --git a/src/views/fault/activityWarning/index.vue b/src/views/fault/activityWarning/index.vue
index 0a42b02..8a8f13d 100644
--- a/src/views/fault/activityWarning/index.vue
+++ b/src/views/fault/activityWarning/index.vue
@@ -102,7 +102,7 @@
           </el-table-column>
           <el-table-column prop="productName" label="产品名称" align="center" min-width="100">
           </el-table-column>
-          <el-table-column prop="nikeName" align="center" label="所属客户"></el-table-column>
+          <el-table-column prop="nickName" align="center" label="所属客户"></el-table-column>
           <el-table-column prop="projectName" align="center" label="所属项目"></el-table-column>
           <el-table-column prop="warningName" align="center" label="告警名称" min-width="150"></el-table-column>
           <el-table-column prop="warningLevel" align="center" label="告警等级" min-width="150"></el-table-column>
diff --git a/src/views/workOrderManage/orderList/detail.vue b/src/views/workOrderManage/orderList/detail.vue
new file mode 100644
index 0000000..b0ee90d
--- /dev/null
+++ b/src/views/workOrderManage/orderList/detail.vue
@@ -0,0 +1,81 @@
+<template>
+  <section class="app-container">
+    <el-row>
+      <el-col :span="8">
+        <el-row>
+          <span>设备名称：{{info.deviceName }}</span>
+        </el-row>
+      </el-col>
+      <el-col :span="8">1</el-col>
+      <el-col :span="8">1</el-col>
+    </el-row>
+  </section>
+</template>
+
+<script>
+import { info } from '@/api/work/order';
+import { getProvinceByCode } from "@/api/hardware/province";
+export default {
+  name: "TicketDetail",
+  data () {
+    return {
+      id: '',
+      info: {},
+      signal: [],
+      signalUpdateTime: '',
+      deviceTypeList: [
+        { 'label': '锐能设备', 'value': 'rn', },
+        { 'label': '铁塔设备', 'value': 'tt', },
+      ],
+    };
+  },
+  created () {
+    let { id } = this.$route.query;
+    if (!id) {
+      this.msgError('无工单ID');
+      this.$router.go(-1);
+      return;
+    }
+    this.id = id;
+    this.getDetail()
+  },
+  methods: {
+    getDetail () {
+      info(this.id).then(async ({ code, msg, info }) => { 
+        console.log(code, msg, info)
+        if (200 == code) {
+          // info.proName = await this.getProvinceByCode(info.proCode);
+          // info.cityName = await this.getProvinceByCode(info.cityCode);
+          // info.disName = await this.getProvinceByCode(info.disCode);
+          this.info = info;
+          // if (info.deviceSignal) {
+          //   let deviceSignal = JSON.parse(info.deviceSignal.signalJsonTurn);
+          //   this.signal = deviceSignal.signal;
+          //   this.signalUpdateTime = info.deviceSignal.updateTime;
+          // }
+        } else {
+          this.msgError(msg);
+        }
+      })
+    },
+    getProvinceByCode (code) {
+      return new Promise((resolve, reject) => {
+        getProvinceByCode(code).then(({ code, msg, data }) => {
+          if (code == 200) {
+            resolve(data.cityName);
+          } else {
+            this.$message.error(msg);
+            reject({ msg, code })
+          }
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+  }
+
+}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/views/workOrderManage/orderList/index.vue b/src/views/workOrderManage/orderList/index.vue
index 49e1eb2..402cddc 100644
--- a/src/views/workOrderManage/orderList/index.vue
+++ b/src/views/workOrderManage/orderList/index.vue
@@ -3,81 +3,38 @@
     <el-row>
       <!-- 地区 -->
       <el-col :span="4">
-        <region
-          @selectdRegionCode="selectdRegionCode"
-          :currentNodeKey.sync="queryParams.provinceCode"
-        ></region>
+        <region @selectdRegionCode="selectdRegionCode" :currentNodeKey.sync="queryParams.provinceCode"></region>
       </el-col>
       <!-- form表单 -->
       <el-col :span="20">
-        <el-form
-          :model="queryParams"
-          :inline="true"
-          ref="queryForm"
-          v-show="showSearch"
-          label-width="68px"
-        >
+        <el-form size="mini" :model="queryParams" :inline="true" ref="queryForm" v-show="showSearch" label-width="68px">
           <!-- 第一行 -->
           <el-row>
             <el-col :span="6">
               <el-form-item label="告警等级">
-                <el-select
-                  v-model="queryParams.deviceType"
-                  clearable
-                  placeholder="请输入告警等级"
-                >
-                  <el-option
-                    v-for="item in signalLevelList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select v-model="queryParams.deviceType" clearable placeholder="请输入告警等级">
+                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="告警名称">
-                <el-input
-                  v-model="queryParams.deviceName"
-                  placeholder="请输入告警名称"
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
+                <el-input v-model="queryParams.deviceName" placeholder="请输入告警名称" clearable @keyup.enter.native="handleQuery" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="产品名称">
-                <el-select
-                  v-model="queryParams.deviceType"
-                  clearable
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in signalLevelList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
+                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="所属客户">
-                <el-select
-                  v-model="queryParams.deviceType"
-                  clearable
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in signalLevelList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
+                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -87,55 +44,25 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="所属项目">
-                <el-select
-                  v-model="queryParams.deviceType"
-                  clearable
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in signalLevelList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select v-model="queryParams.deviceType" clearable placeholder="请选择">
+                  <el-option v-for="item in signalLevelList" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item label="站址名称">
-                <el-input
-                  v-model="queryParams.deviceName"
-                  placeholder="请输入站址名称"
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
+                <el-input v-model="queryParams.deviceName" placeholder="请输入站址名称" clearable @keyup.enter.native="handleQuery" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="设备SN">
-                <el-input
-                  v-model="queryParams.deviceSn"
-                  placeholder="请输入设备SN"
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
+                <el-input v-model="queryParams.deviceSn" placeholder="请输入设备SN" clearable @keyup.enter.native="handleQuery" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="工单编号">
-                <el-input
-                  v-model="queryParams.productId"
-                  placeholder="请输入工单编号"
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                  @keyup.enter.native="handleQuery"
-                />
+                <el-input v-model="queryParams.productId" placeholder="请输入工单编号" clearable @keyup.enter.native="handleQuery" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -143,55 +70,29 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="工单状态">
-                <el-select
-                  v-model="queryParams.deviceType"
-                  clearable
-                  placeholder="请选择"
-                >
-                  <el-option
-                    v-for="item in signalLevelList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                <el-select v-model="queryParams.workStatus" clearable placeholder="请选择">
+                  <el-option v-for="item in workStatusList" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item>
-                <el-date-picker
-                  v-model="dateRange"
-                  size="small"
-                  style="width: 240px"
-                  value-format="yyyy-MM-dd"
-                  type="daterange"
-                  range-separator="-"
-                  start-placeholder="受理开始时间"
-                  end-placeholder="受理结束时间"
-                ></el-date-picker>
+              <el-form-item label="时间范围">
+                <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+                  start-placeholder="受理开始时间" end-placeholder="受理结束时间"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item>
-                <el-button
-                  type="cyan"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleQuery"
-                >
+                <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">
                   查询
                 </el-button>
-                <el-button
-                  icon="el-icon-refresh"
-                  size="mini"
-                  @click="resetQuery"
-                  >重置</el-button
-                >
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
+        <right-toolbar class="mb8" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         <!-- 表格区域 -->
         <el-table v-loading="loading" :data="tableData" style="width: 100%">
           <!-- 省市区 -->
@@ -216,105 +117,45 @@
             min-width="80"
           >
           </el-table-column> -->
-          <el-table-column
-            prop="workCode"
-            align="center"
-            label="工单编号"
-            min-width="150"
-          ></el-table-column
-          ><el-table-column
-            prop="warningName"
-            align="center"
-            label="告警名称"
-            min-width="150"
-          ></el-table-column>
-          <el-table-column
-            prop="warningLevel"
-            align="center"
-            label="告警等级"
-            min-width="150"
-          ></el-table-column>
-          <el-table-column
-            prop="productName"
-            label="产品名称"
-            align="center"
-            min-width="100"
-          >
+          <el-table-column align="center" label="地区" min-width="150">
+            <template slot-scope="scope">
+              {{ scope.row.proName + scope.row.cityName + scope.row.disName }}
+            </template>
           </el-table-column>
-          <el-table-column
-            prop="nikeName"
-            align="center"
-            label="所属客户"
-          ></el-table-column>
-          <el-table-column
-            prop="projectName"
-            align="center"
-            label="所属项目"
-          ></el-table-column>
-          <el-table-column align="center" label="站址名称"></el-table-column>
-          <el-table-column
-            prop="deviceName"
-            align="center"
-            label="设备名称"
-          ></el-table-column>
-          <el-table-column
-            prop="deviceSn"
-            align="center"
-            label="设备SN"
-            min-width="100"
-          ></el-table-column>
+          <el-table-column prop="workCode" align="center" label="工单编号" min-width="180">
+            <template slot-scope="scope">
+              <el-link type="primary"  :href="'./detail?id=' + scope.row.id" target="_blank">{{scope.row.workCode}}</el-link>
+            </template>
+          </el-table-column>
+          <el-table-column prop="warningLevel" align="center" label="告警等级" min-width="100">
+            <template slot-scope="scope">
+              {{ scope.row.warningLevel | toChinaNum }}级
+            </template>
+          </el-table-column>
+          <el-table-column prop="warningName" align="center" label="告警名称" min-width="150"></el-table-column>
+          <el-table-column prop="productName" label="产品名称" align="center" min-width="100"></el-table-column>
+          <el-table-column prop="nickName" align="center" label="所属客户"></el-table-column>
+          <el-table-column prop="projectName" align="center" label="所属项目"></el-table-column>
+          <!-- <el-table-column align="center" label="站址名称"></el-table-column> -->
+          <!-- <el-table-column prop="deviceName" align="center" label="设备名称"></el-table-column> -->
+          <el-table-column prop="deviceSn" align="center" label="设备SN" min-width="100"></el-table-column>
 
-          <el-table-column
-            prop="warningDetails"
-            align="center"
-            label="告警状态"
-          ></el-table-column>
-          <el-table-column
-            prop="status"
-            align="center"
-            label="工单状态"
-          ></el-table-column>
+          <el-table-column prop="status" align="center" label="告警状态"></el-table-column>
+          <el-table-column prop="workStatus" align="center" label="工单状态">
+              <template slot-scope="scope">
+                {{ workStatusList.find(v=> v.value == scope.row.workStatus)['label']}}
+              </template>
+          </el-table-column>
 
-          <el-table-column align="center" label="建单时间" min-width="150">
+          <el-table-column align="center" label="建单时间" min-width="180">
             <template slot-scope="scope">
               {{ scope.row.createTime | formatDate }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="接单时间" min-width="150">
-            <template slot-scope="scope">
-              {{ scope.row.warningTime | formatDate }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="回单时间" min-width="150">
-            <template slot-scope="scope">
-              {{ scope.row.warningTime | formatDate }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            prop=""
-            label="处理人"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop=""
-            label="故障原因"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop=""
-            label="处理方法"
-            align="center"
-          ></el-table-column>
         </el-table>
         <!-- 分页 -->
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
       </el-col>
     </el-row>
   </section>
@@ -327,7 +168,7 @@ export default {
   components: {
     Region
   },
-  data() {
+  data () {
     return {
       dateRange: [],
       signalLevelList: [
@@ -336,6 +177,11 @@ export default {
         { label: '三级', value: '3' },
         { label: '四级', value: '4' }
       ],
+      workStatusList: [
+        { label: '待接单', value: '1' },
+        { label: '待回单', value: '2' },
+        { label: '已回单', value: '3' },
+      ],
       queryParams: {
         pageNum: 1,
         pageSize: 10
@@ -351,12 +197,12 @@ export default {
     };
   },
   methods: {
-    selectdRegionCode({ code }) {
+    selectdRegionCode ({ code }) {
       this.queryParams.provinceCode = code;
       this.handleQuery();
     },
     // 获取告警工单列表
-    getList() {
+    getList () {
       this.loading = true;
       list(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
         this.tableData = res.rows;
@@ -365,13 +211,13 @@ export default {
       });
     },
     // 搜索按钮操作
-    handleQuery() {
+    handleQuery () {
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
       this.getList();
     },
     // 重置按钮操作
-    resetQuery() {
+    resetQuery () {
       this.queryParams = {};
       this.resetForm('queryForm');
       this.dateRange = [];
@@ -380,7 +226,7 @@ export default {
   },
   computed: {},
   watch: {},
-  created() {
+  created () {
     this.getList();
   }
 };