From 2dc217ef7ea1a58350962cffe6962bc4a6053df9 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 07 三月 2023 14:52:05 +0800
Subject: [PATCH] 转孔柱状图添加鼠标移入显示信息,登录页面修改,样式管理,资料馆添加批量下载

---
 src/views/Archive/index.vue             |   69 ++
 src/views/Tools/LayerTree.vue           |    2 
 src/components/login.vue                |    7 
 src/components/mapsdk.vue               |  155 ++++--
 src/views/Tools/queryinfo.vue           |    6 
 src/views/userManage/resourceManage.vue |  865 +++++++++++++++++++++--------------------
 src/components/MapView/mapSpacePop.vue  |   58 ++
 src/views/datamanage/styleManage.vue    |   64 ++
 src/views/datamanage/SpatialData.vue    |    4 
 9 files changed, 710 insertions(+), 520 deletions(-)

diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index 73d023e..fc5f70a 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -88,7 +88,7 @@
             label="鏌辩姸鍥�"
             width="100"
             align="center"
-            v-show="spaceLayer== 'spaceLayer'"
+            v-if="spaceLayer == 'sexplorationpoint'"
           >
             <template slot-scope="scope">
               <el-button
@@ -405,6 +405,12 @@
           Viewer.entities.remove(this.$store.state.histogramLayer[i])
         }
       }
+      if (window.histogramHandler != null && Cesium.defined(window.histogramHandler)) {
+        window.histogramHandler.removeInputAction(
+          Cesium.ScreenSpaceEventType.MOUSE_MOVE
+        )
+        window.histogramHandler = null
+      }
       var param = {
         gid: row.gid,
         name: this.spaceLayer,
@@ -425,8 +431,10 @@
       }
       var data = await dataQuerySelectByPage(obj)
       if (data.code != 200) {
+
       }
-      if (data.result) {
+
+      if (data.result.length != 0) {
         var val = data.result;
         //鍐掓场鎺掑簭
         for (var i = 0; i < val.length; i++) {
@@ -439,8 +447,6 @@
             }
           }
         }
-
-
         var outlineList = [
           'rgba(141,135,114,1)',
           'rgba(248,235,179,1)',
@@ -450,11 +456,8 @@
           'rgba(197,222,130,1)',
           'rgba(208,228,177,1)',
         ]
-
-
         var num = row.elev;
         var height = 0;
-
         for (var i = 0; i < val.length; i++) {
           var fill, line;
           if (i > outlineList.length) {
@@ -465,10 +468,11 @@
             fill = outlineList[i];
             line = outlineList[i];
           }
-
           var height = num - val[i].botdepth
           var layer = Viewer.entities.add({
             position: Cesium.Cartesian3.fromDegrees(coord[0], coord[1]),
+            tag: 'Histogram',
+            properties: val[i],
             ellipse: {
               semiMinorAxis: 1.0, //鐭酱
               semiMajorAxis: 1.0, //闀胯酱
@@ -485,14 +489,40 @@
           this.$store.state.histogramLayer.push(layer)
           sgworld.Navigate.flyToObj(layer)
         }
+        window.histogramHandler = new Cesium.ScreenSpaceEventHandler(
+          sgworld.Viewer.scene.canvas
+        )
+        var that = this;
+        window.histogramHandler.setInputAction((event) => {
+          // var ellipsoid = sgworld.Viewer.scene.globe.ellipsoid;
+          // var cartesian = sgworld.Viewer.scene.camera.pickEllipsoid(event.endPosition, ellipsoid);
+          var pick = sgworld.Viewer.scene.pick(event.endPosition);
+          var selectedEntity = null;
+
+          if (Cesium.defined(pick)) {
+            if (pick && pick.id && pick.id.tag && pick.id.tag == "Histogram") {
+
+              that.$store.state.propertiesInfo = {
+                title: pick.id.properties._exppointid._value,
+                name: pick.id.properties._geoname._value,
+                type: pick.id.properties.geotype._value,
+                botdepth: pick.id.properties._botdepth._value,
+                describe: pick.id.properties._describe._value,
+              }
+              that.$store.state.propertiesFlag = "2"
+            } else {
+              that.$store.state.propertiesFlag = null
+            }
+          } else {
+            that.$store.state.propertiesFlag = null
+          }
+
+        }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
 
 
-
-
-
-
-
-
+      } else {
+        var msg = row.exppointid + " 娌″嫎鎺㈢偣鍦板眰琛ㄦ暟鎹紝鏃犳硶鐢熸垚鏌辩姸鍥�"
+        this.$message.error(msg);
       }
     },
     async spaceLocation(index, row) {
diff --git a/src/components/login.vue b/src/components/login.vue
index 5194ac3..ba202bb 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -44,7 +44,7 @@
         <el-form-item prop="uid">
           <el-input
             v-model="loginForm.uid"
-            placeholder="杈撳叆鎮ㄧ殑璐﹀彿鎴栨墜鏈哄彿"
+            placeholder="杈撳叆鐧诲綍璐﹀彿"
             class="nobr"
             size="meddle"
             autocomplete="off"
@@ -60,7 +60,7 @@
           <el-input
             show-password
             v-model="loginForm.pwd"
-            placeholder="杈撳叆鎮ㄧ殑瀵嗙爜"
+            placeholder="璇疯緭鍏ョ櫥褰曞瘑鐮�"
             class="nobr"
             autocomplete="off"
           >
@@ -76,7 +76,7 @@
             <el-form-item prop="validCode">
               <el-input
                 v-model="loginForm.validCode"
-                placeholder="杈撳叆楠岃瘉鐮侊紙蹇界暐澶у皬鍐欙級"
+                placeholder="璇疯緭鍏ラ獙璇佺爜锛堝拷鐣ュぇ灏忓啓锛�"
                 class="nobr"
               ></el-input>
             </el-form-item>
@@ -89,6 +89,7 @@
             <validCode
               v-model="validCode"
               ref="refresh"
+              style="margin-left:16px"
               @sendData="getCode"
             ></validCode>
           </el-col>
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index f6c03dd..14c3520 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -353,7 +353,12 @@
           <div slot="header">
             <span>{{$store.state.propertiesName.tabDesc || '灞炴�т俊鎭�'}}</span>
             <div style="float: right; cursor: pointer">
-              <el-link type="primary" :underline="false" @click="getAttatchList" style="margin-right: 10px">鏌ョ湅闄勪欢</el-link>
+              <el-link
+                type="primary"
+                :underline="false"
+                @click="getAttatchList"
+                style="margin-right: 10px"
+              >鏌ョ湅闄勪欢</el-link>
               <i
                 class="el-icon-close"
                 @click="closeBufferBox(6)"
@@ -369,49 +374,81 @@
               v-for="(value, key) in $store.state.propertiesInfo"
               :key="key"
             >
-              <span v-if="key != 'eventid'" style="font-size: 14px;font-weight: bold;margin-right: 5px">{{key}}:</span>
+              <span
+                v-if="key != 'eventid'"
+                style="font-size: 14px;font-weight: bold;margin-right: 5px"
+              >{{key}}:</span>
               <span v-if="key != 'eventid'">{{value}}</span>
             </div>
           </div>
         </el-card>
       </div>
+
+      <div
+        class="propertiesPop"
+        v-if="$store.state.propertiesFlag == '2'"
+      >
+        <el-card class="box-card">
+          <div slot="header">
+            <span>{{ $store.state.propertiesInfo.title }}</span>
+          </div>
+          <div
+            class="pointInfoBoxContext"
+            style="height:250px;overflow-y: auto"
+          >
+            <div style="line-height: 20px">宀╁湡鍚嶇О锛� {{ $store.state.propertiesInfo.name }}</div>
+            <div style="line-height: 20px">宀╁湡绫诲瀷锛� {{ $store.state.propertiesInfo.type }}</div>
+            <div style="line-height: 20px">灞傚簳娣卞害锛� {{ $store.state.propertiesInfo.botdepth }} 绫�</div>
+            <div style="line-height: 20px">鎻忚堪锛� {{ $store.state.propertiesInfo.describe }}</div>
+          </div>
+
+        </el-card>
+      </div>
       <!--闄勪欢鍒楄〃寮圭獥-->
       <el-dialog
-          title="闄勪欢鍒楄〃"
-          :append-to-body="false"
-          :visible.sync="showAttach"
-          width="35%"
-          :close-on-click-modal="false"
+        title="闄勪欢鍒楄〃"
+        :append-to-body="false"
+        :visible.sync="showAttach"
+        width="35%"
+        :close-on-click-modal="false"
       >
         <div>
           <el-table
-              :data="attachList"
-              height="100%"
-              style="width: 100%"
-              border
+            :data="attachList"
+            height="100%"
+            style="width: 100%"
+            border
           >
             <el-table-column
-                align="center"
-                type="index"
-                label="搴忓彿"
-                width="50"
+              align="center"
+              type="index"
+              label="搴忓彿"
+              width="50"
             />
             <el-table-column
-                prop="name"
-                label="鍚嶇О">
+              prop="name"
+              label="鍚嶇О"
+            >
             </el-table-column>
             <el-table-column
-                label="鏃堕棿"
-                width="180">
+              label="鏃堕棿"
+              width="180"
+            >
               <template slot-scope="scope">
                 <span>{{format(scope.row.createTime)}}</span>
               </template>
             </el-table-column>
             <el-table-column
-                label="鎿嶄綔"
-                width="100">
+              label="鎿嶄綔"
+              width="100"
+            >
               <template slot-scope="scope">
-                <el-button v-if="showAttachDetailBtn(scope.row)" @click="showAttachDetail(scope.row)" type="text" size="small">鏌ョ湅</el-button>
+                <el-button
+                  v-if="showAttachDetailBtn(scope.row)"
+                  @click="showAttachDetail(scope.row)"
+                  type="text"
+                  size="small"
+                >鏌ョ湅</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -419,32 +456,32 @@
       </el-dialog>
       <!--闄勪欢寮圭獥-->
       <el-dialog
-          title="棰勮"
-          :append-to-body="false"
-          :visible.sync="dialog.dialogVisible"
-          width="70%"
-          :close-on-click-modal="false"
+        title="棰勮"
+        :append-to-body="false"
+        :visible.sync="dialog.dialogVisible"
+        width="70%"
+        :close-on-click-modal="false"
       >
         <div
-            v-if="dialog.isPdf"
-            class="pdfClass"
+          v-if="dialog.isPdf"
+          class="pdfClass"
         >
           <iframe
-              :src="dialog.src"
-              type="application/x-google-chrome-pdf"
-              width="100%"
-              height="100%"
+            :src="dialog.src"
+            type="application/x-google-chrome-pdf"
+            width="100%"
+            height="100%"
           >
           </iframe>
         </div>
         <div
-            v-if="dialog.isJpg"
-            class="pdfClass"
+          v-if="dialog.isJpg"
+          class="pdfClass"
         >
           <img
-              style="width:100%; height:100%;"
-              :src="dialog.src"
-              alt=""
+            style="width:100%; height:100%;"
+            :src="dialog.src"
+            alt=""
           />
         </div>
       </el-dialog>
@@ -472,7 +509,7 @@
   comprehensive_selectRoute,
   dataLib_selectFiles
 } from "../api/api";
-import {getToken} from '@/utils/auth'
+import { getToken } from '@/utils/auth'
 
 export default {
   name: "",
@@ -567,8 +604,8 @@
         height: '10'
       },
       showLengendDialog: false,
-      showAttach:false,
-      attachList:[],
+      showAttach: false,
+      attachList: [],
       dialog: {
         dialogVisible: false,
         isPdf: false,
@@ -1163,11 +1200,11 @@
     },
     //鑾峰彇闄勪欢鍒楄〃
     async getAttatchList() {
-      let tabName = this.$store.state.propertiesName.ns+'.'+this.$store.state.propertiesName.tab;
+      let tabName = this.$store.state.propertiesName.ns + '.' + this.$store.state.propertiesName.tab;
       let eventid = this.$store.state.propertiesInfo.eventid;
       var obj = {
-        eventid:eventid,
-        tabName:tabName,
+        eventid: eventid,
+        tabName: tabName,
       };
       const res = await dataLib_selectFiles(obj);
       if (res.code != 200) {
@@ -1182,7 +1219,7 @@
       this.showAttach = true;
     },
     //鏄惁鏄剧ず鏌ョ湅鎸夐挳
-    showAttachDetailBtn(row){
+    showAttachDetailBtn(row) {
       var name = row.name;
       if (name.indexOf('.pdf') != -1 || name.indexOf('.jpg') != -1 || name.indexOf('.gif') != -1 || name.indexOf('.png') != -1 || name.indexOf('.jpeg') != -1) {
         return true;
@@ -1197,19 +1234,19 @@
       this.dialog.isJpg = false;
     },
     //鏌ョ湅闄勪欢
-    showAttachDetail(row){
+    showAttachDetail(row) {
       this.refreshAttatchDetail();
       var name = row.name;
       if (name.indexOf('.pdf') != -1) {
         this.dialog.dialogVisible = true;
         this.dialog.isPdf = true;
-        var url = BASE_URL + "/res/downloadForView?guid=" + row.guid + "&token=" + getToken();
+        var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken();
         this.dialog.src = url
       }
       else if (name.indexOf('.jpg') != -1 || name.indexOf('.gif') != -1 || name.indexOf('.png') != -1 || name.indexOf('.jpeg') != -1) {
         this.dialog.dialogVisible = true;
         this.dialog.isJpg = true;
-        var url = BASE_URL + "/res/downloadForView?guid=" + row.guid + "&token=" + getToken();
+        var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken();
         this.dialog.src = url
       }
     },
@@ -1224,17 +1261,17 @@
       var mm = time.getMinutes();
       var s = time.getSeconds();
       return (
-          y +
-          '-' +
-          this.add0(m) +
-          '-' +
-          this.add0(d) +
-          ' ' +
-          h +
-          ':' +
-          mm +
-          ':' +
-          s
+        y +
+        '-' +
+        this.add0(m) +
+        '-' +
+        this.add0(d) +
+        ' ' +
+        h +
+        ':' +
+        mm +
+        ':' +
+        s
       );
     },
     //鏍煎紡鍖栨椂闂�
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index d3189da..92acf83 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -123,6 +123,19 @@
               class="el-input__icon el-icon-search"
             ></i></el-input>
         </el-form-item>
+        <!-- 鎵归噺涓嬭級 -->
+        <el-form-item
+          style="float:right"
+          v-if="formInline.dataType =='type2'"
+        >
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-download"
+            @click="setCardDownload"
+          >{{$t('common.download')}}</el-button>
+
+        </el-form-item>
         <!-- 绌洪棿鏌ヨ -->
         <el-form-item style="float:right">
           <el-button
@@ -162,6 +175,12 @@
             >
 
               <span v-show="formInline.dataType =='type2'">
+                <el-checkbox
+                  v-model="item.ischecked"
+                  @change="handleCheckedDataTypeChange(item)"
+                  style="margin-right:10px"
+                >
+                </el-checkbox>
                 <span v-if="item.ismeta > 0">
                   <el-link
                     style="color: #409eff"
@@ -187,18 +206,18 @@
                   @click="setAttatchFileView(index, item)"
                 ></i>
                 <i
-                style="margin-left:10px"
+                  style="margin-left:10px"
                   class="el-icon-tickets"
                   :title="$t('common.details')"
                   @click="setCardDetails(item)"
                 ></i>
-                <i
+                <!-- <i
                   v-show="formInline.dataType=='type2'"
                   style="margin-left:10px"
                   class="el-icon-download"
                   :title="$t('common.download')"
                   @click="setCardDownload(item)"
-                ></i>
+                ></i> -->
                 <i
                   v-show="!item.isShow"
                   style="margin-left:10px"
@@ -239,6 +258,7 @@
             </div>
           </el-card>
         </div>
+
       </div>
       <div class="archBottomBox">
         <div style="margin-top:10px">
@@ -1077,7 +1097,7 @@
   dataLib_selectFiles,
   dataLib_deletes
 } from '../../api/api';
-import {dataLibView } from '@/api/screen.js'
+import { dataLibView } from '@/api/screen.js'
 export default {
   components: {
     MyBread, MapSdk
@@ -1206,7 +1226,8 @@
         isPdf: false,
         isJpg: false,
         src: ''
-      }
+      },
+      checkedDataType: [],
     };
   },
 
@@ -1217,6 +1238,23 @@
     this.signGetPublicKey();
   },
   methods: {
+    //鎵归噺涓嬭浇澶嶉�夋chagne
+    handleCheckedDataTypeChange(res) {
+      var std = 0;
+      for (var i = 0; i < this.multipleSelection1.length; i++) {
+        if (res.guid == this.multipleSelection1[i].guid) {
+          std = i;
+        }
+      }
+      if (std == 0) {
+        this.multipleSelection1.push(res);
+      } else {
+        this.multipleSelection1.splice(std, 1)
+      }
+      console.log(this.multipleSelection1)
+    },
+
+
     matchState(state = "", reg) {
       var row = state.row;
       var name = row.name;
@@ -1271,14 +1309,14 @@
       if (name.indexOf('.pdf') != -1) {
         this.dialog.dialogVisible = true;
         this.dialog.isPdf = true;
-        var url = BASE_URL + "/res/downloadForView?guid=" + row.guid + "&token=" + getToken();
+        var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken();
         this.dialog.src = url
       } else if (name.indexOf('.jpg') != -1 || name.indexOf('.gif') != -1 || name.indexOf('.png') != -1 || name.indexOf('.jpeg') != -1) {
         this.dialog.dialogVisible = true;
         this.dialog.isJpg = true;
-        var url = BASE_URL + "/res/downloadForView?guid=" + row.guid + "&token=" + getToken();
+        var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken();
         this.dialog.src = url
-      }      
+      }
     },
 
     setAttatchFileView(index, row) {
@@ -1663,6 +1701,11 @@
 
       $("#downFrame").attr("src", url).click();
       this.closeDown();
+
+      this.monthdata.filter((res) => {
+        return res.ischecked = false;
+      })
+      this.multipleSelection1 = [];
     },
     closeDown() {
       this.passWorldVisible = false;
@@ -1671,8 +1714,8 @@
     },
     //鏂囦欢涓嬭浇
     setCardDownload(res) {
-      this.multipleSelection1 = [];
-      this.multipleSelection1.push(res);
+      // this.multipleSelection1 = [];
+      // this.multipleSelection1.push(res);
       if (this.multipleSelection1.length == 0) {
         this.$message({
           message: '璇峰厛閫夋嫨瑕佷笅杞界殑鏂囦欢',
@@ -2041,13 +2084,15 @@
         val = val.filter((res) => {
           var type = "." + res.type;
           res.name = res.name.replaceAll(type, "")
-          res.mold = "鏂囦欢"
-          res.isShow = false
+          res.mold = "鏂囦欢";
+          res.isShow = false;
+          res.ischecked = false;
           return res;
         })
 
         this.monthdata = val;
         this.listData.count = data.count;
+
       } else {
         this.monthdata = [];
         this.listData.count = 0;
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index 6334b9e..a57be67 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -91,7 +91,7 @@
         @click="histogram()"
         v-show="shwoHistogram"
       >
-        <i class="el-icon-tickets"></i>&nbsp;&nbsp;杞瓟鏌辩姸鍥�
+        <i class="el-icon-tickets"></i>&nbsp;&nbsp;閽诲瓟鏌辩姸鍥�
       </div>
       <!-- <div
         class="edit"
diff --git a/src/views/Tools/queryinfo.vue b/src/views/Tools/queryinfo.vue
index 2ad8ec1..8f64077 100644
--- a/src/views/Tools/queryinfo.vue
+++ b/src/views/Tools/queryinfo.vue
@@ -81,6 +81,12 @@
           Viewer.entities.remove(this.$store.state.histogramLayer[i])
         }
       }
+      if (window.histogramHandler != null && Cesium.defined(window.histogramHandler)) {
+        window.histogramHandler.removeInputAction(
+          Cesium.ScreenSpaceEventType.MOUSE_MOVE
+        )
+        window.histogramHandler = null
+      }
     },
     // 鎵撳紑寮圭獥
     open(title, value, style = {}) {
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 6c7ac4e..3e9c5d0 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -812,12 +812,12 @@
       if (name.indexOf('.pdf') != -1) {
         this.dialog.dialogVisible = true;
         this.dialog.isPdf = true;
-        var url = BASE_URL + "/res/downloadForView?guid=" + row.guid + "&token=" + getToken();
+        var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken();
         this.dialog.src = url
       } else if (name.indexOf('.jpg') != -1 || name.indexOf('.gif') != -1 || name.indexOf('.png') != -1 || name.indexOf('.jpeg') != -1) {
         this.dialog.dialogVisible = true;
         this.dialog.isJpg = true;
-        var url = BASE_URL + "/res/downloadForView?guid=" + row.guid + "&token=" + getToken();
+        var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken();
         this.dialog.src = url
       }
     },
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 4003bf2..57164e7 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -67,6 +67,13 @@
                 size="small"
               >{{ $t('common.empty') }}
               </el-button>
+              <el-button
+                @click="handleDownload('ruleForm')"
+                icon="el-icon-download"
+                type="success"
+                size="small"
+              >{{ $t('common.download') }}
+              </el-button>
             </el-form-item>
           </div>
         </div>
@@ -165,12 +172,12 @@
               size="small"
             >{{ $t('common.update') }}
             </el-button>
-            <el-button
+            <!-- <el-button
               @click="handleDownload(scope.$index, scope.row)"
               type="success"
               plain
               size="small"
-            >{{ $t('common.download') }}
+            >{{ $t('common.download') }} -->
             </el-button>
           </template>
         </el-table-column>
@@ -1591,22 +1598,63 @@
       this.itemdetail.updateTime = this.formomentTime(
         this.itemdetail.updateTime
       );
-      this.itemdetail.imageFile =
-        BASE_URL + "/res/download?guid=" + row.viewGuid + "&token=" + token;
+      this.itemdetail.imageFile = BASE_URL + "/comprehensive/downloadForView?guid=" + row.viewGuid + "&token=" + token;
     },
     closeDetial() {
       this.showinfoBox = false;
       this.itemdetail = {};
     },
+    handleDownload() {
+      if (this.multipleSelection.length == 0) {
+        return this.$message({
+          message: '璇烽�夋嫨闇�瑕佷笅杞界殑鏂囦欢',
+          type: 'warning'
+        });
+      }
 
-    handleDownload(index, row) {
-
+      // var data = {
+      //   guids: ["e5b6ae0889b88111f13a4b6e048348db", "fa4f299e901a0c46e634f8fcc8185c0c"]
+      // };
+      // ajax(getUrl("/res/downloadReqForGuids"), "POST", JSON.stringify(data), null, null, function (rs) {
+      //   console.log(rs);
+      //   alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+      // });
+      var std = [];
+      for (var i in this.multipleSelection) {
+        std.push(this.multipleSelection[i].fileGuid)
+      }
       var token = getToken()
-      var url = BASE_URL + "/res/download?token=" + token + "&guid=" + row.fileGuid;
+      $.ajax(BASE_URL + "/style/downloadReqForGuids?token=" + token, {
+        type: "post",
+        data: JSON.stringify({
+          guids: std
+        }),
+        async: true,
+        cache: false,
+        processData: false,
+        contentType: false,
+        success: res => {
+          if (res.code != 200) {
+            return
+          }
 
-      $("#downFrame").attr("src", url).click();
+          var token = getToken()
+          var url = BASE_URL + "/style/downloadFile?token=" + token + "&guid=" + res.result;
+
+          $("#downFrame").attr("src", url).click();
+        },
+      })
+
 
     },
+    // handleDownload(index, row) {
+
+    //   var token = getToken()
+    //   var url = BASE_URL + "/res/download?token=" + token + "&guid=" + row.fileGuid;
+
+    //   $("#downFrame").attr("src", url).click();
+
+    // },
     handleEdit(index, row) {
       this.upflag = true;
       this.dialogFormVisible = true;
diff --git a/src/views/userManage/resourceManage.vue b/src/views/userManage/resourceManage.vue
index 73b61b7..b413418 100644
--- a/src/views/userManage/resourceManage.vue
+++ b/src/views/userManage/resourceManage.vue
@@ -5,60 +5,78 @@
         `${$t('userManage.resManage')}`,
       ]"></My-bread>
     <el-divider />
-    <div class="power_quire subpage_Div" ref="container">
+    <div
+      class="power_quire subpage_Div"
+      ref="container"
+    >
       <el-form
         ref="form"
         :model="ruleForm"
         :inline="true"
       >
         <div class="flex_box">
-          <el-form-item :label="$t('userManage.resManageObj.name')" style="margin-right: auto">
-          <el-input v-model="ruleForm.name" size="small" style="width:200px" :placeholder="$t('userManage.resManageObj.nameHolder')">
-            <i slot="suffix" class="el-icon-search" @click="submitForm"></i>
-          </el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            v-if="menuStatus.insert"
-            @click="setInsertFormdialog"
-            icon="el-icon-edit"
-            type="success"
-            size="small"
-          >{{ $t('common.append') }}</el-button>
-          <el-button
-            v-if="menuStatus.delete"
-            @click="DelFromData"
-            icon="el-icon-delete"
-            type="danger"
-            size="small"
-          >{{ $t('common.delete') }}</el-button>
-<!--          <el-button-->
-<!--            @click="submitForm('ruleForm')"-->
-<!--            icon="el-icon-search"-->
-<!--            size="small"-->
-<!--            type="primary"-->
-<!--            style="background: #1890ff"-->
-<!--          >{{ $t('common.iquery') }}</el-button>-->
-          <el-button
-            @click="resetForm('ruleForm')"
-            icon="el-icon-refresh"
-            type="info"
-            size="small"
-          >{{ $t('common.empty') }}</el-button>
-        </el-form-item>
-          </div>
+          <el-form-item
+            :label="$t('userManage.resManageObj.name')"
+            style="margin-right: auto"
+          >
+            <el-input
+              v-model="ruleForm.name"
+              size="small"
+              style="width:200px"
+              :placeholder="$t('userManage.resManageObj.nameHolder')"
+            >
+              <i
+                slot="suffix"
+                class="el-icon-search"
+                @click="submitForm"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              v-if="menuStatus.insert"
+              @click="setInsertFormdialog"
+              icon="el-icon-edit"
+              type="success"
+              size="small"
+            >{{ $t('common.append') }}</el-button>
+            <el-button
+              v-if="menuStatus.delete"
+              @click="DelFromData"
+              icon="el-icon-delete"
+              type="danger"
+              size="small"
+            >{{ $t('common.delete') }}</el-button>
+            <!--          <el-button-->
+            <!--            @click="submitForm('ruleForm')"-->
+            <!--            icon="el-icon-search"-->
+            <!--            size="small"-->
+            <!--            type="primary"-->
+            <!--            style="background: #1890ff"-->
+            <!--          >{{ $t('common.iquery') }}</el-button>-->
+            <el-button
+              @click="resetForm('ruleForm')"
+              icon="el-icon-refresh"
+              type="info"
+              size="small"
+            >{{ $t('common.empty') }}</el-button>
+          </el-form-item>
+        </div>
 
       </el-form>
     </div>
     <div class="dividing-line"></div>
-    <div class="table_box" :style="styleVar">
+    <div
+      class="table_box"
+      :style="styleVar"
+    >
       <el-table
         :data="tableData"
         style="width: 100%"
         fit
         border
         @selection-change="handleSelectionChange"
-         height="calc(100% - 45px)"
+        height="calc(100% - 45px)"
       >
         <el-table-column
           type="selection"
@@ -114,7 +132,6 @@
         >
         </el-table-column>
         <el-table-column
-
           :label="$t('common.operate')"
           width="170px"
         >
@@ -135,112 +152,115 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination_box" style="margin-top: 10px">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="listData.pageIndex"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="listData.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="count"
-      >
-      </el-pagination>
-    </div>
-    </div>
-     <div class="infoBox_box" v-show="showinfoBox">
-    <div
-      class="infoBox box_div "
-
-    >
       <div
-        slot="header"
-        class="clearfix"
+        class="pagination_box"
+        style="margin-top: 10px"
       >
-        <span>{{ $t('dataManage.styleObj.deInformation') }}</span>
-        <div
-          style="float: right; cursor: pointer"
-          @click="closeDetial"
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="listData.pageIndex"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="listData.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="count"
         >
-          <i class="el-icon-close"></i>
-        </div>
+        </el-pagination>
       </div>
-      <el-divider></el-divider>
-      <div class="contentBox">
-        <p>
-          <label> {{ $t('userManage.resManageObj.name') }}:</label>
-          <label class="boxlabel">{{ itemdetail.name }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-        <p>
-          <label> {{ $t('userManage.resManageObj.server') }}:</label>
-          <label class="boxlabel">{{ itemdetail.server }}</label>
-        </p>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.source') }}:</label>
-          <label class="boxlabel">{{ itemdetail.source }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.depid') }}:</label>
-          <label class="boxlabel">{{ itemdetail.depName }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.dirid') }}:</label>
-          <label class="boxlabel">{{ itemdetail.dirName }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.descr') }}:</label>
-          <label class="boxlabel">{{ itemdetail.descr }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.img') }}:</label>
-          <label class="boxlabel">
-            <div style="width:440px;height:200px;">
-              <img
-                style="width:100%; height:100%"
-                :src="itemdetail.imageFile"
-                alt=""
-              />
-            </div>
-          </label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.createUser') }}:</label>
-          <label class="boxlabel">{{ itemdetail.createUser }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.createTime') }}:</label>
-          <label class="boxlabel">{{ itemdetail.createTime }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.updateUser') }}:</label>
-          <label class="boxlabel">{{ itemdetail.updateUser }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.updateTime') }}:</label>
-          <label class="boxlabel">{{ itemdetail.updateTime }}</label>
-        </p>
-        <el-divider></el-divider>
-        <p>
-          <label> {{ $t('userManage.resManageObj.bak') }}:</label>
-          <label class="boxlabel">{{ itemdetail.bak }}</label>
-        </p>
-        <el-divider></el-divider>
-      </div>
-
     </div>
-     </div>
+    <div
+      class="infoBox_box"
+      v-show="showinfoBox"
+    >
+      <div class="infoBox box_div ">
+        <div
+          slot="header"
+          class="clearfix"
+        >
+          <span>{{ $t('dataManage.styleObj.deInformation') }}</span>
+          <div
+            style="float: right; cursor: pointer"
+            @click="closeDetial"
+          >
+            <i class="el-icon-close"></i>
+          </div>
+        </div>
+        <el-divider></el-divider>
+        <div class="contentBox">
+          <p>
+            <label> {{ $t('userManage.resManageObj.name') }}:</label>
+            <label class="boxlabel">{{ itemdetail.name }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+          <p>
+            <label> {{ $t('userManage.resManageObj.server') }}:</label>
+            <label class="boxlabel">{{ itemdetail.server }}</label>
+          </p>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.source') }}:</label>
+            <label class="boxlabel">{{ itemdetail.source }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.depid') }}:</label>
+            <label class="boxlabel">{{ itemdetail.depName }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.dirid') }}:</label>
+            <label class="boxlabel">{{ itemdetail.dirName }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.descr') }}:</label>
+            <label class="boxlabel">{{ itemdetail.descr }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.img') }}:</label>
+            <label class="boxlabel">
+              <div style="width:440px;height:200px;">
+                <img
+                  style="width:100%; height:100%"
+                  :src="itemdetail.imageFile"
+                  alt=""
+                />
+              </div>
+            </label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.createUser') }}:</label>
+            <label class="boxlabel">{{ itemdetail.createUser }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.createTime') }}:</label>
+            <label class="boxlabel">{{ itemdetail.createTime }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.updateUser') }}:</label>
+            <label class="boxlabel">{{ itemdetail.updateUser }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.updateTime') }}:</label>
+            <label class="boxlabel">{{ itemdetail.updateTime }}</label>
+          </p>
+          <el-divider></el-divider>
+          <p>
+            <label> {{ $t('userManage.resManageObj.bak') }}:</label>
+            <label class="boxlabel">{{ itemdetail.bak }}</label>
+          </p>
+          <el-divider></el-divider>
+        </div>
+
+      </div>
+    </div>
     <el-dialog
       :title="dialogTitle"
       :visible.sync="isTransfer"
@@ -271,63 +291,66 @@
       style="overflow: hidden"
       :visible.sync="InsertFormdialog"
     >
-     <div style="height: 500px; overflow: auto">
-      <el-form :model="insertform" label-position="top">
-        <el-form-item
-          :label="$t('userManage.resManageObj.name')"
-          :label-width="formLabelWidth"
+      <div style="height: 500px; overflow: auto">
+        <el-form
+          :model="insertform"
+          label-position="top"
         >
-          <el-input
-            v-model="insertform.name"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.server')"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="insertform.server"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.source')"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="insertform.source"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.depid')"
-          :label-width="formLabelWidth"
-        >
-          <el-select
-            :popper-append-to-body="false"
-            v-model="insertform.depValue"
-            placeholder="璇烽�夋嫨"
-            style="width:85%"
+          <el-form-item
+            :label="$t('userManage.resManageObj.name')"
+            :label-width="formLabelWidth"
           >
-            <el-option
-              :value="insertform.depid"
-              :label="insertform.depValue"
-              style=" height:auto"
+            <el-input
+              v-model="insertform.name"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.server')"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model="insertform.server"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.source')"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model="insertform.source"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.depid')"
+            :label-width="formLabelWidth"
+          >
+            <el-select
+              :popper-append-to-body="false"
+              v-model="insertform.depValue"
+              placeholder="璇烽�夋嫨"
+              style="width:85%"
             >
-              <el-tree
-                ref="tree"
-                :data="depList"
-                node-key="id"
-                :props="props"
-                @node-click="handleDepList"
-              />
-            </el-option>
-          </el-select>
-          <!-- <el-input
+              <el-option
+                :value="insertform.depid"
+                :label="insertform.depValue"
+                style=" height:auto"
+              >
+                <el-tree
+                  ref="tree"
+                  :data="depList"
+                  node-key="id"
+                  :props="props"
+                  @node-click="handleDepList"
+                />
+              </el-option>
+            </el-select>
+            <!-- <el-input
             v-model="insertform.depValue"
             disabled
             autocomplete="off"
@@ -337,97 +360,96 @@
             @click="showDepTree(0)"
             style="margin-left: 10px"
           ><i class="el-icon-plus"></i></el-link> -->
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.dirid')"
-          :label-width="formLabelWidth"
-        >
-          <el-select
-            :popper-append-to-body="false"
-            v-model="insertform.dirValue"
-            placeholder="璇烽�夋嫨"
-            style="width:85%"
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.dirid')"
+            :label-width="formLabelWidth"
           >
-            <el-option
-              :value="insertform.dirid"
-              :label="insertform.dirValue"
-              style=" height:auto"
+            <el-select
+              :popper-append-to-body="false"
+              v-model="insertform.dirValue"
+              placeholder="璇烽�夋嫨"
+              style="width:85%"
             >
-              <el-tree
-                ref="tree"
-                :data="dirList"
-                node-key="id"
-                :props="props"
-                @node-click="handleDirList"
-              />
-            </el-option>
-          </el-select>
+              <el-option
+                :value="insertform.dirid"
+                :label="insertform.dirValue"
+                style=" height:auto"
+              >
+                <el-tree
+                  ref="tree"
+                  :data="dirList"
+                  node-key="id"
+                  :props="props"
+                  @node-click="handleDirList"
+                />
+              </el-option>
+            </el-select>
 
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.descr')"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="insertform.descr"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.img')"
-          :label-width="formLabelWidth"
-        >
-         <div class="BoxFlex">
-           <div class="BoxFlexinput">
-             <el-input
-            v-model="insertform.img"
-            disabled
-            autocomplete="off"
-            style="width:100%"
-          ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.descr')"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model="insertform.descr"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.img')"
+            :label-width="formLabelWidth"
+          >
+            <div class="BoxFlex">
+              <div class="BoxFlexinput">
+                <el-input
+                  v-model="insertform.img"
+                  disabled
+                  autocomplete="off"
+                  style="width:100%"
+                ></el-input>
 
-          </div>
+              </div>
 
-           <div class="BoxFlexbutton">
-             <input
-            name="file1"
-            :accept="'.jpg,.png'"
-            type="file"
-            id="imageFile"
-            multiple="multiple"
-            style="display: none"
-            @change="insertFile"
-          />
-              <el-link
-            :title="$t('common.append')"
-            :underline="false"
-            @click="getIsertFile"
-            style="margin-left: 6px"
-          ><i class="el-icon-plus"></i></el-link>
-          <el-link
-            :title="$t('common.upload')"
-            :underline="false"
-            @click="setUploadFile(0)"
-          ><i class="el-icon-upload2"></i></el-link>
-           </div>
-         </div>
+              <div class="BoxFlexbutton">
+                <input
+                  name="file1"
+                  :accept="'.jpg,.png'"
+                  type="file"
+                  id="imageFile"
+                  multiple="multiple"
+                  style="display: none"
+                  @change="insertFile"
+                />
+                <el-link
+                  :title="$t('common.append')"
+                  :underline="false"
+                  @click="getIsertFile"
+                  style="margin-left: 6px"
+                ><i class="el-icon-plus"></i></el-link>
+                <el-link
+                  :title="$t('common.upload')"
+                  :underline="false"
+                  @click="setUploadFile(0)"
+                ><i class="el-icon-upload2"></i></el-link>
+              </div>
+            </div>
 
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.bak')"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model="insertform.bak"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
 
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.bak')"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="insertform.bak"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-
-        </el-form-item>
-      </el-form>
-     </div>
+          </el-form-item>
+        </el-form>
+      </div>
       <div
         slot="footer"
         class="dialog-footer"
@@ -449,67 +471,69 @@
     </el-dialog>
     <el-dialog
       :title="$t('userManage.userInfoObj.editPermission')"
-
       :visible.sync="EditFormdialog"
       :before-close="EditFromDataClose"
     >
-        <div style="height: 500px; overflow: auto">
-      <el-form :model="upform" label-position="top">
-        <el-form-item
-          :label="$t('userManage.resManageObj.name')"
-          :label-width="formLabelWidth"
+      <div style="height: 500px; overflow: auto">
+        <el-form
+          :model="upform"
+          label-position="top"
         >
-          <el-input
-            v-model="upform.name"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.server')"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="upform.server"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.source')"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="upform.source"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.depid')"
-          :label-width="formLabelWidth"
-        >
-          <el-select
-            :popper-append-to-body="false"
-            v-model="upform.depValue"
-            placeholder="璇烽�夋嫨"
-            style="width:85%"
+          <el-form-item
+            :label="$t('userManage.resManageObj.name')"
+            :label-width="formLabelWidth"
           >
-            <el-option
-              :value="upform.depid"
-              :label="upform.depValue"
-              style=" height:auto"
+            <el-input
+              v-model="upform.name"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.server')"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model="upform.server"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.source')"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model="upform.source"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.depid')"
+            :label-width="formLabelWidth"
+          >
+            <el-select
+              :popper-append-to-body="false"
+              v-model="upform.depValue"
+              placeholder="璇烽�夋嫨"
+              style="width:85%"
             >
-              <el-tree
-                ref="tree1"
-                :data="dirList"
-                node-key="id"
-                :props="props"
-                @node-click="handleEditDepList"
-              />
-            </el-option>
-          </el-select>
-          <!-- <el-input
+              <el-option
+                :value="upform.depid"
+                :label="upform.depValue"
+                style=" height:auto"
+              >
+                <el-tree
+                  ref="tree1"
+                  :data="dirList"
+                  node-key="id"
+                  :props="props"
+                  @node-click="handleEditDepList"
+                />
+              </el-option>
+            </el-select>
+            <!-- <el-input
             v-model="upform.depValue"
             disabled
             autocomplete="off"
@@ -519,33 +543,33 @@
             @click="showDepTree(1)"
             style="margin-left: 10px"
           ><i class="el-icon-plus"></i></el-link> -->
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.dirid')"
-          :label-width="formLabelWidth"
-        >
-          <el-select
-            :popper-append-to-body="false"
-            v-model="upform.dirValue"
-            placeholder="璇烽�夋嫨"
-            style="width:85%"
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.dirid')"
+            :label-width="formLabelWidth"
           >
-            <el-option
-              :value="upform.dirid"
-              :label="upform.dirValue"
-              style=" height:auto"
+            <el-select
+              :popper-append-to-body="false"
+              v-model="upform.dirValue"
+              placeholder="璇烽�夋嫨"
+              style="width:85%"
             >
-              <el-tree
-                ref="tree1"
-                :data="dirList"
-                node-key="id"
-                :props="props"
-                :default-expand-all="defaultExpand"
-                @node-click="handleEditDirList"
-              />
-            </el-option>
-          </el-select>
-          <!-- <el-input
+              <el-option
+                :value="upform.dirid"
+                :label="upform.dirValue"
+                style=" height:auto"
+              >
+                <el-tree
+                  ref="tree1"
+                  :data="dirList"
+                  node-key="id"
+                  :props="props"
+                  :default-expand-all="defaultExpand"
+                  @node-click="handleEditDirList"
+                />
+              </el-option>
+            </el-select>
+            <!-- <el-input
             v-model="upform.dirValue"
             disabled
             autocomplete="off"
@@ -555,69 +579,68 @@
             @click="showDirTree(1)"
             style="margin-left: 10px"
           ><i class="el-icon-plus"></i></el-link> -->
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.descr')"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="upform.descr"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.img')"
-          :label-width="formLabelWidth"
-        >
-         <div class="BoxFlex">
-            <div class="BoxFlexinput">
-          <el-input
-            v-model="upform.img"
-            disabled
-            autocomplete="off"
-             style="width:100%"
-
-          ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.descr')"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model="upform.descr"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.img')"
+            :label-width="formLabelWidth"
+          >
+            <div class="BoxFlex">
+              <div class="BoxFlexinput">
+                <el-input
+                  v-model="upform.img"
+                  disabled
+                  autocomplete="off"
+                  style="width:100%"
+                ></el-input>
+              </div>
+              <div class="BoxFlexbutton">
+                <input
+                  name="file1"
+                  :accept="'.jpg,.png'"
+                  type="file"
+                  id="editimageFile"
+                  multiple="multiple"
+                  style="display: none"
+                  @change="updateFile"
+                />
+                <el-link
+                  :underline="false"
+                  @click="getupdateFile"
+                  style="margin-left: 10px"
+                ><i class="el-icon-plus"></i></el-link>
+                <el-link
+                  v-if="menuStatus.upload"
+                  :title="$t('common.upload')"
+                  :underline="false"
+                  @click="setUploadFile(1)"
+                  style="margin-left: 10px"
+                ><i class="el-icon-upload2"></i></el-link>
+              </div>
             </div>
- <div class="BoxFlexbutton">
-          <input
-            name="file1"
-            :accept="'.jpg,.png'"
-            type="file"
-            id="editimageFile"
-            multiple="multiple"
-            style="display: none"
-            @change="updateFile"
-          />
-          <el-link
-            :underline="false"
-            @click="getupdateFile"
-            style="margin-left: 10px"
-          ><i class="el-icon-plus"></i></el-link>
-          <el-link
-            v-if="menuStatus.upload"
-            :title="$t('common.upload')"
-            :underline="false"
-            @click="setUploadFile(1)"
-            style="margin-left: 10px"
-          ><i class="el-icon-upload2"></i></el-link>
- </div>
-         </div>
-        </el-form-item>
-        <el-form-item
-          :label="$t('userManage.resManageObj.bak')"
-          :label-width="formLabelWidth"
-        >
-          <el-input
-            v-model="upform.bak"
-            autocomplete="off"
-            style="width:85%"
-          ></el-input>
+          </el-form-item>
+          <el-form-item
+            :label="$t('userManage.resManageObj.bak')"
+            :label-width="formLabelWidth"
+          >
+            <el-input
+              v-model="upform.bak"
+              autocomplete="off"
+              style="width:85%"
+            ></el-input>
 
-        </el-form-item>
-      </el-form>
-        </div>
+          </el-form-item>
+        </el-form>
+      </div>
       <div
         slot="footer"
         class="dialog-footer"
@@ -1029,8 +1052,8 @@
       );
 
       this.itemdetail.imageFile =
-        BASE_URL + "/res/download?guid=" + row.img + "&token=" + token;
-      console.log(this.itemdetail.imageFile);
+        BASE_URL + "/comprehensive/downloadForView?guid=" + row.img + "&token=" + token;
+
     },
     handleEdit(index, row) {
       this.getDepList();

--
Gitblit v1.9.3