Merge branch 'master' of https://e.coding.net/ctcdevteam/aqyj

pages/main/main.js

@@ -60,8 +60,7 @@ Page({
         isGjjt: true,
         user__name:getApp().globalData.userInfo.name,
         msgList: [
-          { title: "齐心协力抗肺炎,众志成城渡难关。武汉加油!祖国加油!" },
+          { title: "知识竞赛火热进行中!" },]
-          { title: "'国检战疫,有我助力'知识竞赛火热进行中!" },]
       })
     }
     // let openid = getApp().globalData.userInfo.openid;
@@ -107,8 +106,7 @@ Page({
           isGjjt: true,
           user__name: getApp().globalData.userInfo.name,
           msgList: [
-            { title: "齐心协力抗肺炎,众志成城渡难关。武汉加油!祖国加油!" },
+            { title: "知识竞赛火热进行中!" },]
-            { title: "'国检战疫,有我助力'知识竞赛火热进行中!" },]
         })
       }
     
@@ -324,7 +322,7 @@ Page({
     var that = this
     //获取待考
     wx.request({
-      url: this.data.serverUrl + 'api/riskacttask?a=todonum',
+      url: this.data.serverUrl + 'api/riskacttask?a=todonum2',
       header: {
         'content-type': 'application/json', // 默认值
         'Cookie': getApp().globalData.sessionId,

pages/risktask/index.js

@@ -235,7 +235,7 @@ Page({
       title: '加载中',
     }),
       wx.request({
-        url: this.data.serverUrl + 'api/riskacttask?a=listmytodo&rows=10&page=' + page,
+        url: this.data.serverUrl + 'api/riskacttask?a=listmytodo2&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
           'Cookie': getApp().globalData.sessionId,

pages/risktask/index.wxml

@@ -18,10 +18,10 @@
                 <span style="background-color:green;color:white">风险点</span>
                 {{item.riskact__area__name}} {{item.riskact__name}}
               </view>
-              <view class="weui-media-box__desc">
+              <!-- <view class="weui-media-box__desc">
                 <span style="background-color:orange;color:white">排查岗位</span>
                 {{item.riskact__group__groupname}}
-              </view>
+              </view> -->
               <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
               <view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
             </view>
@@ -30,9 +30,9 @@
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
-              <view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已执行</view>
+              <view wx:if="{{item.taskdo!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已执行</view>
               <view wx:if="{{item.usable==2}}" class="weui-media-box__title" style="background-color:green;color:white">作废</view>
-              <view wx:if="{{item.user__userid==null}}" class="weui-media-box__title" style="background-color:red;color:white">未执行</view>
+              <view wx:if="{{item.taskdo==null}}" class="weui-media-box__title" style="background-color:red;color:white">未执行</view>
             </view>
           </navigator>
         </block>
@@ -60,7 +60,7 @@
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
-              <view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
+              <view wx:if="{{item.taskdo!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
             </view>
           </navigator>
         </block>
@@ -70,27 +70,27 @@
       <view class="head">共{{total}}条任务</view>
       <view class="weui-cells weui-cells_after-title">
         <block wx:for="{{alllist}}" wx:key="unique">
-          <navigator url="../riskact/check?riskact={{item.riskact__id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+          <view  class="weui-media-box weui-media-box_appmsg">
             <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
               <view class="weui-media-box__title">
                 <span style="background-color:green;color:white">风险点</span>
                 {{item.riskact__area__name}} {{item.riskact__name}}
               </view>
-              <view class="weui-media-box__desc">
+              <!-- <view class="weui-media-box__desc">
                 <span style="background-color:orange;color:white">排查岗位</span>
                 {{item.group__groupname}}
-              </view>
+              </view> -->
               <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
               <view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
             </view>
-            <view class="weui-panel__ft weui-cell__ft_in-access">
+            <view class="weui-panel__ft ">
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
-              <view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
+              <view wx:if="{{item.taskdo!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
             </view>
-          </navigator>
+          </view>
         </block>
       </view>
     </view>

project.config.json

@@ -1,51 +1,59 @@
 {
-	"description": "项目配置文件。",
+  "description": "项目配置文件。",
-	"setting": {
+  "setting": {
-		"urlCheck": false,
+    "urlCheck": false,
-		"es6": true,
+    "es6": true,
-		"postcss": true,
+    "enhance": false,
-		"minified": true,
+    "postcss": true,
-		"newFeature": true,
+    "preloadBackgroundData": false,
-		"coverView": true,
+    "minified": true,
-		"nodeModules": true,
+    "newFeature": true,
-		"autoAudits": false,
+    "coverView": true,
-		"showShadowRootInWxmlPanel": true,
+    "nodeModules": true,
-		"scopeDataCheck": false,
+    "autoAudits": false,
-		"checkInvalidKey": true,
+    "showShadowRootInWxmlPanel": true,
-		"checkSiteMap": true,
+    "scopeDataCheck": false,
-		"uploadWithSourceMap": true,
+    "uglifyFileName": false,
-		"babelSetting": {
+    "checkInvalidKey": true,
-			"ignore": [],
+    "checkSiteMap": true,
-			"disablePlugins": [],
+    "uploadWithSourceMap": true,
-			"outputPath": ""
+    "compileHotReLoad": false,
-		},
+    "useMultiFrameRuntime": true,
-		"useIsolateContext": true,
+    "useApiHook": false,
-		"useCompilerModule": false,
+    "babelSetting": {
-		"userConfirmedUseCompilerModuleSwitch": false
+      "ignore": [],
-	},
+      "disablePlugins": [],
-	"compileType": "miniprogram",
+      "outputPath": ""
-	"libVersion": "2.9.4",
+    },
-	"appid": "wx5c39b569f01c27db",
+    "useIsolateContext": true,
-	"projectname": "aqyj",
+    "useCompilerModule": true,
-	"isGameTourist": false,
+    "userConfirmedUseCompilerModuleSwitch": false,
-	"simulatorType": "wechat",
+    "packNpmManually": false,
-	"simulatorPluginLibVersion": {},
+    "packNpmRelationList": []
-	"condition": {
+  },
-		"search": {
+  "compileType": "miniprogram",
-			"current": -1,
+  "libVersion": "2.9.4",
-			"list": []
+  "appid": "wx5c39b569f01c27db",
-		},
+  "projectname": "aqyj",
-		"conversation": {
+  "isGameTourist": false,
-			"current": -1,
+  "simulatorType": "wechat",
-			"list": []
+  "simulatorPluginLibVersion": {},
-		},
+  "condition": {
-		"game": {
+    "search": {
-			"currentL": -1,
+      "current": -1,
-			"list": []
+      "list": []
-		},
+    },
-		"miniprogram": {
+    "conversation": {
-			"current": -1,
+      "current": -1,
-			"list": []
+      "list": []
-		}
+    },
-	}
+    "game": {
+      "currentL": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
+  }
 }