我的

pages.json

@@ -126,6 +126,14 @@
           "titleNView": false
         }
       }
+    },
+    {
+      "path": "pages/buildIncident/buildIncident",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
     }
   ],
   "globalStyle": {

pages/buildIncident/buildIncident.vue

@@ -0,0 +1,521 @@
+<template>
+  <view class="buildIncident">
+    <scroll-view scroll-y class="body">
+      <view class="form_item">
+        <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
+        <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择院区" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
+      </view>
+      <view class="form_item">
+        <view class="title select"><text class="required newicon newicon-bitian"></text>报修科室：</view>
+        <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择报修科室" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
+      </view>
+      <view class="form_item">
+        <view class="title select"><text class="required newicon newicon-bitian transparent"></text>报修人：</view>
+        <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择报修人" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
+      </view>
+    </scroll-view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="cancelButton btn">返回</button>
+      <button @click="submit" type="default" class="primaryButton btn">下一步</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useGoBack } from '@/share/useGoBack.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    incidentId: undefined,//事件ID
+    incidentData: {},//事件对象
+    groupList: [], //工作组列表
+    groupId: undefined, //工作组ID
+    userList: [], //用户列表
+    userId: undefined, //用户ID
+    branchList: [], //院区列表
+    branchId: undefined, //院区ID
+    dutyList: [], //责任科室列表
+    dutyId: undefined, //责任科室ID
+    isAssignUser: 1, //工作组是否转派到人
+    isAssignUserList: [
+      { text: '是', value: 1 },
+      { text: '否', value: 0 },
+    ], //工作组是否转派到人选项
+    reassignRemark: '',//退回原因
+  })
+  
+  // 是否提交
+  const isSubmit = ref(false)
+  
+  // 重置
+  function reset(){
+    dataInfo.branchId = undefined;
+    dataInfo.branchList = [];
+    
+    dataInfo.dutyId = undefined;
+    dataInfo.dutyList = [];
+    
+    dataInfo.groupId = undefined;
+    dataInfo.groupList = [];
+    
+    dataInfo.userId = undefined;
+    dataInfo.userList = [];
+    
+    dataInfo.isAssignUser = 1;
+    
+    dataInfo.reassignRemark = '';
+  }
+  
+  // 获取事件详情
+  function getIncidentDetail(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+
+    api_incidentDetail(dataInfo.incidentId).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        dataInfo.incidentData = res.data || {};
+        
+        initForm()
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取院区列表
+  function getBranchs(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "idx": 0,
+      "sum": 9999,
+    };
+    api_branch(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        res.list = res.list || [];
+        dataInfo.branchList = res.list.map(v => ({
+          text: v.hosName,
+          value: v.id,
+        }));
+        
+        if(loginUserStore.loginUser.user.duty){
+          // 当前的所属责任科室
+          dataInfo.branchId = loginUserStore.loginUser.user.duty.branch;
+          changeBranch();
+          
+          dataInfo.dutyId = loginUserStore.loginUser.user.duty.id;
+          changeDuty();
+        }else if(loginUserStore.loginUser.user.branch){
+          // 当前的所属院区
+          dataInfo.branchId = loginUserStore.loginUser.user.branch.id;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取责任科室列表
+  function getDutys(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "idx": 0,
+      "sum": 9999,
+      "dutyDepartment": {
+        "branch": dataInfo.branchId,
+      }
+    };
+    api_dutyDepartment(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        res.list = res.list || [];
+        dataInfo.dutyList = res.list.map(v => ({
+          text: v.dept,
+          value: v.id,
+        }));
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取工作组列表
+  function getGroups(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    let duty = undefined;
+    
+    let postData = {
+      "idx": 0,
+      "sum": 9999,
+      "group": {
+          "duty": duty,
+          "selectType": "nouser"
+      }
+    };
+    api_group(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        res.list = res.list || [];
+        dataInfo.groupList = res.list.map(v => ({
+          text: v.groupName,
+          value: v.id,
+        }));
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 获取用户列表
+  function getUsers(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    let postData = {
+      "idx": 0,
+      "sum": 9999,
+      "user": {
+          "groupdata":{
+            "id": dataInfo.groupId,
+          },
+          "roledata": {
+              "rolecode": "first-line support"
+          },
+          "roledata2": {
+              "rolecode": "second-line support"
+          },
+          "selectType": "1",
+          "selectDetails": 1,
+          "simple": true,
+          "engineer": 1
+      }
+    };
+    api_user(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        res.list = res.list || [];
+        dataInfo.userList = res.list.map(v => ({
+          text: v.name,
+          value: v.id,
+        }));
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 选择院区
+  function changeBranch(){
+    dataInfo.dutyId = undefined;
+    dataInfo.dutyList = [];
+    
+    dataInfo.groupId = undefined;
+    dataInfo.groupList = [];
+    
+    dataInfo.userId = undefined;
+    dataInfo.userList = [];
+    getDutys();
+  }
+  
+  // 选择责任科室
+  function changeDuty(){
+    dataInfo.groupId = undefined;
+    dataInfo.groupList = [];
+    
+    dataInfo.userId = undefined;
+    dataInfo.userList = [];
+    getGroups();
+  }
+  
+  // 选择工作组
+  function changeGroup(){
+    dataInfo.userId = undefined;
+    dataInfo.userList = [];
+    getUsers();
+  }
+  
+  // 选择是否转派到人
+  function changeIsAssignUser(){
+    dataInfo.userId = undefined;
+  }
+  
+  // 提交
+  function submit(){
+    isSubmit.value = true;
+    
+  }
+  
+  // 转派提交
+  function submitRedeploy(){
+    if(!dataInfo.groupId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择工作组'
+      });
+      return;
+    }
+    
+    if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择指派对象'
+      });
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    if(dataInfo.userId){
+      // 派人
+      postData.incident.assignee = dataInfo.userId;
+    } else {
+      // 派组
+      postData.incident.candidateGroups = dataInfo.groupId;
+    }
+    
+    // api_incidentTask('' 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 submitAssign(){
+    if(!dataInfo.branchId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择院区'
+      });
+      return;
+    }
+    
+    if(!dataInfo.dutyId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择责任科室'
+      });
+      return;
+    }
+    
+    if(!dataInfo.groupId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择工作组'
+      });
+      return;
+    }
+    
+    if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择指派对象'
+      });
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    if(dataInfo.userId){
+      // 派人
+      postData.incident.assignee = dataInfo.userId;
+    } else {
+      // 派组
+      postData.incident.candidateGroups = dataInfo.groupId;
+    }
+    
+    // api_incidentTask('', 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 submitReassign(){
+    if(!dataInfo.reassignRemark.trim()){
+      uni.showToast({
+      	icon: 'none',
+        title: '请填写退回原因'
+      });
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    postData.incident.reassignRemark = dataInfo.reassignRemark;
+    
+    // api_incidentTask('', 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 || '请求数据失败！'
+    //     });
+    //   }
+    // })
+  }
+  
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+    getIncidentDetail();
+  })
+</script>
+
+<style lang="scss" scoped>
+.buildIncident{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .body{
+    margin-top: 88rpx;
+    padding: 0 24rpx;
+    box-sizing: border-box;
+    flex: 1;
+    min-height: 0;
+    .form_item{
+      display: flex;
+      align-items: center;
+      padding-top: 24rpx;
+      min-height: 86rpx;
+      &.column{
+        height: auto;
+        flex-direction: column;
+        align-items: flex-start;
+        .title{
+          margin-right: 0;
+        }
+        .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;
+        &.select{
+          width: calc(5em + 20rpx);
+        }
+      }
+    }
+  }
+}
+</style>

pages/handler/handler.vue

@@ -444,6 +444,8 @@
     dataInfo.tabActiveValue = tabValue;
     isSubmit.value = false;
     reset();
+    dataInfo.category = dataInfo.incidentData.category || {};
+    dataInfo.synergetic = dataInfo.incidentData.synergetic || [];
     initForm();
   }
   

pages/incidentList/incidentList.vue

@@ -70,9 +70,11 @@
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
   import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentNumStore } from '@/stores/incidentNum'
   
   useSetTitle();
   const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
   const { formatDate }  = filterFormatDate();
   const { priorityStyle }  = computedPriorityStyle();
   const { stateStyle }  = computedStateStyle();
@@ -273,7 +275,7 @@
     }
     
     if(dataInfo.evtFilter && dataInfo.evtFilter.category && dataInfo.evtFilter.category.id){
-      postData.incident.levelCategory = dataInfo.evtFilter.category;
+      postData.incident.levelCategory = { id: dataInfo.evtFilter.category.id };
     }
     
     if(dataInfo.evtFilter && dataInfo.evtFilter.area && dataInfo.evtFilter.area.id){
@@ -329,6 +331,13 @@
   }
   
   onLoad((option) => {
+    // 我的-数量跳转
+    if(incidentNumStore.incidentNum.data){
+      dataInfo.evtFilter.selected = incidentNumStore.incidentNum.data.queryTask;
+      dataInfo.tabActiveId = incidentNumStore.incidentNum.data.statusId;
+      incidentNumStore.clearIncidentNumData();
+    }
+    
     for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
       if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_assign") {
         assignFlag.value = true;

pages/my/my.vue

@@ -1,19 +1,224 @@
 <template>
-  <view>
-    我的
+  <view class="mine">
+    <scroll-view scroll-y class="body">
+      <view class="top">
+        <view class="top_name">Hi,廖小明</view>
+        <view class="top_count">
+          <view class="top_count_item" @click="toIncident('todoingAll', 1543)">
+            <view class="name">待接单</view>
+            <view class="value">{{dataInfo.todo}}</view>
+          </view>
+          <view class="top_count_item" @click="toIncident('todoingAll', 1544)">
+            <view class="name">处理中</view>
+            <view class="value">{{dataInfo.doing}}</view>
+          </view>
+          <view class="top_count_item" @click="toIncident('owns', 0)">
+            <view class="name">与我关联</view>
+            <view class="value">{{dataInfo.owns}}</view>
+          </view>
+          <view class="top_count_item" @click="toIncident('resolve', 0)">
+            <view class="name">由我解决</view>
+            <view class="value">{{dataInfo.resolve}}</view>
+          </view>
+        </view>
+      </view>
+      
+      <view class="bottom">
+        <view class="bottom_name">个人信息</view>
+        <view class="bottom_list">
+          <view class="bottom_list_item">
+            <view class="name">工号</view>
+            <view class="value">{{loginUserStore.loginUser.user.account}}</view>
+          </view>
+          <view class="bottom_list_item">
+            <view class="name">手机号</view>
+            <view class="value" @click="makePhoneCall(loginUserStore.loginUser.user.phone)"><uni-icons type="phone-filled" class="phone-filled" :size="18" :color="primaryColor"></uni-icons>{{loginUserStore.loginUser.user.phone}}</view>
+          </view>
+          <view class="bottom_list_item">
+            <view class="name">部门</view>
+            <view class="value">{{loginUserStore.loginUser.user.duty ? loginUserStore.loginUser.user.duty.dept : '无'}}</view>
+          </view>
+          <view class="bottom_list_item">
+            <view class="name">工作组</view>
+            <view class="value">{{(loginUserStore.loginUser.user.group && loginUserStore.loginUser.user.group.length) ? loginUserStore.loginUser.user.group.map(v => v.groupName).join('/') : '无'}}</view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+    <view class="foot_common_btns">
+      <button @click="toBuildIncident" type="default" class="primaryButton btn"><text class="newicon newicon-xinjian2"></text>新建事件</button>
+    </view>
   </view>
 </template>
 
-<script>
-  export default {
-    data() {
-      return {
-        
-      };
+<script setup>
+  import { ref, reactive } from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { api_incident_count } from "@/http/api.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'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const { makePhoneCall }  = useMakePhoneCall();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    todo: 0,
+    doing: 0,
+    owns: 0,
+    resolve: 0,
+  })
+  
+  // 获取列表数量
+  function getCount(){
+    uni.showLoading({
+      title: "加载中",
+    });
+    let postData = {
+      incidentList: [
+        {
+          "queryTask": "todo",
+          "assignee": loginUserStore.loginUser.user.id,
+          "candidateGroups": loginUserStore.loginUser.user.group.map(v => v.id).toString()
+        },
+        {
+          "queryTask": "doing",
+          "assignee": loginUserStore.loginUser.user.id,
+        },
+        {
+          "queryTask": "owns",
+          "assignee": loginUserStore.loginUser.user.id,
+          "candidateGroups": loginUserStore.loginUser.user.group.map(v => v.id).toString()
+        },
+        {
+          "queryTask": "resolve",
+          "assignee": loginUserStore.loginUser.user.id,
+        },
+      ],
     }
+    
+    api_incident_count(postData).then(res => {
+      uni.hideLoading();
+      if(res.state == 200){
+        dataInfo.todo = res.data.todo;
+        dataInfo.doing = res.data.doing;
+        dataInfo.owns = res.data.owns;
+        dataInfo.resolve = res.data.resolve;
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
   }
+  
+  // 新建事件
+  function toBuildIncident(){
+    uni.navigateTo({
+      url: '/pages/buildIncident/buildIncident'
+    })
+  }
+  
+  // 点击数量跳转
+  function toIncident(queryTask, statusId){
+    incidentNumStore.setIncidentNumData({
+      queryTask,
+      statusId,
+    })
+    uni.reLaunch({
+      url: '/pages/incidentList/incidentList'
+    })
+  }
+  
+  onLoad((option) => {
+    getCount();
+  })
 </script>
 
-<style lang="scss">
-
+<style lang="scss" scoped>
+page{
+  height: calc(100vh - 50px);
+  background-color: #EBEBEB;
+}
+.mine{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .phone-filled{
+    margin-right: 5rpx;
+  }
+  .newicon-xinjian2{
+    margin-right: 10rpx;
+  }
+  .body{
+    width: 714rpx;
+    height: 100%;
+    margin: 16rpx auto 50px auto;
+    box-sizing: border-box;
+    border-radius: 8rpx;
+    .top{
+      padding: 30rpx;
+      background-color: #fff;
+      .top_name{
+        font-size: 28rpx;
+        font-weight: bold;
+      }
+      .top_count{
+        margin-top: 45rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .top_count_item{
+          text-align: center;
+          .name{
+            color: #949494;
+            font-size: 22rpx;
+          }
+          .value{
+            font-size: 50rpx;
+            font-weight: bold;
+            margin-top: 15rpx;
+          }
+        }
+      }
+    }
+    
+    .bottom{
+      background-color: #fff;
+      margin-top: 15rpx;
+      .bottom_name{
+        font-size: 26rpx;
+        color: $uni-primary;
+        padding: 21rpx 24rpx;
+      }
+      .bottom_list{
+        .bottom_list_item{
+          border-top: 1rpx solid #DEDEDE;
+          padding: 30rpx 30rpx 30rpx 47rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          font-size: 24rpx;
+          .value{
+            max-width: 380rpx;
+            color: #555555;
+            display: flex;
+            align-items: center;
+            text-align: justify;
+          }
+        }
+      }
+    }
+  }
+}
 </style>

pages/synergeticAdd/synergeticAdd.vue

@@ -7,7 +7,7 @@
       <text class="newicon newicon-zanwu"></text>
     </view>
     <view class="foot_common_btns">
-      <button @click="goBack" type="default" class="primaryButton btn">返回</button>
+      <button @click="goBack" type="default" class="cancelButton btn">返回</button>
       <button @click="confirm" type="default" class="primaryButton btn">确认</button>
     </view>
   </view>

stores/handler.js

@@ -15,6 +15,7 @@ export const useHandlerStore = defineStore(
     
     // 清空事件信息
     function clearHandlerData() {
+      console.log(handler.data)
       handler.data = null;
     }
 

stores/incidentNum.js

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