Merge branch 'dev_shequzhili' into dev

src/router/index.js

@@ -318,11 +318,11 @@ router.beforeEach((to, from, next) => {
           name: "事件处理分析",
           id: "shijianchulifenxi",
         },
-        {
-          url: "visual/communityGovern/processAnalyze",
-          name: "事件处置分析",
-          id: "processAnalyze",
-        },
+        // {
+        //   url: "visual/communityGovern/processAnalyze",
+        //   name: "事件处置分析",
+        //   id: "processAnalyze",
+        // },
         {
           url: "/visual/communityGovern/shijianfenlei/shijianfenleifenxi",
           name: "事件分类分析",
@@ -338,16 +338,16 @@ router.beforeEach((to, from, next) => {
         //   name: "事件分类分析",
         //   id: "typeAnalyze",
         // },
-        {
-          url: "/visual/communityGovern/resibuzz",
-          name: "居民热议分析",
-          id: "resibuzz",
-        },
-        {
-          url: "/visual/communityGovern/distributionAnalyze",
-          name: "事件分布分析",
-          id: "distributionAnalyze",
-        },
+        // {
+        //   url: "/visual/communityGovern/resibuzz",
+        //   name: "居民热议分析",
+        //   id: "resibuzz",
+        // },
+        // {
+        //   url: "/visual/communityGovern/distributionAnalyze",
+        //   name: "事件分布分析",
+        //   id: "distributionAnalyze",
+        // },
       ],
     },
   

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

@@ -100,7 +100,7 @@
             </div>
           </div>
 
-          <div style="margin-top: 10px">
+          <!-- <div style="margin-top: 10px">
             <span>经度</span>
             <el-input class="item_width_3"
                       maxlength="50"
@@ -113,7 +113,7 @@
                       placeholder="请输入纬度"
                       v-model="formData.latitude">
             </el-input>
-          </div>
+          </div> -->
         </div>
       </el-form-item>
 

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

@@ -12,7 +12,8 @@
                       prop="operationType">
           <el-radio-group v-model="operationType"
                           @change="handleChangeOperationType">
-            <el-radio label="">暂不处理</el-radio>
+            <el-radio v-if="!eventId"
+                      label="">暂不处理</el-radio>
             <el-radio label="0">回复</el-radio>
             <el-radio label="1">立项</el-radio>
             <el-radio label="2">转服务</el-radio>

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

@@ -187,6 +187,7 @@
 
           <el-table-column prop="address"
                            align="center"
+                           :show-overflow-tooltip="true"
                            label="地址">
           </el-table-column>
 

src/views/modules/shequzhili/xiangmu/index.vue

@@ -23,12 +23,22 @@
 
             <el-form-item label="转项目时间" prop="date">
               <el-date-picker
-                v-model="fmData.date"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                v-model="fmData.startDate"
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd"
+                style="width: 150px"
+                placeholder="开始时间"
+              >
+              </el-date-picker>
+              <span style="margin:0 8px;">至</span>
+              <el-date-picker
+                v-model="fmData.endDate"
+                size="small"
+                type="date"
+                style="width: 150px"
                 value-format="yyyy-MM-dd"
+                placeholder="结束时间"
               >
               </el-date-picker>
             </el-form-item>
@@ -39,7 +49,7 @@
                 placeholder="请选择"
                 size="small"
                 clearable
-                style="width: 120px"
+                style="width: 150px"
                 class="resi-cell-select"
               >
                 <el-option

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

@@ -23,10 +23,7 @@
           </div>
           <div class="list right-list">
             <template v-if="info.content">
-              <div class="item-title">需求内容</div>
-              <div class="item">
-                <div>{{ info.content }}</div>
-              </div>
+              <!-- <div class="item-title">需求内容</div> -->
               <div class="item">
                 <span class="item-field">所属网格：</span>
                 <span>{{ info.gridName }}</span>
@@ -35,10 +32,10 @@
                 <span class="item-field">需求类型：</span>
                 <span>{{ info.categoryName }}</span>
               </div>
-              <div class="item">
+              <!-- <div class="item">
                 <span class="item-field">需求状态：</span>
                 <span>{{ info.statusName }}</span>
-              </div>
+              </div> -->
               <div class="item">
                 <span class="item-field">上报类型：</span>
                 <span>{{ info.reportTypeName }}</span>
@@ -55,10 +52,18 @@
                 <span class="item-field">上报时间	：</span>
                 <span>{{ info.reportTime }}</span>
               </div>
+              <div class="item">
+                <span class="item-field">需求人	：</span>
+                <span>{{ info.demandUserName }}</span>
+              </div>
               <div class="item">
                 <span class="item-field">服务时间	：</span>
                 <span>{{ info.wantServiceTime }}</span>
               </div>
+              <div class="item">
+                <span class="item-field">需求内容：</span>
+                <div>{{ info.content }}</div>
+              </div>
               <div class="item">
                 <span class="item-field">服务方	：</span>
                 <span>{{ info.serviceShowName }}</span>
@@ -67,10 +72,10 @@
                 <span class="item-field">实际服务时间	：</span>
                 <span>{{ info.serviceStartTime }} 至 {{ info.serviceEndTime }}</span>
               </div>
-              <div class="item">
+              <!-- <div class="item">
                 <span class="item-field">完成情况	：</span>
                 <span>{{ info.finishDesc }}</span>
-              </div>
+              </div> -->
               <div class="item">
                 <span class="item-field">评价	：</span>
                 <span>