report

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeRepairReport/cpns/reportList.vue

@@ -103,6 +103,13 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column prop="ReturnNum" label="返修数" align="center" min-width>
+          <template slot-scope="scope">
+            <el-button type="text" @click="btnClickEvents(2, 'returnNum', scope.row)">
+              {{ scope.row.ReturnNum }}
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table-column>
     </el-table>
     <!-- <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" /> -->

CallCenterWeb.UI/RMYY/src/views/leadConcernNew/officeServiceReport/cpns/reportList.vue

@@ -103,6 +103,13 @@
             </el-button>
           </template>
         </el-table-column>
+        <el-table-column prop="ReturnNum" label="返修数" align="center" min-width>
+          <template slot-scope="scope">
+            <el-button type="text" @click="btnClickEvents(2, 'returnNum', scope.row)">
+              {{ scope.row.ReturnNum }}
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table-column>
     </el-table>
     <!-- <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" /> -->

CallCenterWeb.UI/RMYYAPP/pages.json

@@ -332,7 +332,9 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+                "app-plus": {
+                    "titleNView": false //禁用原生导航栏  
+                }
             }
             
         }

CallCenterWeb.UI/RMYYAPP/pages/myTask/reportForm/reportForm.vue

@@ -262,21 +262,21 @@
 				bieopts: {
 					rotate: false,
 					rotateLock: false,
-					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4",
-						"#ea7ccc", "#aaaa7f", "#00aaff", "#ff5500"
+					color: ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#ff007f",
+						"#ea7ccc", "#aa557f", "#aaaa00", "#ff5500"
 					],
 					padding: [5, 5, 5, 5],
 					dataLabel: true,
 					enableScroll: false,
 					legend: {
 						show: true,
-						position: "top",
+						position: "right",
 						lineHeight: 20,
 						fontSize: 12
 					},
 					title: {
 						name: "报工类型",
-						fontSize: 12,
+						fontSize: 14,
 						color: "#3f3f3f"
 					},
 					subtitle: {
@@ -290,9 +290,9 @@
 							activeOpacity: 0.5,
 							activeRadius: 5,
 							offsetAngle: 0,
-							labelWidth: 2,
+							labelWidth: 10,
 							border: false,
-							borderWidth: 3,
+							borderWidth: 2,
 							borderColor: "#FFFFFF",
 							centerColor: "#d6ebff"
 						}
@@ -480,17 +480,17 @@
 						var data = []
 						var othercon = 0
 						for (var i = 0; i < response.data.dt.length; i++) {
-							if (i <= 11) {
+							if (i < 11) {
 								data.push(response.data.dt[i])
 							}
 							if (i > 11) {
 								othercon += Number(response.data.dt[i].value)
-								data.push({
-									name: "其他",
-									value: othercon
-								})
 							}
-						}
+						}							
+						data.push({
+							name: "其他",
+							value: othercon
+						})
 						var res = {
 							series: [{
 								data: data
@@ -993,7 +993,7 @@
 	.bieechart {
 		margin-top: 0px;
 		width: 100%;
-		height: 600rpx;
+		height: 650rpx;
 	}
 
 	#echartbox {

CallCenterWeb.UI/RMYYAPP/utils/request/request.js

@@ -177,6 +177,11 @@ export default class Request {
 					if (this.validateStatus(response.statusCode)) {
 						// 成功
             // console.log(response)
+			// if(response.data.state == 'notoken'){
+			// 	uni.reLaunch({
+			// 		url: '/pages/login/login'
+			// 	});
+			// }
 						response = this.requestComFun(response);
 						resolve(response);
 					} else {