拉取最新代码

components/repositoryFilter.vue

@@ -0,0 +1,310 @@
+<template>
+  <view class="container" @touchmove.stop.prevent v-if="pageData.pageRouter === 'default'">
+    <view class="container_form">
+      <view class="hospital">
+        <text class="name">标题</text>
+        <text class="value ellipsis">
+					<input class="uni-input" v-model="searchData.title" placeholder="请输入标题" />
+				</text>
+      </view>
+      <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>
+    <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({
+		title:'',
+    hospital: {},
+    selected: 'todoingAll',
+    area: {id: 0, area: '全部'},
+    category: {},
+    acceptDate: [],
+		categoryChangeData:[]
+  })
+  
+  // 清空
+  function clear(){
+    searchData.category = {};
+    searchData.acceptDate = [];
+		searchData.title = '';
+		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.selectType = 'one';
+    }
+    
+    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
+  })
+</script>
+
+<style lang="scss" scoped>
+.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>

manifest.json

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

pages/handler/handler.vue

@@ -85,6 +85,10 @@
 					</view>
           <uni-easyinput id="scheme" class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
         </view>
+				<view class="form_item" v-if="dataInfo.provideBackupMachine==1">
+				  <view class="title"><text class="required newicon newicon-bitian"></text>是否归还备用机：</view>
+					<uni-data-checkbox v-model="dataInfo.returnBackupMachine" :localdata="machineData"></uni-data-checkbox>
+				</view>
         <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
           <view class="title"><text class="required newicon newicon-bitian"></text>故障现象：</view>
           <view class="value category" @click="selectCategory">
@@ -151,6 +155,10 @@
 						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.deferralDayId}">
 					</uni-data-picker>
 				</view>
+				<view class="form_item">
+				  <view class="title"><text class="required newicon newicon-bitian"></text>是否提供备用机：</view>
+					<uni-data-checkbox v-model="dataInfo.provideBackupMachine" :localdata="machineData"></uni-data-checkbox>
+				</view>
       </template>
     <!-- </scroll-view> -->
 		</view>
@@ -186,6 +194,18 @@
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+	// 备用机选项
+	const machineData = ref([
+		{
+			text:'是',
+			value:1
+		},
+		{
+			text:'否',
+			value:0
+		},
+	])
+	
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -218,7 +238,9 @@
     category: {},//故障现象
     synergetic: [],//协同人员
     isSummaryNext: false,//汇总单-下一步
-		introduceCount :0 //引入次数
+		introduceCount :0 ,//引入次数
+		provideBackupMachine:0,//是否提供备用机
+		returnBackupMachine:null//是否归还备用机
   })
   
 	// 知识库id
@@ -471,6 +493,8 @@
     dataInfo.handlerImgList = [];//处理图片列表
     dataInfo.category = {};//故障现象
     dataInfo.synergetic = [];//协同人员
+		dataInfo.provideBackupMachine = 0
+		dataInfo.returnBackupMachine = null
   }
   
   // 初始化表单
@@ -510,7 +534,9 @@
       uni.hideLoading();
       if(res.status == 200){
         dataInfo.incidentData = res.data || {};
-        
+				if(res.data.provideBackupMachine){
+					dataInfo.provideBackupMachine = res.data.provideBackupMachine
+				}
         if(dataInfo.isSummaryNext){
           // 汇总单-下一步
           dataInfo.incidentData.duty.addSummary = 0;
@@ -698,6 +724,7 @@
   
   // 处理提交事件
   function handlerOrder(){
+		dataInfo.incidentData.returnBackupMachine = dataInfo.returnBackupMachine
     let postData = {
       incident: dataInfo.incidentData,
 			solutionId:solutionId.value
@@ -817,7 +844,9 @@
       title: "加载中",
       mask: true,
     });
-    
+    if(dataInfo.provideBackupMachine){
+    	dataInfo.incidentData.provideBackupMachine = dataInfo.provideBackupMachine
+    }
     let postData = {
       incident: dataInfo.incidentData,
     }

pages/incidentDetail/incidentDetail.vue

@@ -114,6 +114,10 @@
 					  <text class="name">引用知识库：</text>
 					  <text class="value">{{dataInfo.incidentData.solutionNo?dataInfo.incidentData.solutionNo:'未引用'}}</text>
 					</view>
+					<view class="deital_item">
+					  <text class="name">是否归还备用机：</text>
+					  <text class="value">{{dataInfo.incidentData.returnBackupMachine==1?'是':'否'}}</text>
+					</view>
         </view>
       </template>
 
@@ -530,7 +534,7 @@
       display: flex;
       align-items: center;
       .name{
-        width: 7em;
+        width: 8em;
         margin-right: 24rpx;
       }
       .value{

pages/my/my.vue

@@ -46,6 +46,7 @@
       </view>
     </scroll-view>
     <view class="foot_common_btns">
+			<button @click="repository" type="default" class="primaryButton btn"><text class="newicon newicon-zhishiku"></text>知识库</button>
       <button @click="toBuildIncident" type="default" class="primaryButton btn"><text class="newicon newicon-xinjian2"></text>新建事件</button>
     </view>
   </view>
@@ -121,6 +122,13 @@
     })
   }
   
+	// 知识库
+	function repository(){
+		uni.navigateTo({
+		  url: `/pages/repository/repository?type=view`
+		})
+	}
+	
   // 新建事件
   function toBuildIncident(){
     uni.navigateTo({
@@ -166,7 +174,8 @@ page{
   .phone-filled{
     margin-right: 5rpx;
   }
-  .newicon-xinjian2{
+  .newicon-xinjian2,
+	.newicon-zhishiku{
     margin-right: 10rpx;
   }
   .body{

pages/repository/repository.vue

@@ -1,6 +1,9 @@
 <template>
   <view class="categoryOne">
-    <view class="body" v-if="dataInfo.list.length">
+		<view class="filter" @click="filterClick" v-if="entrance == 'view'">
+		  <text class="newicon newicon-shaixuan"></text>
+		</view>
+    <view class="body" v-if="dataInfo.list.length" :class="entrance == 'view' ? 'mar-t40' : ''">
       <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
 				<view @click="toCategoryTwo(data)">
 					<view class="title">{{data.title}}</view>
@@ -13,7 +16,7 @@
 					</view>
 				</view>
 				<view class="btn-style">
-					<button @click.stop="importData(data)" type="default" class="primaryButton btn">引入</button>
+					<button v-if="entrance!='view'" @click.stop="importData(data)" type="default" class="primaryButton btn">引入</button>
 				</view>
       </view>
 			<view class="back-style" @click="goBack">
@@ -26,6 +29,8 @@
 		<view v-if="dataInfo.list.length==0" class="foot_common_btns">
 			<button @click="goBack" type="default" class="primaryButton btn">返回</button>
 		</view>
+		<repositoryFilter v-if="isFilter" @cancelEmit="cancelFilter" 
+		@confirmEmit="conformFilter" :evt="evtFilter"></repositoryFilter>
   </view>
 </template>
 
@@ -36,7 +41,7 @@
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useGoBack } from '@/share/useGoBack.js'
   import { useHandlerStore } from '@/stores/handler'
-	
+	import repositoryFilter from '@/components/repositoryFilter.vue';
   useSetTitle();
 	
 	const handlerStore = useHandlerStore();
@@ -49,8 +54,14 @@
 	// 关联故障分类的知识库数量
 	const introduceCount = ref(0)
 	
-	// tab类型
-	// const tabType = ref(null)
+	// 入口类型
+	const entrance = ref(null)
+	
+	// 筛选数据
+	const evtFilter = ref({})
+	
+	// 筛选状态
+	const isFilter = ref(null)
 	
   // 数据
   const dataInfo = reactive({
@@ -89,9 +100,25 @@
 		})
 	}
 	
+	// 点击筛选
+	function filterClick(){
+	  isFilter.value = true;
+	}
+	
+	// 确认筛选
+	function conformFilter(evtFilter){
+	  evtFilter.value = evtFilter;
+	  isFilter.value = false;
+	  getList(0,evtFilter);
+	}
+	
+	// 关闭筛选
+	function cancelFilter(){
+	  isFilter.value = false;
+	}
+	
   // 获取列表信息
-  function getList(idx){
-		
+  function getList(idx,data){
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -101,18 +128,28 @@
     if(dataInfo.idx === 0){
       dataInfo.list = [];
     }
-		console.log(777,handlerStore.handler.data)
+		let categoryId = entrance.value=='view' ? data && data.category : handlerStore.handler.data.category.id
     let postData = {
       idx: dataInfo.idx,
       sum: 9999,
       solution: {
 				category:{
-					id:handlerStore.handler.data.category.id,
+					id:'',
 				},
+				title:'',
 				status:{id:72},
       }
     }
-    
+    if(typeof(categoryId)=='number' || typeof(categoryId)=='string'){
+			postData.solution.category.id = categoryId
+		}else{
+			delete postData.solution.category.id
+		}
+		if(data && data.title){
+			postData.solution.title = data.title
+		}else{
+			delete postData.solution.title
+		}
     api_getSolution(postData).then(res => {
       uni.hideLoading();
       // uni.stopPullDownRefresh();
@@ -137,6 +174,7 @@
   
   onLoad((option) => {
     dataInfo.incidentId = option.incidentId;
+		entrance.value = option.type
     getList(0);
   })
   
@@ -157,6 +195,23 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
+	.filter{
+		width: 100%;
+	  display: flex;
+	  justify-content: flex-end;
+		align-items: center;
+		position: fixed;
+		height: 80rpx;
+		background: #fff;
+	  .newicon-shaixuan{
+			margin-right: 40rpx;
+	    font-size: 36rpx;
+	    color: #2C2C2C;
+	  }
+	}
+	.mar-t40{
+		margin-top: 80rpx;
+	}
   .head{
     height: 88rpx;
     display: flex;

stores/repositorySearch.js

@@ -0,0 +1,30 @@
+import { defineStore } from "pinia"
+import { reactive } from 'vue'
+
+export const repositoryListSearchStore = defineStore(
+  "repositorySearch",
+  () => {
+    const repositorySearch = reactive({
+      data: null,
+    });
+
+    // 保存
+    function setRepositoryListSearchData(data) {
+      repositorySearch.data = data;
+    }
+    
+    // 清空
+    function clearRepositoryListSearchData() {
+      repositorySearch.data = null;
+    }
+
+    return {
+      repositorySearch,
+      setRepositoryListSearchData,
+      clearRepositoryListSearchData,
+    };
+  },
+  {
+    unistorage: true, // 开启后对 state 的数据读写都将持久化
+  },
+);

utils/index.js

@@ -41,3 +41,21 @@ export const encryptByEnAESLogin = (str) => {
   });
   return tmpAES.toString();
 }
+
+// 处理树数据（parent格式转为children格式）
+export const transform = (nodes, id, parentid) => {
+  let parents = [];
+  const idMapping = nodes.reduce((acc, el, i) => {
+    acc[el[id]] = i;
+    return acc;
+  }, {});
+  nodes.forEach((el) => {
+    if (el[parentid] === null || el[parentid] === undefined) {
+      parents.push(el);
+    } else {
+      const parentEl = nodes[idMapping[el[parentid]]];
+      parentEl.children = [...(parentEl.children || []), el];
+    }
+  });
+  return parents;
+}