1.维修故障统计表头加时间单位h;2.员工电话后面增加状态字段，显示在职或离职;3.设备维修,报修，报修时加备注字段，维修接单可以看见

src/permission.js

@@ -7,7 +7,7 @@ import { getToken,removeToken } from '@/utils/auth' // get token from cookie
 import Cookies from 'js-cookie'
 import getPageTitle from '@/utils/get-page-title'
 // 1为单点登录，其他不是
-Cookies.set('sso',1)
+Cookies.set('sso',0)
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 const whiteList = ['/login'] // no redirect whitelist

src/views/console/emp/index.vue

@@ -22,7 +22,7 @@
         <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
         <el-button v-if="isEmpAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
-           
+
       </div>
       <el-table
         v-loading="listLoading"
@@ -81,6 +81,11 @@
             <span>{{ scope.row.tel }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="状态" min-width="130px" header-align="center" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.state }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="账号数" sortable prop="isuser" min-width="90px" header-align="center" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.isuser }}</span>
@@ -520,8 +525,8 @@ export default {
         console.log(this.downLoadList)
         const elecExcelDatas = [
           {
-            tHeader: ['牧场', '姓名', '部门', '职位', '电话', '工号'],
-            filterVal: ['pastureName', 'empname', 'deptname', 'position', 'tel', 'empCode'],
+            tHeader: ['牧场', '姓名', '部门', '职位', '电话','状态', '工号'],
+            filterVal: ['pastureName', 'empname', 'deptname', 'position', 'tel','state', 'empCode'],
             tableDatas: this.downLoadList,
             sheetName: '员工信息'
           }

src/views/maintenance/repair/index.vue

@@ -478,6 +478,13 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="备注：" prop="remark">
+                <el-input ref="remark" v-model="createTemp.remark" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -545,6 +552,13 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="备注：" prop="remark">
+                  <el-input ref="remark" v-model="seeTemp.remark" disabled />
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col v-if="seeTemp.orderStatue == 3" :span="8">
                 <el-form-item label="驳回日期：" prop="shutdownDate">
@@ -670,6 +684,13 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
+                <el-row>
+                  <el-col :span="8">
+                    <el-form-item label="备注：" prop="remark">
+                      <el-input ref="remark" v-model="seeTemp.remark" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
                 <el-row>
                   <el-col :span="8">
                     <h3>维修信息</h3>

src/views/report/maintenanceFault/index.vue

@@ -80,17 +80,17 @@
           <span>{{ row.count }}</span>
         </template>
       </el-table-column>
-      <el-table-column   :key="7" label="平均维修时间（MTTR）" sortable min-width="140px" align="center">
+      <el-table-column   :key="7" label="平均维修时间/h（MTTR）" sortable min-width="140px" align="center">
         <template slot-scope="{row}">
           <span>{{ row.mttr }}</span>
         </template>
       </el-table-column>
-      <el-table-column   :key="8" label="无故障时间（MTTF）" sortable min-width="140px" align="center">
+      <el-table-column   :key="8" label="无故障时间/h（MTTF）" sortable min-width="140px" align="center">
         <template slot-scope="{row}">
           <span>{{ row.mttf }}</span>
         </template>
       </el-table-column>
-      <el-table-column   :key="9" label="平均故障间隔时间（MTBF）" sortable min-width="140px" align="center">
+      <el-table-column   :key="9" label="平均故障间隔时间/h（MTBF）" sortable min-width="140px" align="center">
         <template slot-scope="{row}">
           <span>{{ row.mtbf }}</span>
         </template>
@@ -377,9 +377,9 @@ export default {
       this.isTitle3 = false
       GetDataByName( { name: 'getEqClassBengbu', offset: 0, pagecount: 0, returntype: 'Map', parammaps: {
         'section': '3','pid':'' }}).then(response => {
-      
+
         this.eqClassList3 = response.data.list
-      
+
       })
     },
     goSecond() {
@@ -446,7 +446,7 @@ export default {
             this.downLoadParm.list = response.data
             var excelDatas = [
               {
-                tHeader: ['牧场', '设备二级分类名称', '维修次数', '平均维修时间（MTTR）', '无故障时间（MTTF）', '平均故障间隔时间（MTBF）'],
+                tHeader: ['牧场', '设备二级分类名称', '维修次数', '平均维修时间/h（MTTR）', '无故障时间/h（MTTF）', '平均故障间隔时间/h（MTBF）'],
                 filterVal: ['pastureName', 'eqClassName', 'count', 'mttr', 'mttf', 'mtbf' ],
                 tableDatas: this.downLoadParm.list,
                 sheetName: '设备'
@@ -488,7 +488,7 @@ export default {
             this.downLoadParm.list = response.data
             var excelDatas = [
               {
-                tHeader: [ '设备三级分类名称', '维修次数', '平均维修时间（MTTR）', '无故障时间（MTTF）', '平均故障间隔时间（MTBF）'],
+                tHeader: [ '设备三级分类名称', '维修次数', '平均维修时间/h（MTTR）', '无故障时间/h（MTTF）', '平均故障间隔时间/h（MTBF）'],
                 filterVal: [ 'eqClassName', 'count', 'mttr', 'mttf', 'mtbf' ],
                 tableDatas: this.downLoadParm.list,
                 sheetName: '设备'
@@ -529,7 +529,7 @@ export default {
             this.downLoadParm.list = response.data
             var excelDatas = [
               {
-                tHeader: [   '设备名称','设备内部编号','维修次数', '平均维修时间（MTTR）', '无故障时间（MTTF）', '平均故障间隔时间（MTBF）'],
+                tHeader: [   '设备名称','设备内部编号','维修次数', '平均维修时间/h（MTTR）', '无故障时间/h（MTTF）', '平均故障间隔时间/h（MTBF）'],
                 filterVal: [ '维修次数','维修次数',  'count', 'mttr', 'mttf', 'mtbf' ],
                 tableDatas: this.downLoadParm.list,
                 sheetName: '设备'