Merge branch 'lws-gitee'

config.js

@@ -1,7 +1,7 @@
 // 应用全局配置
 module.exports = {
-  baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'http://192.168.130.155:8080',
+  // baseUrl: 'https://vue.ruoyi.vip/prod-api',
+  baseUrl: 'http://39.105.17.128:8096',
   // baseUrl: 'http://localhost:8080',
   // 应用信息
   appInfo: {

subPackWork/classifiedManagement/classifiedManagement.vue

@@ -47,7 +47,7 @@
 				uni.showModal({
 					title: '确认要删除分组名称为' + item.name + '的分组吗？',
 					confirmText: '确定',
-					showCancel: false,
+					showCancel: true,
 					success(res) {
 						del(item.id).then((res) => {
 							if (res.code == 200) {

subPackWork/commandDispatch/caseFiling/caseFiling.vue

@@ -9,7 +9,7 @@
 								class="tree-pick"
 								v-model="info.userId"
 								:localdata="classDataTree"
-								placeholder="请选择警情分类"
+								placeholder="请选择回访人"
 								popup-title="请选择"
 								@change="onchange"
 								@inputclick="inputclick"
@@ -56,7 +56,8 @@ export default {
 				userId: '',
 				satisfactionType: '1',
 				returnCallFeedback: '',
-				filingSummary: ''
+				filingSummary: '',
+				status:5
 			},
 			rules: {
 				userId: {

subPackWork/commandDispatch/commandDispatchDetail.vue

@@ -7,8 +7,8 @@
 				<view @click="goList" class="v-btn v-btn-primary-b ">处理记录</view>
 				</view>
 				<view class="status-bottom">
-					<evan-steps :active="Number(datas.status)" direction="horizontal">
-						<evan-step v-for="item in processState" :title="item.dictLabel"></evan-step>
+					<evan-steps :active="datas.status-1" direction="horizontal">
+						<evan-step class="step-items" v-for="item in processState" :title="item.dictLabel"></evan-step>
 					</evan-steps>
 				</view>
 			</view>
@@ -210,10 +210,13 @@
 			// 获取上报分类
 			getReportType() {
 				getDicts("alarm_status").then(res => {
-					if (res.code === 200) {
-						res.data.forEach(item => {
-							this.processState.push(item)
-						})
+					if(res.code === 200){
+						let arr = []
+						res.data.forEach(item =>{
+							arr.push(item)
+					 }) 
+						this.processState = arr
+						console.log(this.processState)
 					}
 				})
 			},
@@ -298,4 +301,8 @@
 	.big-btn {
 		margin: 20rpx;
 	}
+	
+	.step-items:first-child{
+		margin-left: 300rpx;
+	}
 </style>

subPackWork/myReport/myReport.vue

@@ -347,6 +347,7 @@
 		justify-content: flex-start;
 		font-size: 24rpx;
 		z-index: 996;
+		overflow-x: scroll;
 	}
 
 	.searchInput999 {

subPackWork/myReport/processingRecord.vue

@@ -3,27 +3,27 @@
 		<view class="g-body">
 			<view class="body-item" v-if="datas.receivingAlarm">
 				<uni-list :border="false" clss="list-box" v-for="(item,key) in datas.receivingAlarm">
-					<uni-list-item :title="key" :rightText="item"></uni-list-item>
+					<uni-list-item :title="key" :rightText="item==null||item==''?'无':item"></uni-list-item>
 				</uni-list>
 			</view>
 			<view class="body-item" v-if="datas.handingAlarm">
 				<uni-list :border="false" clss="list-box" v-for="(item,key) in datas.handingAlarm">
-					<uni-list-item :title="key" :rightText="item"></uni-list-item>
+					<uni-list-item :title="key" :rightText="item==null||item==''?'无':item"></uni-list-item>
 				</uni-list>
 			</view>
 			<view class="body-item" v-if="datas.closingAlarm">
 				<uni-list :border="false" clss="list-box" v-for="(item,key) in datas.closingAlarm">
-					<uni-list-item :title="key" :rightText="item"></uni-list-item>
+					<uni-list-item :title="key" :rightText="item==null||item==''?'无':item"></uni-list-item>
 				</uni-list>
 			</view>
 			<view class="body-item" v-if="datas.filingAlarm">
 				<uni-list :border="false" clss="list-box" v-for="(item,key) in datas.filingAlarm">
-					<uni-list-item :title="key" :rightText="item"></uni-list-item>
+					<uni-list-item :title="key" :rightText="item==null||item==''?'无':item"></uni-list-item>
 				</uni-list>
 			</view>
 			<view class="body-item" v-if="datas.invalidAlarm">
 				<uni-list :border="false" clss="list-box" v-for="(item,key) in datas.invalidAlarm">
-					<uni-list-item :title="key" :rightText="item"></uni-list-item>
+					<uni-list-item :title="key" :rightText="item==null||item==''?'无':item"></uni-list-item>
 				</uni-list>
 			</view>
 		</view>

subPackWork/myReport/reportDetail.vue

@@ -7,7 +7,7 @@
 					<button class="rignt-button" size="mini" @click="goList">处理记录</button>
 				</view>
 				<view class="status-bottom">
-					<evan-steps :active="Number(datas.status-1)" direction="horizontal">
+					<evan-steps :active="datas.status-1" direction="horizontal">
 						<evan-step class="step-items" v-for="item in processState" :title="item.dictLabel"></evan-step>
 <!-- 						<evan-step title="处警"></evan-step>
 						<evan-step title="结警"></evan-step>