Merge remote-tracking branch 'origin/master'

app/admin/controller/Api.php

@@ -471,6 +471,26 @@ class Api extends BaseController
         })->sum('pay_price');
     }
 
+    public function streetList(){
+        $data= get_params();
+        $id = $data['id'];
+        $this->adminInfo = get_admin($data['admin_id']);
+        if ($this->adminInfo['user_id']>0){//不是超级管理员
+            $www['user_id'] = $this->adminInfo['user_id'];
+            $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find();
+            if($user_address['auth_range'] == 3 || $user_address['auth_range'] == 4){
+                $where = [];
+            }else{
+                $where['street_code'] = $user_address['street_id'];
+            }
+            $select= Db::table('fa_geo_street')->where('area_code',$id)->where($where)->field('street_id id,street_code code,street_name name')->select();
+        }else{
+            $select= Db::table('fa_geo_street')->where('area_code',$id)->field('street_id id,street_code code,street_name name')->select();
+        }
+        $select = ['data' => $select];
+        return table_assign(0, '', $select);
+    }
+
 
 
 

app/admin/controller/nk/Village.php

@@ -39,6 +39,25 @@ class Village extends BaseController
             if (isset($params['keywords'])){
                 $where[]=['title','like','%'.$params['keywords'].'%'];
             }
+
+            if($this->adminInfo['position_id'] != 1){ //不是超级管理员
+                $www['admin_id'] = $this->adminInfo['id'];
+                $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find();
+                if ($user_address){
+                    if($user_address['auth_range'] == 1){
+                        $where[] = ['village_id','=',$user_address['village_id']];
+                    }elseif ($user_address['auth_range'] == 2){
+                        $where[] = ['street_id','=',$user_address['street_id']];
+                    }elseif ($user_address['auth_range'] == 3){
+                        $where[] =  ['area_id','=',$user_address['area_id']];
+                    }else{
+                        $where[] = ['village_id','=',$user_address['village_id']];
+                    }
+                }else{
+                    $where[]  = ['village_id','=',''];
+                }
+            }
+
             $total = Db::table('fa_szxc_village')
                 ->where($where)->count();
             $list = Db::table('fa_szxc_village')
@@ -64,6 +83,7 @@ class Village extends BaseController
      */
     public function add()
     {
+        $adds=Db::table('fa_szxc_information_useraddress')->where('admin_id',$this->adminInfo['id'])->find();
         if (request()->isAjax()) {
             $params= get_params();
             if (!empty($params['is_hot'])&&$params['is_hot']=='on'){
@@ -79,6 +99,12 @@ class Village extends BaseController
             if(empty($params['village_id'])){
                 return to_assign(1, '请选择村/社区');
             }
+
+            if($this->adminInfo['position_id'] != 1){ //不是超级管理员
+                $params['area_id']=$adds['area_id'];
+                $params['street_id']=$adds['street_id'];
+            }
+
             $area_code=Db::table('fa_geo_area')->where('area_code',$params['area_id'])->value('area_name');
             $street_code=Db::table('fa_geo_street')->where('street_code',$params['street_id'])->value('street_name');
             $village_id=Db::table('fa_geo_village')->where('village_id',$params['village_id'])->value('village_name');
@@ -91,12 +117,30 @@ class Village extends BaseController
             return to_assign(1, '操作失败，原因：'.$res);
         }
 
+        if($this->adminInfo['position_id'] != 1){ //不是超级管理员
+            $www['admin_id'] = $this->adminInfo['id'];
+            $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find();
+            if ($user_address['auth_range'] == 1) {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->where('area_code', $user_address['area_id'])->select();
+            } elseif ($user_address['auth_range'] == 2) {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->where('area_code', $user_address['area_id'])->select();
+            } elseif ($user_address['auth_range'] == 3) {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->where('area_code', $user_address['area_id'])->select();
+            } elseif ($user_address['auth_range'] == 4) {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->select();
+            } else {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->select();
+            }
+        }else{
             $street = Db::table('fa_geo_area')->where(['switch' => 1, 'city_code' => '510500'])
                 ->field('area_id id,area_code code,area_name name')
                 ->select();
+        }
         View::assign('street', $street);
+        View::assign('detail', $adds);
         View::assign('editor', get_system_config('other','editor'));
         View::assign('url', $this->url);
+        View::assign('admin_id', $this->adminInfo['id']);
         return view();
     }
     /**
@@ -119,6 +163,12 @@ class Village extends BaseController
             if(empty($params['village_id'])){
                 return to_assign(1, '请选择村/社区');
             }
+            $adds=Db::table('fa_szxc_information_useraddress')->where('admin_id',$this->adminInfo['id'])->find();
+            if($this->adminInfo['position_id'] != 1){ //不是超级管理员
+                $params['area_id']=$adds['area_id'];
+                $params['street_id']=$adds['street_id'];
+            }
+
             $area_code=Db::table('fa_geo_area')->where('area_code',$params['area_id'])->value('area_name');
             $street_code=Db::table('fa_geo_street')->where('street_code',$params['street_id'])->value('street_name');
             $village_id=Db::table('fa_geo_village')->where('village_id',$params['village_id'])->value('village_name');
@@ -131,12 +181,30 @@ class Village extends BaseController
             }
         }
         $detail = Db::table('fa_szxc_village')->where('id',$params['id'])->find();
+
+        if($this->adminInfo['position_id'] != 1){ //不是超级管理员
+            $www['admin_id'] = $this->adminInfo['id'];
+            $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find();
+            if ($user_address['auth_range'] == 1) {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->where('area_code', $user_address['area_id'])->select();
+            } elseif ($user_address['auth_range'] == 2) {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->where('area_code', $user_address['area_id'])->select();
+            } elseif ($user_address['auth_range'] == 3) {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->where('area_code', $user_address['area_id'])->select();
+            } elseif ($user_address['auth_range'] == 4) {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->select();
+            } else {
+                $street = Db::table('fa_geo_area')->where('city_code', '510500')->field('area_id id,area_code code,area_name name')->select();
+            }
+        }else{
             $street = Db::table('fa_geo_area')->where(['switch' => 1, 'city_code' => '510500'])
                 ->field('area_id id,area_code code,area_name name')
                 ->select();
+        }
         View::assign('street', $street);
         View::assign('detail', $detail);
         View::assign('url', $this->url);
+        View::assign('admin_id', $this->adminInfo['id']);
         return view();
     }
     /**

app/admin/view/nk/street/edit.html

@@ -61,7 +61,7 @@
                         {if {:session('gougu_admin')['group_access']==1}
                         <select name="area_id" lay-filter="area_id" lay-verify="required">
                             {volist name='street' id='vo'}
-                            <option value="{$vo.code}">{$vo.name}</option>
+                            <option value="{$vo.code}" {if $detail.area_id==$vo.code} selected {/if}>{$vo.name}</option>
                             {/volist}
                         </select>
                         {else /}

app/admin/view/nk/village/add.html

@@ -53,38 +53,42 @@
                 </div>
             </td>
         </tr>
-        {if {:session('gougu_admin')['group_access']==1}
+
         <tr>
-            <td style="width: 30%">
+            <td class="layui-td-gray" style="vertical-align:top;">区县</td>
+            <td >
                 <div class="layui-form-item">
-                    <label class="layui-form-label">区县</label>
                     <div class="layui-input-block">
                         <select name="area_id" lay-filter="area_id" lay-verify="required">
                             {volist name='street' id='vo'}
-                            <option value="{$vo.code}">{$vo.name}</option>
+                            <option value="{$vo.code}" >{$vo.name}</option>
                             {/volist}
                         </select>
                     </div>
                 </div>
             </td>
-            <td colspan="3">
+        </tr>
+        <tr>
+            <td class="layui-td-gray" style="vertical-align:top;">街道/镇</td>
+            <td >
                 <div class="layui-form-item">
-                    <label class="layui-form-label">街道/镇</label>
                     <div class="layui-input-block">
                         <div id="demo1"></div>
                     </div>
                 </div>
             </td>
-            <td colspan="3">
+        </tr>
+        <tr>
+            <td class="layui-td-gray" style="vertical-align:top;">村/社区</td>
+            <td >
                 <div class="layui-form-item">
-                    <label class="layui-form-label">村/社区</label>
                     <div class="layui-input-block">
                         <div id="demo2"></div>
                     </div>
                 </div>
             </td>
         </tr>
-        {/if}
+
         <tr>
             <td colspan="6" class="layui-td-gray" style="text-align:left">文章内容</td>
         </tr>
@@ -110,7 +114,9 @@
     const editorType = '{$editor}';
     var moduleInit = ['tool', 'tagpicker', 'tinymce'];
     var group_access = "{:session('gougu_admin')['group_access']}"
-
+    var area_id = "{$detail.area_id}"
+    var street_id = "{$detail.street_id}"
+    var admin_id = "{$admin_id}"
     function gouguInit() {
         var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker;
 
@@ -128,6 +134,13 @@
                 $('#upload_box_thumb img').attr('src', res.data.filepath);
             }
         });
+        if (area_id != 0) {
+            street(area_id)
+        }
+        if (street_id != 0) {
+            village(street_id)
+        }
+
         form.on('select(area_id)', function (data) {
             street(data.value)
         });
@@ -135,19 +148,20 @@
             var demo1 = xmSelect.render({
                 name: 'street_id',
                 el: '#demo1',
+                initValue: group_access == 2 ||group_access == 4? ["{$detail.street_id}"] : [],
                 prop: {
                     name: 'name',
                     value: 'code',
                 },
                 data: [],
                 radio: true,
-                disabled: group_access == 2 ? true : false,
+                disabled: group_access == 2 ||group_access == 4? true : false,
                 on: function (data) {
                     var arr = data.arr;
                     village(arr[0]['code'])
                 },
             })
-            $.get('/api/geo/street?pcode=' + id, function (result) {
+            $.get('/admin/api/streetList/street?id=' + id +'&admin_id='+admin_id, function (result) {
                 demo1.update({
                     data: result.data
                 })
@@ -162,6 +176,7 @@
                     value: 'id',
                 },
                 data: [],
+                initValue: [],
                 radio: true,
                 disabled: group_access == 2 ? true : false,
             })

app/admin/view/nk/village/edit.html

@@ -54,37 +54,33 @@
             </td>
         </tr>
         <tr>
-            <td style="width: 30%;">
+            <td class="layui-td-gray" style="vertical-align:top;">区县</td>
+            <td >
                 <div class="layui-form-item">
-                    <label class="layui-form-label">区县</label>
                     <div class="layui-input-block">
-                        {if {:session('gougu_admin')['group_access']==1}
                         <select name="area_id" lay-filter="area_id" lay-verify="required">
                             {volist name='street' id='vo'}
-                            <option value="{$vo.code}">{$vo.name}</option>
+                            <option value="{$vo.code}" {if $detail.area_id==$vo.code} selected {/if}>{$vo.name}</option>
                             {/volist}
                         </select>
-                        {else /}
-                        {volist name='street' id='vo'}
-                        {if $address.area_id==$vo.code}
-                        <input type="text" value="{$vo.name}" autocomplete="off" class="layui-input" disabled>
-                        {/if}
-                        {/volist}
-                        {/if}
                     </div>
                 </div>
             </td>
-            <td colspan="3">
+        </tr>
+        <tr>
+            <td class="layui-td-gray" style="vertical-align:top;">街道/镇</td>
+            <td >
                 <div class="layui-form-item">
-                    <label class="layui-form-label">街道/镇</label>
                     <div class="layui-input-block">
                         <div id="demo1"></div>
                     </div>
                 </div>
             </td>
-            <td colspan="3">
+        </tr>
+        <tr>
+            <td class="layui-td-gray" style="vertical-align:top;">村/社区</td>
+            <td >
                 <div class="layui-form-item">
-                    <label class="layui-form-label">村/社区</label>
                     <div class="layui-input-block">
                         <div id="demo2"></div>
                     </div>
@@ -104,6 +100,7 @@
     </table>
     <div class="pt-3">
         <input type="hidden" name="id" value="{$detail.id}"/>
+        <input type="hidden" name="admin_id" value="{$admin_id}"/>
         <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform">立即提交</button>
         <button type="reset" class="layui-btn layui-btn-primary">重置</button>
     </div>
@@ -119,7 +116,7 @@
     var area_id = "{$detail.area_id}"
     var street_id = "{$detail.street_id}"
     var group_access = "{:session('gougu_admin')['group_access']}"
-
+    var admin_id = "{$admin_id}"
     function gouguInit() {
         var form = layui.form, tool = layui.tool, tagpicker = layui.tagpicker;
 
@@ -159,13 +156,13 @@
                 },
                 data: [],
                 radio: true,
-                disabled: group_access == 2 ? true : false,
+                disabled: group_access == 2 ||group_access == 4? true : false,
                 on: function (data) {
                     var arr = data.arr;
                     village(arr[0]['code'])
                 },
             })
-            $.get('/api/geo/street?pcode=' + id, function (result) {
+            $.get('/admin/api/streetList/street?id=' + id +'&admin_id='+admin_id, function (result) {
                 demo1.update({
                     data: result.data
                 })

app/api/controller/Census.php

@@ -195,7 +195,7 @@ class Census extends BaseController
             ['name' => '土地总面积','value'=>$land_area_num],
             ['name' => '农产品销量','value'=>$num_2.'单'],
             ['name' => '农产采购量','value'=>$num_3.'单'],
-            ['name' => '已录入商户','value'=>$num_4],
+            ['name' => '已录入商户','value'=>$num_4.'个'],
             ['name' => '市需求量','value'=>$need_num.'个'],
 //            ['name' => '大于60岁人数','value'=>$old_num],
 //            ['name' => '儿童人数','value'=>$children_num],

app/api/controller/Statistics.php

@@ -728,6 +728,204 @@ class Statistics extends BaseController
         $this->apiSuccess('获取成功',$return);
     }
 
+    //新农产品市场行情
+    public function get_num21($area_id=0,$street_id=0,$village_id=0){
+        $where = [];
+        if ($area_id){
+            $where[] = ['area_id', '=', $area_id];
+        }
+        if ($street_id){
+            $where[] =  ['street_id', '=', $street_id];
+        }
+        if ($village_id){
+            $where[] =  ['village_id', '=', $village_id];
+        }
+
+        $return = [
+            [
+                'name'=>'萝卜',
+                'demand'=>7852,
+                'minnum'=>
+                 [['month'=>'1月','value'=>'661'],
+                 ['month'=>'2月','value'=>'356'],
+                 ['month'=>'3月','value'=>'415'],
+                 ['month'=>'4月','value'=>'258'],
+                 ['month'=>'5月','value'=>'779'],
+                 ['month'=>'6月','value'=>'1465'],
+                 ['month'=>'7月','value'=>'668'],
+                 ['month'=>'8月','value'=>'571'],
+                 ['month'=>'9月','value'=>'498'],
+                 ['month'=>'10月','value'=>'587'],
+                 ['month'=>'11月','value'=>'881'],
+                 ['month'=>'12月','value'=>'1008']],
+                'maxnum'=>
+                 [['month'=>'1月','value'=>'879'],
+                 ['month'=>'2月','value'=>'521'],
+                 ['month'=>'3月','value'=>'754'],
+                 ['month'=>'4月','value'=>'369'],
+                 ['month'=>'5月','value'=>'916'],
+                 ['month'=>'6月','value'=>'1874'],
+                 ['month'=>'7月','value'=>'837'],
+                 ['month'=>'8月','value'=>'667'],
+                 ['month'=>'9月','value'=>'547'],
+                 ['month'=>'10月','value'=>'741'],
+                 ['month'=>'11月','value'=>'983'],
+                 ['month'=>'12月','value'=>'1150']],
+            ],
+            [
+                'name'=>'白菜',
+                'demand'=>8869,
+                'minnum'=>
+                 [['month'=>'1月','value'=>'123'],
+                     ['month'=>'2月','value'=>'456'],
+                     ['month'=>'3月','value'=>'789'],
+                     ['month'=>'4月','value'=>'147'],
+                     ['month'=>'5月','value'=>'258'],
+                     ['month'=>'6月','value'=>'369'],
+                     ['month'=>'7月','value'=>'159'],
+                     ['month'=>'8月','value'=>'267'],
+                     ['month'=>'9月','value'=>'367'],
+                     ['month'=>'10月','value'=>'541'],
+                     ['month'=>'11月','value'=>'354'],
+                     ['month'=>'12月','value'=>'897']],
+                'maxnum'=>
+                 [['month'=>'1月','value'=>'879'],
+                     ['month'=>'2月','value'=>'897'],
+                     ['month'=>'3月','value'=>'1053'],
+                     ['month'=>'4月','value'=>'354'],
+                     ['month'=>'5月','value'=>'535'],
+                     ['month'=>'6月','value'=>'774'],
+                     ['month'=>'7月','value'=>'337'],
+                     ['month'=>'8月','value'=>'410'],
+                     ['month'=>'9月','value'=>'468'],
+                     ['month'=>'10月','value'=>'600'],
+                     ['month'=>'11月','value'=>'883'],
+                     ['month'=>'12月','value'=>'1100']],
+            ],
+            [
+                'name'=>'芋头',
+                'demand'=>2356,
+                'minnum'=>
+                 [['month'=>'1月','value'=>'245'],
+                     ['month'=>'2月','value'=>'245'],
+                     ['month'=>'3月','value'=>'411'],
+                     ['month'=>'4月','value'=>'246'],
+                     ['month'=>'5月','value'=>'631'],
+                     ['month'=>'6月','value'=>'1234'],
+                     ['month'=>'7月','value'=>'546'],
+                     ['month'=>'8月','value'=>'246'],
+                     ['month'=>'9月','value'=>'356'],
+                     ['month'=>'10月','value'=>'466'],
+                     ['month'=>'11月','value'=>'744'],
+                     ['month'=>'12月','value'=>'998']],
+                'maxnum'=>
+                 [['month'=>'1月','value'=>'879'],
+                     ['month'=>'2月','value'=>'511'],
+                     ['month'=>'3月','value'=>'754'],
+                     ['month'=>'4月','value'=>'469'],
+                     ['month'=>'5月','value'=>'916'],
+                     ['month'=>'6月','value'=>'1474'],
+                     ['month'=>'7月','value'=>'887'],
+                     ['month'=>'8月','value'=>'710'],
+                     ['month'=>'9月','value'=>'678'],
+                     ['month'=>'10月','value'=>'854'],
+                     ['month'=>'11月','value'=>'983'],
+                     ['month'=>'12月','value'=>'1005']],
+            ],
+            [
+                'name'=>'地瓜',
+                'demand'=>3641,
+                'minnum'=>
+                 [['month'=>'1月','value'=>'255'],
+                     ['month'=>'2月','value'=>'324'],
+                     ['month'=>'3月','value'=>'124'],
+                     ['month'=>'4月','value'=>'235'],
+                     ['month'=>'5月','value'=>'364'],
+                     ['month'=>'6月','value'=>'688'],
+                     ['month'=>'7月','value'=>'678'],
+                     ['month'=>'8月','value'=>'471'],
+                     ['month'=>'9月','value'=>'468'],
+                     ['month'=>'10月','value'=>'510'],
+                     ['month'=>'11月','value'=>'789'],
+                     ['month'=>'12月','value'=>'986']],
+                'maxnum'=>
+                 [['month'=>'1月','value'=>'899'],
+                     ['month'=>'2月','value'=>'531'],
+                     ['month'=>'3月','value'=>'759'],
+                     ['month'=>'4月','value'=>'569'],
+                     ['month'=>'5月','value'=>'946'],
+                     ['month'=>'6月','value'=>'1474'],
+                     ['month'=>'7月','value'=>'737'],
+                     ['month'=>'8月','value'=>'610'],
+                     ['month'=>'9月','value'=>'538'],
+                     ['month'=>'10月','value'=>'700'],
+                     ['month'=>'11月','value'=>'911'],
+                     ['month'=>'12月','value'=>'1050']],
+            ],
+            [
+                'name'=>'土豆',
+                'demand'=>5345,
+                'minnum'=>
+                 [['month'=>'1月','value'=>'468'],
+                     ['month'=>'2月','value'=>'315'],
+                     ['month'=>'3月','value'=>'409'],
+                     ['month'=>'4月','value'=>'268'],
+                     ['month'=>'5月','value'=>'756'],
+                     ['month'=>'6月','value'=>'1126'],
+                     ['month'=>'7月','value'=>'641'],
+                     ['month'=>'8月','value'=>'552'],
+                     ['month'=>'9月','value'=>'483'],
+                     ['month'=>'10月','value'=>'568'],
+                     ['month'=>'11月','value'=>'821'],
+                     ['month'=>'12月','value'=>'896']],
+                'maxnum'=>
+                 [['month'=>'1月','value'=>'879'],
+                     ['month'=>'2月','value'=>'551'],
+                     ['month'=>'3月','value'=>'756'],
+                     ['month'=>'4月','value'=>'389'],
+                     ['month'=>'5月','value'=>'946'],
+                     ['month'=>'6月','value'=>'1474'],
+                     ['month'=>'7月','value'=>'847'],
+                     ['month'=>'8月','value'=>'720'],
+                     ['month'=>'9月','value'=>'668'],
+                     ['month'=>'10月','value'=>'830'],
+                     ['month'=>'11月','value'=>'993'],
+                     ['month'=>'12月','value'=>'1260']],
+            ],
+            [
+                'name'=>'山药',
+                'demand'=>6548,
+                'minnum'=>
+                 [['month'=>'1月','value'=>'578'],
+                     ['month'=>'2月','value'=>'316'],
+                     ['month'=>'3月','value'=>'409'],
+                     ['month'=>'4月','value'=>'249'],
+                     ['month'=>'5月','value'=>'789'],
+                     ['month'=>'6月','value'=>'1420'],
+                     ['month'=>'7月','value'=>'647'],
+                     ['month'=>'8月','value'=>'561'],
+                     ['month'=>'9月','value'=>'478'],
+                     ['month'=>'10月','value'=>'513'],
+                     ['month'=>'11月','value'=>'841'],
+                     ['month'=>'12月','value'=>'889']],
+                'maxnum'=>
+                 [['month'=>'1月','value'=>'889'],
+                     ['month'=>'2月','value'=>'531'],
+                     ['month'=>'3月','value'=>'774'],
+                     ['month'=>'4月','value'=>'569'],
+                     ['month'=>'5月','value'=>'910'],
+                     ['month'=>'6月','value'=>'1574'],
+                     ['month'=>'7月','value'=>'857'],
+                     ['month'=>'8月','value'=>'740'],
+                     ['month'=>'9月','value'=>'648'],
+                     ['month'=>'10月','value'=>'810'],
+                     ['month'=>'11月','value'=>'983'],
+                     ['month'=>'12月','value'=>'1241']],
+            ],
+        ];
+        $this->apiSuccess('获取成功',$return);
+    }
+
 
 
 }