修复 bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -1,5 +1,6 @@
 package com.community.huiju.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
@@ -355,11 +356,11 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
+            @ApiImplicitParam(name = "parameter", value = "score 评分, comment 评语 ", required = true, dataType = "String"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "工单Id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/accessTicket/{communityId}", method = RequestMethod.POST)
-    public ResponseBean accessTicket(@PathVariable("communityId") Integer communityId, @RequestBody TpTicket tpTicket, @RequestParam("ticketId") String ticketId, HttpSession session) {
+    public ResponseBean accessTicket(@PathVariable("communityId") Integer communityId, @RequestBody String parameter, @RequestParam("ticketId") String ticketId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
@@ -369,6 +370,7 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
+        TpTicket tpTicket = JSONObject.parseObject(parameter,TpTicket.class);
         socialServiceI.accessTicket(communityId, tpTicket, ticketId, userId);
         return responseBean;
     }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/CodeController.java

@@ -46,14 +46,13 @@ public class CodeController {
         }
 
         int code = (int) ((Math.random()*9+1)*1000);
-        //boolean result = iCode.sendCode(phone,String.valueOf(code));
-        boolean result = true;
+        boolean result = iCode.sendCode(phone,String.valueOf(code));
+        //boolean result = true;
         if (result) {
             log.info("{} 验证码: {}",phone,code);
             // 设置缓存
             AppkeyCache.setCache(phone,String.valueOf(code));
-            //session.setAttribute(Constant.SESSION_PHONE_CODE,String.valueOf(code));
-            response.addSuccess("发送成功!"+code);
+            response.addSuccess("发送成功!");
         } else {
             response.addError("发送失败!");
         }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToBanner.java

@@ -9,8 +9,8 @@ public class ToBanner {
     @NotBlank(message = "标题不能为空!")
     private String title;
 
-    @Min(value = 0,message = "请选择有效的小区!")
-    @NotNull(message = "小区不能空!")
+    @Min(value = 0,message = "请选择有效的投放社区!")
+    @NotNull(message = "投放社区不能为空！")
     private Integer communityId;
 
     // @NotBlank(message = "跳转描述不能为空!")

VUECODE/smart-operate-manage/build/webpack.dev.conf.js

@@ -56,7 +56,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       filename: 'index.html',
       template: 'index.html',
       inject: true,
-      favicon: resolve('favicon.ico'),
+      favicon: resolve('zhihui.jpg'),
       title: '智慧社区运营平台'
     })
   ]

VUECODE/smart-operate-manage/build/webpack.prod.conf.js

@@ -54,7 +54,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       filename: config.build.index,
       template: 'index.html',
       inject: true,
-      favicon: resolve('favicon.ico'),
+      favicon: resolve('zhihui.jpg'),
       title: '智慧社区运营平台',
       minify: {
         removeComments: true,

VUECODE/smart-operate-manage/src/router/index.js

@@ -24,7 +24,6 @@ import Layout from '../views/layout/Layout'
 export const constantRouterMap = [
   { path: '/login', component: () => import('@/views/login/index'), hidden: true },
   { path: '/404', component: () => import('@/views/404'), hidden: true },
-
   {
     path: '/dashboard',
     component: Layout,
@@ -41,8 +40,6 @@ export const constantRouterMap = [
     path: '/',
     component: Layout,
     redirect: '/index',
-    alwaysShow: true,
-    meta: { title: '首页', icon: 'zip' },
     children: [
       {
         path: '',

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -1,25 +1,25 @@
 <template>
   <div class="app-container">
     <el-form ref="addForm" :model="addForm">
-      <el-form-item :label-width="formLabelWidth" label="标题">
+      <el-form-item :label-width="formLabelWidth" label="标题 *">
         <el-input v-model="addForm.title"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="权重">
+      <el-form-item :label-width="formLabelWidth" label="权重 *">
         <el-input v-model="addForm.sort"/>
       </el-form-item>
-       <el-form-item :label-width="formLabelWidth" label="生效时间">
+       <el-form-item :label-width="formLabelWidth" label="生效时间 *">
         <el-date-picker
           v-model="addForm.effTime"
           type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="失效时间">
+      <el-form-item :label-width="formLabelWidth" label="失效时间 *">
         <el-date-picker
           v-model="addForm.expTime"
           type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="banner图">
+      <el-form-item :label-width="formLabelWidth" label="banner图 *">
         <el-upload
           class="avatar-uploader"
           action="http://101.132.102.231:8085/operate-api/uploadimage"
@@ -30,7 +30,7 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="banner位">
+      <el-form-item :label-width="formLabelWidth" label="banner位 *">
         <el-select v-model="addForm.bannerPosition" placeholder="请选择位置">
           <!-- <el-option label="请选择位置" value="-1"/> -->
           <el-option
@@ -42,7 +42,7 @@
           <!-- <el-option v-for="item in bannerPositionArr" label="item.value" value="item.id"/> -->
         </el-select>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="投放社区">
+      <el-form-item :label-width="formLabelWidth" label="投放社区 *">
         <el-select v-model="addForm.communityId" placeholder="请选择社区">
           <!-- <el-option label="请选择社区" value="-1"/> -->
           <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
@@ -56,18 +56,18 @@
           type="textarea"
           placeholder="请输入跳转描述"/>
       </el-form-item> -->
-      <el-form-item :label-width="formLabelWidth" label="banner跳转">
+      <el-form-item :label-width="formLabelWidth" label="banner跳转 *">
         <el-radio v-model="addForm.bannerType" label="1" @change="showContent">外部超链接</el-radio>
         <el-radio v-model="addForm.bannerType" label="2" @change="showContent">自写文章</el-radio>
       </el-form-item>
-      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接">
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接 *">
         <el-input v-model="addForm.externalLink" placeholder="跳转链接"/>
       </el-form-item>
       <div v-if="showContentVisible">
-        <el-form-item :label-width="formLabelWidth" label="内容标题">
+        <el-form-item :label-width="formLabelWidth" label="内容标题 *">
           <el-input v-model="addForm.bannerTitle" placeholder="内容标题"/>
         </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="内容详情">
+        <el-form-item :label-width="formLabelWidth" label="内容详情 *">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
             <wangeditor v-on:wangeditorEvent="wangeditorValue"></wangeditor>

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -129,6 +129,7 @@ export default {
       calendarTypeOptions,
       listQuery: [],
       form: {
+        id: '',
         title: '',
         sort: '1',
         bannerCover: '',
@@ -174,7 +175,7 @@ export default {
     ]),
     handleAvatarSuccess(res, file) { // 上传成功回调
       this.imageUrl = URL.createObjectURL(file.raw)
-      this.addForm.bannerCover = res.data[0]
+      this.form.bannerCover = res.data[0]
     },
     dialogAddForm() {
       this.dialogFormVisible = true

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -5,11 +5,11 @@
       <el-input v-model="listQuery.title" placeholder="请输入标题" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
       <!-- <label>跳转概述</label>
       <el-input v-model="listQuery.bannerDescription" placeholder="请输入跳转概述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/> -->
-      <label>选择小区</label>
-      <el-select v-model="listQuery.communityId" placeholder="选择小区" clearable style="width: 200px" class="filter-item">
+      <label>适用社区</label>
+      <el-select v-model="listQuery.communityId" placeholder="适用社区" clearable style="width: 200px" class="filter-item">
         <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
       </el-select>
-      <label>位置</label>
+      <label>banner位置</label>
       <el-select v-model="listQuery.bannerPosition" placeholder="banner位置" clearable class="filter-item" style="width: 200px">
         <el-option v-for="item in bannerPositionArr" :key="item.id" :value="item.id" :label="item.value"/>
       </el-select>
@@ -34,15 +34,10 @@
       @selection-change="handleSelectionChange">
       <el-table-column label="选择" type="selection" sortable="custom" align="center" >
       </el-table-column>
-      <el-table-column label="编号" align="center" min-width="30px">
-        <template slot-scope="scope">
-          <span>{{ scope.row.id }}</span>
-        </template>
-      </el-table-column>
       <el-table-column label="标题" align="center" min-width="250px">
         <template slot-scope="scope">
           <!-- <span class="link-type" @click="handleUpdate(scope.row)">{{ scope.row.title }}</span> -->
-          <span class="link-type" @click="infoBanner(scope.row.id)">{{ scope.row.title }}</span>
+          <span class="link-type title-span" @click="infoBanner(scope.row.id)">{{ scope.row.title }}</span>
         </template>
       </el-table-column>
       <el-table-column label="适用社区" align="center">
@@ -91,7 +86,7 @@
     <el-pagination
       :total="total"
       :current-page="listQuery.pageNum"
-      :page-sizes="[5, 10, 20, 30]"
+      :page-sizes="[10, 20, 30]"
       :page-size="listQuery.pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       @size-change="handleSizeChange"
@@ -140,12 +135,16 @@ export default {
       listLoading: true,
       listQuery: {
         pageNum: 1,
-        pageSize: 5,
+        pageSize: 10,
         title: undefined,
         bannerPosition: undefined,
         bannerDescription: undefined,
         communityId: undefined
       },
+      communityQuery: {
+        pageNum: 1,
+        pageSize: 200,
+      },
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
       addForm: {
@@ -267,7 +266,7 @@ export default {
     },
     getCommuniryList() {
       this.listLoading = true
-      this.FetchCommunityList().then(() => {
+      this.FetchCommunityList(this.communityQuery).then(() => {
         this.listLoading = false
       }).catch(() => {
         this.loading = false
@@ -303,3 +302,20 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.title-span {
+  background-color: rgba(64,158,255,.1);
+  padding: 0 10px;
+  height: 32px;
+  line-height: 30px;
+  font-size: 12px;
+  color: #409EFF;
+  border-radius: 4px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 1px solid rgba(64,158,255,.2);
+  white-space: nowrap;
+}
+</style>
+

VUECODE/smart-operate-manage/src/views/banner/infoBanner/index.vue

@@ -50,6 +50,7 @@
       </div>
     </el-form>
     <div slot="footer" class="dialog-footer">
+      <el-button @click="updateBanner" type="primary">修 改</el-button>
       <el-button @click="dialogForm('0')">返 回</el-button>
     </div>
   </div>
@@ -100,6 +101,7 @@ export default {
       calendarTypeOptions,
       listQuery: [],
       form: {
+        id: '',
         title: '',
         sort: '1',
         bannerCover: '',
@@ -184,6 +186,9 @@ export default {
         this.showURLVisible = false
       }
     },
+    updateBanner() {
+      this.$router.push({ name: 'banner-edi', params: { id: this.form.id, listQuery: this.listQuery }})
+    },
     updateData() {
       this.$refs['form'].validate((valid) => {
         if (valid) {

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

@@ -156,29 +156,17 @@
     <el-dialog :title="查看" :visible.sync="dialogLookFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="detail" label-position="left" label-width="100px" style="margin-left:50px;">
         <el-form-item label="社区名称">
-          <el-input v-model="detail.communityName"/>
+          <span>{{ detail.communityName }}</span>
         </el-form-item>
         <el-form-item label="社区别名">
-          <el-input v-model="detail.communityAlias"/>
+          <span>{{ detail.communityAlias }}</span>
         </el-form-item>
         <el-form-item label="所在区县">
-          <el-select v-model="detail.provinceId" placeholder="省" clearable style="width: 90px" class="filter-item" @change="getEditCityList">
-            <el-option v-for="item in provinceList" :key="item.id" :label="item.province" :value="item.id"/>
-          </el-select>
-          <el-select v-model="detail.cityId" placeholder="市" clearable class="filter-item" style="width: 130px" @change="getEditDistrictList">
-            <el-option v-for="item in editCityList" :key="item.id" :label="item.city" :value="item.id"/>
-          </el-select>
-          <el-select v-model="detail.districtId" placeholder="区县乡" clearable class="filter-item" style="width: 130px">
-            <el-option v-for="item in editDistrictList" :key="item.id" :label="item.district" :value="item.id"/>
-          </el-select>
+          <span>{{ getProvinceName(detail.provinceId) + getCityName(detail.cityId) + getDistrictName(detail.districtId) }}</span>
         </el-form-item>
         <el-form-item label="高德坐标">
-          <el-input
-            v-model="detail.longitude"
-            placeholder="经度"/>
-          <el-input
-            v-model="detail.latitude"
-            placeholder="纬度"/>
+          <span>{{ '经度: ' + detail.longitude }}</span>
+          <span>{{ '纬度: ' + detail.latitude }}</span>
         </el-form-item>
         <!-- <el-amap-search-box class="search-box" :search-option="searchOption" :on-search-result="onSearchResult"></el-amap-search-box> -->
         <div style="width:100%;height:200px;">
@@ -187,14 +175,10 @@
           </el-amap>
         </div>
         <el-form-item label="管理员姓名">
-          <el-input
-            v-model="detail.userName"
-            placeholder="建议先填写运营人员姓名"/>
+          <span>{{ detail.userName }}</span>
         </el-form-item>
         <el-form-item label="管理员账号">
-          <el-input
-            v-model="detail.loginName"
-            placeholder="建议先填写运营人员手机号"/>
+          <span>{{ detail.loginName }}</span>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -550,7 +534,31 @@ export default {
           return v[j]
         }
       }))
-    }
+    },
+    getProvinceName(provinceId) {
+      const tempProvince = this.provinceList
+      for (const i in tempProvince) {
+        if (tempProvince[i].id === provinceId) {
+          return tempProvince[i].province
+        }
+      }
+    },
+    getCityName(cityId) {
+      const tempCity = this.editCityList
+      for (const i in tempCity) {
+        if (tempCity[i].id === cityId) {
+          return tempCity[i].city
+        }
+      }
+    },
+    getDistrictName(districtId) {
+      const tempDistrict = this.editDistrictList
+      for (const i in tempDistrict) {
+        if (tempDistrict[i].id === districtId) {
+          return tempDistrict[i].district
+        }
+      }
+    },
   }
 }
 </script>

VUECODE/smart-operate-manage/src/views/layout/components/Navbar.vue

@@ -8,8 +8,8 @@
     <breadcrumb/>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
-        <span style="position: relative;top: -15px;right:5px">{{ userData.userName }}</span>
-        <img :src="userData.headPortrait" class="user-avatar" v-if="userData.headPortrait != ''">
+        <span style="position: relative;top: -15px;right:5px;">{{ userData.userName }}</span>
+        <img :src="userData.headPortrait" class="user-avatar" v-if="userData.headPortrait != '' && userData.headPortrait != undefined">
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -97,8 +97,10 @@ export default {
           this.loading = true
           this.$store.dispatch('Login', this.loginForm).then((res) => {
             if (res.code === '0') {
+              console.log('登陆结果: ',res)
               this.loading = false
-              this.$router.push({ path: this.redirect || '/' })
+              // this.$router.push({ path: this.redirect || '/index' })
+              this.$router.push({ name: 'index' })
             } else {
               this.loading = false
             }