Merge branch 'master' of ssh://192.168.20.39:29418/LFWEB

王旭

2022-10-13 17b2681fbd5029ddf65e7c1fe30a49a9ff8479ac

 src/views/userManage/resourceManage.vue

@@ -91,19 +91,19 @@

        >
        </el-table-column>
        <el-table-column
        <!-- <el-table-column
          prop="img"
          align="center"
          :label="$t('userManage.resManageObj.img')"
        >
        </el-table-column>
         <el-table-column
        </el-table-column> -->
         <!-- <el-table-column
          prop="createUser"
          align="center"
          :label="$t('userManage.resManageObj.createUser')"
        >
        </el-table-column>
         <el-table-column
        </el-table-column> -->
         <!-- <el-table-column
          prop="createTime"
          align="center"
          :label="$t('userManage.resManageObj.createTime')"
@@ -122,7 +122,7 @@
          :label="$t('userManage.resManageObj.updateTime')"
            :formatter="formatTime"
        >
        </el-table-column>
        </el-table-column>-->
         <el-table-column
          prop="bak"
          align="center"
@@ -208,7 +208,11 @@
          <el-divider></el-divider>
          <p>
            <label> {{ $t('userManage.resManageObj.img') }}:</label>
            <label class="boxlabel">{{ itemdetail.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>
@@ -328,10 +332,18 @@
            @change="insertFile"
          />
            <el-link
            :title="$t('common.append')"
            :underline="false"
            @click="getIsertFile"
            style="margin-left: 10px"
            ><i class="el-icon-plus"></i
          ></el-link>
           <el-link
           :title="$t('common.upload')"
            :underline="false"
            @click="setUploadFile(0)"
            style="margin-left: 10px"
            ><i class="el-icon-upload2"></i
          ></el-link>
        </el-form-item>
         <el-form-item
@@ -426,6 +438,13 @@
            style="margin-left: 10px"
            ><i class="el-icon-plus"></i
          ></el-link>
           <el-link
           :title="$t('common.upload')"
            :underline="false"
            @click="setUploadFile(1)"
            style="margin-left: 10px"
            ><i class="el-icon-upload2"></i
          ></el-link>
        </el-form-item>
         <el-form-item
          :label="$t('userManage.resManageObj.bak')"
@@ -444,7 +463,7 @@
        }}</el-button>
      </div>
    </el-dialog>
        <div class="leftTree" v-if="showDirCata">
    <div class="leftTree" v-if="showDirCata">
      <div class="treeBox">
        <style-dir-tree></style-dir-tree>
      </div>
@@ -475,9 +494,12 @@

<script>
import $ from 'jquery';
import {
  getToken
} from '../../utils/auth.js'
import moment from 'moment';
import MyBread from '../../components/MyBread.vue';
import { select_Res_ByPageAndCount, insertRes, updateRes, deleteRess }
import { select_Res_ByPageAndCount, insertRes, updateRes, deleteRess, upload_res }
  from '../../api/api.js';
import styleDirTree from '../datamanage/styleDirTree.vue';
import styleDepTree from '../datamanage/styleDepTree.vue';
@@ -497,12 +519,14 @@
      showDepCata: false,
      dirFlag: null,
      depFlag: null,
      ImageFile: null,
      uploadFile: null,
      insertform: {
        img:''
        img: ''
      },
      tableData: [],
      itemdetail: {},
      upform: { img:''},
      upform: { img: '' },
      multipleSelection: [],
      count: 0,
      listData: {
@@ -520,18 +544,45 @@
    this.getRoleTabelData();
  },
  methods: {
     getIsertFile() {
    getIsertFile() {
      $('#imageFile').click();
    },
    getupdateFile(){
 $('#editimageFile').click();
    getupdateFile() {
      $('#editimageFile').click();
    },
    async setUploadFile(res) {
      var fs;
      if (res == 0) {
       fs = document.getElementById("imageFile");

      }else if (res ==1) {
        fs = document.getElementById("editimageFile");
        if(fs.files.length == 0){
          return;
        }
      }
      var formData = new FormData();
      formData.append("file", fs.files[0]);
      var val_data = await upload_res(formData);
      if (val_data.code == 200) {
        this.uploadFile = val_data.result;
        this.$message({
          message: '上传成功！',
          type: 'success',
        });
      } else {
        this.$message({
          message: '上传失败！',
          type: 'warning',
        });
      }
    },
    insertFile() {
      var val = document.getElementById('imageFile').files;
      if (!val || !val.length) return;
      this.insertform.img = val[0].name;
    },
  updateFile() {
    updateFile() {
      var val = document.getElementById('editimageFile').files;
      if (!val || !val.length) return;
      this.upform.img = val[0].name;
@@ -606,10 +657,16 @@
      this.upform = {};
    },
    async EditFromData() {


       if (this.uploadFile != null) {
        this.upform.img = this.uploadFile;
      }
      const data = await updateRes(this.upform);
      if (data.code == 200) {
        this.EditFormdialog = false;
        this.upform = {};
        this.uploadFile = null;
        this.$message({
          message: '修改成功！',
          type: 'success',
@@ -625,15 +682,16 @@
    },
    showDetail(index, row) {
      this.showinfoBox = true;
      var token = getToken();
      this.itemdetail = row;
      this.itemdetail.createTime = this.formomentTime(this.itemdetail.createTime);
      this.itemdetail.updateTime = this.formomentTime(this.itemdetail.updateTime);

      this.itemdetail.imageFile = BASE_URL + "/res/download?guid=" + row.img + "&token=" + token
    },
    handleEdit(index, row) {
      this.EditFormdialog = true;
      this.upform = row;
            this.upform.depValue = row.depName;
      this.upform.depValue = row.depName;
      this.upform.dirValue = row.dirName;
    },
    closeDetial() {
@@ -660,10 +718,16 @@
        });
        return;
      }
      if (this.uploadFile != null) {
        this.insertform.img = this.uploadFile;
      }
      const data = await insertRes(this.insertform);
      if (data.code == 200) {
        this.InsertFormdialog = false;
        this.insertform = {};
        this.insertform= {
        img: ''
      };
        this.uploadFile = null;
        this.$message({
          message: '添加成功！',
          type: 'success',
@@ -716,7 +780,7 @@
  padding: 10px;
  box-sizing: border-box;
  .el-input {
    width: 745px;
    width: 730px;
  }
  .power_quire {
    margin: 10px auto;