fdfd

application/admin/view/cms/cms/classlist.html

@@ -52,6 +52,12 @@
 <script type="text/html" id="statusTpl">
     <input type="checkbox" name="status" data-href='{:url("setstate",["catid"=>$catid])}?id={{d.id}}' value="{{d.id}}" lay-skin="switch" lay-text="通过|待审核" lay-filter="switchStatus" {{ d.status==1 ? 'checked' : '' }}>
 </script>
+
+<script type="text/html" id="areaTpl">
+    {{ d.diqu }}
+</script>
+
+
 <div id="remove" style="display: none;">
     <div class="box-body" style="margin: 20px">
         <div class="alert alert-warning-light">只能将数据移动到相同模型的栏目下，不同模型的数据移动将被忽略</div>
@@ -124,6 +130,9 @@ layui.use(['yzn','table', 'yznTable'], function() {
                 { field: 'username', width: 80, title: '发布人', templet: '#username' },
                 { field: 'url', width: 60, align: "center", title: 'URL', templet: yznTable.formatter.url, search: false },
                 { field: 'status', width: 100, align: "center", title: '状态', templet: '#statusTpl', unresize: true, selectList: { 0: '待审核', 1: '通过' } },
+                { field: 'diqu', width: 100, align: "center", title: '区域', templet: '#areaTpl', unresize: true, selectList: {"1":"广东","30":"福建","6872":"陕西","6791":"西藏","6645":"云南","6344":"四川","6303":"重庆","6003":"海南","5879":"广西","5742":"湖南","5625":"湖北","5448":"河南","5179":"江西","5056":"安徽","4833":"江苏","4813":"上海","4667":"黑龙江","4589":"吉林","4474":"辽宁","4228":"山西","4042":"河北","4023":"天津","4003":"浙江","6547":"贵州","4359":"内蒙古","4004":"北京","6990":"甘肃","7092":"青海","7144":"宁夏","7171":"新疆","10000":"主站"} },
+
+
                 { fixed: 'right', width: 90, title: '操作', toolbar: '#barTool' }
             ]
         ],

application/api/controller/Cms.php

@@ -30,7 +30,7 @@ use think\Db;
 class Cms extends MemberApi
 {
 
-    protected $noNeedLogin = ['login', 'register','getProduct','getProductSmall','createTask','tagHandle','taskHandle'];
+    protected $noNeedLogin = ['login', 'register','getProduct','getProductSmall','createTask','tagHandle','taskHandle','getAreaJson'];
     protected $noNeedRight = [];
 
     //初始化
@@ -287,7 +287,39 @@ class Cms extends MemberApi
     }
 
     /*
-     * http://console.zx2049.com/api/cms/tagHandle?taskid=10
+     * {"1":"广东","30":"福建","6872":"陕西","6791":"西藏","6645":"云南","6344":"四川","6303":"重庆","6003":"海南","5879":"广西","5742":"湖南","5625":"湖北","5448":"河南","5179":"江西","5056":"安徽","4833":"江苏","4813":"上海","4667":"黑龙江","4589":"吉林","4474":"辽宁","4228":"山西","4042":"河北","4023":"天津","4003":"浙江","6547":"贵州","4359":"内蒙古","4004":"北京","6990":"甘肃","7092":"青海","7144":"宁夏","7171":"新疆","10000":"主站"}
+     *
+     * http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=1
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=30
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=6872
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=6791
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=6645
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=6344
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=6303
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=6003
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=5879
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=5742
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=5625
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=5448
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=5179
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=5056
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4833
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4813
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4667
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4589
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4474
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4228
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4042
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4023
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4003
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=6547
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4359
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=4004
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=6990
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=7092
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=7144
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=7171
+        http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu=10000
      */
     public function tagHandle()
     {
@@ -297,11 +329,18 @@ class Cms extends MemberApi
             $this->error('fail');
         }
 
+        //地区参数
+        $diqu = $this->request->get('diqu',0);
+        if((int)$diqu === 0){
+            $this->error('fail');
+        }
+
         $page = 1;
         $list = Db::name('task')->where([
                 'catid' => $taskid, //任务分组id
                 'tagid' => 0,
                 'status' => 0,
+                'diqu' => (int)$diqu
             ])
             ->order('add_time asc')->paginate(1);
         $list = $list->toArray();
@@ -417,7 +456,41 @@ class Cms extends MemberApi
      * 增加字段 is_run 未执行0 执行成功1 执行失败2(远程响应错误) 执行忽略3(存在小类或无级别-只有一个主页) 产品异常4(删除或未审核或屏蔽)
      * run_time 执行时间
      * is_run = 0 每次处理10条
-     * http://console.zx2049.com/api/cms/taskHandle?taskid=10
+     *
+     * {"1":"广东","30":"福建","6872":"陕西","6791":"西藏","6645":"云南","6344":"四川","6303":"重庆","6003":"海南","5879":"广西","5742":"湖南","5625":"湖北","5448":"河南","5179":"江西","5056":"安徽","4833":"江苏","4813":"上海","4667":"黑龙江","4589":"吉林","4474":"辽宁","4228":"山西","4042":"河北","4023":"天津","4003":"浙江","6547":"贵州","4359":"内蒙古","4004":"北京","6990":"甘肃","7092":"青海","7144":"宁夏","7171":"新疆","10000":"主站"}
+     *
+     *  http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=1
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=30
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=6872
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=6791
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=6645
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=6344
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=6303
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=6003
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=5879
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=5742
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=5625
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=5448
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=5179
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=5056
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4833
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4813
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4667
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4589
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4474
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4228
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4042
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4023
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4003
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=6547
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4359
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=4004
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=6990
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=7092
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=7144
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=7171
+        http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu=10000
+     *
      */
     public function taskHandle()
     {
@@ -426,12 +499,19 @@ class Cms extends MemberApi
             $this->error('fail');
         }
 
+        //地区参数
+        $diqu = $this->request->get('diqu',0);
+        if((int)$diqu === 0){
+            $this->error('fail');
+        }
+
         //查询未执行的任务
         $page = 1;
         $list = Db::name('task')->where([
                 'catid' => $taskid, //任务分组id
                 'is_run' => 0,
                 'status' => 0,
+                'diqu' => (int)$diqu
             ])
             ->where('tagid','>',0) //标签id需要已经获取到的
             ->order('add_time asc')->paginate(1);
@@ -630,7 +710,7 @@ class Cms extends MemberApi
             $area_name = Db::connect('db1')->name('citysite')->where('id', '=', $diqu)->value('name');
         }
         $title = $this->getName($row['title']);
-        $str = $area_name.$title.'评定';
+        $str = $area_name.$title.'评定学历要求';
         return $str;
     }
 
@@ -678,15 +758,17 @@ class Cms extends MemberApi
         }
 
         $h = ['一）','二）','三）','四）','五）','六）','七）','八）','九）','十）','十一）'];
+        $jk = 0;
         foreach ($aids as $k=>$v){
             $data = Db::connect('db1')->table('ey_zczygz_content')
                 ->field('aid,content_6')->where('aid','=',$v['aid'])->find();
             if(!empty($data['content_6'])){
                 $pro_title = $this->getName($row['title']);
                 $html .= '<p style="text-align: left;font-weight: bold !important;font-size:16px !important;margin-top:5px;">
-'.$h[$k].$area_name.$pro_title.'评定'.$v['title'].'学历要求：</p>';
+'.$h[$jk].$area_name.$pro_title.'评定'.$v['title'].'学历要求：</p>';
                 $html .= '<p style="text-align: left;">
                     '.$data['content_6'].'</p>';
+                $jk++;
             }
         }
 
@@ -714,14 +796,14 @@ class Cms extends MemberApi
         }
 
         $html .= '<p style="text-align: left;margin-top:15px;">
-            <font style="font-weight: bold !important;font-size:16px !important;">最新'.$area_name.$pro_title.'评定政策详情请点击：</font><a href="'.$link.'" targey="_blank" style="color: blue !important;">'.$area_name.$pro_title.'评审</a></p>';
+            <font style="font-weight: bold !important;font-size:16px !important;">最新'.$area_name.$pro_title.'评定政策详情请点击：</font><a href="'.$link.'" targey="_blank" style="color: blue !important;font-size:16px !important;">'.$area_name.$pro_title.'</a></p>';
 
         //其他链接
         $html .= '<p style="text-align: left;margin-top:15px;">
-            <a href="https://'.$domain.'.gdzcfw.com" style="color: blue !important;">职称网</a>更多<a href="https://'.$domain.'.gdzcfw.com" style="color: blue !important;">职称评审</a>相关请点击：<br/>
-            <a href="https://'.$domain.'.gdzcfw.com/zccl" style="color: blue !important;">'.$area_name.'职称政策文件下载： https://'.$domain.'.gdzcfw.com/zccl</a><br/>
-            <a href="https://www.gdzcfw.com/zcdb" style="color: blue !important;">职称答辩相关指引请点击： https://www.gdzcfw.com/zcdb</a><br/>
-            <a href="https://zczl.gdzcfw.com" style="color: blue !important;">职称评审绿色破格通道： https://zczl.gdzcfw.com</a><br/></p><br/>';
+            <a href="https://www.gdzcfw.com" style="color: blue !important;">职称网</a>更多<a href="https://www.gdzcfw.com" style="color: blue !important;">职称评审</a>相关请点击：<br/>
+            '.$area_name.'职称政策文件下载： <a href="https://www.gdzcfw.com/zccl" style="color: blue !important;">职称材料</a><br/>
+            职称答辩相关指引请点击： <a href="https://www.gdzcfw.com/zcdb" style="color: blue !important;">职称答辩</a><br/>
+            职称评审绿色破格通道： <a href="https://zczl.gdzcfw.com" style="color: blue !important;">职称代办</a><br/></p><br/>';
 
         return $html;
     }
@@ -740,7 +822,43 @@ class Cms extends MemberApi
      */
 
     /*
-     * 校验产品如果正常了 任务改为未执行
+     * 产品异常 校验产品如果正常了 任务改为未执行
      */
 
+
+    /*
+     * 生成地区json 方便增加查询条件
+     * http://console.zx2049.com/api/cms/getAreaJson
+     */
+    public function getAreaJson()
+    {
+        $area = Db::connect('db1')
+            ->table('ey_citysite')
+            ->where(['level'=>1,'is_open'=>1,'status'=>1])
+            ->select();
+        //dump($area);
+        $area[] = [
+            'id' => 10000,
+            'name' => '主站',
+        ];
+
+        //{ 0: '待审核', 1: '通过' }
+        $collect = [];
+        $str = '';
+        foreach($area as $k=>$v){
+            $collect[(int)$v['id']] = $v['name'];
+            //$str .= 'http://console.zx2049.com/api/cms/taskHandle?taskid=10&diqu='.$v['id'].'<br/>';
+            $str .= 'http://console.zx2049.com/api/cms/tagHandle?taskid=10&diqu='.$v['id'].'<br/>';
+
+        }
+
+        $collect = json_encode($collect,JSON_UNESCAPED_UNICODE);
+
+
+        echo $str;
+        //return $collect;
+
+    }
+
+
 }

public/static/libs/layui_exts/yznTable/yznTable.js

@@ -156,6 +156,9 @@ layui.define(['form', 'table', 'yzn', 'laydate', 'laytpl', 'element','notice'],
             });
         },
         render: function(options) {
+
+           // console.log(options);
+
             options.init = options.init || init;
             options.modifyReload = yzn.parame(options.modifyReload, false);
             options.id = options.id || options.init.table_render_id;