拉取最新代码

components/repairsFilter.vue

@@ -0,0 +1,314 @@
+<template>
+  <view class="container" @touchmove.stop.prevent v-if="pageData.pageRouter === 'default'">
+    <view class="container_form">
+      <view class="category">
+        <text class="name">状态</text>
+        <text class="value">
+					<uni-data-picker @change="categoryChange" v-model="searchData.category" :localdata="pageData.categoryList" popup-title="请选择状态" :map="{text:'category',value:'id'}">
+						
+					</uni-data-picker>
+				</text>
+      </view>
+			<view class="category">
+				<label class="uni-list-cell uni-list-cell-pd">
+					<text class="name">待评价</text>
+					<checkbox value="1" color="#49b856" :checked="searchData.evaluate" />
+				</label>
+			</view>
+    </view>
+    <view class="container_foot">
+      <view class="clear" @click="clear">清除选项</view>
+      <view class="foot_btns">
+        <view class="cancel" @click="cancel">取消</view>
+        <view class="confirm" @click="confirm">确认</view>
+      </view>
+    </view>
+  </view>
+  <view class="mask" @touchmove.stop.prevent></view>
+  <view class="line" @touchmove.stop.prevent></view>
+  
+</template>
+
+<script setup>
+  import { defineEmits, ref, reactive, defineProps } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { useLoginUserStore } from '@/stores/loginUser'
+	import { repositoryListSearchStore } from '@/stores/repositorySearch'
+  import { api_area, api_incidentcategory } from "@/http/api.js"
+  import { transform } from '@/utils/index.js'
+		
+  const emit = defineEmits(['cancelEmit', 'confirmEmit']);
+  const loginUserStore = useLoginUserStore();
+	const repositorySearchStore = repositoryListSearchStore();
+  
+  // 页面数据
+  const pageData = reactive({
+    pageRouter: 'default',
+    areaList: [],
+    categoryList: [],
+  });
+	
+  const searchData = reactive({
+		evaluate:false,
+    hospital: {},
+    selected: 'todoingAll',
+    area: {id: 0, area: '全部'},
+    category: {},
+    acceptDate: [],
+		categoryChangeData:[]
+  })
+  
+  // 清空
+  function clear(){
+    searchData.category = {};
+    searchData.acceptDate = [];
+		searchData.evaluate = false;
+		searchData.categoryChangeData = [];
+		repositorySearchStore.clearRepositoryListSearchData()
+  }
+  
+  // 取消
+  function cancel(){
+    emit('cancelEmit')
+  }
+  
+  // 确认
+  function confirm(){
+		repositorySearchStore.setRepositoryListSearchData(searchData)
+    emit('confirmEmit', searchData);
+  }
+
+  function categoryChange(val){
+		searchData.categoryChangeData = val.detail.value
+	}
+	
+  // 获取故障现象列表
+  function getCategoryList(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      incidentcategory: {
+
+			},
+    }
+    if(loginUserStore.loginUser.user.duty){
+      postData.incidentcategory.duty = loginUserStore.loginUser.user.duty.id;
+    }else if(loginUserStore.loginUser.user.branch){
+      postData.incidentcategory.branch = loginUserStore.loginUser.user.branch.id;
+    }
+    
+    api_incidentcategory(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        let list = res.list || [];
+				list = list.map(i=> ({...i, parentid: i.parent?.id}))
+				pageData.categoryList = transform(list, 'id', 'parentid')
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+	
+  // 页面路由跳转
+  function clickPageRouter(type){
+    pageData.pageRouter = type;
+    switch(type){
+      case 'category':
+        getCategoryList('one');
+      break;
+    }
+  }
+	
+  onLoad((option) => {
+		getCategoryList()
+		let data = repositorySearchStore.repositorySearch.data
+    searchData.category = data && data.category;
+		searchData.title = data && data.title;
+		searchData.categoryChangeData = data && data.categoryChangeData
+		searchData.evaluate = data && data.evaluate
+  })
+</script>
+
+<style lang="scss" scoped>
+.uni-checkbox-input:hover{
+	border-color:#49b856;
+}
+.mask{
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+}
+.line{
+  content: '';
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9999;
+  height: 8rpx;
+  width: 100%;
+  background-color: #EBEBEB;
+}
+.container{
+  position: fixed;
+  left: 125rpx;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+  background-color: #F7F7F7;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  
+  .container_form{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-height: 0;
+		.item{
+			padding: 32rpx;
+		}
+  }
+  
+  .hospital{
+    display: flex;
+		align-items: center;
+    padding: 32rpx 24rpx 24rpx;
+    background-color: #fff;
+    .name{
+      font-size: 28rpx;
+      flex-shrink: 0;
+      margin-right: 24rpx;
+    }
+    .value{
+			width: 100%;
+      font-size: 22rpx;
+			.uni-input{
+				font-size: 26rpx;
+			}
+    }
+  }
+  
+  .areas{
+    flex: 1;
+    min-height: 0;
+    margin-top: 16rpx;
+    background-color: #fff;
+    .areas_item{
+      padding: 24rpx;
+      border-bottom: 1rpx solid #DEDEDE;
+    }
+  }
+  
+  .categorys{
+    flex: 1;
+    min-height: 0;
+    margin-top: 16rpx;
+    background-color: #fff;
+    .categorys_item{
+      padding: 24rpx;
+      border-bottom: 1rpx solid #DEDEDE;
+    }
+  }
+  
+  .tabs{
+    margin-top: 16rpx;
+    background-color: #FBFBFB;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    gap: 16rpx 0;
+    padding: 24rpx 16rpx;
+    .tab{
+      width: 180rpx;
+      height: 60rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background-color: #F7F7F7;
+      font-size: 28rpx;
+      position: relative;
+      .newicon-xuanzejiaobiao{
+        opacity: 0;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        font-size: 38rpx;
+        color: #53B9BB;
+      }
+      &.active{
+        background-color: rgba(149, 220, 231, 0.30);
+        .newicon-xuanzejiaobiao{
+          opacity: 1;
+        }
+      }
+    }
+  }
+  
+  .area,
+  .category,
+  .acceptDate{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 24rpx;
+    background-color: #fff;
+    margin-top: 24rpx;
+    .name{
+      font-size: 28rpx;
+      flex-shrink: 0;
+      margin-right: 24rpx;
+    }
+		.value{
+			flex:1;
+		}
+  }
+  
+  .container_foot{
+    .clear{
+      padding: 24rpx;
+      font-size: 28rpx;
+      background-color: #fff;
+      margin: 0 16rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .foot_btns{
+      margin-top: 24rpx;
+      display: flex;
+      border-top: 1rpx solid #BFBFBF;
+      .cancel{
+        flex: 1;
+        background-color: #fff;
+        font-size: 32rpx;
+        padding: 24rpx;
+        display: flex;
+        justify-content: center;
+      }
+      .confirm{
+        flex: 1;
+        font-size: 32rpx;
+        padding: 24rpx;
+        background-color: $uni-primary;
+        display: flex;
+        justify-content: center;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>

http/api.js

@@ -214,3 +214,18 @@ export function api_getSolution(data){
 export function api_loginEncrypt(data){
   return post("/auth/loginEncrypt", data);
 }
+
+/**
+ * 报修端-公告
+ */
+export function api_getNotice(data){
+  return post("/user/data/fetchDataList/notice", data);
+}
+
+/**
+ * 报修端-首页
+ */
+export function api_getCount(data){
+  return post("/repair/incident/count", data);
+}
+

http/http.js

@@ -1,4 +1,7 @@
 export const path = `${location.origin}/service`
+// #ifdef H5
+import wx from 'weixin-jsapi'
+// #endif
 // get方法
 export function get(url, data = {}) {
   url = path + url;
@@ -62,3 +65,59 @@ export function post(url, data = {}) {
     })
   });
 }
+
+// 扫一扫
+export function SM() {
+  // #ifndef H5
+  return new Promise((resolve, reject) => {
+    uni.scanCode({
+      onlyFromCamera: true,
+      success: function(res) {
+        let str = res.result.replace(/[\s\/]/g, '') || 'none';
+        str = str.replace(/CODABAR,/i, '');
+        str = str.replace(/CODE_128,/i, '');
+        resolve(str);
+      },
+      fail(err) {
+        reject(err);
+      }
+    });
+  });
+  // #endif
+  // #ifdef H5
+  return new Promise((resolve, reject) => {
+    let param = {
+      requestUrl: location.href.split('#')[0]
+    };
+    post("/wechat/getJsConfig", param).then(res => {
+      if (res) {
+        wx.config({
+          debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+          appId: res.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+          timestamp: res.timestamp, // 必填，生成签名的时间戳
+          nonceStr: res.nonceStr, // 必填，生成签名的随机串
+          signature: res.signature, // 必填，签名，见附录1
+          jsApiList: res.jsApiList // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+        });
+        wx.ready(function() {
+          wx.scanQRCode({
+            desc: "scanQRCode desc",
+            needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+            scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+            success: function(res) {
+              // 当needResult 为 1 时，扫码返回的结果
+              let str = res.resultStr.replace(/[\s\/]/g, '') || 'none';
+              str = str.replace(/CODABAR,/i, '');
+              str = str.replace(/CODE_128,/i, '');
+              resolve(str);
+            },
+            cancel(err){
+              reject(err);
+            }
+          });
+        });
+      }
+    })
+  });
+  // #endif
+}

interceptor/routeInterceptor.js

@@ -14,7 +14,7 @@ let repaireRouterList = [
         // 调用前拦截
         const url = e.url.split('?')[0];
         // 报修人不可以访问除了登录页,绑定工号页,报修入口页的其他页面
-        if (!repaireRouterList.includes(url) && loginUserStore.loginUser.user && loginUserStore.loginUser.user
+        if (!repaireRouterList.includes(url) && !url.includes("repair") && loginUserStore.loginUser.user && loginUserStore.loginUser.user
           .engineer !== 1) {
           uni.reLaunch({
             url: "/pages/repairEntrance/repairEntrance"

manifest.json

@@ -62,8 +62,8 @@
         "devServer" : {
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.3.111", //请求的目标域名
-										// "target" : "http://192.168.4.163", //宋程玉本地
+                    // "target" : "http://192.168.3.111", //请求的目标域名
+										"target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 },

node_modules/.package-lock.json

@@ -248,6 +248,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/recorder-core": {
+      "version": "1.3.24040900",
+      "resolved": "https://registry.npmmirror.com/recorder-core/-/recorder-core-1.3.24040900.tgz",
+      "integrity": "sha512-QVOXHqrQhQ5FMgXTKh4P7oc31Qex2Q5skgBT972+0wrtwHr76zMnrybo48/VyUhS75whRxMFJ5yQpv+wj333Bw=="
+    },
     "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.8.tgz",

package-lock.json

@@ -8,6 +8,7 @@
         "crypto-js": "^4.2.0",
         "date-fns": "^3.6.0",
         "lodash-es": "^4.17.21",
+        "recorder-core": "^1.3.24040900",
         "weixin-jsapi": "^1.1.0"
       },
       "devDependencies": {
@@ -292,6 +293,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/recorder-core": {
+      "version": "1.3.24040900",
+      "resolved": "https://registry.npmmirror.com/recorder-core/-/recorder-core-1.3.24040900.tgz",
+      "integrity": "sha512-QVOXHqrQhQ5FMgXTKh4P7oc31Qex2Q5skgBT972+0wrtwHr76zMnrybo48/VyUhS75whRxMFJ5yQpv+wj333Bw=="
+    },
     "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.8.tgz",

package.json

@@ -6,6 +6,7 @@
     "crypto-js": "^4.2.0",
     "date-fns": "^3.6.0",
     "lodash-es": "^4.17.21",
+    "recorder-core": "^1.3.24040900",
     "weixin-jsapi": "^1.1.0"
   },
   "devDependencies": {

pages.json

@@ -181,6 +181,38 @@
 	       "titleNView": false
 	     }
 	   }
+	 },
+	 {
+		 "path": "pages/repair/home",
+		 "style": {
+			 "h5": {
+				 "titleNView": false
+			 }
+		 }
+	 },
+	 {
+		 "path": "pages/repair/repairsList",
+		 "style": {
+			 "h5": {
+				 "titleNView": false
+			 }
+		 }
+	 },
+	 {
+		 "path": "pages/repair/rapidRep",
+		 "style": {
+			 "h5": {
+				 "titleNView": false
+			 }
+		 }
+	 },
+	 {
+		 "path": "pages/repair/rapidRepNext",
+		 "style": {
+			 "h5": {
+				 "titleNView": false
+			 }
+		 }
 	 }
   ],
   "globalStyle": {
@@ -193,16 +225,31 @@
     "selectedColor": "#49B856",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
-    "list": [{
+    "list": [
+			// {
+			//   "pagePath": "pages/repair/home",
+			//   "iconPath": "static/img/icon_index.png",
+			//   "selectedIconPath": "static/img/icon_index_active.png",
+			//   "text": "首页"
+			// },
+			{
       "pagePath": "pages/incidentList/incidentList",
       "iconPath": "static/img/icon_incidentList.png",
       "selectedIconPath": "static/img/icon_incidentList_active.png",
       "text": "故障"
-    }, {
+			}, 
+			{
+			"pagePath": "pages/repair/home",
+			"iconPath": "static/img/icon_repairList.png",
+			"selectedIconPath": "static/img/icon_repairList_active.png",
+			"text": "我的报修"
+			},
+			{
       "pagePath": "pages/my/my",
       "iconPath": "static/img/icon_my.png",
       "selectedIconPath": "static/img/icon_my_active.png",
       "text": "我的"
-    }]
+			},
+		]
   }
 }

pages/repair/home.vue

@@ -0,0 +1,271 @@
+<template>
+	<view class="home">
+		<view class="home_item" v-if="isDept.valueconfig==1" @click="repairsView(1)">
+		  <view class="title">科室报修</view>
+		  <view class="content">
+				<view>
+					<view class="con-title">处理中</view>
+					<view class="con-value">{{repairData.deptHandlerCount}}</view>
+				</view>
+				<view>
+					<view class="con-title">待评价</view>
+					<view class="con-value">{{repairData.deptCloseCount}}</view>
+				</view>
+				<view>
+					<view class="con-title">本月维修费用（元）</view>
+					<view class="con-value-gr">{{repairData.deptCurrentMonthPrice}}</view>
+				</view>
+		  </view>
+		</view>
+		<view class="home_item" @click="repairsView(0)">
+		  <view class="title">我的报修</view>
+		  <view class="content">
+				<view>
+					<view class="con-title">处理中</view>
+					<view class="con-value">{{repairData.userCloseCount}}</view>
+				</view>
+				<view>
+					<view class="con-title">待评价</view>
+					<view class="con-value">{{repairData.userHandlerCount}}</view>
+				</view>
+		  </view>
+		</view>
+		<view class="home_item">
+			<uni-notice-bar show-icon scrollable background-color="#ffffff" color="#000"
+			:text="noticeData" />
+		</view>
+		<view class="home_item home-disp">
+			<view class="bottom-left" @click="addRepairs">
+				<view class="bottom-left-box">
+					<text class="newicon newicon-kuaisubaoxiu icon"></text>
+					<view>快速报修</view>
+				</view>
+			</view>
+			<view class="bottom-right mar-t-20">
+				<view class="bottom-right-item" v-if="isRepair.valueconfig==1" @click="scanCodes">
+					<text class="newicon newicon-saoma icon"></text>
+					<view class="name1">扫资产报修</view>
+				</view>
+				<view class="bottom-right-item" @click="repository">
+					<text class="newicon newicon-zhishiku1 icon"></text>
+					<view class="name2">知识库</view>
+				</view>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { SM } from "@/http/http.js"
+	import { ref, reactive } from 'vue'
+	import { onLoad,onShow } from '@dcloudio/uni-app'
+	import { api_systemConfiguration, api_getNotice, api_getCount } from "@/http/api.js"
+	import { useSetTitle } from '@/share/useSetTitle.js'
+	import { repositoryListSearchStore } from '@/stores/repositorySearch'
+	useSetTitle();
+	
+	// 数据
+	const sysData = ref({})
+	const isDept = ref({})
+	const isRepair = ref({})
+	const noticeData = ref('')
+	const repairData = ref({})
+	const repositorySearchStore = repositoryListSearchStore();
+	
+	// 知识库
+	function repository(){
+		repositorySearchStore.clearRepositoryListSearchData()
+		uni.navigateTo({
+		  url: `/pages/repository/repository?type=view`
+		})
+	}
+	
+	// 报修列表
+	function repairsView(type){
+	  uni.navigateTo({
+	    url: '/pages/repair/repairsList?type='+type
+	  })
+	}
+	
+	// 获取公告
+	function getNotice(){
+		api_getNotice({
+			idx: 0,
+			sum: 3,
+			type:'wxRepair',
+			notice: {
+			  status: 1
+			}
+		}).then(res=>{
+			uni.hideLoading();
+			getHtml(res.list[0])
+		})
+	}
+	
+	// 获取报修数量
+	function getCount(){
+		api_getCount({}).then(res=>{
+			repairData.value = res.data
+			getNotice()
+		})
+	}
+	
+	// 快速报修
+	function addRepairs(){
+		uni.navigateTo({
+		  url: '/pages/repair/rapidRep'
+		})
+	}
+	
+	// 扫资产报修
+	function scanCodes(){
+		SM().then((res) => {
+		  uni.showLoading({
+		    title: "加载中",
+		    mask: true,
+		  });
+			uni.hideLoading();
+		})
+	}
+	
+	// 获取文本内容
+	function getHtml(data) {
+	  const tempDiv = document.createElement('div');
+	  tempDiv.innerHTML = data.content;
+		noticeData.value = tempDiv.textContent || tempDiv.innerText || '';
+	}
+	
+	onLoad((option) => {
+		
+	})
+	
+	onShow((option) => {
+		uni.showLoading({
+		  title: "加载中",
+		});
+	  api_systemConfiguration({
+			idx: 0,
+			sum: 9999,
+		}).then(res=>{
+			sysData.value = res.list
+			isDept.value = res.list.find(i=>i.keyconfig=='deptRepair')
+			isRepair.value = res.list.find(i=>i.keyconfig=='cmdbRepair')
+			uni.setStorageSync('sysData',JSON.stringify(res.list))
+			getCount()
+		})
+	})
+	
+
+</script>
+
+<style lang="scss" scoped>
+	.home{
+		height: 100vh;
+		padding: 20rpx;
+		background: #fff;
+		.home_item{
+			padding: 20rpx;
+			box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.16);
+			border-radius: 10rpx;
+			margin-bottom: 30rpx;
+			.title{
+			  font-size: 26rpx;
+			  color: $uni-primary;
+			  padding-left: 18rpx;
+			  position: relative;
+				margin-bottom: 20rpx;
+			  &:before{
+			    content: '';
+			    width: 8rpx;
+			    height: 25rpx;
+			    background-color: $uni-primary;
+			    position: absolute;
+			    left: 0;
+			    top: 50%;
+			    transform: translateY(-50%);
+			  }
+			}
+			.content{
+				display: flex;
+				align-items: center;
+				justify-content: space-around;
+				text-align: center;
+				.con-title{
+					color: #949494;
+					font-size: 24rpx;
+					margin-bottom: 15rpx;
+				}
+				.con-value{
+					color: #000;
+					font-size: 50rpx;
+				}
+				.con-value-gr{
+					color: #49B856;
+					font-size: 50rpx;
+				}
+			}
+			.uni-noticebar{
+				margin: 0 !important;
+				padding: 0 !important;
+			}
+		}
+		.home-disp{
+			display: flex;
+			justify-content: space-around;
+			.bottom-left{
+				height: 380rpx;
+				background: linear-gradient( 269deg, #54B99C 0%, #7AC481 100%);
+				border-radius: 10rpx;
+				flex: 1.5;
+				margin-right: 20rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #FFFFFF;
+				margin-top: 20rpx;
+				.bottom-left-box{
+					text-align: center;
+					.icon{
+						font-size: 100rpx;
+						position: relative;
+						top: -20rpx;
+					}
+				}
+			}
+			.mar-t-20{
+				margin-top: 20rpx;
+			}
+			.bottom-right{
+				flex: 2;
+				.bottom-right-item{
+					height: 175rpx;
+					background: #FFFFFF;
+					border-radius: 10rpx;
+					border: 2rpx solid #6FC073;
+					margin-bottom: 20rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					position: relative;
+					.icon{
+						font-size: 50rpx;
+						color: #6FC073;
+						position: absolute;
+						left: 60rpx;
+					}
+					.name1{
+						font-size: 32rpx;
+						position: absolute;
+						right: 50rpx;
+					}
+					.name2{
+						font-size: 32rpx;
+						position: absolute;
+						right: 80rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/repair/rapidRep.vue

@@ -0,0 +1,590 @@
+<template>
+	<view class="handler">
+		<view class="body view-body">
+			<view class="form_item column">
+				<view class="title"><text class="required newicon newicon-bitian"></text>故障描述：</view>
+				<uni-easyinput class="value" type="textarea" v-model="dataInfo.deferralRemark" placeholder="请输入故障描述" :class="{formRed: isSubmit && !dataInfo.deferralRemark.trim()}" />
+			</view>
+			<view class="candidate">
+				<view class="candidate-item" v-for="item in candidateData" :key="item" @click="itemCandidate(item)">{{item.name}}</view>
+			</view>
+			<view class="form_item" v-if="cmdbRepair.valueconfig==1">
+				<view class="title select">关联资产：</view>
+				<input class="item-input" focus placeholder="请扫描资产卡二维码" v-model="dataInfo.property"/>
+				<text class="newicon newicon-saoma icon" @click="scanCodes"></text>
+			</view>
+			<view class="form_item">
+				<view class="title">照片录像：</view>
+				<view class="value">
+					<uni-file-picker ref="handlerImgRef" v-model="dataInfo.handlerImgList"
+					 limit="4" @success="handlerImgSuccess" 
+					@fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete">
+					</uni-file-picker>
+					<view class="imgTips">(支持JPG/PNG格式图片，单张大小3M以内，录像支持30秒）</view>
+				</view>
+			</view>
+			<view class="form_item">
+				<view class="title">录音：</view>
+				<view class="chunk" v-if="!dataInfo.recBlob" @click="examineRecord" @mouseup="recStop">按住录音</view>
+				<view v-if="dataInfo.recBlob">
+					<!-- <audio src="dataInfo.recBlob" controls></audio> -->
+					<icon type="clear" size="26" @click="clearRec"/>
+				</view>
+			</view>
+		</view>
+		<view class="foot_common_btns">
+			<button @click="goBackOrToList" type="default" class="cancelButton btn">返回</button>
+			<button @click="submit" type="default" class="primaryButton btn">下一步</button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { SM } from "@/http/http.js"
+  import { ref, reactive, computed } from 'vue'
+  import NumberModal from '@/components/NumberModal.vue';
+  import { onLoad } from '@dcloudio/uni-app'
+  import { generateNumberArray } from '@/utils/index.js'
+  import { api_group, api_incidentDetail, api_getSolution, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useUploadFile } from '@/share/useUploadFile.js'
+  import { useGoBack } from '@/share/useGoBack.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useHandlerStore } from '@/stores/handler'
+  
+	import Recorder from 'recorder-core';
+	import 'recorder-core/src/engine/mp3';
+  import 'recorder-core/src/engine/mp3-engine';
+  import 'recorder-core/src/engine/wav';
+  import 'recorder-core/src/extensions/waveview';
+			
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const handlerStore = useHandlerStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { uploadFile }  = useUploadFile();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+	
+  // 数据
+  const dataInfo = reactive({
+    tabs: [
+      // {id: 5, name: '故障处理', value: 'doing', num: ''},
+      // {id: 6, name: '延期处理', value: 'overtime', num: ''},
+    ],
+    tabActiveValue: 0,//当前选择的tab
+    incidentId: undefined,//事件ID
+    incidentData: {},//事件对象
+    deferralRemark: '',//故障描述
+		property:'', //资产
+    handlerImgList: [],//处理图片列表
+		recBlob:'' //录音
+  })
+  
+	// 故障处理用是否提供备用机
+	const newProvideBackupMachine = ref(0)
+	
+	// 知识库id
+	const solutionId = ref(null)
+	
+  // 是否提交
+  const isSubmit = ref(false)
+  
+  // 处理图片
+  const handlerImgRef = ref(null)
+  
+  const candidateData = ref([
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+	])
+  
+	const cmdbRepair = ref(null)
+	
+	let rec = null;
+	let wave = null;
+	const recwave = ref(null);
+	
+  // 上一步或者返回列表
+  function goBackOrToList(){
+		uni.setStorageSync('repairData','')
+    goBack();
+  }
+	
+	function itemCandidate(item){
+		dataInfo.deferralRemark = item.name
+	}
+	
+	// 获取录音权限
+	function recOpen() {
+		rec = Recorder({
+		    type: 'wav', //录音格式，可以换成wav等其他格式
+		    sampleRate: 16000, //录音的采样率，越大细节越丰富越细腻
+		    bitRate: 16, //录音的比特率，越大音质越好
+		    onProcess: (buffers, powerLevel, bufferDuration, bufferSampleRate) => {
+					if (wave) {
+						wave.input(buffers[buffers.length - 1], powerLevel, bufferSampleRate);
+					}
+				},
+		  });
+		  if (!rec) {
+		    alert('当前浏览器不支持录音功能！');
+		    return;
+		  }
+		  //打开录音，获得权限
+		  rec.open(
+		    () => {
+		      console.log('录音已打开');
+					startRecord()
+		      if (recwave.value) {
+		        //创建音频可视化图形绘制对象
+		        wave = Recorder.WaveView({ elem: recwave.value });
+		      }
+		    },
+		    (msg, isUserNotAllow) => {
+		      //用户拒绝了录音权限，或者浏览器不支持录音
+		      console.log((isUserNotAllow ? 'UserNotAllow，' : '') + '无法录音:' + msg);
+		    },
+		  );
+
+		// uni.getSetting({
+		//   success(res) {
+		//     // 判断是否开启了录音权限
+		//     if (res.authSetting['scope.record']) {
+		// 			startRecord()
+		//     } else {
+		// 			uni.showToast({
+		// 				icon: 'none',
+		// 			  title: '录音权限未开启，无法录音',
+		// 			  mask: true,
+		// 			});
+		//     }
+		//   }
+		// })
+	}
+	
+	// 检查录音
+	function examineRecord() {
+		recOpen()
+	}
+	
+  function startRecord(){
+		if (!rec) {
+			console.error('未打开录音');
+			return;
+		}
+		rec.start();
+	}
+	
+	// 结束录音
+	function recStop() {
+	  if (!rec) {
+	    console.error('未打开录音');
+	    return;
+	  }
+	  rec.stop(
+	    (blob, duration) => {
+	      //blob就是我们要的录音文件对象，可以上传，或者本地播放
+	      dataInfo.recBlob = blob;
+	      //简单利用URL生成本地文件地址，此地址只能本地使用，比如赋值给audio.src进行播放，赋值给a.href然后a.click()进行下载（a需提供download="xxx.mp3"属性）
+	      const localUrl = (window.URL || window.webkitURL).createObjectURL(blob);
+	      console.log('录音成功', blob, localUrl, '时长:' + duration + 'ms');
+	      // upload(blob); //把blob文件上传到服务器
+	      rec.close(); //关闭录音，释放录音资源，当然可以不释放，后面可以连续调用start
+	      rec = null;
+	    },
+	    (err) => {
+	      console.error('结束录音出错：' + err);
+	      rec.close(); //关闭录音，释放录音资源，当然可以不释放，后面可以连续调用start
+	      rec = null;
+	    },
+	  );
+	}
+	
+	// 删除录音
+	function clearRec(){
+		dataInfo.recBlob = null
+	}
+	
+	// 扫码资产码
+	function scanCodes(){
+		SM().then((res) => {
+		  uni.showLoading({
+		    title: "加载中",
+		    mask: true,
+		  });
+			uni.hideLoading();
+		})
+	}
+	
+  // 上传处理图片成功
+  function handlerImgSuccess(e){
+    dataInfo.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+    console.log(dataInfo.handlerImgList);
+    let handlerOrder$ = handlerOrder();
+    let requestList = [handlerOrder$];
+    dataInfo.handlerImgList.forEach(v => {
+      let handlerOrderImg$ = handlerOrderImg(v);
+      requestList.push(handlerOrderImg$);
+    })
+    
+    Promise.all(requestList).then(resList => {
+      uni.hideLoading();
+      console.log(resList);
+      if(resList[0].state == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '处理成功',
+          mask: true,
+        });
+        setTimeout(() => {
+          uni.reLaunch({
+            url: '/pages/incidentList/incidentList',
+          })
+        }, 1500)
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: resList[0].msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 上传处理图片失败
+  function handlerImgFail(e){
+    dataInfo.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 选择上传图片
+  function handlerImgSelect(e){
+    dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 删除上传图片
+  function handlerImgDelete(e){
+    dataInfo.handlerImgList = dataInfo.handlerImgList.filter(v => e.tempFile.uuid != v.uuid);
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 获取事件详情
+  function getIncidentDetail(){
+		if(uni.getStorageSync('repairData')){
+			let data = JSON.parse(uni.getStorageSync('repairData'))
+			if(data){
+				dataInfo.deferralRemark = data.deferralRemark
+				dataInfo.property = data.property
+				dataInfo.handlerImgList = data.handlerImgList
+				dataInfo.recBlob = data.recBlob
+			}
+		}
+  }
+  
+  // 下一步
+  function submit(){
+		isSubmit.value = true;
+		if(dataInfo.deferralRemark==''){
+		  uni.showToast({
+		  	icon: 'none',
+		    title: '请选择输入故障描述'
+		  });
+		  return;
+		}
+		uni.setStorageSync('repairData',JSON.stringify(dataInfo))
+		uni.navigateTo({
+		  url: `/pages/repair/rapidRepNext`,
+		});
+  }
+  
+  // 处理提交事件
+  function handlerOrder(){
+		dataInfo.incidentData.returnBackupMachine = dataInfo.returnBackupMachine
+    let postData = {
+      incident: dataInfo.incidentData,
+			solutionId:solutionId.value
+    }
+    postData.incident.handleDescription = dataInfo.handleDescription;
+    postData.incident.handleCategory = {id: dataInfo.handleCategory};
+    postData.incident.closecode = {id: dataInfo.closecode};
+    postData.incident.category = dataInfo.category;
+    postData.incident.synergetic = dataInfo.synergetic;
+    
+    return api_incidentTask(dataInfo.tabActiveValue, postData);
+  }
+  
+  // 处理图片
+  function handlerOrderImg(imgObj){
+    return uploadFile(imgObj, 'incident', dataInfo.incidentId)
+  }
+	
+  onLoad((option) => {
+		// let storeData = handlerStore.handler.data
+		// if(storeData && storeData.type=='rep'){
+		// 	solutionId.value = storeData.solutionId
+		// 	dataInfo.isSummaryNext = storeData.isSummaryNext
+		// 	dataInfo.incidentId = storeData.incidentId;
+		// }else{
+		// 	dataInfo.incidentId = option.incidentId;
+		// 	dataInfo.isSummaryNext = option.isSummaryNext == 1;
+		// }
+		let data = JSON.parse(uni.getStorageSync('sysData'))
+		cmdbRepair.value = data.find(i=>i.keyconfig=='cmdbRepair')
+    getIncidentDetail();
+  })
+</script>
+
+<style lang="scss" scoped>
+.handler{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+	padding: 0 30rpx;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+  }
+  .body{
+    box-sizing: border-box;
+    flex: 1;
+    min-height: 0;
+    &.bg{
+      background-color: #F7F7F7;
+    }
+    .summaryItem{
+      &:first-of-type{
+        .summaryItem_head{
+          border-bottom: 1rpx solid #DDDDDD;
+        }
+      }
+      .summary_total{
+        padding: 20rpx 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .summaryItem_head{
+        padding: 24rpx;
+        font-size: 26rpx;
+        color: #3A3A3A;
+      }
+      .summaryItem_body{
+        font-size: 30rpx;
+        background-color: #fff;
+        .summaryItem_bodyItem{
+          padding: 24rpx;
+          border-bottom: 1rpx solid #DDDDDD;
+          .summaryItem_bodyItem_top{
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .value{
+              padding-left: 48rpx;
+              flex-shrink: 0;
+            }
+          }
+          .summaryItem_bodyItem_bottom{
+            margin-top: 24rpx;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .name{
+              text-align: right;
+              flex: 1;
+            }
+            .value{
+              width: 240rpx;
+              text-align: right;
+              padding-left: 48rpx;
+              flex-shrink: 0;
+            }
+          }
+        }
+      }
+      .summaryItem_foot{
+        font-size: 30rpx;
+        background-color: #fff;
+        &.total{
+          margin-top: 24rpx;
+        }
+        .summaryItem_foot_total{
+          padding: 24rpx 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        .summaryItem_foot_add{
+          border-top: 1rpx solid #DDDDDD;
+          padding: 24rpx 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          .newicon-icon-test{
+            font-size: 30rpx;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+    .form_item_column{
+      padding-top: 24rpx;
+      min-height: 86rpx;
+      .form_item{
+        padding-top: 0;
+        min-height: auto;
+      }
+    }
+		.candidate{
+			display: flex;
+			flex-wrap: wrap;
+			.candidate-item{
+				padding: 6rpx 15rpx;
+				font-size: 26rpx;
+				color: #949494;
+				background: #E9E9E9;
+				border-radius: 50rpx;
+				margin-right: 20rpx;
+				margin-top: 15rpx;
+			}
+		}
+    .form_item{
+      display: flex;
+      align-items: center;
+      padding-top: 24rpx;
+      min-height: 86rpx;
+			position: relative;
+			.chunk{
+				width: 100%;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				background: #F7F8FA;
+				box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.16);
+				border-radius: 10rpx;
+			}
+      &.column{
+        height: auto;
+        flex-direction: column;
+        align-items: flex-start;
+				.import-rep{
+					padding: 5rpx 10rpx;
+					border-radius: 50rpx;
+					background: #d1fcd5;
+					color: #49b856;
+					font-size: 24rpx;
+				}
+        .title{
+          margin-right: 0;
+        }
+				.title-width{
+					width: 100%;
+				}
+				.title-fl-sb{
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+				}
+        .value{
+          margin-top: 10rpx;
+          // padding-left: 20rpx;
+          box-sizing: border-box;
+        }
+        .tips{
+          padding: 24rpx;
+          text-align: center;
+          font-size: 22rpx;
+          color: #909399;
+          width: 100%;
+          box-sizing: border-box;
+        }
+      }
+      .title{
+        font-size: 26rpx;
+        display: flex;
+        align-items: center;
+        margin-right: 12rpx;
+        flex-shrink: 0;
+        &.select{
+          width: calc(5em + 20rpx);
+        }
+      }
+      .value{
+        width: 100%;
+        &.category{
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .categoryName{
+            font-size: 26rpx;
+            color: #555;
+            flex: 1;
+          }
+          .newicon-weibiaoti2010104{
+            color: $uni-primary;
+            margin-left: 24rpx;
+          }
+        }
+        .imgTips{
+          color: #909399;
+          font-size: 22rpx;
+					margin-top: 10rpx;
+        }
+      }
+			.item-input{
+				border: 1px solid #DBDBDB;
+				height: 70rpx;
+				line-height: 70rpx;
+				padding: 0 10rpx;
+				border-radius: 4rpx;
+				width: 100%;
+				font-size: 14px;
+			}
+			.icon{
+				position: absolute;
+				right: 20rpx;
+				color: #49b856;
+			}
+      .synergeticNames{
+        font-size: 26rpx;
+        margin-right: 24rpx;
+      }
+      .synergeticAdd{
+        flex-shrink: 0;
+      }
+    }
+  }
+}
+</style>

pages/repair/rapidRepNext.vue

@@ -0,0 +1,713 @@
+<template>
+  <view class="handler">
+    <view class="head">
+      <view class="tab" :class="{active: tab.value === dataInfo.tabActiveValue}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.value)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+    </view>
+		<view class="body view-body" :class="{ page_padding: !(dataInfo.tabActiveValue === 'doing' && isInSummaryOrder), bg: (dataInfo.tabActiveValue === 'doing' && isInSummaryOrder) }">
+      <!-- 科内报修 -->
+      <template v-if="dataInfo.tabActiveValue === 'doing'">
+        <view class="form_item">
+          <view class="title select"><text class="required newicon newicon-bitian"></text>报修科室：</view>
+        	<uni-data-picker class="value" placeholder="请选择报修科室"
+        		v-model="dataInfo.dept" :localdata="dataInfo.repairTypeList"
+        		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.dept}">
+        	</uni-data-picker>
+        </view>
+				<view class="candidate">
+					<view class="candidate-item" v-for="item in candidateData" :key="item" @click="itemCandidate(item)">{{item.name}}</view>
+				</view>
+				
+				<view class="form_item column">
+					<view class="title"><text class="required newicon newicon-bitian"></text>详细地址：</view>
+					<uni-easyinput class="value" type="textarea" v-model="dataInfo.addres" placeholder="请输入详细地址"  :class="{formRed: isSubmit && !dataInfo.addres }" />
+				</view>
+				<view class="candidate">
+					<view class="candidate-item" v-for="item in addresData" :key="item" @click="itemAddres(item)">{{item.name}}</view>
+				</view>
+				
+				<view class="form_item" :class="{formRed: isSubmit && !dataInfo.name}">
+					<view class="title select"><text class="required newicon newicon-bitian"></text>联系人：</view>
+					<input class="item-input" placeholder="请输入联系人" v-model="dataInfo.name" />
+				</view>
+				
+				<view class="form_item" :class="{formRed: isSubmit && !dataInfo.phone}">
+					<view class="title select"><text class="required newicon newicon-bitian"></text>联系电话：</view>
+					<input class="item-input" placeholder="请输入联系电话" v-model="dataInfo.phone"/>
+				</view>
+      </template>
+      
+      <!-- 公告报修 -->
+      <template v-if="dataInfo.tabActiveValue === 'overtime'">
+       <view class="form_item">
+         <view class="title select"><text class="required newicon newicon-bitian"></text>楼层楼栋：</view>
+       	<uni-data-picker class="value" placeholder="请选择楼层楼栋"
+       		v-model="dataInfo.building" :localdata="dataInfo.buildingTypeList"
+       		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.building}">
+       	</uni-data-picker>
+       </view>
+       
+       <view class="form_item column">
+       	<view class="title"><text class="required newicon newicon-bitian"></text>详细地址：</view>
+       	<uni-easyinput class="value" type="textarea" v-model="dataInfo.addres" placeholder="请输入详细地址" :class="{formRed: isSubmit && !dataInfo.addres}" />
+       </view>
+       
+       <view class="form_item" :class="{formRed: isSubmit && !dataInfo.name}">
+       	<view class="title select"><text class="required newicon newicon-bitian"></text>联系人：</view>
+       	<input class="item-input value" focus placeholder="请输入联系人" v-model="dataInfo.name"/>
+       </view>
+       
+       <view class="form_item" :class="{formRed: isSubmit && !dataInfo.phone}">
+       	<view class="title select"><text class="required newicon newicon-bitian"></text>联系电话：</view>
+       	<input class="item-input value" focus placeholder="请输入联系电话" v-model="dataInfo.phone"/>
+       </view>
+      </template>
+		</view>
+    <view class="foot_common_btns">
+      <button @click="goBackOrToList" type="default" class="primaryButton btn">上一步</button>
+      <button @click="submit" type="default" class="primaryButton btn">提交</button>
+    </view>
+    <NumberModal v-if="dataInfo.isNumber" @cancelEmit="cancelNumber" @confirmEmit="conformNumber" @removeEmit="removeNumber" :selectData="dataInfo.selectData" :selectType="dataInfo.selectType" :evtNumber="dataInfo.evtNumber" showRemove></NumberModal>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive, computed } from 'vue'
+  import NumberModal from '@/components/NumberModal.vue';
+  import { onLoad } from '@dcloudio/uni-app'
+  import { generateNumberArray } from '@/utils/index.js'
+  import { api_group, api_incidentDetail, api_getSolution, api_area, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_department, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useUploadFile } from '@/share/useUploadFile.js'
+  import { useGoBack } from '@/share/useGoBack.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useHandlerStore } from '@/stores/handler'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const handlerStore = useHandlerStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { uploadFile }  = useUploadFile();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+	// 备用机选项
+	const machineData = ref([
+		{
+			text:'是',
+			value:1
+		},
+		{
+			text:'否',
+			value:0
+		},
+	])
+	
+	const candidateData = ref([
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+		{name:'马桶肃杀'},
+	])
+	
+	const addresData = ref([
+		{name:'护士站'},
+		{name:'卫生间'},
+		{name:'更衣室'},
+		{name:'治疗室'}
+	])
+	
+  // 数据
+  const dataInfo = reactive({
+    tabs: [
+      {id: 5, name: '科内报修', value: 'doing', num: ''},
+      {id: 6, name: '公共报修', value: 'overtime', num: ''},
+    ],
+    tabActiveValue: 'doing',//当前选择的tab
+    incidentId: undefined,//事件ID
+    incidentData: {},//事件对象
+		repairTypeList:[],//科室数据
+		buildingTypeList:[],//楼栋数据
+    dept:'',//报修科室
+		addres:'',//详细地址
+		name:'',//联系人
+		phone:'',//手机
+		building:''//楼栋
+  })
+  
+	// 故障处理用是否提供备用机
+	const newProvideBackupMachine = ref(0)
+	
+	// 知识库id
+	const solutionId = ref(null)
+	
+  // 是否提交
+  const isSubmit = ref(false)
+  
+  // 处理图片
+  const handlerImgRef = ref(null)
+  
+  // 是否进入汇总单
+  const isInSummaryOrder = computed(() => {
+    return dataInfo.tabActiveValue === 'doing' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
+  })
+  
+  // 上一步或者返回列表
+  function goBackOrToList(){
+		uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
+    goBack();
+  }
+  
+  // 重置
+  function reset(){
+		dataInfo.dept = '',//报修科室
+		dataInfo.addres = '',//详细地址
+		dataInfo.name = '',//联系人
+		dataInfo.phone = ''//手机
+		dataInfo.building = ''//楼栋
+  }
+  
+  // 初始化表单
+  function initForm(){
+    if(dataInfo.tabActiveValue === 'doing'){
+      getRepairTypes()
+    }else if(dataInfo.tabActiveValue === 'overtime'){
+			getbuildingList()
+    }
+  }
+  
+	function itemCandidate(item){
+		dataInfo.dept = item.id
+	}
+	
+	function itemAddres(item){
+		dataInfo.addres = item.name
+	}
+	
+  // 点击tab
+  function clickTab(tabValue){
+    if(dataInfo.tabActiveValue == tabValue){
+      return;
+    }
+    dataInfo.tabActiveValue = tabValue;
+    isSubmit.value = false;
+    reset();
+    dataInfo.category = dataInfo.incidentData.category || {};
+    dataInfo.synergetic = dataInfo.incidentData.synergetic || [];
+		newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine
+    initForm();
+  }
+  
+  // 获取事件详情
+  function getIncidentDetail(){
+    if(uni.getStorageSync('rapidRepNext')){
+    	let data = JSON.parse(uni.getStorageSync('rapidRepNext'))
+    	if(data){
+    		dataInfo.dept = data.dept//报修科室
+    		dataInfo.addres = data.addres//详细地址
+    		dataInfo.name = data.name//联系人
+    		dataInfo.phone = data.phone//手机
+    		dataInfo.building = data.building//楼栋
+    	}
+    }
+  }
+  
+  // 获取报修科室列表
+  function getRepairTypes(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+			department: {
+			  branch: dataInfo.incidentData.branch,
+			},
+			idx:0,
+			sum:9999
+		}
+		if(loginUserStore.loginUser.user.duty){
+		  postData.department.branch = loginUserStore.loginUser.user.duty.id;
+		}else if(loginUserStore.loginUser.user.branch){
+		  postData.department.branch = loginUserStore.loginUser.user.branch.id;
+		}
+    api_department(postData).then(res => {
+      uni.hideLoading();
+      res = res.list || [];
+      dataInfo.repairTypeList = res.map(v => ({
+        text: v.dept,
+        value: v.id,
+      }));
+    })
+  }
+  
+  // 获取楼栋
+  function getbuildingList(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      area: {
+        branch: '',
+      }
+    };
+		if(loginUserStore.loginUser.user.duty){
+		  postData.area.branch = loginUserStore.loginUser.user.duty.id;
+		}else if(loginUserStore.loginUser.user.branch){
+		  postData.area.branch = loginUserStore.loginUser.user.branch.id;
+		}
+    api_area(postData).then(res => {
+      uni.hideLoading();
+      res = res.list || [];
+      dataInfo.buildingTypeList = res.map(v => ({
+        text: v.area,
+        value: v.id
+      }));
+    })
+  }
+  
+  // 提交
+  function submit(){
+		isSubmit.value = true;
+    submitHandler()
+  }
+  
+  // 处理提交事件
+  function handlerOrder(){
+		dataInfo.incidentData.returnBackupMachine = dataInfo.returnBackupMachine
+    let postData = {
+      incident: dataInfo.incidentData,
+			solutionId:solutionId.value
+    }
+    postData.incident.handleDescription = dataInfo.handleDescription;
+    postData.incident.handleCategory = {id: dataInfo.handleCategory};
+    postData.incident.closecode = {id: dataInfo.closecode};
+    postData.incident.category = dataInfo.category;
+    postData.incident.synergetic = dataInfo.synergetic;
+    
+    return api_incidentTask(dataInfo.tabActiveValue, postData);
+  }
+  
+  // 处理图片
+  function handlerOrderImg(imgObj){
+    return uploadFile(imgObj, 'incident', dataInfo.incidentId)
+  }
+  
+  // 处理提交
+  function submitHandler(){
+    console.log(dataInfo);
+		if(dataInfo.tabActiveValue=='doing'){
+			if(dataInfo.dept==''){
+			  uni.showToast({
+			  	icon: 'none',
+			    title: '请选择报修科室'
+			  });
+			  return;
+			}
+		}else{
+			if(dataInfo.building==''){
+			  uni.showToast({
+			  	icon: 'none',
+			    title: '请选择楼层楼栋'
+			  });
+			  return;
+			}
+		}
+
+    if(dataInfo.addres==''){
+      uni.showToast({
+      	icon: 'none',
+        title: '请输入详细地址'
+      });
+      return;
+    }
+    
+    if(dataInfo.name==''){
+      uni.showToast({
+      	icon: 'none',
+        title: '请输入联系人'
+      });
+      return;
+    }
+    
+    if(dataInfo.phone==''){
+      uni.showToast({
+      	icon: 'none',
+        title: '请输入联系电话'
+      });
+      return;
+    }
+    console.log(dataInfo.handlerImgList)
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+		// 没有图片
+		let handlerOrder$ = handlerOrder();
+		let requestList = [handlerOrder$];
+		Promise.all(requestList).then(resList => {
+			uni.hideLoading();
+			console.log(resList);
+			if(resList[0].state == 200){
+				uni.showToast({
+					icon: 'none',
+					title: '处理成功',
+					mask: true,
+				});
+				setTimeout(() => {
+					uni.reLaunch({
+						url: '/pages/incidentList/incidentList',
+					})
+				}, 1500)
+			}else{
+				uni.showToast({
+					icon: 'none',
+					title: resList[0].msg || '请求数据失败！'
+				});
+			}
+		})
+    uni.setStorageSync('rapidRepNext','')
+  }
+  
+  // 延期处理提交
+  function submitOvertime(){
+    if(!dataInfo.repairTypeId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择延期原因'
+      });
+      return;
+    }
+    
+    if(!dataInfo.deferralRemark.trim()){
+      uni.showToast({
+      	icon: 'none',
+        title: '请填写延期说明'
+      });
+      return;
+    }
+    
+    if(!dataInfo.deferralDayId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择延期天数'
+      });
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    dataInfo.incidentData.provideBackupMachine = dataInfo.provideBackupMachine
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    postData.incident.currentLog = {
+      remark: dataInfo.deferralRemark,
+      extra1: dataInfo.repairTypeId,
+      extra2: dataInfo.deferralDayId,
+    }
+    
+    api_incidentTask(dataInfo.tabActiveValue, postData).then(res => {
+      uni.hideLoading();
+      if(res.state == 200){
+        uni.showToast({
+        	icon: 'none',
+          title: '延期处理成功',
+          mask: true,
+        });
+        setTimeout(() => {
+          uni.reLaunch({
+            url: '/pages/incidentList/incidentList',
+          })
+        }, 1500)
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+	// 获取知识库数量
+	function getIntroduceCount(categoryId){
+	  uni.showLoading({
+	    title: "加载中",
+	    mask: true,
+	  });
+	  let postData = {
+	    idx: 0,
+	    sum: 9999,
+	    solution: {
+				category:{
+					id:categoryId,
+				},
+				status:{id:72},
+	    }
+	  }
+	  
+	  api_getSolution(postData).then(res => {
+	    uni.hideLoading();
+	    if(res.status == 200){
+				dataInfo.introduceCount = res.totalNum
+	    }else{
+	      uni.showToast({
+	        icon: 'none',
+	        title: res.msg || '请求数据失败！'
+	      });
+	    }
+	  })
+	}
+	
+	// 获取文本内容
+	function getHtml(html) {
+	  const tempDiv = document.createElement('div');
+	  tempDiv.innerHTML = html;
+	  return tempDiv.textContent || tempDiv.innerText || '';
+	}
+	
+  onLoad((option) => {
+		initForm()
+    getIncidentDetail();
+  })
+</script>
+
+<style lang="scss" scoped>
+.handler{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+  }
+  .body{
+    margin-top: 88rpx;
+    box-sizing: border-box;
+    flex: 1;
+    min-height: 0;
+    &.bg{
+      background-color: #F7F7F7;
+    }
+    .summaryItem{
+      &:first-of-type{
+        .summaryItem_head{
+          border-bottom: 1rpx solid #DDDDDD;
+        }
+      }
+      .summary_total{
+        padding: 20rpx 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+      .summaryItem_head{
+        padding: 24rpx;
+        font-size: 26rpx;
+        color: #3A3A3A;
+      }
+      .summaryItem_body{
+        font-size: 30rpx;
+        background-color: #fff;
+        .summaryItem_bodyItem{
+          padding: 24rpx;
+          border-bottom: 1rpx solid #DDDDDD;
+          .summaryItem_bodyItem_top{
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .value{
+              padding-left: 48rpx;
+              flex-shrink: 0;
+            }
+          }
+          .summaryItem_bodyItem_bottom{
+            margin-top: 24rpx;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .name{
+              text-align: right;
+              flex: 1;
+            }
+            .value{
+              width: 240rpx;
+              text-align: right;
+              padding-left: 48rpx;
+              flex-shrink: 0;
+            }
+          }
+        }
+      }
+      .summaryItem_foot{
+        font-size: 30rpx;
+        background-color: #fff;
+        &.total{
+          margin-top: 24rpx;
+        }
+        .summaryItem_foot_total{
+          padding: 24rpx 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        .summaryItem_foot_add{
+          border-top: 1rpx solid #DDDDDD;
+          padding: 24rpx 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          .newicon-icon-test{
+            font-size: 30rpx;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+    .form_item_column{
+      padding-top: 24rpx;
+      min-height: 86rpx;
+      .form_item{
+        padding-top: 0;
+        min-height: auto;
+      }
+    }
+		.candidate{
+			display: flex;
+			flex-wrap: wrap;
+			.candidate-item{
+				padding: 6rpx 15rpx;
+				font-size: 26rpx;
+				color: #949494;
+				background: #E9E9E9;
+				border-radius: 50rpx;
+				margin-right: 20rpx;
+				margin-top: 15rpx;
+			}
+		}
+    .form_item{
+      display: flex;
+      align-items: center;
+      padding-top: 24rpx;
+      min-height: 86rpx;
+      &.column{
+        height: auto;
+        flex-direction: column;
+        align-items: flex-start;
+				.import-rep{
+					padding: 5rpx 10rpx;
+					border-radius: 50rpx;
+					background: #d1fcd5;
+					color: #49b856;
+					font-size: 24rpx;
+				}
+        .title{
+          margin-right: 0;
+        }
+				.title-width{
+					width: 100%;
+				}
+				.title-fl-sb{
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+				}
+        .value{
+          margin-top: 10rpx;
+          padding-left: 20rpx;
+          box-sizing: border-box;
+        }
+        .tips{
+          padding: 24rpx;
+          text-align: center;
+          font-size: 22rpx;
+          color: #909399;
+          width: 100%;
+          box-sizing: border-box;
+        }
+      }
+      .title{
+        font-size: 26rpx;
+        display: flex;
+        align-items: center;
+        margin-right: 12rpx;
+        flex-shrink: 0;
+        &.select{
+          width: calc(5em + 20rpx);
+        }
+      }
+      .value{
+        width: 100%;
+        &.category{
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .categoryName{
+            font-size: 26rpx;
+            color: #555;
+            flex: 1;
+          }
+          .newicon-weibiaoti2010104{
+            color: $uni-primary;
+            margin-left: 24rpx;
+          }
+        }
+        .imgTips{
+          color: #909399;
+          font-size: 22rpx;
+        }
+      }
+			.item-input{
+				border: 1px solid #DBDBDB;
+				height: 70rpx;
+				line-height: 70rpx;
+				padding: 0 10rpx;
+				border-radius: 4rpx;
+				width: 100%;
+				font-size: 14px;
+			}
+      .synergeticNames{
+        font-size: 26rpx;
+        margin-right: 24rpx;
+      }
+      .synergeticAdd{
+        flex-shrink: 0;
+      }
+    }
+  }
+}
+</style>

pages/repair/repairsList.vue

@@ -0,0 +1,516 @@
+<template>
+  <view class="incidentList">
+    <view class="head">
+      <view class="tab" :class="{active: tab.id === dataInfo.tabActiveId}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.id)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+      <view class="filter" @click="filterClick">
+        <text class="newicon newicon-shaixuan"></text>
+      </view>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id" @click="toIncidentDetail(data)">
+        <view class="body_item_head ellipsis-multiline">
+          {{data.description}}
+        </view>
+
+        <view class="body_item_content">
+					<view class="body_item_content_p" v-if="data.place || data.houseNumber">
+					  <text class="name ellipsis">详细地址：{{data.place ? data.place.area.area : ''}}{{data.place ? data.place.place : ''}}{{data.houseNumber}}</text>
+					</view>
+          <view class="body_item_content_p" v-if="data.department">
+            <text class="name ellipsis">维修总价：{{data.department.dept}}</text>
+            <view class="status" :style="stateStyle(data.state)">{{data.state ? data.state.name : ''}}</view>
+          </view>
+          <view class="body_item_content_p">
+						 <view class="name ellipsis" @click.stop="makePhoneCall(data.contactsInformation)">维修人员电话：{{data.contactsInformation || '暂无'}}<uni-icons v-if="data.contactsInformation" type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons></view>
+          </view>
+					<view class="body_item_content_p" v-if="data.department">
+					  <text class="name ellipsis">维修说明：{{data.department.dept}}</text>
+					</view>
+        </view>
+
+        <view class="body_item_foot">
+          <view class="foot_info">
+            <view class="name">维修人员：{{data.assigneeName || '暂无'}}</view>
+            <text class="date">{{formatDate(data.acceptDate, 'yyyy-MM-dd HH:mm')}}</text>
+          </view>
+          <view class="btns">
+            <button @click.stop="handler('changeUser', data.id)" type="default" class="primaryButton btn">评价</button>
+            <!-- <button @click.stop="handler('handler', data.id)" type="default" class="primaryButton btn" v-if="data.state.value === 'handler' && data.handlingPersonnelUser && data.handlingPersonnelUser.id == loginUserStore.loginUser.user.id">处理</button> -->
+            <!-- <button @click.stop="receive(data)" type="default" class="primaryButton btn" v-if="computedReceive(data)">接单</button> -->
+          </view>
+        </view>
+				<div class="sign-style" v-if="deptRepair && publicRepair">科</div>
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <repairsFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></repairsFilter>
+    <IncidentAttachment v-if="dataInfo.isAttachment" @knowEmit="knowAttachment" :incidentData="dataInfo.incidentData"></IncidentAttachment>
+  </view>
+</template>
+
+<script setup>
+  import repairsFilter from '@/components/repairsFilter.vue';
+  import IncidentAttachment from '@/components/IncidentAttachment.vue';
+  import { startOfDay, endOfDay, format, add } from 'date-fns'
+  import { ref, reactive, computed } from 'vue'
+  import { onLoad, onShow, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
+  import { api_getDictionary, api_incident, api_incident_count, api_incidentTask } from "@/http/api.js"
+  import { filterFormatDate } from '@/filters/filterFormatDate.js'
+  import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
+  import { computedStateStyle } from '@/filters/computedStateStyle.js'
+  import { computedCurrentLogOverTime } from '@/filters/computedCurrentLogOverTime.js'
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentNumStore } from '@/stores/incidentNum'
+  import { useIncidentListSearchStore } from '@/stores/incidentListSearch'
+
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const incidentListSearchStore = useIncidentListSearchStore();
+  const { formatDate }  = filterFormatDate();
+  const { priorityStyle }  = computedPriorityStyle();
+  const { stateStyle }  = computedStateStyle();
+  const { currentLogOverTime }  = computedCurrentLogOverTime();
+  const { makePhoneCall }  = useMakePhoneCall();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+
+  const assignFlag = ref(false);//指派权限
+  const qiangdan = ref(false);//接单权限
+	const deptRepair = ref({});//科内报修
+	const publicRepair = ref({});//公共报修
+	
+  // 判断是否显示接单按钮
+  const computedReceive = computed(() => (data) => {
+    let inUser = data.currentLog && data.currentLog.workerId == loginUserStore.loginUser.user.id;
+    let inGroup = false;
+    loginUserStore.loginUser.user.group.forEach(item => {
+        if(data.currentLog){
+            if (item.id == data.currentLog.groupId) {
+                inGroup = true;
+            }
+        }
+    })
+    return data.state.value === 'pending' && (inUser || inGroup) && qiangdan.value;
+  })
+
+  // 转换协同人
+  const computedSynergetic = computed(() => (synergetic) => {
+    return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join('，') : ''
+  })
+
+  // 数据
+  const dataInfo = reactive({
+    tabs: [{id: 0, name: '我的报修', value: 'all', num: ''},],
+    tabActiveId: 0,//当前选择的tab
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    isFilter: false,//筛选框开关
+    isAttachment: false,//图片和录音开关
+    incidentId: undefined,
+    evtFilter: {
+      hospital: {},
+      selected: 'todoingAll',
+      area: {id: 0, area: '全部'},
+      category: {id: 0, category: '全部'},
+      acceptDate: [],
+    },//筛选框数据
+  })
+
+  // 工单详情
+  function toIncidentDetail(data){
+    uni.navigateTo({
+      url: `/pages/incidentDetail/incidentDetail?incidentId=${data.id}`
+    })
+  }
+
+  // 获取tab选项
+  function getTabs(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+		let data = JSON.parse(uni.getStorageSync('sysData'))
+		deptRepair.value = data.find(i=>i.keyconfig=='deptRepair')
+		publicRepair.value = data.find(i=>i.keyconfig=='publicRepair')
+		if(deptRepair.value){
+			 dataInfo.tabs = [
+				 {id: 0, name: '我的报修', value: 'all', num: ''},
+				 {id: 1, name: '科内报修', value: '2', num: ''}
+			 ]
+		}else{
+			dataInfo.tabs = [
+				{id: 0, name: '我的报修', value: 'all', num: ''},
+			]
+		}
+		getList(0);
+  }
+
+  // 点击tab
+  function clickTab(tabId){
+		console.log(tabId)
+    dataInfo.tabActiveId = tabId;
+    getList(0);
+  }
+
+  // 点击筛选
+  function filterClick(){
+    dataInfo.isFilter = true;
+  }
+
+  // 确认筛选
+  function conformFilter(evtFilter){
+    dataInfo.evtFilter = evtFilter;
+    dataInfo.isFilter = false;
+    getList(0);
+  }
+
+  // 关闭筛选
+  function cancelFilter(){
+    dataInfo.isFilter = false;
+  }
+
+  // 点击图片和录音
+  function attachmentClick(incidentData){
+    dataInfo.incidentData = incidentData;
+    dataInfo.isAttachment = true;
+  }
+
+  // 知道了图片和录音
+  function knowAttachment(){
+    dataInfo.isAttachment = false;
+  }
+
+  // 处理按钮
+  function handler(type, incidentId){
+    uni.navigateTo({
+      url: `/pages/${type}/${type}?incidentId=${incidentId}`
+    })
+  }
+
+  // 接单调用方案
+  function receiveFn(incidentData){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+
+    let postData = {
+      incident: incidentData,
+    }
+
+    api_incidentTask('receive', postData).then(res => {
+      uni.hideLoading();
+      if(res.state == 200){
+        getList(0);
+        uni.showToast({
+        	icon: 'none',
+          title: '接单成功',
+        });
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  // 接单按钮
+  function receive(incidentData){
+    uni.showModal({
+      title: '提示',
+      content: `您确认要接单吗？`,
+      confirmColor: defaultColor,
+      confirmText: '确认',
+      success: function(res) {
+        if (res.confirm) {
+          receiveFn(incidentData);
+        }
+      }
+    });
+  }
+
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+    let postData = {
+        "idx": dataInfo.idx,
+        "sum": 10,
+        "incident": {
+            "queryTask": dataInfo.evtFilter.selected || undefined,
+            "assignee": loginUserStore.loginUser.user.id,
+            "statusId": dataInfo.tabActiveId || undefined,
+        }
+    }
+
+    // 请求参数调整
+    if(!postData.incident){
+        postData.incident = {};
+    }
+
+    if(postData.incident.queryTask === 'all' || postData.incident.queryTask === 'callback'){
+      if(loginUserStore.loginUser.user.duty){
+        // 当前的所属责任科室
+        postData.incident.duty = loginUserStore.loginUser.user.duty;
+      }else if(loginUserStore.loginUser.user.branch){
+        // 当前的所属院区
+        postData.incident.branch = loginUserStore.loginUser.user.branch.id;
+      }
+    }else{
+      delete postData.incident.duty;
+      delete postData.incident.branch;
+    }
+
+    if(postData.incident.queryTask === 'todo' || postData.incident.queryTask === 'owns' || postData.incident.queryTask === 'todoingAll'){
+        postData.incident.candidateGroups = loginUserStore.loginUser.user.group.map(v => v.id).toString();
+    }else{
+        delete postData.incident.candidateGroups;
+    }
+
+    if(dataInfo.evtFilter && dataInfo.evtFilter.category && dataInfo.evtFilter.category.id){
+      postData.incident.levelCategory = { id: dataInfo.evtFilter.category.id };
+    }
+
+    if(dataInfo.evtFilter && Array.isArray(dataInfo.evtFilter.acceptDate) && dataInfo.evtFilter.acceptDate.length){
+      postData.incident.acceptDate = format(startOfDay(new Date(dataInfo.evtFilter.acceptDate[0])), 'yyyy-MM-dd HH:mm:ss');
+      postData.incident.acceptDateEnd = format(endOfDay(dataInfo.evtFilter.acceptDate[1]), 'yyyy-MM-dd HH:mm:ss');
+    }
+
+    if(dataInfo.evtFilter && dataInfo.evtFilter.area && dataInfo.evtFilter.area.id){
+      postData.incident.area = dataInfo.evtFilter.area
+    }
+
+    // incidentListSearchStore.setIncidentListSearchData(dataInfo);
+    api_incident(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+
+    getCount(postData.incident);
+  }
+
+  // 获取列表数量
+  function getCount(incident = {}){
+    let postData = {
+      wxCount: 'true',
+      incidentList: [],
+    }
+    dataInfo.tabs.forEach(v => {
+        postData.incidentList.push({...incident, ...{statusId: v.id || undefined}});
+    })
+
+    api_incident_count(postData).then(res => {
+      if(res.state == 200){
+        let myData = res.data || [];
+        dataInfo.tabs.forEach((v, i) => {
+            v.num = myData[i];
+        })
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+
+  // 初始化
+  function onLoadFn(){
+    // 我的-数量跳转
+    // if(incidentNumStore.incidentNum.data){
+    //   dataInfo.evtFilter.selected = incidentNumStore.incidentNum.data.queryTask;
+    //   dataInfo.tabActiveId = incidentNumStore.incidentNum.data.statusId;
+    //   incidentNumStore.clearIncidentNumData();
+    // }else if(incidentListSearchStore.incidentListSearch.data){
+    //   // 缓存的搜索条件
+    //   Object.assign(dataInfo, incidentListSearchStore.incidentListSearch.data);
+    // }
+
+    // for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
+    //   if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_assign") {
+    //     assignFlag.value = true;
+    //   }
+    //   if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_qiangdan") {
+    //     qiangdan.value = true
+    //   }
+    // }
+    getTabs();
+  }
+
+  onLoad((option) => {
+		dataInfo.tabActiveId = Number(option.type)
+		console.log(222,Number(option.type))
+    onLoadFn();
+  })
+	
+	onShow((option) =>{
+		
+	})
+	
+  onTabItemTap(e => {
+    // onLoadFn();
+  })
+
+  onPullDownRefresh(() => {
+    // getList(0)
+  })
+
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+page{
+  height: calc(100vh - var(--window-bottom));
+}
+.incidentList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+    .filter{
+      width: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .newicon-shaixuan{
+        font-size: 36rpx;
+        color: #2C2C2C;
+      }
+    }
+  }
+  .body{
+    margin-bottom: var(--window-bottom);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    .body_item{
+      border-bottom: 8rpx solid #EBEBEB;
+			position: relative;
+			.sign-style{
+				position: absolute;
+				right: 0;
+				top: 0;
+			}
+      .body_item_head{
+        word-break: break-all;
+        text-align: justify;
+        text-align: left;
+        margin: 24rpx;
+        font-size: 30rpx;
+      }
+      .body_item_content{
+        border-top: 1rpx solid #D8D8D8;
+        padding: 24rpx 24rpx 24rpx 48rpx;
+        .body_item_content_p{
+          color: #6A6A6A;
+          font-size: 26rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 24rpx;
+          &:last-of-type{
+            margin-bottom: 0;
+          }
+          .name{
+            flex: 1;
+          }
+          .status{
+            padding: 4rpx 10rpx;
+            border-radius: 20rpx;
+            background-color: #DBE8FE;
+            font-size: 22rpx;
+            color: #006CF9;
+          }
+          .icon_all{
+            .mic-filled,
+            .image-filled
+            {
+              margin-left: 16rpx;
+            }
+          }
+        }
+      }
+      .body_item_foot{
+        border-top: 1rpx solid #D8D8D8;
+        font-size: 26rpx;
+        padding: 24rpx;
+        .foot_info{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .phone-filled{
+            margin-left: 5rpx;
+          }
+        }
+      }
+    }
+  }
+  .zanwu{
+    box-sizing: border-box;
+    margin-bottom: var(--window-bottom);
+    margin-top: 88rpx;
+    border-top: 6rpx solid #EBEBEB;
+    height: calc(100vh - var(--window-bottom) - 88rpx);
+    display: flex;
+    justify-content: center;
+    background-color: #F7F7F7;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+}
+</style>

pages/repairEntrance/repairEntrance.vue

@@ -19,7 +19,9 @@
    * 进入报修
    */
   function goToRepair() {
-    location.href = location.origin + '/req';
+		uni.reLaunch({
+		  url: '/pages/repair/home'
+		})
   }
 </script>
 

static/font/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe661;</span>
+                <div class="name">扫一扫</div>
+                <div class="code-name">&amp;#xe661;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe63d;</span>
+                <div class="name">知识库</div>
+                <div class="code-name">&amp;#xe63d;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe634;</span>
                 <div class="name">返回</div>
                 <div class="code-name">&amp;#xe634;</div>
@@ -228,9 +240,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1718344479829') format('woff2'),
-       url('iconfont.woff?t=1718344479829') format('woff'),
-       url('iconfont.ttf?t=1718344479829') format('truetype');
+  src: url('iconfont.woff2?t=1721722303907') format('woff2'),
+       url('iconfont.woff?t=1721722303907') format('woff'),
+       url('iconfont.ttf?t=1721722303907') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -257,6 +269,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-saoma"></span>
+            <div class="name">
+              扫一扫
+            </div>
+            <div class="code-name">.newicon-saoma
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-zhishiku1"></span>
+            <div class="name">
+              知识库
+            </div>
+            <div class="code-name">.newicon-zhishiku1
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-fanhui1"></span>
             <div class="name">
               返回
@@ -519,6 +549,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-saoma"></use>
+                </svg>
+                <div class="name">扫一扫</div>
+                <div class="code-name">#newicon-saoma</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-zhishiku1"></use>
+                </svg>
+                <div class="name">知识库</div>
+                <div class="code-name">#newicon-zhishiku1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-fanhui1"></use>
                 </svg>
                 <div class="name">返回</div>

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304860 */
-  src: url('iconfont.woff2?t=1718344479829') format('woff2'),
-       url('iconfont.woff?t=1718344479829') format('woff'),
-       url('iconfont.ttf?t=1718344479829') format('truetype');
+  src: url('iconfont.woff2?t=1721722303907') format('woff2'),
+       url('iconfont.woff?t=1721722303907') format('woff'),
+       url('iconfont.ttf?t=1721722303907') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-saoma:before {
+  content: "\e661";
+}
+
+.newicon-zhishiku1:before {
+  content: "\e63d";
+}
+
 .newicon-fanhui1:before {
   content: "\e634";
 }

static/font/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "6757421",
+      "name": "扫一扫",
+      "font_class": "saoma",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "35679393",
+      "name": "知识库",
+      "font_class": "zhishiku1",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
       "icon_id": "9645687",
       "name": "返回",
       "font_class": "fanhui1",

static/scss/common.scss

@@ -135,6 +135,7 @@ uni-toast,
   .uni-select,
   .uni-easyinput__content,
   .uni-date-x,
+	.item-input,
   .uni-data-tree-input .input-value{
     border: 1px solid red!important;
   }