随手报

src/App.vue

@@ -8,7 +8,7 @@
 export default {
 	name: 'app',
 	components: {
-		
+
 	},
 	methods:{
 
@@ -30,4 +30,7 @@ export default {
 	color: #666666;
 	text-align: center
 }
-</style>
+.mr8{
+  margin-right: 8px;
+}
+</style>

src/router/index.js

@@ -3,7 +3,7 @@ import Router from 'vue-router'
 import Login from './../views/Login.vue'
 import Main from './../views/Main.vue'
 import Indes from './../views/indes.vue'//首页
-import Repair from './../views/repair.vue'//我的申请
+import Repair from './../views/repair.vue'//申请列表
 import My from './../views/my.vue'//设置
 import Supplementary from './../views/supplementary.vue'//补充资料
 import IncidentList from './../views/incidentList.vue'//事件列表

src/views/Main.vue

@@ -9,8 +9,10 @@
                 <span>首页</span>
             </router-link>
             <router-link to="/main/incidentList" class="link" active-class="active">
-                <i class="iconfont icon-baoxiuxian"></i>
-                <span>我的申请</span>
+                <!-- <i class="iconfont icon-baoxiuxian"></i> -->
+                <img src="../assets/icon4.png" alt="" class="img-1" width="24">
+                <img src="../assets/icon4-active.png" alt="" class="img-2" width="24">
+                <span>申请列表</span>
             </router-link>
             <router-link to="/main/my" class="link" active-class="active">
                 <i class="iconfont icon-wodexian"></i>
@@ -62,6 +64,18 @@ export default {
     justify-content:center;
     align-items:center
 }
+.section2 .link img.img-1{
+  display: inline-block;
+}
+.section2 .link img.img-2{
+  display: none;
+}
+.section2 .link.active img.img-1{
+  display: none;
+}
+.section2 .link.active img.img-2{
+  display: inline-block;
+}
 .section2 i{
     font-size: .48rem
 }

src/views/evaluate.vue

@@ -5,12 +5,12 @@
                 申请信息
             </div>
             <div class="state">
-                <div>申请编号:&nbsp;{{data.incident.incidentsign}}</div>
+                <div>编号:&nbsp;{{data.incident.incidentsign}}</div>
                 <div :class="stateClassFn(data.state.name)">{{data.state.name}}</div>
             </div>
             <div class="description">
                 <div>
-                    申请内容:
+                    问题描述:
                 </div>
                 <div>
                     {{data.description||"暂无"}}
@@ -18,7 +18,7 @@
             </div>
             <div class="ipt">
                 <div>
-                    申请图片:
+                    现场图片:
                 </div>
                 <div class="imgs-container">
                     <img :src="img" v-for="(img, index) in imgs" @click="handleImgsClick(index)" v-if="imgs.length">
@@ -27,7 +27,7 @@
             </div>
             <div class="faultLocation">
                 <div>
-                    申请地址:
+                    问题地点:
                 </div>
                 <div>
                     {{data.address}}

src/views/incidentDetails.vue

@@ -5,28 +5,39 @@
         申请信息
       </div>
       <div class="state">
-        <div>申请编号:&nbsp;{{ data.bxcode }}</div>
+        <div class="mr8">编&emsp;&emsp;号:&nbsp;{{ data.bxcode }}</div>
         <div :class="stateClassFn(data.state.name)">{{ data.state.name }}</div>
       </div>
       <div class="description" v-if="data.category && data.category.category">
-        <div>
-          申请类别:
+        <div class="mr8">
+          问题类型:
         </div>
         <div>
           {{ data.category.category }}
         </div>
       </div>
-      <div class="description">
+      <div class="faultLocation">
+        <div class="mr8">
+          问题地点:
+        </div>
         <div>
-          申请内容:
+          <template v-if="data.place">
+            {{ data.branch?data.branch.hosName:'' }} {{ data.place.area.area }} {{ data.place.place }}
+          {{ data.address }}
+          </template>
+        </div>
+      </div>
+      <div class="description">
+        <div class="mr8">
+          问题描述:
         </div>
         <div>
           {{ data.description || "暂无" }}
         </div>
       </div>
       <div class="ipt">
-        <div>
-          申请图片:
+        <div class="mr8">
+          现场图片:
         </div>
         <div class="imgs-container">
           <img
@@ -38,19 +49,8 @@
           <span v-if="!imgs.length">暂无</span>
         </div>
       </div>
-      <div class="faultLocation">
-        <div>
-          申请地址:
-        </div>
-        <div>
-          <template v-if="data.place">
-            {{ data.branch?data.branch.hosName:'' }} {{ data.place.area.area }} {{ data.place.place }}
-          {{ data.address }}
-          </template>
-        </div>
-      </div>
       <div class="faultLocation" v-if="wxIncidentWithCmdb == 1">
-        <div>
+        <div class="mr8">
           资产:
         </div>
         <div>
@@ -64,40 +64,8 @@
       </div>
       <div class="handleUser">
         <div>
-          维修人:&nbsp;&nbsp;{{
-            data.incident.handlingPersonnelUser &&
-            data.incident.handlingPersonnelUser.name
-              ? data.incident.handlingPersonnelUser.name
-              : "暂无"
-          }}
-        </div>
-        <div v-if="data.incident.directProcess != 1">
-          电话:&nbsp;&nbsp;<a
-            :href="'tel:' + data.incident.handlingPersonnelUser.phone"
-            v-if="
-              data.incident.handlingPersonnelUser &&
-                data.incident.handlingPersonnelUser.phone
-            "
-            >{{ data.incident.handlingPersonnelUser.phone }}</a
-          >
-          <span
-            v-if="
-              !data.incident.handlingPersonnelUser ||
-                !data.incident.handlingPersonnelUser.phone
-            "
-            >暂无</span
-          >
+          责任部门:&nbsp;&nbsp;{{ data.groups ? data.groups.groupName : '暂无'}}
         </div>
-        <!-- <a href="tel:13429850125"><i class="iconfont icon-shouji"></i></a> -->
-        <i
-          class="iconfont icon-shouji"
-          v-if="(!data.incident.handlingPersonnelUser || !data.incident.handlingPersonnelUser.phone) && data.incident.directProcess != 1"
-        ></i>
-        <a
-          v-if="data.incident.handlingPersonnelUser && data.incident.handlingPersonnelUser.phone && data.incident.directProcess != 1"
-          :href="'tel:' + data.incident.handlingPersonnelUser.phone"
-          ><i class="iconfont icon-shouji"></i
-        ></a>
       </div>
     </div>
     <!-- 流程图 -->
@@ -842,9 +810,6 @@ export default {
   padding: 0 0.24rem;
 }
 .handleUser div:nth-child(1) {
-  width: 49%;
-  border-right: 0.01rem rgb(223, 222, 222) solid;
-  /* padding-left: .24rem; */
   font-size: 0.32rem;
 }
 .handleUser div:nth-child(2) {

src/views/incidentList.vue

@@ -26,7 +26,7 @@
                   <div class="title">
                     <div>
                       <i class="iconfont icon-baoxiuliebiao"></i
-                      ><span>申请编号:&nbsp;{{ data.bxcode || "暂无" }}</span>
+                      ><span>编号:&nbsp;{{ data.bxcode || "暂无" }}</span>
                     </div>
                     <div :class="stateClassFn(data.state.name)">
                       {{ data.state.name }}
@@ -37,11 +37,7 @@
                   </div>
                   <div class="timeBox">
                     <div>
-                      维修人：&nbsp;{{
-                        data.incident.handlingPersonnelUser
-                          ? data.incident.handlingPersonnelUser.name
-                          : "暂无"
-                      }}
+                      责任部门：&nbsp;{{ data.groups ? data.groups.groupName : '暂无'}}
                     </div>
                     <div>申请时间：&nbsp;{{ data.createTime }}</div>
                   </div>

src/views/indes.vue

@@ -3,15 +3,18 @@
     <!-- 头部导航栏 -->
     <div class="tav">
       <div @click="toRapir()">
-        <i class="iconfont icon-xinjian"></i>
+        <!-- <i class="iconfont icon-xinjian"></i> -->
+        <img src="../assets/icon1.png" alt="">
         <span>快速申请</span>
       </div>
       <div @click="toKnowList()">
-        <i class="iconfont icon-message"></i>
+        <!-- <i class="iconfont icon-message"></i> -->
+        <img src="../assets/icon2.png" alt="">
         <span>常见问题</span>
       </div>
       <div @click="toGuide()">
-        <i class="iconfont icon-fuwuzhinan"></i>
+        <!-- <i class="iconfont icon-fuwuzhinan"></i> -->
+        <img src="../assets/icon3.png" alt="">
         <span>服务指南</span>
       </div>
     </div>
@@ -36,7 +39,7 @@
           <div class="conent">
             <div class="head">
               <!-- <span>{{v.requester.name}}</span> -->
-              <span>申请编号:{{ v.bxcode }}</span>
+              <span>编号:{{ v.bxcode }}</span>
               <span>{{ v.createTime }}</span>
             </div>
             <div class="cot">

src/views/my.vue

@@ -32,7 +32,7 @@
           <div v-if="repairMain.valueconfig != 1 && !loginUser.dept">暂无</div>
         </li>
         <li class="myArea">
-          <div>校区区域地点</div>
+          <div>问题地点</div>
           <div>
             <cube-button @click="showCascadePicker">
               {{ areaData || "暂无" }}
@@ -50,9 +50,9 @@
       </ul>
     </div>
     <div class="myRapir">
-      <div class="label">我的申请</div>
+      <div class="label">申请列表</div>
       <div class="tit">
-        <div>我的申请</div>
+        <div>申请列表</div>
         <div @click="toIncidentList()">
           {{ incidentStateData.resultCount }}条&nbsp;&nbsp;&nbsp;>
         </div>
@@ -271,7 +271,7 @@ export default {
           console.log(collectionBranch,'collectionBranch集合');
           console.log(this.treeData,'地点');
           this.cascadePicker = this.$createCascadePicker({
-            title: "请选择校区区域地点",
+            title: "请选择问题地点",
             data: this.treeData,
             selectedIndex: [0, 0, 0],
             onSelect: this.selectHandle,
@@ -291,7 +291,7 @@ export default {
         )
         .then(function(res) {
           if (res.status == 200) {
-            that.promptingConent = "恭喜您,修改校区区域地点成功!";
+            that.promptingConent = "恭喜您,修改问题地点成功!";
             that.promptingStatus = true;
             $("#fade").fadeIn();
             setTimeout(function() {
@@ -330,7 +330,7 @@ export default {
   },
   mounted() {
     // this.cascadePicker = this.$createCascadePicker({
-    //     title: '请选择校区区域地点',
+    //     title: '请选择问题地点',
     //     data: this.treeData,
     //     selectedIndex: [0,0],
     //     onSelect: this.selectHandle,
@@ -434,7 +434,7 @@ export default {
   font-size: 0.34rem;
   width: 12%;
 }
-/* 我的申请 */
+/* 申请列表 */
 
 /* .myRapir {
     margin-top: .2rem

src/views/repair.vue

@@ -1,17 +1,16 @@
 <template>
   <div slot="content" class="bgColor">
+    <div class="ssb">随手报-网络问题</div>
+    <div class="ssb_title">
+      <div class="ssb_title_content">上报身边的问题，目前仅网络问题上报，后续会不断扩展服务范围。</div>
+    </div>
     <cube-form
       :model="model"
       @validate="validateHandler"
       @submit="submitHandler"
     >
       <cube-form-group>
-        <!-- <div class="label">
-                    申请联系人</div>
-                <div class="zhidu">
-                    <div>联系人:</div>
-                    <div>{{name}}</div>
-        </div>-->
+        <cube-form-item :field="fields[9]"></cube-form-item>
         <cube-form-item :field="fields[5]" v-if="repairMain.valueconfig == 2">
           <cube-input
             @input="showDeptId(model.deptId)"
@@ -20,39 +19,24 @@
             >{{ model.deptId || "请输入申请科室" }}</cube-input
           >
         </cube-form-item>
-
         <cube-form-item :field="fields[0]"></cube-form-item>
         <cube-form-item :field="fields[1]"></cube-form-item>
-        <cube-form-item
-          :field="fields[2]"
-          class="btn_plcaeholde"
-        ></cube-form-item>
+
+        <div class="label">问题详情</div>
+        <cube-form-item :field="fields[6]" v-if="reqHasCategory.valueconfig == 1"></cube-form-item>
+        <cube-form-item :field="fields[2]" class="btn_plcaeholde"></cube-form-item>
         <cube-form-item :field="fields[8]" v-if="ifRoom == 1"></cube-form-item>
         <cube-form-item :field="fields[3]"></cube-form-item>
-        <!-- <cube-form-item :field="fields[3]">
-          <cube-input
-            @focus="showAddress(model.address)"
-            @input="showAddress(model.address)"
-            v-model="model.address"
-            >{{ model.address || "请输入故障地点" }}</cube-input
-          >
-        </cube-form-item> -->
-        <cube-form-item
-          :field="fields[6]"
-          v-if="reqHasCategory.valueconfig == 1"
-        ></cube-form-item>
-        <div class="label">申请信息</div>
         <div class="zc" v-if="wxIncidentWithCmdb == 1">
           <cube-form-item :field="fields[7]" class="zc-item"></cube-form-item>
           <span class="icon dash dash-saoyisao zc-sao" @click="scan()"></span>
         </div>
         <cube-form-item :field="fields[4]"></cube-form-item>
         <div class="label">
-          申请图片
-          <span>(最多可上传3张JPG或PNG,每张不能超过10M)</span>
+          现场图片
+          <span>(最大支持1MB的图片(jpg/gif/png),每张不能超过1M)</span>
         </div>
         <div class="uplod">
-          <!-- <div>申请图片:</div> -->
           <cube-upload
             ref="upload"
             :max="3"
@@ -64,7 +48,7 @@
         </div>
       </cube-form-group>
       <cube-form-group class="sub">
-        <cube-button type="submit" @click="subVali()">提交申请</cube-button>
+        <cube-button type="submit" @click="subVali()">提交</cube-button>
       </cube-form-group>
     </cube-form>
     <load-ing v-show="loadShow"></load-ing>
@@ -105,7 +89,7 @@ const PCA = {
           click: this.showPicker
         }
       },
-      this.selected.length ? this.selected.join(" ") : "请选择校区区域地点"
+      this.selected.length ? this.selected.join(" ") : "请选择问题地点"
     );
   },
   mounted() {},
@@ -196,7 +180,7 @@ const PCA = {
           console.log(collectionBranch,'collectionBranch集合');
           console.log(this.selectData,'地点');
           // this.picker = this.$createCascadePicker({
-          //   title: "校区区域地点选择",
+          //   title: "问题地点选择",
           //   data: this.selectData,
           //   selectedIndex: [0, 0, 0],
           //   onSelect: this.selectHandler
@@ -215,7 +199,7 @@ const PCA = {
 
           this.selectIndex = [branchIndex, areaIndex, placeIndex];
           this.picker = this.$createCascadePicker({
-            title: "校区区域地点选择",
+            title: "问题地点选择",
             data: this.selectData,
             selectedIndex: this.selectIndex,
             onSelect: this.selectHandler
@@ -307,13 +291,7 @@ export default {
       reqHasCategory: null,
       validity: {},
       valid: undefined,
-      // action: 'http://localhost:8080/service/common/common/uploadAttachment/wechatRequesterIncident/',
-      // action: 'http://192.168.199.164:8080/service/common/common/uploadAttachment/wechatRequesterIncident/',
       action: {
-        // "target":'http://192.168.3.100:8080/service/common/common/uploadAttachment/wechatRequesterIncident/',
-        // "fileName":"upload",
-        // "target":'http://localhost/service/common/common/uploadAttachment/wechatRequesterIncident/',
-        // "target":'http://weixintest.ngser.dashitech.com/service/common/common/uploadAttachment/wechatRequesterIncident/',
         target:
           this.$host +
           "/service/common/common/uploadAttachment/wechatRequesterIncident/",
@@ -324,6 +302,7 @@ export default {
       name: "",
       phone: "",
       model: {
+        requesterAccount: "",
         contactsInformation: "",
         pcaValue: [],
         address: "",
@@ -342,9 +321,9 @@ export default {
         {
           type: "input",
           modelKey: "contacts",
-          label: "联系人:",
+          label: "姓名:",
           props: {
-            placeholder: "请输入联系人"
+            placeholder: "请输入姓名"
           },
           rules: {
             // required: this.repairMain.valueconfig == 1
@@ -365,12 +344,12 @@ export default {
         {
           component: PCA,
           modelKey: "pcaValue",
-          label: "校区区域地点:",
+          label: "问题地点:",
           rules: {
             required: true
           },
           messages: {
-            required: "请选择校区区域地点"
+            required: "请选择问题地点"
           }
         },
         {
@@ -388,9 +367,9 @@ export default {
         {
           type: "textarea",
           modelKey: "description",
-          label: "申请内容:",
+          label: "问题描述:",
           props: {
-            placeholder: "请输入申请内容"
+            placeholder: "请输入问题描述"
           },
           rules: {
             required: true
@@ -411,9 +390,9 @@ export default {
         {
           type: "select",
           modelKey: "categoryId",
-          label: "申请类别:",
+          label: "问题类型:",
           props: {
-            placeholder: "请选择申请类别",
+            placeholder: "请选择问题类型",
             options: []
           },
           rules: {
@@ -443,7 +422,19 @@ export default {
           rules: {
             required: false
           }
-        }
+        },
+        {
+          type: "input",
+          modelKey: "requesterAccount",
+          label: "学号/职工号:",
+          props: {
+            placeholder: "请输入学号/职工号",
+            disabled: true,
+          },
+          rules: {
+            required: true
+          }
+        },
       ]
     };
   },
@@ -521,7 +512,6 @@ export default {
         this.model.areaId = this.model.pcaValue[1];
         this.model.placeId = this.model.pcaValue[2];
       }
-
       this.model["requester"] = this.loginUser;
       delete this.model.pcaValue;
       this.model.fileUrl = "url";
@@ -670,7 +660,7 @@ export default {
     },
     filesAdded(files) {
       let hasIgnore = false;
-      const maxSize = 1000 * 1024 * 1024; // 1M
+      const maxSize = 1 * 1024 * 1024; // 1M
       for (let k in files) {
         const file = files[k];
         if (file.size > maxSize) {
@@ -682,7 +672,7 @@ export default {
         this.$createToast({
           type: "warn",
           time: 1000,
-          txt: "不能上传超过100M的文件"
+          txt: "不能上传超过1M的文件"
         }).show();
     },
     fileSubmitted(files) {
@@ -721,7 +711,7 @@ export default {
         item.rules.required = this.repairMain.valueconfig == 1;
       }
     });
-    // 获取申请类别
+    // 获取问题类型
     this.$http
       .post("service/bpm/data/fetchDataList/incidentcategory", {
         idx: 0,
@@ -735,7 +725,7 @@ export default {
             arr.push({ value: item.id, text: item.category });
           });
           this.fields.forEach(item => {
-            // 初始化申请类别下拉框列表
+            // 初始化问题类型下拉框列表
             if (item.modelKey == "categoryId") {
               item.props.options = arr;
             }
@@ -745,6 +735,7 @@ export default {
   },
   mounted() {
     this.loginUser = JSON.parse(localStorage.getItem("loginUser"));
+    this.model.requesterAccount = this.loginUser.account
     this.getMessage();
     this.getbxcode();
     // 获取申请主体
@@ -769,6 +760,27 @@ export default {
 };
 </script>
 <style lang="stylus" rel="stylesheet/stylus" scoped>
+.ssb{
+  height: 1rem;
+  font-size: 16px;
+  color: #fff;
+  background-color: #005395;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.ssb_title{
+  background-color: #f1f2f2;
+}
+.ssb_title_content{
+  background-color: #eaeaea;
+  color: #999;
+  padding: 16px;
+  margin:0 8px;
+  text-indent: 2em;
+  line-height: normal;
+  font-size: 14px;
+}
 .zc{
   display:flex;
   position:relative;
@@ -783,6 +795,15 @@ export default {
     font-size:0.6rem;
   }
 }
+.cube-form {
+ padding: 0 8px;
+ background-color: #f1f2f2;
+}
+
+.cube-form-item{
+    background-color:#fff!important;
+}
+
 .form-custom {
   .cube-form-item {
     .cube-btn {
@@ -799,7 +820,7 @@ export default {
 .label {
   background-color: rgb(238, 238, 238);
   height: 0.6rem;
-  line-height: 0.5rem;
+  line-height: 0.6rem;
   padding-left: 0.2rem;
   font-size: 0.24rem;
   color: #666666;
@@ -827,10 +848,6 @@ export default {
   width: 27.5%;
   padding-left: 6%;
 }
-
-.uplod {
-  padding: 0 0.24rem;
-}
 </style>
 <style>
 .btn_plcaeholde .cube-btn {
@@ -848,8 +865,6 @@ export default {
 }
 .sub .cube-btn {
   background-color: #005395 !important;
-  width: 90%;
-  margin: 0 auto;
   border-radius: 8px;
 }
 .cube-picker-wheel-item {

src/views/supplementary.vue

@@ -23,7 +23,7 @@
           </div>
         </li>
         <li class="myArea">
-          <div>校区区域地点</div>
+          <div>问题地点</div>
           <div style="flex:1;">
             <cube-button @click="showCascadePicker" style="white-space:normal;">
               {{ areaData || "暂无" }}
@@ -110,7 +110,7 @@ export default {
       } else if (!this.areaData) {
         this.$createDialog({
           type: "alert",
-          content: "校区区域地点不能为空",
+          content: "问题地点不能为空",
           icon: "cubeic-wrong"
         }).show();
       } else {
@@ -222,7 +222,7 @@ export default {
           console.log(collectionBranch,'collectionBranch集合');
           console.log(this.treeData,'地点');
           this.cascadePicker = this.$createCascadePicker({
-            title: "请选择校区区域地点",
+            title: "请选择问题地点",
             data: this.treeData,
             selectedIndex: [0, 0, 0],
             onSelect: this.selectHandle,
@@ -242,7 +242,7 @@ export default {
         )
         .then(function(res) {
           if (res.status == 200) {
-            that.promptingConent = "恭喜您,修改校区区域地点成功!";
+            that.promptingConent = "恭喜您,修改问题地点成功!";
             that.promptingStatus = true;
             $("#fade").fadeIn();
             setTimeout(function() {
@@ -281,7 +281,7 @@ export default {
   },
   mounted() {
     // this.cascadePicker = this.$createCascadePicker({
-    //     title: '请选择校区区域地点',
+    //     title: '请选择问题地点',
     //     data: this.treeData,
     //     selectedIndex: [0,0],
     //     onSelect: this.selectHandle,
@@ -399,7 +399,7 @@ export default {
   font-size: 0.34rem;
   width: 12%;
 } */
-/* 我的申请 */
+/* 申请列表 */
 
 /* .myRapir {
     margin-top: .2rem