zhengkaixin 4 роки тому
батько
коміт
7b02825220

+ 2 - 2
src/projects/business/views/Master/Health/Worker.vue

@@ -210,10 +210,10 @@
 					for (var i in page.data) {
 						var mod = page.data[i];
 						var key = "(未分组)";
-						if (mod.teacherInfo == null) {
+						if (mod.groupKey == null) {
 
 						} else {
-							key = mod.teacherInfo.jobType;
+							key = mod.groupKey;
 						}
 
 						if (map.get(key) == null) {

+ 1 - 1
src/projects/business/views/Master/Health/WorkerInfo.vue

@@ -71,7 +71,7 @@
 				</div>
 				<div class="mui-input-row" style="height: 100px;">
 					<label style="width:30%;height: 100px;">定位</label>
-					<span   class="vongi-yidi-location aaa" >{{detail.personHealthLedger.address}}</span>
+					<span   class="vongi-yidi-location aaa" style="text-align: left;" >{{detail.personHealthLedger.address}}</span>
 				</div>
 
 			</form>

+ 4 - 4
src/projects/business/views/Master/Health/WorkerReport.vue

@@ -125,7 +125,7 @@
 					<span v-if="!curDateIsUpload" style="text-align: left;" class="vongi-yidi-location" @click="getPoint"
 
 					>{{report.address}}<i class="mui-icon mui-icon-location" style="color: #096DD9;font-size: 13px;">重新定位</i></span>
-					<span v-if="curDateIsUpload" class="vongi-yidi-location aaa" >{{address?address:report.address}}</span>
+					<span v-if="curDateIsUpload" class="vongi-yidi-location aaa" style="text-align: left;" >{{address?address:report.address}}</span>
 
 				</div>
 
@@ -197,7 +197,7 @@
 
                     longitude: 112.276527,
                     latitude: 30.306427,
-                    address: '湖北省荆州市江津东路附155号荆鹏软件园',
+                    address: '定位中……',
                 },
                 address:'',
 				curDateIsUpload: false,
@@ -271,8 +271,8 @@
 		},
 		methods: {
             getPoint(){
-                this.report.address=='定位中……';
-                this.isLoading = true;
+                this.report.address='定位中……';
+                //this.isLoading = true;
                 WxJsApi.getLocation().then((res) => {
                     this.isLoading = false;