fix: 冲突解决

components/levitatedsphere/levitatedsphere.vue

@@ -55,10 +55,9 @@
 			} = uni.getSystemInfoSync();
 			this.windowWidth = windowWidth
 			this.windowHeight = windowHeight
-		},
+			this.projectSn = JSON.parse(uni.getStorageSync('userInfo')).sn;
-		onShow() {
+			this.workerInfoId = JSON.parse(uni.getStorageSync('userInfo')).userId;
-			this.projectSn = uni.getStorageSync('devInfoList').projectSn;
+			console.log(JSON.parse(uni.getStorageSync('userInfo')));
-			this.workerInfoId = uni.getStorageSync('devInfoList').id;
 		},
 		methods: {
 			drag_start(event) {
@@ -148,127 +147,127 @@
 					this.orientation();
 					return
 				}
-				emergencyRecordAdd({
-					projectSn: this.projectSn,
-					emergencyTypeId: -1,
-					alarmPersonId: this.workerInfoId,
-				}).then(result => {
-					if (result.code == 200) {
-						// uni.showToast({
-						// 	title: "登录成功"
-						// })
-						that.id = result.result.id;
-						console.log(result);
-					} else {
-						uni.showToast({
-							title: result.message,
-							icon: "none"
-						})
-					}
-				}).finally(() => {
-					uni.showModal({
-						title: '提示信息',
-						content: '是否快速报警？',
-						cancelText: "取消",
-						confirmText: "确认",
-						success: function(res) {
-							if (res.confirm) {
-								// uni.navigateTo({
-								// 	url: `${url}?id=${that.id}`,
-								// });
-								uni.showLoading({
-									title: "报警中..."
-								})
-								uni.getLocation({
-									type: 'gcj02',
-									// type: 'wgs84',
-									geocode: true, //设置该参数为true可直接获取经纬度及城市信息
-									isHighAccuracy: "true",
-									accuracy: "best", // 精度值为20m
-									success: function(res) {
-										console.log(res)
-										// const latitude = parseFloat(res.latitude);
-										// const longitude = parseFloat(res.longitude);
-										that.emergencyInfo.longitude = parseFloat(res
-											.longitude);
-										that.emergencyInfo.latitude = parseFloat(res
-											.latitude);
-										that.addressList = [
-											res.address.province,
-											res.address.city,
-											res.address.district,
-											res.address.street,
-											res.address.poiName,
-										]
-										that.emergencyInfo.incidentSite = that
-											.addressList.map(
-												item => item).join('')
 
-										console.log(111111111);
+				uni.showModal({
-										console.log(that.emergencyInfo.longitude, that
+					title: '提示信息',
-											.emergencyInfo.latitude);
+					content: '是否快速报警？',
+					cancelText: "取消",
+					confirmText: "确认",
+					success: function(res) {
+						if (res.confirm) {
+							// uni.navigateTo({
+							// 	url: `${url}?id=${that.id}`,
+							// });
+							emergencyRecordAdd({
+								projectSn: that.projectSn,
+								emergencyTypeId: -1,
+								alarmPersonId: that.workerInfoId,
+							}).then(result => {
+								if (result.code == 200) {
+									// uni.showToast({
+									// 	title: "登录成功"
+									// })
+									that.id = result.result.id;
+									console.log(result);
+									uni.showLoading({
+										title: "报警中..."
+									})
+									uni.getLocation({
+										type: 'gcj02',
+										// type: 'wgs84',
+										geocode: true, //设置该参数为true可直接获取经纬度及城市信息
+										isHighAccuracy: "true",
+										accuracy: "best", // 精度值为20m
+										success: function(res) {
+											console.log(res)
+											// const latitude = parseFloat(res.latitude);
+											// const longitude = parseFloat(res.longitude);
+											that.emergencyInfo.longitude = parseFloat(res
+												.longitude);
+											that.emergencyInfo.latitude = parseFloat(res
+												.latitude);
+											that.addressList = [
+												res.address.province,
+												res.address.city,
+												res.address.district,
+												res.address.street,
+												res.address.poiName,
+											]
+											that.emergencyInfo.incidentSite = that
+												.addressList.map(
+													item => item).join('')
 
-										emergencyRecordEdit({
+											console.log(111111111);
-											id: that.id,
+											console.log(that.emergencyInfo.longitude, that
-											projectSn: that.projectSn,
+												.emergencyInfo.latitude);
-											incidentSite: that.emergencyInfo
-												.incidentSite,
-											longitude: that.emergencyInfo
-												.longitude,
-											latitude: that.emergencyInfo
-												.latitude,
-										}).then(result => {
-											if (result.code == 200) {
-												uni.showToast({
-													title: result
-														.message,
-												})
-												emergencyRecordSendNotice({
-													projectSn: that
-														.projectSn,
-													incidentSite: that
-														.emergencyInfo
-														.incidentSite,
-													id: that.id,
-												}).then(result => {
-													if (result.code ==
-														200) {
-														uni
-															.hideLoading(); //关闭提示
-													} else {
-														uni.showToast({
-															title: result
-																.message,
-															icon: "none"
-														})
-													}
-												})
-											} else {
-												uni.showToast({
-													title: result
-														.message,
-													icon: "none"
-												})
-												uni.hideLoading(); //关闭提示
-											}
-										})
 
-										// that.addrDel = res;
+											emergencyRecordEdit({
-									},
+												id: that.id,
-									fail: function() {
+												projectSn: that.projectSn,
-										uni.showToast({
+												incidentSite: that.emergencyInfo
-											title: '获取地址失败，将导致部分功能不可用',
+													.incidentSite,
-											icon: 'none'
+												longitude: that.emergencyInfo
-										});
+													.longitude,
-									}
+												latitude: that.emergencyInfo
-								});
+													.latitude,
-							} else if (res.cancel) {
+											}).then(result => {
-								console.log('用户点击取消');
+												if (result.code == 200) {
+													uni.showToast({
+														title: result
+															.message,
+													})
+													emergencyRecordSendNotice({
+														projectSn: that
+															.projectSn,
+														incidentSite: that
+															.emergencyInfo
+															.incidentSite,
+														id: that.id,
+													}).then(result => {
+														if (result.code ==
+															200) {
+															uni
+																.hideLoading(); //关闭提示
+														} else {
+															uni.showToast({
+																title: result
+																	.message,
+																icon: "none"
+															})
+														}
+													})
+												} else {
+													uni.showToast({
+														title: result
+															.message,
+														icon: "none"
+													})
+													uni.hideLoading(); //关闭提示
+												}
+											})
+
+											// that.addrDel = res;
+										},
+										fail: function() {
+											uni.showToast({
+												title: '获取地址失败，将导致部分功能不可用',
+												icon: 'none'
+											});
+										}
+									});
+								} else {
+									uni.showToast({
+										title: result.message,
+										icon: "none"
+									})
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
 
-							}
 						}
-					});
+					}
-				})
+				});
 			},
 		}
 	}

pages/messageCenter/messageCenter.vue

@@ -41,10 +41,12 @@
 			</view>
 		</view>
 		<footers :activeTab="'mssage'" v-if="accountType == 5 || accountType == 6 || accountType == 10"></footers>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../components/headers/headers.vue'
 	import footers from '../../components/footers/footers.vue'
 	export default {

pages/my/my.vue

@@ -56,13 +56,13 @@
 		</view>
 		<footers v-if="flag" :activeTab="'my'"></footers>
 		<footers2 v-else></footers2>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
-	import {
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
-		exitApp
+	import { exitApp } from "@/utils/tool.js"
-	} from "@/utils/tool.js"
 	import footers from "@/components/footers/footers.vue"
 	import footers2 from "@/components/footers/footers2.vue"
 	import headers from "@/components/headers/headers.vue"
@@ -70,7 +70,8 @@
 		components: {
 			footers,
 			headers,
-			footers2
+			footers2,
+			levitatedsphere
 		},
 		data() {
 			return {

pages/my/userInfo/userInfo.vue

@@ -44,10 +44,12 @@
 				<view><uni-icons2 class="arrowright" type="arrowright" size="20"></uni-icons2></view>
 			</view>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default {
 		components: {

pages/projectEnd/ekashManage/ekashManage.vue

@@ -20,10 +20,12 @@
 			<image class="img" src="/static/noData.png"></image>
 			<text class="txt">暂无数据</text>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 
 	export default {

pages/projectEnd/ekashManage/lookDetails.vue

@@ -31,10 +31,12 @@
 				<span class="details-remark">{{result.remark}}</span>
 			</view>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 
 	export default {

pages/projectEnd/ekashManage/materials.vue

@@ -35,10 +35,12 @@
 			<image class="img" src="/static/noData.png"></image>
 			<text class="txt">暂无数据</text>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 
 	export default {

pages/projectEnd/projectIndex/projectIndex.vue

@@ -136,10 +136,12 @@
 			</view>
 		</uni-popup>
 		<footers :activeTab="'projectEnd'" v-if="accountType == 5 || accountType == 6 || accountType == 10"></footers>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	import footers from '../../../components/footers/footers.vue'
 	import checkVersion from '@/pages/lq-upgrade/checkVersion.js'

pages/projectEnd/qualityManage/addExamine.vue

@@ -271,10 +271,12 @@
 
 			<canversCom v-if="openImg" @imgUrl="imgUrl" :imgList="imgList"></canversCom>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import canversCom from "@/pages/videoManage/component/canversCom.vue"
 	import tkiTree from "@/components/tki-tree/tki-tree.vue"
 	import headers from '../../../components/headers/headers.vue';

pages/projectEnd/safeManage/dangerLibrary.vue

@@ -116,10 +116,12 @@
 				</view>
 			</template>
 		</dialogs>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	import dialogs from '../../../components/dialog/dialog.vue'
 	export default {

pages/projectEnd/safeManage/dangerList.vue

@@ -42,10 +42,12 @@
 				</view>
 			</view>
 		</scroll-view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default{
 		data(){

pages/projectEnd/safeManage/dangerRecord.vue

@@ -27,10 +27,12 @@
 				</view>
 			</view>
 		</scroll-view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default{
 		data(){

pages/projectEnd/safeManage/projectList.vue

@@ -39,10 +39,12 @@
         </view>
       </view>
     </scroll-view>
+	<levitatedsphere :x="100" :y="80"></levitatedsphere>
   </view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
   import headers from '../../../components/headers/headers.vue'
   export default {
     data() {

pages/projectEnd/safeManage/rectificationReply.vue

@@ -44,10 +44,12 @@
 		</scroll-view>
 		<view class="submit-btn" @click="submitForm">提交</view>
 		<canversCom v-if="openImg" @imgUrl="imgUrl" :imgList="imgList"></canversCom>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import canversCom from "@/pages/videoManage/component/canversCom.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default{

pages/projectEnd/safeManage/safeIndex.vue

@@ -81,10 +81,12 @@
 				</view>
 			</view>
 		</scroll-view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 import headers from '../../../components/headers/headers.vue'
 export default{
 	data(){

pages/projectEnd/safeManage/taskList.vue

@@ -37,10 +37,12 @@
 			</view>
 
 		</scroll-view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default{
 		data(){

pages/projectEnd/safeSame/addExamine.vue

@@ -271,10 +271,12 @@
 
 			<canversCom v-if="openImg" @imgUrl="imgUrl" :imgList="imgList"></canversCom>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import canversCom from "@/pages/videoManage/component/canversCom.vue"
 	import tkiTree from "@/components/tki-tree/tki-tree.vue"
 	import headers from '../../../components/headers/headers.vue';

pages/projectEnd/safeSame/projectList.vue

@@ -42,10 +42,12 @@
         </view>
       </view>
     </scroll-view>
+	<levitatedsphere :x="100" :y="80"></levitatedsphere>
   </view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
   import headers from '../../../components/headers/headers.vue'
 
   export default {

pages/projectEnd/safeSame/taskList.vue

@@ -41,10 +41,12 @@
         </view>
       </view>
     </scroll-view>
+	<levitatedsphere :x="100" :y="80"></levitatedsphere>
   </view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
   import headers from '../../../components/headers/headers.vue'
   export default {
     data() {

pages/projectEnd/specialOperations/specialCheck.vue

@@ -80,10 +80,12 @@
 				</view>
 			</view>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default {
 		navigationBarTitleText: '页面标题',

pages/projectEnd/specialOperations/specialOperations.vue

@@ -80,10 +80,12 @@
 				</view>
 			</view>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default {
 		navigationBarTitleText: '页面标题',

pages/projectEnd/supplyQualityManage/supplyProjectList.vue

@@ -42,10 +42,12 @@
         </view>
       </view>
     </scroll-view>
+	<levitatedsphere :x="100" :y="80"></levitatedsphere>
   </view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
   import headers from '../../../components/headers/headers.vue'
 
   export default {

pages/projectEnd/ukashManage/lookDetails.vue

@@ -31,10 +31,12 @@
 				<span class="details-remark">{{result.remark}}</span>
 			</view>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 
 	export default {

pages/projectEnd/ukashManage/materials.vue

@@ -41,10 +41,12 @@
 			<image class="img" src="/static/noData.png"></image>
 			<text class="txt">暂无数据</text>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 
 	export default {

pages/projectEnd/ukashManage/ukashManage.vue

@@ -20,10 +20,12 @@
 			<image class="img" src="/static/noData.png"></image>
 			<text class="txt">暂无数据</text>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 
 	export default {

pages/projectEnd/visitorsManage/visitorsDetails.vue

@@ -48,10 +48,12 @@
 			</view>
 		</view>
 		<view class="delete" @click="deleteEvent">删除</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 
 	export default {

pages/projectEnd/visitorsManage/visitorsManage.vue

@@ -25,10 +25,12 @@
 			<image class="img" src="/static/noData.png"></image>
 			<text class="txt">暂无数据</text>
 		</view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 
 	export default {

pages/workstation/worfStationNotice/addNotice.vue

@@ -79,10 +79,12 @@
 			
 			<view class="submit-btn" @click="submitForm">提交通知</view>
 		</scroll-view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default {
 		data(){

pages/workstation/worfStationNotice/noticeDetail.vue

@@ -56,10 +56,12 @@
 				</ul>
 			</view>
 		</scroll-view>
+		<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	export default {
 		data(){

pages/workstation/workstationIndex/addProject.vue

@@ -296,10 +296,12 @@
 		</scroll-view>
 	
 	<mx-date-picker :show="showPicker" type="rangetime" :value="value" :show-tips="true" :begin-text="'会议开始'" :end-text="'会议结束'" :show-seconds="true" @confirm="ed" @cancel="ed" />
+	<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import headers from '../../../components/headers/headers.vue'
 	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
 	export default {

pages/workstation/workstationIndex/editProject.vue

@@ -302,10 +302,12 @@
 		</scroll-view>
 	
 	<mx-date-picker :show="showPicker" type="rangetime" :value="value" :show-tips="true" :begin-text="'会议开始'" :end-text="'会议结束'" :show-seconds="true" @confirm="ed" @cancel="ed" />
+	<levitatedsphere :x="100" :y="80"></levitatedsphere>
 	</view>
 </template>
 
 <script>
+	import levitatedsphere from "@/components/levitatedsphere/levitatedsphere.vue"
 	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue";
 	import headers from '../../../components/headers/headers.vue'
 	export default {