From 8be34111083683b772ad9d4c38fb10b4c47855f0 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 06 六月 2023 21:02:49 +0800
Subject: [PATCH] 新增百年心愿

---
 ruoyi-ui/src/api/wish/index.js          |   73 +++
 ruoyi.iml                               |   14 
 ruoyi-ui/src/router/index.js            |   18 
 ruoyi-ui/src/views/wish/index.vue       |  815 +++++++++++++++++++++++++++++++++
 ruoyi-ui/src/views/collection/index.vue |    6 
 ruoyi-ui/src/views/wish/wishInfo.vue    |  505 +++++++++++++++++++++
 6 files changed, 1,422 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/api/wish/index.js b/ruoyi-ui/src/api/wish/index.js
new file mode 100644
index 0000000..eb4e58c
--- /dev/null
+++ b/ruoyi-ui/src/api/wish/index.js
@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+// 鏌ョ湅鎵�鏈�
+export function listWish(query) {
+  return request({
+    url: '/zIdea/all',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鏍规嵁id鏌ヨ
+export function getWish(id) {
+  return request({
+    url: '/zIdea/' + id,
+    method: 'get',
+
+  })
+}
+
+//鏂板
+export function addWish(data)
+{
+  return request({
+    url: '/zIdea',
+    method: 'post',
+    data: data
+  })
+}
+
+// 鍒犻櫎
+export function delWish(ids) {
+  return request({
+    url: '/zIdea/' + ids,
+    method: 'delete'
+  })
+}
+
+//淇敼
+export function updateWish(data) {
+  return request({
+    url: '/zIdea',
+    method: 'put',
+    data: data
+  })
+}
+
+//涓婁紶鏂囦欢
+export function uploadPic(data) {
+  return request({
+    url: '/common/upload',
+    method: 'post',
+    data: data
+  })
+}
+//涓嬭浇鏂囦欢
+export function download(data) {
+  return request({
+    url: '/common/downLoadFile',
+    method: 'get',
+    params: data,
+    responseType: 'blob'
+  })
+}
+//瀵煎叆妯℃澘
+export function downloadModel(data) {
+  return request({
+    url: '/zIdea/model',
+    method: 'get',
+    params: data,
+    responseType: 'blob'
+  })
+}
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 930ac12..4acd499 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -314,6 +314,24 @@
     ]
   },
 
+  //鐧惧勾蹇冩効
+  {
+    path: '/self/wish',
+    component: Layout,
+    // permissions: [],
+    hidden: true,
+    permissions: ['self:wish:info'],
+
+    children: [
+      {
+        path: 'wishInfo/:id(\\d+)',
+        component: () => import('@/views/wish/wishInfo'),
+        name: 'wishInfo',
+        meta: { title: '鐧惧勾蹇冩効璇︾粏淇℃伅',activeMenu: '/self/zIdea'}
+      }
+    ]
+  },
+
   {
     path: '/system/role-auth',
     component: Layout,
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 3afe8d8..ee55371 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -205,7 +205,7 @@
         <template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
 
-      <el-table-column label="鎷ユ湁鑰�" prop="owner" sortable width="110" align="center">
+      <el-table-column label="鎸佹湁鑰�" prop="owner" sortable width="110" align="center">
 
         <template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
@@ -304,8 +304,8 @@
           <el-input v-model="formDat.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
-        <el-form-item label="鎷ユ湁鑰�" prop="owner">
-          <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ嫢鏈夎��" clearable :style="{width: '100%'}" >
+        <el-form-item label="鎸佹湁鑰�" prop="owner">
+          <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="浠锋牸" prop="price">
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index eede110..ed74568 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -1,13 +1,816 @@
 <template>
- <div>hello</div>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
+        <el-input
+          v-model:phone="queryParams.phone"
+          v-model:wx="queryParams.wx"
+          v-model:qq="queryParams.qq"
+          v-model:twitter="queryParams.twitter"
+          v-model:isAlways="queryParams.isAlways"
+          v-model:remark="queryParams.remark"
+          placeholder="鍦ㄢ�滅櫨骞村績鎰库�濅腑鎼滅储"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+        <!--        <el-input
+                  v-model="searchVal"
+                  placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
+                  clearable
+                  style="width: 240px"
+                  @input="inputChange">
+                  <i slot="prefix" class="el-input__icon el-icon-search"></i>
+                </el-input>
+                <div class="outer-table">
+                   姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
+                  <tablemax label="myLabel" :tableData="contactList">
+                    <template v-slot:table>
+                      <el-table-column label="鎿嶄綔" width="180">
+                        <template slot-scope="scope">
+                          <el-button @click="handleCheck(scope.row)" type="text" size="small"
+                          >璋冪敤</el-button
+                          >
+                        </template>
+                      </el-table-column>
+                    </template>
+                  </tablemax>
+                </div>-->
+
+
+        <!--        v-model="queryParams.id"
+
+                  v-model:phone="queryParams.phone"
+                  v-model:wx="queryParams.wx"
+                  v-model:qq="queryParams.qq"
+                  v-model:twitter="queryParams.twitter"
+                  v-model:isAlways="queryParams.isAlways"
+                  v-model:remark="queryParams.remark"
+                  @keyup.enter.native="handleQuery"
+                  -->
+      </el-form-item>
+
+      <el-form-item label="鏃堕棿">
+        <el-date-picker
+          v-model="dateRange"
+          style="width:  197px;
+          height: 30px;
+          background: #FFFFFF;
+          border-radius: 14px 14px 14px 14px;
+          opacity: 0.5;
+          border: 1px solid rgba(0,0,0,0.25);"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="鐞嗘兂鏍囬" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="璇疯緭鍏ョ悊鎯虫爣棰�"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label="鍙楁儬浜�" prop="beneficiary" >
+        <el-input
+          v-model="queryParams.beneficiary"
+          placeholder="璇疯緭鍏ュ彈鎯犱汉"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label="缁ф壙浜�" prop="heir">
+        <el-input
+          v-model="queryParams.heir"
+          placeholder="璇疯緭鍏ョ户鎵夸汉"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+      <el-cntainer>
+        <el-col :span="9" >
+          <el-form-item>
+            <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+            border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
+            <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+            border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
+          </el-form-item>
+        </el-col>
+      </el-cntainer>
+    </el-form>
+    <div>
+      <!--      <div style="width: 100px;-->
+      <!--      height: 24px;-->
+      <!--      font-size: 18px;-->
+      <!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
+      <!--      font-weight: 400;-->
+      <!--      color: #000000;-->
+      <!--      line-height: 21px;-->
+      <!--      ">鏀惰棌鍜岃崳瑾�</div>-->
+
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['system:role:add']"
+          >鏂板</el-button>
+        </el-col>
+
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:role:remove']"
+          >鍒犻櫎</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['family:note:export']"
+          >瀵煎嚭</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExportModel"
+            v-hasPermi="['family:note:export']"
+          >瀵煎叆妯℃澘涓嬭浇</el-button>
+        </el-col>
+        <el-col :span="1.2">
+
+          <el-upload
+            action=""
+
+            class="upload-demo"
+            :show-file-list="false"
+            :http-request="handleEnport"
+          >
+            <el-button size="mini"   type="primary"
+                       plain
+                       icon="el-icon-plus" >瀵煎叆</el-button>
+          </el-upload>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+    </div>
+    <el-table v-loading="loading" :data="wishList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+      <el-table-column type="selection" :reserve-selection="true" width="25"  align="center" />
+      <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+      <el-table-column label="鏃堕棿" prop="happenTime" sortable width="100" align="center">
+        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title" sortable width="150" align="center">
+        <template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="濮嬩簬浣曞洜" prop="cause" sortable :show-overflow-tooltip="true" width="120" align="center" >
+        <template slot-scope="scope">{{scope.row.cause? scope.row.cause: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鍙楁儬浜�" prop="beneficiary" sortable width="120" align="center" >
+        <template slot-scope="scope">{{scope.row.beneficiary? scope.row.beneficiary: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="缁ф壙浜�" prop="heir" sortable width="110" align="center">
+        <template slot-scope="scope">{{scope.row.heir? scope.row.heir: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="瀹炵幇闅惧害" prop="difficulty" sortable width="120" align="center">
+        <template slot-scope="scope">{{scope.row.difficulty? scope.row.difficulty: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鏄惁渚濇棫鏈夋晥" prop="isEffective" sortable width="160" align="center">
+        <template slot-scope="scope">
+          {{ getSrc1(scope.row.isEffective) }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
+
+        <template slot-scope="scope" >
+          <img
+            class="el-upload-list__item-thumbnail"
+            src="../../assets/images/deviceLis.png"
+            alt=""
+            style="width: 35px; height: 35px;"
+            fit="cover"
+            v-if="scope.row.url !== ',' "
+          >
+          <img
+            class="el-upload-list__item-thumbnail"
+            src="../../assets/images/deviceA.png"
+            alt=""
+            style="width: 35px; height: 35px;"
+            fit="cover"
+            v-if="scope.row.url === ','"
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
+        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >淇敼</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:role:remove']"
+          >鍒犻櫎</el-button>
+          <el-dropdown
+            size="mini"
+            @command="(command) => handleCommand(command, scope.row)"
+            v-hasPermi="['system:role:edit']">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-d-arrow-right"
+              @click="handleCheck(scope.row)"
+
+            >鏌ョ湅璇︽儏</el-button>
+
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      style="background: #FEF7FC;"
+      @pagination="getList"
+    />
+
+    <!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+        <!--        <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
+        <!--          <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="鏃堕棿" prop="happenTime">
+          <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title">
+          <el-input v-model="formDat.title" placeholder="璇疯緭鍏ョ悊鎯虫爣棰�/鐧惧勾蹇冩効" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="濮嬩簬浣曞洜" prop="cause">
+          <el-input v-model="formDat.cause" placeholder="璇疯緭鍏ュ師鍥�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="鍙楁儬浜�" prop="beneficiary">
+          <el-input v-model="formDat.beneficiary" placeholder="璇疯緭鍏ュ彈鎯犱汉" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="缁ф壙浜�" prop="heir">
+          <el-input v-model="formDat.heir" placeholder="璇疯緭鍏ョ户鎵夸汉" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="瀹炵幇闅惧害" prop="difficulty">
+          <el-input v-model="formDat.difficulty" placeholder="璇疯緭鍏ュ疄鐜伴毦搴�" clearable :style="{width: '100%'}" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="鏄惁渚濇棫鏈夋晥" prop="isEffective">
+          <el-select v-model="formDat.isEffective" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}"  >
+            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="澶囨敞" prop="remark">
+          <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
+        </el-form-item>
+
+        <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+        <el-upload
+          action="#"
+          list-type="picture-card"
+          multiple
+          :http-request="requestUpload"
+          :file-list="fileList"
+        >
+          <i slot="default" class="el-icon-plus"></i>
+          <div slot="file" slot-scope="{file}">
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="file.url"
+              alt=""
+              style="width: 126px; height: 126px"
+              fit="cover"
+              :preview-src-list="[file.url]"
+            >
+            <span class="el-upload-list__item-actions">
+        <span
+          class="el-upload-list__item-preview"
+          @click="handlePictureCardPreview(file)"
+        >
+          <i class="el-icon-zoom-in"></i>
+        </span>
+
+        <span
+          v-if="!disabled"
+          class="el-upload-list__item-delete"
+          @click="handleRemove(file)"
+        >
+          <i class="el-icon-delete"></i>
+        </span>
+      </span>
+
+
+          </div>
+        </el-upload>
+        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
+
+          :on-remove="handleRemove"
+          :http-request="requestUpload"
+          :show-file-list="true"
+        >
+          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+          <template #tip>
+            <div class="el-upload__tip">
+            </div>
+          </template>
+        </el-upload>
+
+      </el-form>
+      <h4 class="form-header"> </h4>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
+        <el-button @click="cancelData">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+
+    </el-dialog>
+
+  </div>
 </template>
 
 <script>
-export default {
-  name: "index"
-}
-</script>
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 
-<style scoped>
+
+
+//瀵煎叆鎺ュ彛鍑芥暟
+import {listWish, getWish, addWish,updateWish, delWish,uploadPic,downloadModel} from "@/api/wish/index";
+import {enload} from "@/api/doctor";
+import {Message} from "element-ui";
+
+
+export default {
+  name: "index",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 閬僵灞�
+      disabled: false,
+
+      loading: true,
+      formData:[],
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 鐧惧勾蹇冩効琛ㄦ牸鏁版嵁
+      wishList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:[".jpg",".jif"],
+      fileList:[
+      ],
+      fileListOther:[
+
+      ],
+      dsb:true,
+      btn:false,
+      fit:['fill'],
+
+      formDat: {
+        //鐧惧勾蹇冩効璁板綍
+        id:undefined,
+        happenTime:undefined,
+        title:undefined,
+        cause:undefined,
+        beneficiary:undefined,
+        heir:undefined,
+        difficulty:undefined,
+        isEffective:undefined,
+        remark:undefined,
+        url: undefined,
+
+      },
+      // 鑿滃崟鍒楄〃
+      menuOptions: [],
+      // 閮ㄩ棬鍒楄〃
+      deptOptions: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title:undefined,
+        heir:undefined,
+        beneficiary:undefined,
+        // happenTime:undefined,
+      },
+      // searchVal:"",
+
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+
+        title: [{
+          required: true,
+          message: '璇疯緭鍏ョ悊鎯虫爣棰樻垨鐧惧勾蹇冩効',
+          trigger: 'blur'
+        }],
+        happenTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃堕棿',
+          trigger: 'blur'
+        }],
+        cause: [{
+          required: true,
+          message: '璇疯緭鍏ュ師鍥�',
+          trigger: 'blur'
+        }],
+        beneficiary: [{
+          required: true,
+          message: '璇疯緭鍏ュ彈鎯犱汉',
+          trigger: 'blur'
+        }],
+        heir: [{
+          required: true,
+          message: '璇疯緭鍏ョ户鎵夸汉',
+          trigger: 'blur'
+        }],
+        difficulty: [{
+          // required: true,
+          message: '璇疯緭鍏ュ疄鐜伴毦搴�',
+          trigger: 'blur'
+        }],
+
+        remark: [{
+          // required: true,
+          message: '璇疯緭鍏ュ娉�',
+          trigger: 'blur'
+        }],
+      },
+      typeOptions: [{
+        value: '1',
+        label: '鏄�',
+      },
+        {
+          value: '0',
+          label: '鍚�',
+        }],
+    };
+  },
+  created() {
+    this.getList();
+    this.getCateInfor()
+    // for (let i = 0; i < this.contactList.length; i++) {
+    //   this.formDat[i] = this.contactList[i];
+    // }
+  },
+  methods: {
+
+    getSrc1(isEffective) {
+      if (isEffective === 1) {
+        return '鏄�'
+      }else {
+        return '鍚�'
+      }
+    },
+
+    // 鍙栨秷鎸夐挳
+    cancelData() {
+      this.open = false;
+      this.reset();
+    },
+    getRowId(row)
+    {
+      return row.id
+    },
+    //闅旇鍙樿壊
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 0) {
+        return "statistics-warning-row1";
+      } else {
+        return "statistics-warning-row";
+      }
+    },
+    /** 鏌ヨ璁板綍鍒楄〃 */
+    getList() {
+      this.loading = true;
+      console.log(this.queryParams)
+      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+
+      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listWish(this.queryParams).then(response => {
+          //  alert(123)
+          //   console.log(response.data)
+          this.wishList = response.data.data;
+
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 鏌ヨ绫诲埆淇℃伅 */
+    getCateInfor()
+    {
+      let _this = this
+      getCategory().then(response=>{
+
+        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+        })
+      })
+    },
+    //绫诲埆閫夋嫨
+    // getSrc(type) {
+    //   if (type === '閭エ') {
+    //     return '閭エ'
+    //   }else if(type === '鏃ユ湰鍐涘垁'){
+    //     return '鏃ユ湰鍐涘垁'
+    //   }else if(type === '鑼呭彴閰�'){
+    //     return '鑼呭彴閰�'
+    //   }else if(type === '绾㈡湪'){
+    //     return '绾㈡湪'
+    //   }else if(type === '绾康鍝�'){
+    //     return '绾康鍝�'
+    //   }else if(type === '鐡峰櫒'){
+    //     return '鐡峰櫒'
+    //   }else if(type === '涔︾睄'){
+    //     return '涔︾睄'
+    //   } else {
+    //     return '鍏跺畠'
+    //   }
+    // },
+    handleRemove(file) {
+      alert(323)
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false,
+        this.menuNodeAll = false,
+        this.deptExpand = true,
+        this.deptNodeAll = false,
+        this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 0,
+          status: "0",
+          menuIds: [],
+          deptIds: [],
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined
+        };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      console.log(this.ids)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫��
+    // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList
+    //   let newlist = this.formDat.filter(
+    //     (item) => item.content.indexOf(this.searchVal) > -1
+    //   );
+    //   this.contactList = newlist;
+    // },
+
+
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞鐧惧勾蹇冩効璇︾粏淇℃伅";
+    },
+    /** 鏌ョ湅璇︾粏淇℃伅 */
+    handleCheck(row){
+      const id = row.id;
+      this.$router.push("/self/wish/wishInfo/" + id);
+
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      const id = row.id;
+      let jd = true
+
+      this.$router.push({
+        path:"/self/wish/wishInfo/" + id,
+        query:{
+          detail:jd
+        }
+      });
+    },
+
+
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+    submitDataScope: function() {
+
+      let ul = this.fileList.map(function (elem){
+        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      }).join(",")
+      let uls = this.fileListOther.map(function (elem){
+        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      }).join(",")
+      this.formDat.url = ul+","+uls
+      this.$refs["elForm"].validate(valid => {
+        if (valid) {
+
+          addWish(this.formDat).then(response => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    requestUpload(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('uploadFile', file);
+      let _this = this
+
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+
+        if(_this.fot.includes(pth) === true)
+        {
+          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+        }
+
+        else{
+          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        }
+      })
+
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const Ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+        return delWish(Ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      const Ids = this.ids;
+
+      if(Ids.length==0)
+      {
+        this.download('zIdea/export', {
+          ...this.queryParams
+        }, `zIdea_${new Date().getTime()}.xlsx`)
+      }else{
+        this.download('zIdea/export1/'+Ids, {
+        }, `zIdea_${new Date().getTime()}.xlsx`)
+      }
+    },
+
+    /** 瀵煎叆妯℃澘涓嬭浇鎸夐挳鎿嶄綔 */
+    handleExportModel() {
+
+      this.download('/zIdea/model', {
+      }, `zIdea_model_${new Date().getTime()}.xlsx`)
+    },
+
+    /** 瀵煎叆鎿嶄綔*/
+    handleEnport(params){
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('excelImport', file);
+      let _this = this
+
+      enload(formData).then(response => {
+        _this.getList();
+        Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+
+      }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
+
+    }
+  }
+};
+</script>
+<style>
+.app-container{
+  background-color: #FEF7FC;
+}
+
+.el-table__row.statistics-warning-row {
+  background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+  background: #FFEFF2;
+
+}
+
 
 </style>
diff --git a/ruoyi-ui/src/views/wish/wishInfo.vue b/ruoyi-ui/src/views/wish/wishInfo.vue
new file mode 100644
index 0000000..6daf558
--- /dev/null
+++ b/ruoyi-ui/src/views/wish/wishInfo.vue
@@ -0,0 +1,505 @@
+<template>
+  <div class="app-container">
+    <div class="form-header mt">
+      <h4 class="dt h4">鐧惧勾蹇冩効璇︾粏淇℃伅 </h4>
+      <!--      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
+      <!--      <br>-->
+      <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
+      <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
+    </div>
+    <div style="padding-left:15px">
+      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="120px">
+        <!--      <el-form-item label="id" prop="id">-->
+        <!--        <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"-->
+        <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
+        <!--      </el-form-item>-->
+        <el-container>
+          <el-row :span="12">
+            <el-cow >
+              <el-form-item label="鏃堕棿" prop="happenTime" label-width="70px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+                </el-input>
+
+              </el-form-item>
+              <!--               <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="78px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">-->
+              <!--                 <el-date-picker v-model='formData.happenTime' type='date' placeholder='璇烽�夋嫨鏃ユ湡'></el-date-picker>-->
+              <!--               </el-form-item>-->
+            </el-cow>
+            <el-cow >
+              <el-form-item label="鐞嗘兂鏍囬" prop="title" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                <el-input v-model="formData.title" placeholder="璇疯緭鍏ョ悊鎯虫爣棰樻垨鐧惧勾蹇冩効" clearable :style="{width: '100%'}" :disabled="dsb">
+                </el-input>
+              </el-form-item>
+            </el-cow>
+
+            <el-cow >
+              <el-form-item label="濮嬩簬浣曞洜" prop="cause" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                <el-input v-model="formData.cause" placeholder="璇疯緭鍏ュ師鍥�" clearable :style="{width: '100%'}" :disabled="dsb">
+                </el-input>
+              </el-form-item>
+            </el-cow>
+            <el-cow >
+              <el-form-item label="鍙楁儬浜�" prop="beneficiary" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                <el-input v-model="formData.beneficiary" placeholder="璇疯緭鍏ュ彈鎯犱汉" clearable :style="{width: '100%'}" :disabled="dsb">
+                </el-input>
+              </el-form-item>
+            </el-cow>
+            <el-cow >
+              <el-form-item label="缁ф壙浜�" prop="heir" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                <el-input v-model="formData.heir" placeholder="璇疯緭鍏ョ户鎵夸汉" clearable :style="{width: '100%'}" :disabled="dsb">
+                </el-input>
+              </el-form-item>
+            </el-cow>
+            <el-cow >
+              <el-form-item label="瀹炵幇闅惧害" prop="difficulty" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                <el-input v-model="formData.difficulty" placeholder="璇疯緭鍏ュ疄鐜伴毦搴�" clearable :style="{width: '100%'}" :disabled="dsb">
+                </el-input>
+              </el-form-item>
+            </el-cow>
+            <el-cow >
+              <el-form-item label="鏄惁渚濇棫鏈夋晥" prop="isEffective" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                <el-select v-model="formData.isEffective" placeholder="璇烽�夋嫨鏄惁渚濇棫鏈夋晥" clearable :style="{width: '100%'}"  >
+                  <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-cow>
+            <el-cow >
+              <el-form-item label="澶囨敞" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+              </el-form-item>
+            </el-cow>
+          </el-row>
+        </el-container>
+        <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+        <el-upload
+          action="#"
+          list-type="picture-card"
+          multiple
+          :http-request="requestUpload"
+          :file-list="fileList"
+        >
+          <i slot="default" class="el-icon-plus"></i>
+          <div slot="file" slot-scope="{file}">
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="file.url"
+              alt=""
+              style="width: 147px; height: 147px"
+              fit="cover"
+              :preview-src-list="[file.url]"
+            >
+            <span class="el-upload-list__item-actions" >
+            <span
+              v-if="isShow"
+              class="el-upload-list__item-preview"
+              @click="handlePictureCardPreview(file)"
+            >
+              <i class="el-icon-zoom-in"></i>
+            </span>
+            <span
+              v-if="isShow"
+              class="el-upload-list__item-delete"
+              @click="handleDownload(file.url)"
+            >
+              <i class="el-icon-download"></i>
+            </span>
+            <span
+              v-if="isShow"
+              class="el-upload-list__item-delete"
+              @click="handleRemove(file)"
+            >
+              <i class="el-icon-delete"></i>
+            </span>
+          </span>
+
+
+          </div>
+        </el-upload>
+
+        <!--<h4 class="form-header">鍏朵粬闄勪欢 </h4>
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
+          :on-preview="handlePreview"
+
+          :on-remove="handleRemove"
+          :http-request="requestUpload"
+          :show-file-list="true"
+        >
+          <el-button v-if="isShow" type="primary" >鐐瑰嚮涓婁紶</el-button>
+          <template #tip>
+            <div class="el-upload__tip">
+            </div>
+          </template>
+
+
+        </el-upload>-->
+        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
+          list-type="picture-card"
+          :on-preview="handleFileCardPreview"
+          :on-remove="handleRemove"
+          :http-request="requestUpload"
+          :show-file-list="true"
+        >
+
+          <i slot="default" class="el-icon-plus"></i>
+          <div slot="file" slot-scope="{file}">
+            <img
+              class="el-upload-list__item-thumbnail"
+              src="../../assets/401_images/401.gif"
+              alt=""
+              style="width: 147px; height: 147px"
+              fit="cover"
+            >
+            <span class="el-upload-list__item-actions">
+                    <span v-if="isShow"
+                          class="el-upload-list__item-preview"
+                          @click="handleFileCardPreview(file)"
+                    >
+                      <i class="el-icon-zoom-in"></i>
+                    </span>
+                    <span
+                      v-if="isShow"
+                      @click="handleRemove(file)"
+                      class="el-upload-list__item-delete"
+
+                    >
+                      <i class="el-icon-download"></i>
+                    </span>
+                    <span
+                      v-if="isShow"
+                      class="el-upload-list__item-delete"
+                      @click="handleRemoveFile(file)"
+                    >
+                      <i class="el-icon-delete"></i>
+                    </span>
+                  </span>
+
+
+          </div>
+
+
+        </el-upload>
+
+        <el-form-item size="large">
+          <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb" >淇敼</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <el-dialog  :visible.sync="dialogVisible">
+      <img w-full :src="dialogImageUrl"    style="width: 700px; height: 700px" alt="Preview Image" />
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+import {getWish, updateWish,download,uploadPic} from "@/api/wish/index";
+
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      cdi:"鏀惰棌涓庤崳瑾夎缁嗕俊鎭�",
+      udi:"鏀惰棌涓庤崳瑾変俊鎭鎯�",
+      fot:[".jpg",".jif"],
+      fileList:[
+      ],
+      fileListOther:[
+
+      ],
+      dsb:true,
+      btn:false,
+      isShow:true,
+      // 鐧惧勾蹇冩効琛ㄦ牸鏁版嵁
+      wishList: [],
+
+      formData: {
+        //鐧惧勾蹇冩効璁板綍
+        id:undefined,
+        happenTime:undefined,
+        title:undefined,
+        cause:undefined,
+        beneficiary:undefined,
+        heir:undefined,
+        difficulty:undefined,
+        isEffective:undefined,
+        remark:undefined,
+        url: undefined,
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+      rules: {
+        title: [{
+          required: true,
+          message: '璇疯緭鍏ョ悊鎯虫爣棰樻垨鐧惧勾蹇冩効',
+          trigger: 'blur'
+        }],
+        happenTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃堕棿',
+          trigger: 'blur'
+        }],
+        cause: [{
+          required: true,
+          message: '璇疯緭鍏ュ師鍥�',
+          trigger: 'blur'
+        }],
+        beneficiary: [{
+          required: true,
+          message: '璇疯緭鍏ュ彈鎯犱汉',
+          trigger: 'blur'
+        }],
+        heir: [{
+          required: true,
+          message: '璇疯緭鍏ョ户鎵夸汉',
+          trigger: 'blur'
+        }],
+        difficulty: [{
+          // required: true,
+          message: '璇疯緭鍏ュ疄鐜伴毦搴�',
+          trigger: 'blur'
+        }],
+
+        remark: [{
+          // required: true,
+          message: '璇疯緭鍏ュ娉�',
+          trigger: 'blur'
+        }],
+      },
+      typeOptions: [{
+        value: '1',
+        label: '鏄�',
+      },
+        {
+          value: '0',
+          label: '鍚�',
+        }],
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
+    const id = this.$route.params && this.$route.params.id;
+    let jd;
+    if(this.$route.query.detail!=undefined)
+    {
+      jd =  this.$route.query.detail
+      this.btn= jd
+      this.dsb = !jd
+      document.title = "淇敼鐧惧勾蹇冩効璇︾粏淇℃伅";
+      this.$route.meta.title = "淇敼鐧惧勾蹇冩効璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+    }
+    else{
+      document.title = "鐧惧勾蹇冩効璇︾粏淇℃伅";
+      this.$route.meta.title = "鐧惧勾蹇冩効璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+      this.isShow=true
+    }
+
+    let _this = this
+    if (id) {
+      this.loading = true;
+      getWish(id).then((response) => {
+        this.formData = response.data;
+        let paths = response.data.url.split(",");
+        for(let i = 0; i < paths.length; i++)
+        {
+          if(paths[i]!="") {
+
+            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+
+            if (_this.fot.includes(pth) === true)
+              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+            else {
+              // alert(paths[i])
+              let nms = paths[i].split("\/")
+              let nm = nms[nms.length - 1]
+              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+            }
+          }
+        }
+        this.loading = false;
+      });
+      // this.getCateInfor()
+
+    }
+  },
+  mounted() {},
+  methods: {
+    /** 鏌ヨ绫诲埆淇℃伅 */
+    // getCateInfor()
+    // {
+    //   let _this = this
+    //   getCategory().then(response=>{
+    //
+    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+    //     })
+    //   })
+    // },
+    submitForm() {
+      let ul = this.fileList.map(function (elem){
+        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      }).join(",")
+      let uls = this.fileListOther.map(function (elem){
+        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      }).join(",")
+      this.formData.url = ul+","+uls
+
+      this.$refs['elForm'].validate(valid => {
+
+
+        if (valid) {
+          if (this.formData.id != undefined) {
+            updateWish(this.formData).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              // this.open = false;
+              this.btn=false
+            });
+          } else {
+            this.$modal.msgSuccess("淇敼澶辫触");
+
+          }
+        }
+      })
+    },
+    resetForm() {
+      this.$refs['elForm'].resetFields()
+    },
+    // //杩斿洖涓婁竴椤�
+    // goBack(){
+    //   this.$router.push("/familymodel/collection/index" );
+    // },
+    handlePreview(file)
+    {
+      let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+      let lens = formData.path.split(".")
+      let suffix = lens[lens.length-1]
+      download(formData).then(async (response) => {
+        const isLogin = await blobValidate(response);
+        let nt = new Date().getTime()
+        let filename = 'property_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
+      })
+    },
+    handleRemoveFile(file) {
+      for(let i = 0; i < this.fileListOther.length; i++)
+      {
+        if(this.fileListOther[i].url==file.url)
+          this.$delete(this.fileListOther,i);
+      }
+    },
+    handleRemove(file) {
+      for(let i = 0; i < this.fileList.length; i++)
+      {
+        if(this.fileList[i].url==file.url)
+          this.$delete(this.fileList,i);
+      }
+    },
+    handleFileCardPreview(file){
+      this.dialogFileUrl = file.url;
+      const Base64 = require('js-base64').Base64
+      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    handleDownload(url) {
+      var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+
+      let lens = formData.path.split(".")
+      let suffix = lens[lens.length-1]
+      download(formData).then(async (response) => {
+        const isLogin = await blobValidate(response);
+        let nt = new Date().getTime()
+        let filename = 'property_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
+      })
+    },
+    handleEdit()
+    {
+      this.dsb = false
+      // this.btn = true
+      this.isShow=false
+    },
+    requestUpload(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('uploadFile', file);
+      let _this = this
+
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+
+        if(_this.fot.includes(pth) === true)
+        {
+          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+        }
+
+        else{
+          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        }
+      })
+
+    },
+
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('/zIdea/export', {
+        ...this.queryParams
+      }, `zIdea_${new Date().getTime()}.xlsx`)
+    }
+
+  }
+}
+
+</script>
+
+<style scoped>
+.app-container{
+  background-color: #FEF7FC;
+}
+.mt
+{
+  position: relative;
+}
+.dt{
+  display: block;
+
+}
+.pt{
+  right: 10px;
+  top:-3px;
+  display: block;
+  position: absolute;
+}
+.form_item{
+  font-size: 12px;
+  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+  font-weight: 400;
+  color: #000000;
+}
+</style>
diff --git a/ruoyi.iml b/ruoyi.iml
new file mode 100644
index 0000000..2a74ada
--- /dev/null
+++ b/ruoyi.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+    <output-test url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

--
Gitblit v1.9.1