doum
16 小时以前 54e81529b5644b10ebe9aa56c811c27e27bba59e
Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

# Conflicts:
# admin/src/views/index.vue
# admin/whyc_admin/index.html
已删除41个文件
已修改5个文件
334 ■■■■■ 文件已修改
admin/.env.development 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/common/CommonHeader.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/admissionStatistics.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/carStatistics.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/avatar/man.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/avatar/woman.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/favicon.ico 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/css/chunk-vendors.04c7bff3.css 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/fonts/element-icons.535877f5.woff 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/fonts/element-icons.732389de.ttf 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/404-tip.4d90651f.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/404.5c17595f.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/bg@2x.db5d20c2.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/bg_shenhe@2x.632406ea.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/bg_shenhe_chexiao@2x.966d7ff8.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/bg_shenhe_fail@2x.f31e62ff.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/bg_shenhe_pass@2x.356d8eee.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/default_homeimg.f3e4e5d0.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/default_nodata.5d1df1bb.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/department.0c08872e.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/dictionary.ad728d75.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/home_func1.2273dcea.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/home_func5.d27eba52.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/listener.fcf79708.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/log-login.5b08fa8b.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/log-opera.f8d4f877.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/log.f8f7b2f8.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/login_img@2x.cb2860d8.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/man.6eaa0e37.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/permission.14c1bcf1.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/position.8a867f13.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/pwd.f73be658.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/role.2a1931ed.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/shield.54851228.svg 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/img/sousuo.069aa14f.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/js/chunk-vendors.6d4f879a.js 283 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/static/js/chunk-vendors.6d4f879a.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/template/cars.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/template/jkCustomerTemplate.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/template/jkLineTemplate.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/template/jkOrdersTemplate.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/template/member.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/template/oil.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
admin/whyc_admin/template/traintime.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.development
@@ -3,7 +3,7 @@
# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
#VUE_APP_API_URL  = 'http://192.168.1.45:10010'
VUE_APP_API_URL  = 'http://192.168.1.45:10010'
#VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
admin/src/components/common/CommonHeader.vue
@@ -26,9 +26,9 @@
              <img src="@/assets/icons/ic_3.jpg" alt="">
              <img src="@/assets/icons/ic_4.jpg" alt="">
              <img src="@/assets/icons/ic_5.jpg" alt="">
              <img src="@/assets/icons/ic_6.jpg" alt="">
<!--              <img src="@/assets/icons/ic_6.jpg" alt="">-->
              <img src="@/assets/icons/ic_7.jpg" alt="">
              <img src="@/assets/icons/ic_8.jpg" alt="">
<!--              <img src="@/assets/icons/ic_8.jpg" alt="">-->
          </div>
          <el-dropdown v-if="isLogined" trigger="click">
            <span class="el-dropdown-link" style="cursor: pointer; color: rgba(255,255,255,.56);">
admin/src/views/business/admissionStatistics.vue
@@ -87,7 +87,7 @@
                    <el-table
                        style="width: 100%; margin-top: 15px;"
                        :data="list"
                        header-row-style="background-color: #F7F7F7;"
                        :header-row-style="{ backgroundColor: '#F7F7F7' }"
                        border
                    >
                        <el-table-column :prop="item" :label="item" align="center" :fixed="index === 0 ? true : index === column.length - 1 ? 'right' : false" v-for="(item, index) in column" :key="index"></el-table-column>
@@ -102,7 +102,7 @@
                <el-table
                    style="width: 100%; margin-top: 15px;"
                    :data="info.yearSortList"
                    header-row-style="background-color: #F7F7F7;"
                    :header-row-style="{ backgroundColor: '#F7F7F7' }"
                    border
                >
                    <el-table-column prop="name" label="人员分类" align="center"></el-table-column>
@@ -167,6 +167,11 @@
      getReportLists() {
        getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 })
          .then(res => {
            if (res.length === 0) {
              this.column = []
              this.list = []
              return
            }
            this.column = res[0]
admin/src/views/business/carStatistics.vue
@@ -87,7 +87,7 @@
                    <el-table
                        style="width: 100%; margin-top: 15px;"
                        :data="list"
                        header-row-style="background-color: #F7F7F7;"
                        :header-row-style="{ backgroundColor: '#F7F7F7' }"
                        border
                    >
                        <el-table-column :prop="item" :label="item" align="center" :fixed="index === 0 ? true : index === column.length - 1 ? 'right' : false" v-for="(item, index) in column" :key="index"></el-table-column>
@@ -102,7 +102,7 @@
                <el-table
                    style="width: 100%; margin-top: 15px;"
                    :data="info.yearSortList"
                    header-row-style="background-color: #F7F7F7;"
                    :header-row-style="{ backgroundColor: '#F7F7F7' }"
                    border
                >
                    <el-table-column prop="name" label="车辆分类" align="center"></el-table-column>
@@ -168,6 +168,11 @@
      getReportLists() {
        getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 0 })
            .then(res => {
              if (res.length === 0) {
                this.column = []
                this.list = []
                return
              }
              this.column = res[0]
@@ -188,8 +193,8 @@
              //   }, {});
              // });
              console.log(this.column)
              console.log(this.list)
              // console.log(this.column)
              // console.log(this.list)
              // if (res.length === 0) {
              //   this.column = []
admin/src/views/index.vue
@@ -413,9 +413,7 @@
        arr.push({ name: '访客', value: this.headerData.inParkVisitUserNum })
        arr.push({ name: '内部员工', value: this.headerData.todayInParkUserNum - this.headerData.inParkLwUserNum - this.headerData.inParkVisitUserNum - this.headerData.inParkDriverUserNum })
        arr.push({ name: '长期相关方', value: this.headerData.inParkLwUserNum })
/*
        arr.push({ name: '货运司机', value: this.headerData.inParkDriverUserNum })
*/
        // arr.push({ name: '货运司机', value: this.headerData.inParkDriverUserNum })
        arr.sort((a, b) => b.value - a.value)
        this.manningRatio = arr
        this.initEchart1()
admin/whyc_admin/avatar/man.png
Binary files differ
admin/whyc_admin/avatar/woman.png
Binary files differ
admin/whyc_admin/favicon.ico
Binary files differ
admin/whyc_admin/index.html
ÎļþÒÑɾ³ý
admin/whyc_admin/static/css/chunk-vendors.04c7bff3.css
ÎļþÒÑɾ³ý
admin/whyc_admin/static/fonts/element-icons.535877f5.woff
Binary files differ
admin/whyc_admin/static/fonts/element-icons.732389de.ttf
Binary files differ
admin/whyc_admin/static/img/404-tip.4d90651f.png
Binary files differ
admin/whyc_admin/static/img/404.5c17595f.png
Binary files differ
admin/whyc_admin/static/img/bg@2x.db5d20c2.png
Binary files differ
admin/whyc_admin/static/img/bg_shenhe@2x.632406ea.png
Binary files differ
admin/whyc_admin/static/img/bg_shenhe_chexiao@2x.966d7ff8.png
Binary files differ
admin/whyc_admin/static/img/bg_shenhe_fail@2x.f31e62ff.png
Binary files differ
admin/whyc_admin/static/img/bg_shenhe_pass@2x.356d8eee.png
Binary files differ
admin/whyc_admin/static/img/default_homeimg.f3e4e5d0.png
Binary files differ
admin/whyc_admin/static/img/default_nodata.5d1df1bb.png
Binary files differ
admin/whyc_admin/static/img/department.0c08872e.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/dictionary.ad728d75.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/home_func1.2273dcea.png
Binary files differ
admin/whyc_admin/static/img/home_func5.d27eba52.png
Binary files differ
admin/whyc_admin/static/img/listener.fcf79708.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/log-login.5b08fa8b.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/log-opera.f8d4f877.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/log.f8f7b2f8.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/login_img@2x.cb2860d8.png
Binary files differ
admin/whyc_admin/static/img/man.6eaa0e37.png
Binary files differ
admin/whyc_admin/static/img/permission.14c1bcf1.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/position.8a867f13.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/pwd.f73be658.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/role.2a1931ed.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/shield.54851228.svg
ÎļþÒÑɾ³ý
admin/whyc_admin/static/img/sousuo.069aa14f.png
Binary files differ
admin/whyc_admin/static/js/chunk-vendors.6d4f879a.js
ÎļþÒÑɾ³ý
admin/whyc_admin/static/js/chunk-vendors.6d4f879a.js.map
ÎļþÒÑɾ³ý
admin/whyc_admin/template/cars.xlsx
Binary files differ
admin/whyc_admin/template/jkCustomerTemplate.xlsx
Binary files differ
admin/whyc_admin/template/jkLineTemplate.xlsx
Binary files differ
admin/whyc_admin/template/jkOrdersTemplate.xlsx
Binary files differ
admin/whyc_admin/template/member.xlsx
Binary files differ
admin/whyc_admin/template/oil.xlsx
Binary files differ
admin/whyc_admin/template/traintime.xlsx
Binary files differ