Merge branch 'test' of ssh://39.155.253.71:33222/PHP/Jz-Php into test

application/admin/view/staff/role.html

@@ -60,7 +60,11 @@
       <script src="dist/js/md5.js"></script>
       <script src="dist/js/sha1.js"></script>
       <script src="dist/js/util.js"></script>
+<<<<<<< HEAD
+      <!--<script src="dist/js/getUserToken.js"></script>-->
+=======
       <!-- <script src="dist/js/getUserToken.js"></script> -->
+>>>>>>> test
     <script>
       layui.use(['laydate','form','upload'], function(){
         upload  = layui.upload;

application/em/view/useage/index.html

@@ -57,19 +57,19 @@
                     <table class="layui-table" lay-filter="useage" lay-data="{  url:'/useage', page:true,  id:'idTest',where:{search_type:document.getElementById('search_type').value,search_text:document.getElementById('search_text').value,date_start:document.getElementById('date_start').value,date_end:document.getElementById('date_end').value,cp_date:document.getElementById('cp_date').value,status:document.getElementById('useage_status').value} }">
                         <thead>
                         <tr>
-                            <th lay-data="{templet: '#useage_id',sort: true} ">抄表单号</th>
-                            <th lay-data="{field:'station_name'}">所属基站名</th>
-                            <th lay-data="{field:'em_numb'} ">所属电表号</th>
-                            <th lay-data="{field:'last_date',sort: true}">上次日期</th>
-                            <th lay-data="{field:'current_date',sort: true}">本次日期</th>
+                            <th lay-data="{templet: '#useage_id',sort: true,width:'12%'} ">抄表单号</th>
+                            <th lay-data="{field:'station_name',width:'12%'}">所属基站名</th>
+                            <th lay-data="{field:'em_numb',width:'8%'} ">所属电表号</th>
+                            <th lay-data="{field:'last_date',sort: true,width:'9%'}">上次日期</th>
+                            <th lay-data="{field:'current_date',sort: true,width:'9%'}">本次日期</th>
 
-                            <th lay-data="{field:'last_sum_numb'}">上次度数</th>
-                            <th lay-data="{field:'current_sum_numb'}">本次度数</th>
-                            <th lay-data="{field:'repo_numb'}">用电量</th>
-                            <th lay-data="{templet: '#status',sort: true}">状态</th>
+                            <th lay-data="{field:'last_sum_numb',width:'7%'}">上次度数</th>
+                            <th lay-data="{field:'current_sum_numb',width:'7%'}">本次度数</th>
+                            <th lay-data="{field:'repo_numb',width:'7%'}">用电量</th>
+                            <th lay-data="{templet: '#status',sort: true,width:'5%'}">状态</th>
 
-                            <th lay-data="{templet: '#photo_id',sort: true}">抄表凭证</th>
-                            <th lay-data="{fixed: 'right',  align:'center', toolbar: '#barDemo'}">操作</th>
+                            <th lay-data="{templet: '#photo_id',sort: true,width:'7%'}">抄表凭证</th>
+                            <th lay-data="{fixed: 'right',  align:'center', toolbar: '#barDemo',width:'16%'}">操作</th>
                         </tr>
                         </thead>
                     </table>

config/admin.php

-<?php
-//配置文件
-return [
-    //加密串
-    'passwd_salt'                   => 'gonn',
-    'passwd_init'                   => 'gonn',
-    'encrypt_key'                   => 'INJq4HXEGI',
-    'login_pattern'          => '/^\w{2,}@\w+/',   //开放模式
-    //'login_pattern'          => '/^\w{2,}@gonn\.com\.cn$', 严格模式
-    'upload_dir' => './static/uploads',
-    'images_dir' => './static/uploads/images',
-    'files_dir' => './static/uploads/files',
-    'search_area' => '1',   //1按部门搜索,2全局
-    'order_per' =>'ZD',
-    'redis_host' => '192.168.1.71',
-    'redis_port' => 6379,
-];