Merge remote-tracking branch 'origin/liujun-2024-02-04-相关方新流程上线后新提需求' into 2024年2月22日v1.0.55

src/utils/useDownloadFile.js

@@ -0,0 +1,16 @@
+export default async function useDownloadFile(url) {
+  if (!url) throw new Error('没有下载地址')
+  fetch(config.fileUrl + url)
+    .then((res) => res.blob())
+    .then((blob) => {
+      const a = document.createElement('a')
+      document.body.appendChild(a)
+      a.style.display = 'none'
+      const url = window.URL.createObjectURL(blob)
+      a.href = url
+      a.download = url.substring(url.lastIndexOf('/') + 1)
+      a.click()
+      document.body.removeChild(a)
+      window.URL.revokeObjectURL(url)
+    })
+}

src/views/corpInfo/information/info/components/corpEdit.vue

@@ -206,17 +206,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--        <el-row>-->
+        <el-row>
-        <!--          <el-col :span="12">-->
+          <el-col :span="12">
-        <!--            <el-form-item label="四色图类型">-->
+            <el-form-item label="四色图类型">
-        <!--              <template>-->
+              <template>
-        <!--                <el-radio v-model="form.FOURTYPE" label="1">平面四色图</el-radio>-->
+                <el-radio v-model="form.FOURTYPE" label="1">平面四色图</el-radio>
-        <!--                <el-radio v-model="form.FOURTYPE" label="2">3D图</el-radio>-->
+                <el-radio v-model="form.FOURTYPE" label="2">3D图</el-radio>
-        <!--              </template>-->
+              </template>
-        <!--            </el-form-item>-->
+            </el-form-item>
-        <!--          </el-col>-->
+          </el-col>
-        <!--        </el-row>-->
+        </el-row>
-        <el-row v-if="form.FOURTYPE==='1'">
+        <el-row v-if="form.FOURTYPE=='1'">
           <el-col :span="24">
             <div class="lh-1">
               <el-form-item label="四色图">
@@ -258,7 +258,7 @@
             </div>
           </el-col>
         </el-row>
-        <el-row v-else-if="form.FOURTYPE==='2'">
+        <el-row v-else-if="form.FOURTYPE=='2'">
           <el-col :span="12">
             <el-form-item label="四色图">
               <span v-if="form.FFILE">{{ form.FFILE.name }}</span>
@@ -1077,14 +1077,7 @@ export default {
       // map.addOverlay(marker) // 将标注添加到地图中
     },
     goBack() {
-      this.$confirm('确定要退出吗?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
       this.$parent.activeName = 'corpView'
-      }).catch(() => {
-      })
     },
     handleChangeIMGFour(file, fileList) {
       const types = ['image/jpeg', 'image/jpg', 'image/png']

src/views/hidden/major/confirmationperson/components/detail.vue

@@ -142,7 +142,7 @@
               </el-col>
             </td>
           </tr>
-          <tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' && HIDDENLEVEL != 'hiddenLevel1001'">
+          <tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' ">
             <td class="tbg">整改期限</td>
             <td>
               <el-col :span="24">
@@ -150,7 +150,7 @@
               </el-col>
             </td>
           </tr>
-          <tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != '' && HIDDENLEVEL != 'hiddenLevel1001'">
+          <tr v-if="HIDDENLEVEL !='jdyh001' && HIDDENLEVEL !='hiddenLevel2002' && HIDDENLEVEL != ''">
             <td class="tbg">整改负责人</td>
             <td>
               <el-col :span="12">
@@ -175,7 +175,7 @@
             <td class="tbg">隐患确认人</td>
             <td>{{ pd.conUserName }}</td>
           </tr>
-          <tr v-if="HIDDENLEVEL != 'hiddenLevel1001'">
+          <tr>
             <td class="tbg">隐患确认时间</td>
             <td>
               <el-col :span="24">

src/views/safetyenvironmental/inspection/components/add.vue

@@ -957,15 +957,8 @@ export default {
     },
 
     goBack() {
-      this.$confirm('确定要退出吗', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
       this.$parent.INSPECTION_ID = ''
       this.$parent.activeName = 'List'
-      }).catch(() => {
-      })
     },
     // 获取整改人列表
     getUserList(DEPARTMENT_ID) {

src/views/safetyenvironmental/inspection/components/edit.vue

@@ -964,15 +964,8 @@ export default {
     },
 
     goBack() {
-      this.$confirm(('确定要退出吗?'), {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
       this.$parent.INSPECTION_ID = ''
       this.$parent.activeName = 'List'
-      }).catch(() => {
-      })
     },
     // 获取整改人列表
     getUserList(DEPARTMENT_ID) {

src/views/safetyenvironmental/inspection/components/list.vue

@@ -149,7 +149,7 @@
           <el-button icon="el-icon-view" size="mini" @click="goDetail(row)">查看</el-button>
           <el-button type="success" icon="el-icon-view" size="mini" @click="checkFlow(row)">流程图</el-button>
           <el-button
-            v-show="edit && ( row.INSPECTION_STATUS == '-1') && loginUserId == row.INSPECTION_ORIGINATOR_ID"
+            v-show="edit && ( row.INSPECTION_STATUS == '-1')"
             type="primary"
             icon="el-icon-edit"
             size="mini"

src/views/xgf/flow/components/flowInfo.vue

@@ -7,13 +7,15 @@
     title="审批流程"
     width="60%">
     <el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
-      <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT">
+      <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT+''">
         <template slot="description">
-          <el-card class="box-card" style="width: 900px;">
+          <el-card class="box-card a" style="width: 900px;">
             <div slot="header" class="clearfix">
               <span>{{ item.STEP_NAME }}</span>
             </div>
             <div>
+              <el-row>
+                <el-col :span="12">
                   <el-row>
                     <el-col v-if="item.APPROVER_NAME">
                       审批人：{{ item.APPROVER_NAME }}
@@ -34,6 +36,11 @@
                       审批结束
                     </el-col>
                   </el-row>
+                </el-col>
+                <el-col v-if="item.APPOINT_ANNEX" :span="12">
+                  <el-button icon="el-icon-download" type="primary" @click = "download(item)">下载附件</el-button>
+                </el-col>
+              </el-row>
             </div>
           </el-card>
         </template>
@@ -47,6 +54,7 @@
 
 <script>
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import useDownloadFile from '../../../../utils/useDownloadFile'
 
 export default {
   props: {
@@ -77,6 +85,9 @@ export default {
     },
     closeWindow() {
       this.handleClose()
+    },
+    download(item) {
+      useDownloadFile(item.APPOINT_ANNEX)
     }
   }
 }

src/views/xgf/flowApply/components/userInfo.vue

@@ -62,7 +62,7 @@
 
             <tr>
               <th>民族</th>
-              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+              <td>{{ userDetailForm.NATIONALITY_NAME ? userDetailForm.NATIONALITY_NAME : '暂无信息' }}</td>
               <th>婚姻状况</th>
               <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
               <th>政治面貌</th>
@@ -137,6 +137,22 @@
               <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
             </tr>
           </table>
+          <div v-if="userDetailForm.ANNEX" style="padding-bottom: 10px">
+            <div class="level-title">
+              <h1>承诺书</h1>
+            </div>
+            <div>
+              <el-button icon="el-icon-download" type="primary" @click = "download(userDetailForm.ANNEX)">下载附件</el-button>
+            </div>
+          </div>
+          <div v-if="userDetailForm.ATTORNEY" style="padding-bottom: 10px">
+            <div class="level-title">
+              <h1>委托书</h1>
+            </div>
+            <div>
+              <el-button icon="el-icon-download" type="primary" @click = "download(userDetailForm.ATTORNEY)">下载附件</el-button>
+            </div>
+          </div>
           <div>
             <div class="level-title">
               <h1>培训记录</h1>
@@ -317,6 +333,7 @@
 import vueQr from 'vue-qr'
 import dateformat from '@/utils/dateformat'
 import { requestFN } from '@/utils/request'
+import useDownloadFile from '../../../../utils/useDownloadFile'
 
 export default {
   components: { vueQr },
@@ -401,6 +418,9 @@ export default {
       } else {
         return ''
       }
+    },
+    download(item) {
+      useDownloadFile(item)
     }
   }
 }

src/views/xgf/flowList/components/list.vue

@@ -44,8 +44,8 @@
       <el-table-column label="操作" align="center" width="350">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批记录</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批记录</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
           <el-button v-if="false" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
           <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
         </template>

static/bi/index.html

@@ -13,8 +13,6 @@
   <script src="./js/ezuikit.js"></script>
   <script src="./swiper-master/package/swiper-bundle.min.js"></script>
   <script src="https://statics.ys7.com/openweb/common/scripts/jquery-39b5fb0510.cookie.js"></script>
-  <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
   <!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts@4/dist/echarts.min.js"></script>
  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-gl@1/dist/echarts-gl.min.js"></script>
  <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-stat@1/dist/ecStat.min.js"></script> -->
@@ -142,7 +140,6 @@
                     本年隐患
                   </div>
                 </div>
-                <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     待处理
@@ -151,8 +148,6 @@
                     {{hdCount.yearUncheck}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     已处理
@@ -161,9 +156,6 @@
                     {{hdCount.yearChecked}}
                   </div>
                 </div>
-                </el-tooltip>
-
-                <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
                 <div class="task-text">
                   <div class="title">
                     隐患整改率
@@ -174,7 +166,6 @@
                     <span class="f14">%</span>
                   </div>
                 </div>
-                </el-tooltip>
               </div>
               <div class="task-item">
                 <div class="task-textsp">
@@ -185,7 +176,6 @@
                     本季隐患
                   </div>
                 </div>
-                <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     待处理
@@ -194,8 +184,6 @@
                     {{hdCount.quarterUncheck}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     已处理
@@ -204,8 +192,6 @@
                     {{hdCount.quarterChecked}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
                 <div class="task-text">
                   <div class="title">
                     隐患整改率
@@ -216,7 +202,6 @@
                     <span class="f14">%</span>
                   </div>
                 </div>
-                </el-tooltip>
               </div>
               <div class="task-item">
                 <div class="task-textsp">
@@ -227,7 +212,6 @@
                     本月隐患
                   </div>
                 </div>
-                <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     待处理
@@ -236,8 +220,6 @@
                     {{hdCount.monthUncheck}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     已处理
@@ -246,8 +228,6 @@
                     {{hdCount.monthChecked}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
                 <div class="task-text">
                   <div class="title">
                     隐患整改率
@@ -258,7 +238,6 @@
                     <span class="f14">%</span>
                   </div>
                 </div>
-                </el-tooltip>
               </div>
             </div>
             <div class="swiper-slide">
@@ -271,7 +250,6 @@
                     本旬隐患
                   </div>
                 </div>
-                <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     待处理
@@ -280,8 +258,6 @@
                     {{hdCount.xunUncheck}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     已处理
@@ -290,8 +266,6 @@
                     {{hdCount.xunChecked}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
                 <div class="task-text">
                   <div class="title">
                     隐患整改率
@@ -302,7 +276,6 @@
                     <span class="f14">%</span>
                   </div>
                 </div>
-                </el-tooltip>
               </div>
               <div class="task-item">
                 <div class="task-textsp">
@@ -313,7 +286,6 @@
                     本周隐患
                   </div>
                 </div>
-                <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     待处理
@@ -322,8 +294,6 @@
                     {{hdCount.weekUncheck}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     已处理
@@ -332,8 +302,6 @@
                     {{hdCount.weekChecked}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
                 <div class="task-text">
                   <div class="title">
                     隐患整改率
@@ -344,7 +312,6 @@
                     <span class="f14">%</span>
                   </div>
                 </div>
-                </el-tooltip>
               </div>
               <div class="task-item">
                 <div class="task-textsp">
@@ -355,7 +322,6 @@
                     本日隐患
                   </div>
                 </div>
-                <el-tooltip class="item" effect="dark" content="本周期除已验收、已归档的重大隐患、忽略隐患及重大隐患以外的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     待处理
@@ -364,8 +330,6 @@
                     {{hdCount.dayUncheck}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="本周期已验收、已归档的重大隐患、忽略隐患及重大隐患的数量" placement="top">
                 <div class="task-text">
                   <div class="title">
                     已处理
@@ -374,8 +338,6 @@
                     {{hdCount.dayChecked}}
                   </div>
                 </div>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="(本周期已处理/(本周期待处理+本周期已处理))*100%" placement="top">
                 <div class="task-text">
                   <div class="title">
                     隐患整改率
@@ -386,7 +348,6 @@
                     <span class="f14">%</span>
                   </div>
                 </div>
-                </el-tooltip>
               </div>
             </div>
           </div>
@@ -1860,135 +1821,135 @@ var vm = new Vue({
         }, 2000)
       })
       // 周检查
-      // $.ajax({
+      $.ajax({
-      //   xhrFields: {
+        xhrFields: {
-      //     withCredentials: true
+          withCredentials: true
-      //   },
+        },
-      //   type: 'POST',
+        type: 'POST',
-      //   url: config.httpurl + 'checkrecord/goBiListCount',
+        url: config.httpurl + 'checkrecord/goBiListCount',
-      //   data: {
+        data: {
-      //     COUNTTYPE: 'week',
+          COUNTTYPE: 'week',
-      //     tm: new Date().getTime()
+          tm: new Date().getTime()
-      //   },
+        },
-      //   dataType: 'json',
+        dataType: 'json',
-      //   success: function(data) {
+        success: function(data) {
-      //     if (data.result == 'success') {
+          if (data.result == 'success') {
-      //       _this.listCountWeek = data.all
+            _this.listCountWeek = data.all
-      //       vm.$forceUpdate() // 强制刷新
+            vm.$forceUpdate() // 强制刷新
-      //     } else if (data.result == 'exception') {
+          } else if (data.result == 'exception') {
-      //       showException('系统首页', '数据异常') // 显示异常
+            showException('系统首页', '数据异常') // 显示异常
-      //     }
+          }
-      //   }
+        }
-      // }).done().fail(function() {
+      }).done().fail(function() {
-      //   swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
+        swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
-      //   setTimeout(function() {
+        setTimeout(function() {
-      //     window.location.href = config.weburl + '#/login'
+          window.location.href = config.weburl + '#/login'
-      //   }, 2000)
+        }, 2000)
-      // })
+      })
       // 旬检查
-      // $.ajax({
+      $.ajax({
-      //   xhrFields: {
+        xhrFields: {
-      //     withCredentials: true
+          withCredentials: true
-      //   },
+        },
-      //   type: 'POST',
+        type: 'POST',
-      //   url: config.httpurl + 'checkrecord/goBiListCount',
+        url: config.httpurl + 'checkrecord/goBiListCount',
-      //   data: {
+        data: {
-      //     COUNTTYPE: 'xun',
+          COUNTTYPE: 'xun',
-      //     tm: new Date().getTime()
+          tm: new Date().getTime()
-      //   },
+        },
-      //   dataType: 'json',
+        dataType: 'json',
-      //   success: function(data) {
+        success: function(data) {
-      //     if (data.result == 'success') {
+          if (data.result == 'success') {
-      //       _this.listCountXun = data.all
+            _this.listCountXun = data.all
-      //       vm.$forceUpdate() // 强制刷新
+            vm.$forceUpdate() // 强制刷新
-      //     } else if (data.result == 'exception') {
+          } else if (data.result == 'exception') {
-      //       showException('系统首页', '数据异常') // 显示异常
+            showException('系统首页', '数据异常') // 显示异常
-      //     }
+          }
-      //   }
+        }
-      // }).done().fail(function() {
+      }).done().fail(function() {
-      //   swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
+        swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
-      //   setTimeout(function() {
+        setTimeout(function() {
-      //     window.location.href = config.weburl + '#/login'
+          window.location.href = config.weburl + '#/login'
-      //   }, 2000)
+        }, 2000)
-      // })
+      })
       // 月检查
-      // $.ajax({
+      $.ajax({
-      //   xhrFields: {
+        xhrFields: {
-      //     withCredentials: true
+          withCredentials: true
-      //   },
+        },
-      //   type: 'POST',
+        type: 'POST',
-      //   url: config.httpurl + 'checkrecord/goBiListCount',
+        url: config.httpurl + 'checkrecord/goBiListCount',
-      //   data: {
+        data: {
-      //     COUNTTYPE: 'month',
+          COUNTTYPE: 'month',
-      //     tm: new Date().getTime()
+          tm: new Date().getTime()
-      //   },
+        },
-      //   dataType: 'json',
+        dataType: 'json',
-      //   success: function(data) {
+        success: function(data) {
-      //     if (data.result == 'success') {
+          if (data.result == 'success') {
-      //       _this.listCountMonth = data.all
+            _this.listCountMonth = data.all
-      //       vm.$forceUpdate() // 强制刷新
+            vm.$forceUpdate() // 强制刷新
-      //     } else if (data.result == 'exception') {
+          } else if (data.result == 'exception') {
-      //       showException('系统首页', '数据异常') // 显示异常
+            showException('系统首页', '数据异常') // 显示异常
-      //     }
+          }
-      //   }
+        }
-      // }).done().fail(function() {
+      }).done().fail(function() {
-      //   swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
+        swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
-      //   setTimeout(function() {
+        setTimeout(function() {
-      //     window.location.href = config.weburl + '#/login'
+          window.location.href = config.weburl + '#/login'
-      //   }, 2000)
+        }, 2000)
-      // })
+      })
       // 季检查
-      // $.ajax({
+      $.ajax({
-      //   xhrFields: {
+        xhrFields: {
-      //     withCredentials: true
+          withCredentials: true
-      //   },
+        },
-      //   type: 'POST',
+        type: 'POST',
-      //   url: config.httpurl + 'checkrecord/goBiListCount',
+        url: config.httpurl + 'checkrecord/goBiListCount',
-      //   data: {
+        data: {
-      //     COUNTTYPE: 'quarter',
+          COUNTTYPE: 'quarter',
-      //     tm: new Date().getTime()
+          tm: new Date().getTime()
-      //   },
+        },
-      //   dataType: 'json',
+        dataType: 'json',
-      //   success: function(data) {
+        success: function(data) {
-      //     if (data.result == 'success') {
+          if (data.result == 'success') {
-      //       _this.listCountQuarter = data.all
+            _this.listCountQuarter = data.all
-      //       vm.$forceUpdate() // 强制刷新
+            vm.$forceUpdate() // 强制刷新
-      //     } else if (data.result == 'exception') {
+          } else if (data.result == 'exception') {
-      //       showException('系统首页', '数据异常') // 显示异常
+            showException('系统首页', '数据异常') // 显示异常
-      //     }
+          }
-      //   }
+        }
-      // }).done().fail(function() {
+      }).done().fail(function() {
-      //   swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
+        swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
-      //   setTimeout(function() {
+        setTimeout(function() {
-      //     window.location.href = config.weburl + '#/login'
+          window.location.href = config.weburl + '#/login'
-      //   }, 2000)
+        }, 2000)
-      // })
+      })
       // 年检查
-      // $.ajax({
+      $.ajax({
-      //   xhrFields: {
+        xhrFields: {
-      //     withCredentials: true
+          withCredentials: true
-      //   },
+        },
-      //   type: 'POST',
+        type: 'POST',
-      //   url: config.httpurl + 'checkrecord/goBiListCount',
+        url: config.httpurl + 'checkrecord/goBiListCount',
-      //   data: {
+        data: {
-      //     COUNTTYPE: 'year',
+          COUNTTYPE: 'year',
-      //     tm: new Date().getTime()
+          tm: new Date().getTime()
-      //   },
+        },
-      //   dataType: 'json',
+        dataType: 'json',
-      //   success: function(data) {
+        success: function(data) {
-      //     if (data.result == 'success') {
+          if (data.result == 'success') {
-      //       _this.listCountYear = data.all
+            _this.listCountYear = data.all
-      //       vm.$forceUpdate() // 强制刷新
+            vm.$forceUpdate() // 强制刷新
-      //     } else if (data.result == 'exception') {
+          } else if (data.result == 'exception') {
-      //       showException('系统首页', '数据异常') // 显示异常
+            showException('系统首页', '数据异常') // 显示异常
-      //     }
+          }
-      //   }
+        }
-      // }).done().fail(function() {
+      }).done().fail(function() {
-      //   swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
+        swal('登录失效!', '请求服务器无响应，稍后再试', 'warning')
-      //   setTimeout(function() {
+        setTimeout(function() {
-      //     window.location.href = config.weburl + '#/login'
+          window.location.href = config.weburl + '#/login'
-      //   }, 2000)
+        }, 2000)
-      // })
+      })
     },
 
     // 退出系统