пре 1 година · a5a24c84ce
--- a/server/api/modules/v1/controllers/SurveyController.php
+++ b/server/api/modules/v1/controllers/SurveyController.php
@@ -216,13 +216,18 @@ class SurveyController extends Controller {
 
				             foreach ($survey as $key=>$value) {
			
 
				                 $filter = explode(';',$value['filter']);//先判断第一层and关系
			
 
				                 $is_match = [];
			
 
				+
			
 
				                 foreach ($filter as $key1 => $value1){
			
 
				                     if(!empty($value1)){
			
 
				                         if(strpos($value1,'|') !== false){//如果有存在判断大小
			
 
				                             $filter2 = explode('|',$value1);
			
 
				+                            if($value['id'] == 1144 && $filter2[0] == 'shebao'){
			
 
				+                                var_dump($data , $filter2[2]);die;
			
 
				+                            }
			
 
				                             if(array_key_exists($filter2[0],$data) && !empty($data[$filter2[0]]) && $data[$filter2[0]] != '请选择'){
			
 
				                                 switch ($filter2[1]){
			
 
				                                     case '>=':
			
 
				+
			
 
				                                         if($data[$filter2[0]] >= $filter2[2]){
			
 
				                                             $is_match[$key1] = true;
			
 
				                                         }else{
			
@@ -248,6 +253,7 @@ class SurveyController extends Controller {
 
				                                         break;
			
 
				                                     case 'in':
			
 
				                                         $arr = explode(',',$filter2[2]);
			
 
				+
			
 
				                                         if(in_array($data[$filter2[0]],$arr)){
			
 
				                                             $is_match[$key1] = true;
			
 
				                                         }else{
			
@@ -255,7 +261,6 @@ class SurveyController extends Controller {
 
				                                             continue 2;
			
 
				                                         }
			
 
				                                         break;
			
 
				-                                        break;
			
 
				                                 }
			
 
				                             }else{
			
 
				                                 $is_match[$key1] = false;
			
@@ -271,7 +276,6 @@ class SurveyController extends Controller {
 
				                     }
			
 
				                 }
			
 
				                 if($match_count == count($filter)){
			
 
				-
			
 
				                     $list[] = [
			
 
				                         'id'=>$value['id'],
			
 
				                         'title'=>$value['title'],
			
@@ -280,6 +284,7 @@ class SurveyController extends Controller {
 
				                     ];
			
 
				                 }
			
 
				             }
			
 
				+            var_dump($list);die;
			
 
				 
			
 
				             $cengci = [];
			
 
				             $level = [];
			
--- a/server/web/mobile/index.html
+++ b/server/web/mobile/index.html
@@ -1,2 +1,2 @@
 
				 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>加载中</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
			
 
				-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/mobile/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/mobile/static/js/chunk-vendors.492ca56c.js></script><script src=/mobile/static/js/index.3fa01503.js></script></body></html>
			
 
				+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/mobile/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/mobile/static/js/chunk-vendors.5bad1cee.js></script><script src=/mobile/static/js/index.2e3d7051.js></script></body></html>
			
--- a/server/web/mobile/static/images/type-5.png
+++ b/server/web/mobile/static/images/type-5.png
--- a/server/web/mobile/static/js/index.2e3d7051.js
+++ b/server/web/mobile/static/js/index.2e3d7051.js
--- a/server/web/mobile/static/js/pages-policy-search.b1fbe645.js
+++ b/server/web/mobile/static/js/pages-policy-search.b1fbe645.js
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -1,6 +1,6 @@
 
				 {
			
 
				     "name" : "人才图谱",
			
 
				-    "appid" : "__UNI__919686E",
			
 
				+    "appid" : "__UNI__5FF294B",
			
 
				     "description" : "",
			
 
				     "versionName" : "2.2.4",
			
 
				     "versionCode" : 104,
			
--- a/uniapp/pages/policy/index.vue
+++ b/uniapp/pages/policy/index.vue
@@ -11,9 +11,9 @@
 
				         <!-- 我是人才 -->
			
 
				         <view class="p-70 p-t-40 talent-tab" v-if="currentTab == 0">
			
 
				             <view class="flex-col col-center">
			
 
				-                <view class="title">您所从事的行业:</view>
			
 
				+                <!-- <view class="title">您所从事的行业:</view> -->
			
 
				                 <router-link :to="{ path: '/pages/policy/talent', query: { type: item.type, title: item.title }}"
			
 
				-                    class="m-t-40" v-for="(item,index) in talentTypeList">
			
 
				+                    class="m-t-20" v-for="(item,index) in talentTypeList">
			
 
				                     <image :src="item.image" mode="widthFix"></image>
			
 
				                 </router-link>
			
 
				             </view>
			
@@ -384,6 +384,10 @@
 
				                     'image': '/static/images/type-4.png',
			
 
				                     type: 'circuit',
			
 
				                     title: '集成电路'
			
 
				+                }, {
			
 
				+                    'image': '/static/images/type-5.png',
			
 
				+                    type: 'special',
			
 
				+                    title: '专项政策'
			
 
				                 }, ],
			
 
				 
			
 
				                 manageLevelList: [{
			
--- a/uniapp/static/images/type-5.png
+++ b/uniapp/static/images/type-5.png