Merge branch 'shoot-hand-html' of gitee.com:elegant_wings/dbd-meeting-html into shoot-hand-html

src/views/admin/RepairList.vue

@@ -3,17 +3,32 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="48">
-          <a-col :md="5" :sm="15">
+          <a-col :md="7" :sm="15">
-            <a-form-item label="报修单号">
+            <a-form-item label="维修单号">
               <a-input placeholder="请输入关键词" v-model="queryParam.sn" />
             </a-form-item>
           </a-col>
-          <a-col :md="5" :sm="15">
+          <a-col :md="7" :sm="15">
-            <a-form-item label="关键词">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :allowClear="true" label="故障类别">
-              <a-input placeholder="请输入关键词" v-model="queryParam.explain" />
+              <a-select v-model="queryParam.typeId"
+                        v-decorator="['typeId']"
+                        @change="selectDevice">
+                <a-select-option v-for="item in typeList" :key="item.id">{{ item.name }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="5" :sm="15">
+          <a-col :md="7" :sm="15">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :allowClear="true" label="故障子类">
+              <a-select v-model="queryParam.deviceId"
+                        v-decorator="['deviceId', {rules: [{ required: true, message: '请选择所属设备' }]}]"
+                        @change="getDeviceName">
+                <a-select-option v-for="item in deviceList" :key="item.id">{{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="7" :sm="15">
             <a-form-item label="报修来源">
               <a-select v-model="queryParam.remark"
                         v-decorator="['remark']">
@@ -22,30 +37,9 @@
                 </a-select-option>
               </a-select>
             </a-form-item>
-
           </a-col>
-          <a-col :md="5" :sm="15">
+          <a-col :md="7" :sm="15">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="故障类型">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工单状态">
-              <a-select :label-in-value="true"
-                        v-decorator="['typeId', {rules: [{ required: true, message: '请选择故障类型' }]}]"
-                        @change="selectDevice">
-                <a-select-option v-for="item in typeList" :key="item.id" :value="item.id">{{ item.name }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="5" :sm="15">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="报修设备">
-              <a-select :label-in-value="true"
-                        v-decorator="['deviceId', {rules: [{ required: true, message: '请选择所属设备' }]}]"
-                        @change="getDeviceName">
-                <a-select-option v-for="item in deviceList" :key="item.id" :value="item.id">{{ item.name }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="5" :sm="15">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="请选择状态">
               <a-select v-model="queryParam.type"
                         v-decorator="['status']">
                 <a-select-option v-for="item in options" :key="item.value">
@@ -54,18 +48,22 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="5" :sm="15">
+          <a-col :md="7" :sm="15">
             <a-form-item label="故障等级">
-              <a-select v-model="queryParam.repairLevel"
+              <a-select v-model="queryParam.repairLevel" :allowClear="true"
                         v-decorator="['repairLevel']">
                 <a-select-option v-for="item in repairLevelOptions" :key="item.value">
                   {{ item.label }}
                 </a-select-option>
               </a-select>
             </a-form-item>
-
           </a-col>
-          <a-col :md="5" :sm="15">
+          <a-col :md="7" :sm="20">
+            <a-form-item label="关键词（故障描述）">
+              <a-input placeholder="请输入关键词" v-model="queryParam.explain" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="7" :sm="15">
             <a-form-item label="评价">
               <a-select v-model="queryParam.evalService"
                         v-decorator="['evalService']">
@@ -75,7 +73,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :md="5" :sm="15">
+          <a-col :md="7" :sm="15">
             <a-form-item label="时间范围">
               <a-range-picker v-model="dateRange" @change="onChange" />
             </a-form-item>
@@ -194,12 +192,6 @@ export default {
       }, {
         value: '三级',
         label: '三级'
-      }, {
-        value: '四级',
-        label: '四级'
-      }, {
-        value: '五级',
-        label: '五级'
       }
       ],
       evalOptions: [{
@@ -251,11 +243,11 @@ export default {
           dataIndex: 'sn'
         },
         {
-          title: '所属分类',
+          title: '故障类别',
           dataIndex: 'typeName'
         },
         {
-          title: '设备名称',
+          title: '故障子类',
           dataIndex: 'deviceName'
         },
         {
@@ -273,7 +265,7 @@ export default {
           dataIndex: 'repairLevel'
         },
         {
-          title: '提交人',
+          title: '报修人',
           dataIndex: 'name'
         },
         {
@@ -301,12 +293,12 @@ export default {
     // 状态:1 待派单,3 重新派单,5 已派单,7 处理中, 9已完成 待评价, 11 已关闭 13 已评价
     statusFilter (status) {
       const statusMap = {
-        '1': '待分配',
+        '1': '待派单',
         '3': '重新派单',
         '5': '已派单',
         '7': '处理中',
         '9': '已完成,待评价',
-        '11': '已关闭',
+        '11': '无效申请',
         '13': '已评价'
       }
       return statusMap[status]
@@ -327,6 +319,7 @@ export default {
     },
     reset () {
       this.queryParam = {}
+      this.queryParam.typeId = ''
       this.selectRepairList()
     },
     customRequest (file) {
@@ -401,16 +394,15 @@ export default {
       })
     },
     // 查询设备
-    selectDevice (item) {
+    selectDevice (typeId) {
-      getRepairDeviceList({ 'typeId': item.key }).then(res => {
+      getRepairDeviceList({ 'typeId': typeId }).then(res => {
         this.deviceList = res.rows
       })
-      this.queryParam.typeId = item.key
+      this.queryParam.typeId = typeId
-      console.log(this.queryParam.typeId)
+
     },
-    getDeviceName (item) {
+    getDeviceName (deviceId) {
-      this.deviceName = item.label
+      this.queryParam.deviceId = deviceId
-      this.queryParam.deviceId = item.key
     },
     // 查询工单列表
     selectRepairList () {
@@ -449,7 +441,8 @@ export default {
             'endTime': this.queryParam.endTime,
             'evalService': this.queryParam.evalService,
             'timeout': this.queryParam.timeout,
-            'remark': this.queryParam.remark
+            'remark': this.queryParam.remark,
+            'name': this.queryParam.name
           }
         }
         getRepairList(datas).then(res => {

src/views/admin/repair/PerformanceList.vue

@@ -8,7 +8,7 @@
               <a-input placeholder="请输入报修单号" v-model="queryParam.sn" />
             </a-form-item>
           </a-col>
-          <a-col :md="5" :sm="15">
+          <a-col :md="7" :sm="15">
             <a-form-item label="时间范围">
               <a-range-picker v-model="timeRange" @change="selectTime" />
             </a-form-item>
@@ -23,22 +23,6 @@
       </a-form>
     </div>
     <a-tabs default-active-key="1" @change="callback">
-      <a-tab-pane key="1" tab="维修人员">
-        <a-table
-          size="default"
-          ref="table"
-          rowKey="id"
-          :columns="columns"
-          :data-source="workerData"
-        >
-      <span slot="status" slot-scope="text">
-        {{ text | statusFilter }}
-      </span>
-          <span slot="action" slot-scope="text, record">
-        <a v-if="editEnabel" @click="handleView(record.id)">详情</a>
-      </span>
-        </a-table>
-      </a-tab-pane>
       <a-tab-pane key="2" tab="网格区域" force-render>
         <a-table
           size="default"
@@ -71,6 +55,23 @@
       </span>
         </a-table>
       </a-tab-pane>
+      <a-tab-pane key="1" tab="维修人员">
+        <a-table
+          size="default"
+          ref="table"
+          rowKey="id"
+          :columns="columns"
+          :data-source="workerData"
+        >
+      <span slot="status" slot-scope="text">
+        {{ text | statusFilter }}
+      </span>
+          <span slot="action" slot-scope="text, record">
+        <a v-if="editEnabel" @click="handleView(record.id)">详情</a>
+      </span>
+        </a-table>
+      </a-tab-pane>
+
     </a-tabs>
   </a-card>
 </template>

src/views/admin/repair/RepairAddressList.vue

@@ -29,7 +29,7 @@
       <span slot="action" slot-scope="text, record">
         <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
         <a-divider type="vertical" />
-        <a v-if="editEnabel" @click="dataModal(record.id)"><a-icon type="bars" />门牌</a>
+        <a v-if="editEnabel" @click="dataModal(record.id)"><a-icon type="bars" />楼层</a>
         <a-divider type="vertical" />
         <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
       </span>

src/views/admin/repair/RepairDeviceTypeList.vue

@@ -4,7 +4,7 @@
       <a-form layout="inline">
         <a-row :gutter="48">
           <a-col :md="5" :sm="15">
-            <a-form-item label="名称">
+            <a-form-item label="设备类别">
               <a-input placeholder="请输入名称" v-model="queryParam.name" />
             </a-form-item>
           </a-col>
@@ -81,11 +81,11 @@ export default {
       // 表头
       columns: [
         {
-          title: '名称',
+          title: '设备类别',
           dataIndex: 'name'
         },
         {
-          title: '负责人',
+          title: '派单员',
           dataIndex: 'staffName'
         },
         {

src/views/admin/repair/RepairStatistics.vue

@@ -50,17 +50,17 @@
           <div class="label">超时量</div>
           <div class="value">{{ repairStatsCount.timeout }}</div>
         </div>
-        <div class="itemView" @click="dispatchEval(3)">
+        <div class="itemView" @click="dispatchEval(1)">
-          <div class="label">差评量</div>
+          <div class="label">好评量</div>
-          <div class="value">{{ repairStatsCount.l }}</div>
+          <div class="value">{{ repairStatsCount.h }}</div>
         </div>
         <div class="itemView" @click="dispatchEval(2)">
           <div class="label">中评量</div>
           <div class="value">{{ repairStatsCount.m }}</div>
         </div>
-        <div class="itemView" @click="dispatchEval(1)">
+        <div class="itemView" @click="dispatchEval(3)">
-          <div class="label">好评量</div>
+          <div class="label">差评量</div>
-          <div class="value">{{ repairStatsCount.h }}</div>
+          <div class="value">{{ repairStatsCount.l }}</div>
         </div>
       </div>
     </div>
@@ -230,7 +230,7 @@ export default {
           dataIndex: 'typename'
         },
         {
-          title: '保修次数',
+          title: '报修次数',
           dataIndex: 'zs'
         },
         {