Merge remote-tracking branch 'origin/build' into build

2022-11-18 16:39:29 +08:00
parent 4ac0d0b7d8 b4a5343ce6
commit cc96fa6d65
7 changed files with 78 additions and 23 deletions
--- a/components/AiDvRender.vue
+++ b/components/AiDvRender.vue
@@ -2,27 +2,35 @@
  <div class="AiDvRender" style="width: 100%; height: 100%;">
    <ai-dv-display v-if="data.type === 'display'" :title="data.title" :list="values"></ai-dv-display>
    <ai-dv-panel
-        style="height: 100%; width: 100%;"
-        v-if="data.type !== 'display'"
-        :title="data.title"
-        :border="data.border || ''">
+      style="height: 100%; width: 100%;"
+      v-if="data.type !== 'display'"
+      :title="data.title"
+      :border="data.border || ''">
      <AiDvSummary v-if="data.type === 'summary'" :summaryTitle="data.summaryTitle" :key="`summary${index}`" :type="data.display" :data="values"/>
      <AiSwiper v-else-if="data.type === 'swiper'" :heigth="'100%'" :data="values"/>
      <dv-scroll-board
-          v-if="data.type === 'table'"
-          :class="'dvScrollBoard' + theme"
-          :config="formatTable(values, data.isShowIndex, data.rowNum)"
-          :key="data.height"
-          :theme="theme"
-          :style="{height: data.height + 'px', width: '100%'}"/>
+        v-if="data.type === 'table'"
+        :class="'dvScrollBoard' + theme"
+        :config="formatTable(values, data.isShowIndex, data.rowNum)"
+        :key="data.height"
+        :theme="theme"
+        :style="{height: data.height + 'px', width: '100%'}" />
      <ai-echart v-else-if="/Chart/.test(data.type)"
-                 style="height: 100%; width: 100%;"
-                 :ref="'chart' + index"
-                 :key="`chart${index}`"
-                 :theme="theme"
-                 :data="values"
-                 :ops="chartList[data.config]"/>
-      <ai-map v-else-if="data.type=='map'" :mask="data.mask === '1'" :areaId="data.areaId || user.info.areaId" :is3d="data.is3d==1"
+        style="height: 100%; width: 100%;"
+        :ref="'chart' + index"
+        :key="`chart${index}`"
+        :theme="theme"
+        :data="values"
+        :ops="chartList[data.config]" />
+        <!-- <ai-q-map
+          v-else-if="data.type=='map'"
+          :area-id="data.areaId"
+          :markers="markers"
+          :is3d="data.is3D === '1'"
+          :limitArea="data.limitArea === '1'"
+          :is3dAround="data.is3dAround === '1'">
+        </ai-q-map> -->
+      <ai-map v-else-if="data.type=='map'" :mask="data.mask === '1'" :areaId="data.areaId" :is3d="data.is3d==1" :is3dAround="data.is3dAround === '1'"
              :map-style="`amap://styles/${data.mapStyle}`" :pulseLines="data.pulseLines==1" :map.sync="map" :lib.sync="lib" :onlyShowArea="data.limitArea==1"/>
      <ai-monitor :src="data.src" v-else-if="data.type === 'monitor'" :type="data.monitorType"/>
      <video style="width: 100%; height: 100%; object-fit: fill;" loop :src="data.src" autoplay v-else-if="data.type === 'video'"/>
@@ -80,7 +88,7 @@ export default {
      immediate: true,
      deep: true, handler() {
        if (this.currentType == 'map') {
-          this.renderMap()
+          // this.renderMap()
        }
      }
    }
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -106,6 +106,7 @@
              <ai-info-item v-if="['2', '3', '6'].includes(item.handleType) && item.handoverPersonName" label="移交方式" :value="dict.getLabel('EP_handoverMethod', item.handoverMethod)"></ai-info-item>
              <ai-info-item v-if="['2', '3', '6'].includes(item.handleType) && item.handoverPersonName" label="交接人员姓名" :value="item.handoverPersonName"></ai-info-item>
              <ai-info-item v-if="['2', '3', '6'].includes(item.handleType) && item.handoverPersonName" label="手机号" :value="item.handoverPersonPhone"></ai-info-item>
+              <ai-info-item isLine label="备注" :value="item.remarks"></ai-info-item>

              <ai-info-item label="交接图片" isLine v-if="['3', '2', '6'].includes(item.handleType) && item.handoverPersonName">
                <ai-uploader
--- a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
@@ -24,6 +24,7 @@
              <ai-info-item label="管控人" :value="info.controllerUserName"></ai-info-item>
              <ai-info-item label="联系方式" :value="info.controllerUserPhone"></ai-info-item>
              <ai-info-item label="管理内容" isLine :value="info.controllerContent"></ai-info-item>
+              <ai-info-item isLine label="备注" :value="info.lastRiskDisposal.remarks"></ai-info-item>
              <ai-info-item label="图片" isLine>
                <ai-uploader
                  :instance="instance"
--- a/project/pingchang/apps/AppPartyMember/components/List.vue
+++ b/project/pingchang/apps/AppPartyMember/components/List.vue
@@ -145,7 +145,7 @@
            </el-input>
          </el-form-item>
          <el-form-item label="审核意见" v-if="form.pass == 0" :prop="form.pass == 0? 'opinion': ''">
-            <el-input type="textarea" :rows="5" v-model="form.opinion" placeholder="请输入" show-word-limit maxlength="500"></el-input>
+            <el-input type="textarea" :rows="5" v-model="form.opinion" placeholder="请输入" show-word-limit maxlength="100"></el-input>
          </el-form-item>
        </el-form>
        <div slot="footer" style="text-align: center;">
--- a/project/pingchang/apps/AppWishfulThinking/components/Add.vue
+++ b/project/pingchang/apps/AppWishfulThinking/components/Add.vue
@@ -39,7 +39,7 @@
                    v-model="form.content"
                    placeholder="请输入..."
                    clearabel
-                    :maxLength="60"
+                    :maxLength="500"
                  ></el-input>
                </el-form-item>
                <el-form-item label="所属地区" prop="areaId" style="width: 100%">
@@ -268,5 +268,50 @@ export default {
    ::v-deep .el-date-editor {
      width: 100%;
    }
+    ::v-deep .mapDialog {
+      .el-dialog__body {
+        padding: 0;
+
+        .ai-dialog__content {
+          padding: 0;
+        }
+
+        .ai-dialog__content--wrapper {
+          padding: 0 !important;
+          position: relative;
+        }
+
+        #map {
+          width: 100%;
+          height: 420px;
+        }
+
+        .searchPlaceInput {
+          position: absolute;
+          width: 250px;
+          top: 30px;
+          left: 25px;
+        }
+
+        #searchPlaceOutput {
+          position: absolute;
+          width: 250px;
+          left: 25px;
+          height: initial;
+          top: 80px;
+          background: white;
+          z-index: 250;
+          max-height: 300px;
+          overflow-y: auto;
+
+          .auto-item {
+            text-align: left;
+            font-size: 14px;
+            padding: 8px;
+            box-sizing: border-box;
+          }
+        }
+      }
+    }
  }
 </style>
--- a/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
+++ b/project/pingchang/apps/AppWishfulThinking/components/Detail.vue
@@ -32,7 +32,7 @@
              </ai-wrapper>
            </template>
          </ai-card>
-          <ai-card title="办事评价" v-if="detail.eventStatus == 2">
+          <ai-card title="办事评价" v-if="detail.evaluation && detail.evaluation.id">
            <template #content>
              <ai-wrapper>
                <ai-info-item label="评价时间" :value="detail.evaluation.createTime"></ai-info-item>
--- a/project/pingchang/apps/AppWishfulThinking/components/List.vue
+++ b/project/pingchang/apps/AppWishfulThinking/components/List.vue
@@ -11,10 +11,10 @@
          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd()">
            添加
          </el-button>
-          <ai-import :instance="instance" :dict="dict" type="appcommunitybuildinginfo" name="微心愿"
+          <!-- <ai-import :instance="instance" :dict="dict" type="appcommunitybuildinginfo" name="微心愿"
                      @success="getList()">
            <el-button icon="iconfont iconImport">导入</el-button>
-          </ai-import>
+          </ai-import> -->
          <ai-select
              v-model="search.eventStatus"
              clearable