Merge branch 'dev-shuzicaidan' into test

# Conflicts:
#	src/views/modules/visual/components/screen-map/index.vue

.env.development

@@ -10,3 +10,6 @@ VUE_APP_API_SERVER =  http://192.168.1.140/api
 VUE_APP_NODE_ENV=dev 
 #项目根路径
 VUE_APP_PUBLIC_PATH=epmet-oper
+
+#是否使用另外一种登录方式
+VUE_APP_SSO_LOGIN=off

.env.production

@@ -2,3 +2,4 @@ NODE_ENV=production
 VUE_APP_API_SERVER =  https://epmet-cloud.elinkservice.cn/api
 VUE_APP_NODE_ENV=prod
 VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_SSO_LOGIN=off

.env.production.sit

@@ -3,3 +3,4 @@ NODE_ENV=production
 VUE_APP_API_SERVER =  http://192.168.1.140/api
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_SSO_LOGIN=off

.env.production.uat

@@ -3,3 +3,4 @@ NODE_ENV=production
 VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_NODE_ENV=prod:uat
 VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_SSO_LOGIN=off

.env.shibei_production

@@ -2,3 +2,4 @@ NODE_ENV=production
 VUE_APP_API_SERVER =  https://epdc-shibei.elinkservice.cn/api
 VUE_APP_NODE_ENV=shibei_prod
 VUE_APP_PUBLIC_PATH=epmet-oper
+VUE_APP_SSO_LOGIN=off

src/router/index.js

@@ -32,6 +32,14 @@ export const pageRoutes = [
       title: "登录",
     },
   },
+  {
+    path: "/login-sso",
+    component: () => import("@/views/pages/login-sso"),
+    name: "login-sso",
+    meta: {
+      title: "登录",
+    },
+  },
   {
     path: "/",
     name: "index",

src/views/modules/base/community/roomForm.vue

@@ -50,9 +50,13 @@
                       v-model="dataForm.houseCode">
             </el-input>
           </el-form-item>
-            <div v-if="dataForm.houseQrcodeUrl" style="display: flex;flex-direction: column;">
+          <div v-if="dataForm.houseQrcodeUrl"
-                <img style="margin-left: 70px;width: 200px;" :src="dataForm.houseQrcodeUrl">
+               style="display: flex;flex-direction: column;">
-                <a style="margin-left: 80px" :href="dataForm.houseQrcodeUrl" target="_blank">下载</a>
+            <img style="margin-left: 70px;width: 200px;"
+                 :src="dataForm.houseQrcodeUrl">
+            <a style="margin-left: 80px"
+               :href="dataForm.houseQrcodeUrl"
+               target="_blank">下载</a>
           </div>
         </div>
         <el-form-item label="房屋类型"

src/views/modules/base/community/roomTable.vue

@@ -213,6 +213,7 @@ export default {
       // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
 
       agencyObj: {},//树所选的小区对象
+      agencyLevel: '',//树对应的level， grid neighborHood building agency
 
 
       validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
@@ -339,6 +340,20 @@ export default {
 
       }
 
+      if (this.agencyObj.level === 'grid') {
+        this.agencyLevel = 'grid'
+
+      } else if (this.agencyObj.level === 'neighborHood') {
+        this.agencyLevel = 'neighborHood'
+
+      } else if (this.agencyObj.level === 'building') {
+        this.agencyLevel = 'building'
+
+      } else {
+        this.agencyLevel = 'agency'
+
+      }
+
       // if (fromTree) {
       //   this.agencyObj = treeObj
 
@@ -346,7 +361,7 @@ export default {
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        level: this.agencyObj.level,
+        level: this.agencyLevel,
         id: this.agencyObj.id,
         ownerName: this.ownerName,
         ownerPhone: this.ownerPhone,

src/views/modules/communityService/fuwujilu/detailForm.vue

@@ -139,6 +139,142 @@
 
       </el-form>
 
+      <div v-show="formData.serviceStatus==='completed'">
+        <h3 class="d-h3">反馈内容</h3>
+
+        <el-form ref="ref_form_feedback"
+                 :inline="true"
+                 :disabled="true"
+                 :model="feedbackFormData"
+                 class="div_form">
+
+          <el-form-item label="服务目标"
+                        prop="serviceGoal"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="1000"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务目标，不超过1000字"
+                      v-model="feedbackFormData.serviceGoal"></el-input>
+          </el-form-item>
+
+          <el-form-item label="服务效果"
+                        prop="serviceEffect"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      type="textarea"
+                      maxlength="1000"
+                      show-word-limit
+                      :rows="3"
+                      placeholder="请输入服务效果，不超过1000字"
+                      v-model="feedbackFormData.serviceEffect"></el-input>
+          </el-form-item>
+
+          <el-form-item label="服务人数"
+                        style="display: block"
+                        prop="servicePeopleNumber"
+                        label-width="150px">
+            <el-input-number class="item_width_1"
+                             v-model="feedbackFormData.servicePeopleNumber"
+                             :min="0"
+                             :max="9999"
+                             label="服务人数"></el-input-number>
+          </el-form-item>
+
+          <el-form-item label="服务状态"
+                        label-width="150px"
+                        prop="serviceStatus">
+            <span>已完成</span>
+            <!-- <el-select class="item_width_1"
+                       v-model="feedbackFormData.serviceStatus"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in statusArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select> -->
+
+          </el-form-item>
+          <el-form-item label="满意度"
+                        label-width="150px"
+                        prop="satisfaction">
+            <el-select class="item_width_1"
+                       v-model="feedbackFormData.satisfaction"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in satisfyArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+          <el-form-item label="地址"
+                        prop="address"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="item_width_1"
+                      v-model="feedbackFormData.address"></el-input>
+          </el-form-item>
+          <!-- <el-form-item label="地图位置"
+                        label-width="150px"
+                        style="display: block">
+            <div style="width:500px">
+
+              <div class="div_map">
+                <div id="map_app">
+
+                </div>
+                <div class="div_searchmap">
+                  <el-input maxlength="50"
+                            size="mini"
+                            placeholder="请输入关键字"
+                            v-model="keyWords">
+                  </el-input>
+                  <el-button style="margin-left: 10px"
+                             type="primary"
+                             size="mini"
+                             @click="handleSearchMap">查询</el-button>
+                </div>
+              </div>
+
+            </div>
+          </el-form-item> -->
+
+          <el-form-item class="block"
+                        label="附件"
+                        label-width="150px"
+                        prop="attach">
+            <!-- <el-upload v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
+                       class="upload-demo"
+                       :on-preview="handleFileDownload"
+                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+                       :limit="3"
+                       :file-list="fileList">
+
+            </el-upload> -->
+            <div v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
+                 class="attachement-list">
+              <a :href="att.attachmentUrl"
+                 target="_blank"
+                 :key="att.attachmentUrl"
+                 v-for="att in feedbackFormData.attachmentList">
+                <i class="el-icon-folder-opened"></i>
+                {{ att.attachmentName }}
+              </a>
+            </div>
+            <span v-else>无附件</span>
+          </el-form-item>
+        </el-form>
+      </div>
+
     </div>
 
     <div class="div_btn">
@@ -202,6 +338,20 @@ export default {
         longitude: 36.0722275, //经度
         latitude: 120.38945519 //纬度
       },
+
+      feedbackFormData: {
+        serviceProjectId: '',//	服务项目id	
+        serviceProjectName: '',
+        serviceGoal: '',//	服务目标	
+        serviceEffect: '',//	服务效果	
+        servicePeopleNumber: null,//	服务人数	
+        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
+        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
+        longitude: '',//	经度	
+        latitude: '',//	维度	
+        address: '',
+        attachmentList: [],//	附件列表
+      },
       serviceList: [],//服务list
 
       endPickerOptions: {
@@ -211,18 +361,19 @@ export default {
         disabledDate: startDisabledDate
       },
 
-
       projectList: [],
-
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
     }
   },
   components: {},
   mounted () {
     if (this.serviceRecordId) {//详情
       this.loadInfo()
+
     }
     // this.initMap()
-    console.log('mounted')
+
   },
 
 
@@ -240,13 +391,26 @@ export default {
       if (code === 0) {
         this.formData = { ...data }
         this.formData.serviceRecordId = this.serviceRecordId
+        this.feedbackFormData = { ...data.feedBack }
+        this.feedbackFormData.servicePeopleNumber = this.formData.servicePeopleNumber
+        this.fileList = []
+        if (data.feedBack.attachmentList && data.feedBack.attachmentList.length > 0) {
+          data.feedBack.attachmentList.forEach(element => {
+            let obj = {
+              name: element.attachmentName,
+              format: element.attachmentFormat,
+              url: element.attachmentUrl,
+            }
+            this.fileList.push(obj)
+          });
+        }
+
+
       } else {
         this.$message.error(msg)
       }
     },
 
-
-
     async handleComfirm () {
 
       this.btnDisable = true
@@ -303,6 +467,19 @@ export default {
 
     },
 
+    //下载
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = file.name;
+      console.log(a)
+      a.href = file.url;
+      a.dispatchEvent(event);
+
+
+    },
+
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap () {
       // 定义地图中心点坐标
@@ -485,7 +662,13 @@ export default {
       default () {
         return []
       }
+    },
+    satisfyArray: {
+      type: Array,
+      default () {
+        return []
       }
+    },
   }
 }
 </script>
@@ -493,4 +676,18 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/form-main.scss";
+
+.attachement-list {
+  // padding-left: 20px;
+  a {
+    display: block;
+    cursor: pointer;
+    // color: #4df0ff;
+    font-size: 14px;
+
+    i {
+      color: #333;
+    }
+  }
+}
 </style>

src/views/modules/communityService/fuwujilu/fuwuList.vue

@@ -253,6 +253,7 @@
                @closed="showDetail = false">
       <detail-form ref="ref_detail_form"
                    :serviceRecordId="serviceRecordId"
+                   :satisfyArray="satisfyArray"
                    :categrayArray="categrayArray"
                    @handleOk="handleOk"
                    @handleClose="handleClose"

src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue

@@ -348,7 +348,7 @@ export default {
       geocoder
         .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          // this.fmData.address = result.result.address;
+          this.fmData.address = result.result.address;
         });
     },
 

src/views/modules/communityService/sqzzz/index.vue

@@ -1,72 +1,58 @@
 <template>
   <div class="resi-container">
-    <el-card ref="searchCard" class="search-card">
+    <el-card ref="searchCard"
-      <el-form
+             class="search-card">
-        ref="searchForm"
+      <el-form ref="searchForm"
                :inline="true"
                :model="fmData"
-        class="demo-form-inline"
+               class="demo-form-inline">
-      >
+        <el-form-item label="组织名称"
-        <el-form-item label="组织名称" prop="organizationName">
+                      prop="organizationName">
-          <el-input
+          <el-input v-model="fmData.organizationName"
-            v-model="fmData.organizationName"
                     class="resi-cell-input"
                     size="small"
                     clearable
-            placeholder="请输入"
+                    placeholder="请输入">
-          >
           </el-input>
         </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
+        <el-form-item label="创建时间"
-          <el-date-picker
+                      prop="createTime">
-            v-model="fmData.createTime"
+          <el-date-picker v-model="fmData.createTime"
                           type="daterange"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd">
-          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="备注"
-          <el-input
+                      prop="remark">
-            v-model="fmData.remark"
+          <el-input v-model="fmData.remark"
                     class="resi-cell-input"
                     size="small"
                     clearable
-            placeholder="请输入"
+                    placeholder="请输入">
-          >
           </el-input>
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button class="diy-button--search"
-            class="diy-button--search"
                      size="small"
-            @click="handleSearch"
+                     @click="handleSearch">查询</el-button>
-            >查询</el-button
+          <el-button class="diy-button--reset"
-          >
-          <el-button
-            class="diy-button--reset"
                      size="small"
-            @click="resetForm('searchForm')"
+                     @click="resetForm('searchForm')">重置</el-button>
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button class="diy-button--add" size="small" @click="handleAdd"
+        <el-button class="diy-button--add"
-          >新增</el-button
+                   size="small"
-        >
+                   @click="handleAdd">新增</el-button>
-        <el-button
+        <el-button class="diy-button--export"
-          class="diy-button--export"
                    size="small"
-          @click="handleExportModule('room')"
+                   @click="handleExportModule('room')">下载模板</el-button>
-          >下载模板</el-button
+        <el-upload ref="upload"
-        >
-        <el-upload
-          ref="upload"
                    class="upload-btn"
                    action="uploadUlr"
                    :limit="1"
@@ -77,73 +63,73 @@
                    :on-progress="handleProgress"
                    :on-success="handleExcelSuccess"
                    :before-upload="beforeExcelUpload"
-          :http-request="uploadHttpRequest"
+                   :http-request="uploadHttpRequest">
-        >
+          <el-button size="small"
-          <el-button
-            size="small"
                      class="diy-button--delete"
-            :loading="importLoading"
+                     :loading="importLoading">{{ importBtnTitle }}</el-button>
-            >{{ importBtnTitle }}</el-button
-          >
         </el-upload>
 
-        <el-button @click="handleChu" class="diy-button--reset" size="small"
+        <el-button @click="handleChu"
-          >导出</el-button
+                   class="diy-button--reset"
-        >
+                   size="small">导出</el-button>
       </div>
-      <el-table
+      <el-table :data="tableData"
-        :data="tableData"
                 border
                 style="width: 100%"
                 class="resi-table"
-        :height="maxTableHeight"
+                :height="maxTableHeight">
-      >
+        <el-table-column label="序号"
-        <el-table-column label="序号" type="index" align="center" width="50" />
+                         type="index"
-        <el-table-column
-          prop="organizationName"
-          label="组织名称"
                          align="center"
-        >
+                         width="50" />
+        <el-table-column prop="organizationName"
+                         label="组织名称"
+                         align="center">
           <template slot-scope="scope">
-            <a class="name-a" @click="handleWatch(scope.$index)">
+            <a class="name-a"
+               @click="handleWatch(scope.$index)">
               {{ scope.row.organizationName }}
             </a>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="categoryName"
-          prop="categoryName"
                          align="center"
-          label="分类名称"
+                         label="分类名称">
-        >
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="organizationPersonCount"
-          prop="organizationPersonCount"
                          align="center"
-          label="组织人数"
+                         label="组织人数">
-        >
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="serviceItem"
-          prop="serviceItem"
                          label="服务事项"
                          align="center"
-          :show-overflow-tooltip="true"
+                         :show-overflow-tooltip="true">
-        >
         </el-table-column>
-        <el-table-column prop="score" width="100" align="center" label="积分">
+        <el-table-column prop="score"
+                         width="100"
+                         align="center"
+                         label="积分">
         </el-table-column>
-        <el-table-column prop="principalName" align="center" label="负责人">
+        <el-table-column prop="principalName"
+                         align="center"
+                         label="负责人">
         </el-table-column>
-        <el-table-column prop="principalPhone" align="center" label="联系电话">
+        <el-table-column prop="principalPhone"
+                         align="center"
+                         label="联系电话">
         </el-table-column>
-        <el-table-column prop="remark" align="center" label="备注">
+        <el-table-column prop="remark"
+                         align="center"
+                         label="备注">
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="organizationCreatedTime"
-          prop="organizationCreatedTime"
                          align="center"
-          label="创建时间"
+                         label="创建时间">
-        >
         </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="160">
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="160">
           <template slot-scope="scope">
             <!-- <el-button
               @click="handleWatch(scope.$index)"
@@ -151,85 +137,64 @@
               size="small"
               >查看</el-button
             > -->
-            <el-button
+            <el-button type="text"
-              type="text"
                        class="div-table-button--detail"
                        size="small"
-              @click="handleScore(scope.row)"
+                       @click="handleScore(scope.row)">积分记录</el-button>
-              >积分记录</el-button
-            >
 
-            <el-button
+            <el-button @click="handleEdit(scope.$index)"
-              @click="handleEdit(scope.$index)"
                        type="text"
                        size="small"
-              class="div-table-button--edit"
+                       class="div-table-button--edit">修改</el-button>
-              >修改</el-button
-            >
 
-            <el-popconfirm
+            <el-popconfirm title="删除之后无法回复，确认删除？"
-              title="删除之后无法回复，确认删除？"
                            @onConfirm="handleDel(scope.row, scope.$index)"
-              @confirm="handleDel(scope.row, scope.$index)"
+                           @confirm="handleDel(scope.row, scope.$index)">
-            >
+              <el-button slot="reference"
-              <el-button
-                slot="reference"
                          type="text"
                          size="small"
                          class="div-table-button--delete"
-                style="margin-left: 10px"
+                         style="margin-left: 10px">删除</el-button>
-                >删除</el-button
-              >
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination
+        <el-pagination @size-change="handleSizeChange"
-          @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
                        :page-sizes="[20, 50, 100, 200]"
                        :page-size="parseInt(pageSize)"
                        layout="sizes, prev, pager, next, total"
-          :total="total"
+                       :total="total">
-        >
         </el-pagination>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog
+    <el-dialog :visible.sync="formShow"
-      :visible.sync="formShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
                width="850px"
                top="5vh"
                class="dialog-h"
-      @closed="handleClose"
+               @closed="handleClose">
-    >
+      <edit-form ref="eleEditForm"
-      <edit-form
-        ref="eleEditForm"
                  @dialogCancle="handleClose"
-        @dialogOk="handleEditSuccess"
+                 @dialogOk="handleEditSuccess"></edit-form>
-      ></edit-form>
     </el-dialog>
 
     <!-- 积分记录 -->
-    <el-dialog
+    <el-dialog :visible.sync="scoreDiaShow"
-      :visible.sync="scoreDiaShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="scoreDiaTitle"
                width="70%"
                top="5vh"
-      @closed="diaClose"
+               @closed="diaClose">
-    >
+      <score-record ref="ref_score"
-      <score-record
+                    :serviceType="'community_org'"></score-record>
-        ref="ref_score"
-        :serviceType="'community_org'"
-      ></score-record>
     </el-dialog>
   </div>
 </template>
@@ -513,7 +478,8 @@ export default {
         this.$message.success("删除成功！");
         this.getTableData();
       } else {
-        this.$message.success("操作失败！");
+        this.$message.error(msg)
+        // this.$message.success("操作失败！");
       }
     },
 
@@ -535,6 +501,7 @@ export default {
           })
           : [];
       } else {
+        this.$message.error(msg)
       }
     },
 

src/views/modules/plugins/stats/factagencyuserhousedaily.vue

@@ -3,7 +3,7 @@
     <div class="mode-block resi-container">
       <el-card ref="searchCard" class="search-card">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="组织机构" label-width="100px"
+        <el-form-item label="所属组织" label-width="100px"
                       prop="agencyId">
           <!-- <el-select
                   v-model.trim="dataForm.agencyId"
@@ -208,7 +208,7 @@ export default {
     getGridList() {
       const { user } = this.$store.state
       this.$http
-              .post('/gov/org/icServiceProject/service/serviceScopeTree')
+              .post('/gov/org/userhouse/service/serviceScopeTree')
               .then(({ data: res }) => {
                 if (res.code !== 0) {
                   return this.$message.error(res.msg)

src/views/modules/shequzhili/event copy/cpts/process-form-demand.vue

@@ -52,7 +52,7 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="服务人"
+      <el-form-item label="需求人"
                     label-width="150px"
                     prop="demandUserName">
         <el-input v-model="formData.demandUserName"
@@ -187,9 +187,9 @@ function iniFmData () {
     reportUserName: '',//	上报人姓名	
     reportUserMobile: '',//	自身上报时存储注册居民的手机号	
     reportTime: '',//	上报时间	
-    demandUserId: '',//	服务人：user.id或者ic_resi_user.id	
+    demandUserId: '',//	需求人：user.id或者ic_resi_user.id	
-    demandUserName: '',//	服务人姓名	
+    demandUserName: '',//	需求人姓名	
-    demandUserMobile: '',//服务人联系电话	
+    demandUserMobile: '',//需求人联系电话	
     wantServiceTime: '',//	希望服务时间
     serviceType: '',
     serverId: '',
@@ -249,7 +249,7 @@ export default {
           { required: true, message: "服务时间不能为空", trigger: "blur" },
         ],
         demandUserName: [
-          { required: true, message: "服务人不能为空", trigger: "blur" },
+          { required: true, message: "需求人不能为空", trigger: "blur" },
         ],
         demandUserMobile: [
           { required: true, message: "联系电话不能为空", trigger: "blur" },

src/views/modules/shequzhili/event copy/cpts/process-form-project.vue

@@ -188,7 +188,7 @@ import { isCard } from "@/utils/validate";
 let loading; // 加载动画
 function iniFmData () {
   return {
-    operationType: '1',//处理方式[0:已回复 1:已转项目  2:已转需求]	
+    operationType: '1',//处理方式[0:已回复 1:已转项目  2:已转服务]	
     publicReply: '',//项目方案 1000	
     internalRemark: '',//	内部备注 1000	
     gridId: '',//

src/views/modules/shequzhili/event copy/cpts/process-form-replay.vue

@@ -58,7 +58,7 @@ export default {
     return {
       btnDisable: false,
       formData: {
-        operationType: '0',//处理方式[0:已回复 1:已转项目  2:已转需求]	
+        operationType: '0',//处理方式[0:已回复 1:已转项目  2:已转服务]	
         content: '',
         status: ''
       },

src/views/modules/shequzhili/event copy/eventList.vue

@@ -609,7 +609,7 @@ export default {
 
         this.tableData.forEach(item => {
           if (item.operationType === '2') {
-            item.operationTypeShow = '已转需求'
+            item.operationTypeShow = '已转服务'
           }
           if (item.operationType === '1') {
             item.operationTypeShow = '已立项'

src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue

@@ -21,6 +21,7 @@
             </template>
             <screen-nodata class="nodata" v-else></screen-nodata>
           </div>
+          <div class="dashed-line"></div>
           <div class="list right-list">
             <template v-if="info.content">
               <!-- <div class="item-title">需求内容</div> -->
@@ -290,6 +291,12 @@ export default {
 .list-wr {
   display: flex;
   padding: 0 20px;
+  .dashed-line {
+    width: 1px;
+    height: 600px;
+    margin: 0 15px;
+    border: 1px dashed #1257c9;
+  }
   .left-list {
     width: 280px !important;
     height: 600px;
@@ -322,7 +329,7 @@ export default {
     }
   }
   .right-list {
-    padding: 0 25px !important;
+    padding: 0 15px !important;
   }
 }
 </style>

src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue

@@ -369,8 +369,10 @@ export default {
           if (item.coordinates && item.coordinates.length > 0) {
             if (!this.isRepeatItem(item.name)) {
               let colorIndex = index < polygonColorArray.length ? index : 0
-              item.fillColor = transparent,
+              // item.fillColor = 'rgba(0, 229, 237, 0.16)'
-                item.color = polygonColorArray[colorIndex]
+              item.fillColor = transparent
+              item.color = '#00E5ED'
+                // item.color = polygonColorArray[colorIndex]
               subPolygonList.push(item)
             }
           }
@@ -456,7 +458,10 @@ export default {
       if (this.isfirstInit) {
         // this.agencyInfo.level = 'agency'
         //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
-        this.$refs.map.loadMap(this.agencyInfo, this.polygonList, null, this.distributionsList, this.iconUrlArray, null)
+        const polygonIconArray = [
+          'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
+        ]
+        this.$refs.map.loadMap(this.agencyInfo, this.polygonList, polygonIconArray, this.distributionsList, this.iconUrlArray, null)
       } else {
         this.$refs.map.refreshMap(this.agencyInfo, this.polygonList, this.distributionsList, false)
       }
@@ -464,10 +469,11 @@ export default {
 
     // 点击项目
     async clickMap (feature) {
-      if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
+      // 点击显示下级区域
-        await this.loadOrgData(feature.values_.level, feature.values_.id)
+      // if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
-        this.loadMap()
+      //   await this.loadOrgData(feature.values_.level, feature.values_.id)
-      }
+      //   this.loadMap()
+      // }
       console.log('标注信息', feature.values_.properties)
       if (!feature.values_.properties) {
         return

src/views/modules/visual/components/screen-map/index.vue

@@ -560,7 +560,6 @@ const vueGis = {
       }
       mapView.setZoom(this.zoom);
 
-      
     },
     firstCentermap () {
       if (this.mapInfo.longitude && this.mapInfo.latitude) {

src/views/pages/login-sso.vue

@@ -0,0 +1,73 @@
+<template>
+  <div class="g-app">
+    <div class="m-hint">登录中...</div>
+  </div>
+</template>
+
+<script>
+import { requestGet, requestPost } from "@/js/dai/request";
+import getQueryPara from "dai-js/modules/getQueryPara";
+
+export default {
+  data() {
+    return {};
+  },
+
+  components: {},
+  computed: {},
+
+  created() {
+    let ticket = getQueryPara("ticket");
+    if (ticket) {
+      this.loginByTicket(ticket);
+    } else {
+      this.getAuthUrl();
+    }
+  },
+  mounted() {},
+
+  methods: {
+    async getAuthUrl() {
+      const url = "/auth/sso/ssoAuthUrl";
+
+      const { data, code, msg } = await requestGet(url, {
+        clientLoginUrl: location.href,
+      });
+
+      if (code === 0) {
+        location.href = data.authUrl + "&mode=ticket";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async loginByTicket(ticket) {
+      const url = "/auth/sso/login?ticket=" + ticket;
+
+      const { data, code, msg } = await requestPost(url, {
+        ticket,
+      });
+
+      if (code === 0) {
+        localStorage.setItem("token", data.token);
+        this.$router.replace({ name: "index" });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.g-app {
+  width: 100vw;
+  height: 100vh;
+  background-color: #f7f7f7;
+  .m-hint {
+    text-align: center;
+    font-size: 36px;
+    line-height: 100vh;
+    color: #999999;
+    font-weight: bold;
+  }
+}
+</style>

src/views/pages/login.vue

@@ -140,6 +140,10 @@ export default {
     },
   },
   created() {
+    if (process.env.VUE_APP_SSO_LOGIN == "on") {
+      this.$router.replace({ name: "login-sso" });
+    }
+
     //平阴联动平台 登陆
     if (this.$route.query.platformToken) {
       this.isShowLogin = false;