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

王旭

2022-10-13 17b2681fbd5029ddf65e7c1fe30a49a9ff8479ac

 src/views/datamanage/styleManage.vue

@@ -106,7 +106,7 @@
              prop="descr"
              :label="$t('dataManage.styleObj.descr')"
            />
            <el-table-column
            <!-- <el-table-column
              align="center"
              prop="fileGuid"
              :label="$t('dataManage.styleObj.fileguid')"
@@ -137,13 +137,13 @@
              prop="updateTime"
              :label="$t('dataManage.styleObj.updateTime')"
              :formatter="formatTime"
            />
            /> -->
            <el-table-column
              align="center"
              prop="bak"
              :label="$t('dataManage.styleObj.bak')"
            />
            <el-table-column min-width="150" :label="$t('common.operate')">
            <el-table-column min-width="120" :label="$t('common.operate')">
              <template slot-scope="scope">
                <el-button
                  @click="showDetail(scope.$index, scope.row)"
@@ -228,12 +228,14 @@
          <el-divider></el-divider>
          <p>
            <label> {{ $t('dataManage.styleObj.fileguid') }}:</label>
            <label class="boxlabel">{{ itemdetail.fileguid }}</label>
            <label class="boxlabel">{{ itemdetail.fileGuid }}</label>
          </p>
          <el-divider></el-divider>
          <p>
            <label> {{ $t('dataManage.styleObj.viewguid') }}:</label>
            <label class="boxlabel">{{ itemdetail.viewguid }}</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>
@@ -266,7 +268,7 @@
    </div>
    <el-dialog
      title="修改详情"
      top="5vh"
      top="2vh"
      style="overflow: hidden"
      :before-close="removeUpdate"
      :visible.sync="dialogFormVisible"
@@ -360,13 +362,57 @@
          :label="$t('dataManage.styleObj.fileguid')"
          :label-width="formLabelWidth"
        >
          <el-input v-model="upform.fileGuid" autocomplete="off"></el-input>
          <el-input v-model="upform.fileGuid" disabled autocomplete="off"></el-input>
           <input
            name="file1"

            type="file"
            id="editFile"
            multiple="multiple"
            style="display: none"
            @change="editFile(0)"
          />
           <el-link
            :underline="false"
            @click="geteditFile(0)"
            style="margin-left: 10px"
            ><i class="el-icon-plus"></i
          ></el-link>
           <el-link
           :title="$t('common.upload')"
            :underline="false"
            @click="seteditFile(0)"
            style="margin-left: 10px"
            ><i class="el-icon-upload2"></i
          ></el-link>
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.styleObj.viewguid')"
          :label-width="formLabelWidth"
        >
          <el-input v-model="upform.viewGuid" autocomplete="off"></el-input>
          <el-input v-model="upform.viewGuid" disabled autocomplete="off"></el-input>
           <input
            name="file1"
            :accept="'.jpg,.png'"
            type="file"
            id="editimageFile"
            multiple="multiple"
            style="display: none"
            @change="editFile(1)"
          />
           <el-link
            :underline="false"
            @click="geteditFile(1)"
            style="margin-left: 10px"
            ><i class="el-icon-plus"></i
          ></el-link>
           <el-link
           :title="$t('common.upload')"
            :underline="false"
             @click="seteditFile(1)"
            style="margin-left: 10px"
            ><i class="el-icon-upload2"></i
          ></el-link>
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.styleObj.bak')"
@@ -376,8 +422,8 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="removeUpdate">取 消</el-button>
        <el-button type="primary" @click="updateForm">确 定</el-button>
        <el-button @click="removeUpdate">{{$t('common.close')}}</el-button>
        <el-button type="primary" @click="updateForm">{{$t('common.confirm')}}</el-button>
      </div>
    </el-dialog>
    <el-dialog
@@ -443,7 +489,7 @@
        >
          <el-select
            v-model="insertform.status"
            style="width: 745px"
            style="width: 730px"
            :placeholder="$t('common.choose')"
          >
            <el-option
@@ -469,19 +515,63 @@
          :label="$t('dataManage.styleObj.descr')"
          :label-width="formLabelWidth"
        >
          <el-input v-model="insertform.descr" autocomplete="off"></el-input>
          <el-input v-model="insertform.descr"  autocomplete="off"></el-input>
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.styleObj.fileguid')"
          :label-width="formLabelWidth"
        >
          <el-input v-model="insertform.fileGuid" autocomplete="off"></el-input>
          <el-input v-model="insertform.fileGuid" disabled autocomplete="off" />
           <input
            name="file1"

            type="file"
            id="insertFile"
            multiple="multiple"
            style="display: none"
            @change="insertFile(0)"
          />
           <el-link
            :underline="false"
            @click="getInsertFile(0)"
            style="margin-left: 10px"
            ><i class="el-icon-plus"></i
          ></el-link>
           <el-link
           :title="$t('common.upload')"
            :underline="false"
  @click="setinsertFile(0)"
            style="margin-left: 10px"
            ><i class="el-icon-upload2"></i
          ></el-link>
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.styleObj.viewguid')"
          :label-width="formLabelWidth"
        >
          <el-input v-model="insertform.viewGuid" autocomplete="off"></el-input>
          <el-input v-model="insertform.viewGuid" disabled autocomplete="off"/>
           <input
            name="file1"
            :accept="'.jpg,.png'"
            type="file"
            id="insertimageFile"
            multiple="multiple"
            style="display: none"
            @change="insertFile(1)"
          />
           <el-link
            :underline="false"
            @click="getInsertFile(1)"
            style="margin-left: 10px"
            ><i class="el-icon-plus"></i
          ></el-link>
           <el-link
           :title="$t('common.upload')"
            :underline="false"
             @click="setinsertFile(1)"
            style="margin-left: 10px"
            ><i class="el-icon-upload2"></i
          ></el-link>
        </el-form-item>
        <el-form-item
          :label="$t('dataManage.styleObj.bak')"
@@ -491,8 +581,8 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="insertFromDataClose">取 消</el-button>
        <el-button type="primary" @click="insertFromData">确 定</el-button>
        <el-button @click="insertFromDataClose">{{$t('common.close')}}</el-button>
        <el-button type="primary" @click="insertFromData">{{$t('common.confirm')}}</el-button>
      </div>
    </el-dialog>
    <div class="leftTree" v-if="showDirCata">
@@ -527,6 +617,9 @@
<script>
import $ from 'jquery';
import moment from 'moment';
import {
  getToken
} from '../../utils/auth.js'
import MyBread from '../../components/MyBread.vue';
import styleDirTree from './styleDirTree.vue';
import styleDepTree from './styleDepTree.vue';
@@ -534,7 +627,8 @@
  select_Style_ByPageAndCount,
  insertStyle,
  deleteStyles,
  updateStyle
  updateStyle,
  upload_style
} from '../../api/api';
export default {
  name: 'styleManage',
@@ -549,7 +643,6 @@
      showinfoBox: false,
      itemdetail: {},
      ruleForm: {
        name: '',
      },

      backupData: [],
@@ -561,13 +654,17 @@
      showDirCata: false,
      showDepCata: false,
      tableData: [],
      insertform: {},
      insertform: {
        fileGuid: null,
        viewGuid: null,
      },
      dirFlag: null,
      depFlag: null,
      guidFile: null,
      viewFile: null,
      count: 0,
      listData: {
        name: null,
        depName: null,
        pageIndex: 1,
        pageSize: 10,
      },
@@ -577,6 +674,134 @@
    this.getRoleTabelData();
  },
  methods: {
    filesReset() {
      document.getElementById('insertFile').reset();
      document.getElementById('insertimageFile').reset();
      this.guidFile = null;
      this.fileGuid = null;
    },
    getInsertFile(res) {
      if (res == 0) {
        $('#insertFile').click();
      } else if (res == 1) {
        $('#insertimageFile').click();
      }
    },
    insertFile(res) {
      if (res == 0) {
        var val = document.getElementById('insertFile').files;
        if (!val || !val.length) return;
        this.insertform.fileGuid = val[0].name;
      } else if (res == 1) {
        var val = document.getElementById('insertimageFile').files;
        if (!val || !val.length) return;
        this.insertform.viewGuid = val[0].name;
      }
    },
    async setinsertFile(res) {
      if (res == 0) {
        var fs = document.getElementById("insertFile");
        if (fs.files.length == 0) {
          return;
        }
        var formData = new FormData();
        formData.append("file", fs.files[0]);
        var val_data = await upload_style(formData);
        if (val_data.code == 200) {
          this.guidFile = val_data.result;
          this.$message({
            message: '上传成功！',
            type: 'success',
          });
        } else {
          this.$message({
            message: '上传失败！',
            type: 'warning',
          });
        }
      } else if (res == 1) {
        var fs = document.getElementById("insertimageFile");
        if (fs.files.length == 0) {
          return;
        }
        var formData = new FormData();
        formData.append("file", fs.files[0]);
        var val_data = await upload_style(formData);
        if (val_data.code == 200) {
          this.viewFile = val_data.result;
          this.$message({
            message: '上传成功！',
            type: 'success',
          });
        } else {
          this.$message({
            message: '上传失败！',
            type: 'warning',
          });
        }
      }
    },
     geteditFile(res) {
      if (res == 0) {
        $('#editFile').click();
      } else if (res == 1) {
        $('#editimageFile').click();
      }
    },
   editFile(res) {
      if (res == 0) {
        var val = document.getElementById('editFile').files;
        if (!val || !val.length) return;
        this.upform.fileGuid = val[0].name;
      } else if (res == 1) {
        var val = document.getElementById('editimageFile').files;
        if (!val || !val.length) return;
        this.upform.viewGuid = val[0].name;
      }
    },
    async seteditFile(res) {
      if (res == 0) {
        var fs = document.getElementById("editFile");
        if (fs.files.length == 0) {
          return;
        }
        var formData = new FormData();
        formData.append("file", fs.files[0]);
        var val_data = await upload_style(formData);
        if (val_data.code == 200) {
          this.guidFile = val_data.result;
          this.$message({
            message: '上传成功！',
            type: 'success',
          });
        } else {
          this.$message({
            message: '上传失败！',
            type: 'warning',
          });
        }
      } else if (res == 1) {
        var 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_style(formData);
        if (val_data.code == 200) {
          this.viewFile = val_data.result;
          this.$message({
            message: '上传成功！',
            type: 'success',
          });
        } else {
          this.$message({
            message: '上传失败！',
            type: 'warning',
          });
        }
      }
    },
    handleSelectionChange(val) {
      this.multipleSelection = val;
    },
@@ -618,10 +843,8 @@
    },
    selectDepCataName() {
      this.showDepCata = false;
      console.log(this.depFlag)
      switch (this.depFlag) {
        case 0:
          // var data = this.$store.state.styleDirCateNodes;
          this.insertform.depValue = this.$store.state.styleDepCateNodes.name;
          this.insertform.depid = this.$store.state.styleDepCateNodes.id;
          break;
@@ -648,6 +871,7 @@
    insertFromDataClose() {
      this.InsertFormdialog = false;
      this.insertform = {};
       this.filesReset();
    },
    async insertFromData() {
      if (this.insertform.dirid == null || this.insertform.depid == null) {
@@ -657,10 +881,18 @@
        });
        return;
      }
      if (this.guidFile != null) {
        this.insertform.fileGuid = this.guidFile;
      }
      if (this.viewFile != null) {
        this.insertform.viewGuid = this.viewFile;
      }
      const data = await insertStyle(this.insertform);
      if (data.code == 200) {
        this.InsertFormdialog = false;
        this.insertform = {};

        this.filesReset();
        this.$message({
          message: '添加成功！',
          type: 'success',
@@ -677,6 +909,7 @@
      if (this.listData.tab == '') {
        delete this.listData.tab;
      }
      this.listData.name = this.ruleForm.name;
      const data = await select_Style_ByPageAndCount(this.listData);
      if (data.code != 200) {
        this.$message.error('列表调用失败');
@@ -696,8 +929,11 @@
    },
    formatStatus(row, column) {
      let date = row[column.property];
      return this.forMontStatus(date);
    },
    forMontStatus(date) {
      if (date === undefined || date === null) {
        return '';
        return;
      }
      switch (date) {
        case 1:
@@ -805,13 +1041,38 @@
    addstyle() {
      this.$router.push('/addstyle');
    },
   async updateForm() {
  if (this.upform.dirid == null || this.upform.depid == null) {
    statusFormat(res) {
      switch (res) {
        case "启用":
          return 1;
          break;
        case "停用":
          return 0;
          break;
        case "Start Using":
          return 1;
          break;
        case "Stop Using":
          return 0;
          break;
      }
    },
    async updateForm() {
      if (this.upform.dirid == null || this.upform.depid == null) {
        this.$message({
          message: '请选择样式所属的目录或单位',
          type: 'warning',
        });
        return;
      }
      if (Number.isInteger(this.upform.status) == false) {
        this.upform.status = this.statusFormat(this.upform.status)
      }
        if (this.guidFile != null) {
        this.upform.fileGuid = this.guidFile;
      }
      if (this.viewFile != null) {
        this.upform.viewGuid = this.viewFile;
      }
      const data = await updateStyle(this.upform);
      if (data.code == 200) {
@@ -835,26 +1096,32 @@
    removeUpdate() {
      this.upflag = false;
      this.dialogFormVisible = false;
      this.upform={}
      this.upform = {};
       this.filesReset();
    },
    submitForm(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          this.searchName = this.ruleForm.name.trim();
          this.startFromData();
        } else {
          console.log('error submit!!');
          return false;
        }
      });
      this.getRoleTabelData()
      // this.$refs[formName].validate((valid) => {
      //   if (valid) {
      //     this.searchName = this.ruleForm.name.trim();
      //     this.startFromData();
      //   } else {
      //     console.log('error submit!!');
      //     return false;
      //   }
      // });
    },
    resetForm(formName) {
      this.ruleForm = {}
      this.getRoleTabelData();
    },
    showDetail(index, row) {
      var token = getToken();
      this.showinfoBox = true;
      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.viewGuid + "&token=" + token
    },
    closeDetial() {
      this.showinfoBox = false;
@@ -868,6 +1135,7 @@
      this.upform = row;
      this.upform.depValue = row.depName;
      this.upform.dirValue = row.dirName;
      this.upform.status = this.forMontStatus(row.status)
    },
    handleDelete(index, row) {
      this.$confirm('确定是否删除?', '提示', {
@@ -907,7 +1175,7 @@
  box-sizing: border-box;

  .el-input {
    width: 745px;
    width: 730px;
  }

  .searchComp {
@@ -940,7 +1208,7 @@
      }
    }
    .btnBox {
      width: 123px;
      width: 160px;
      margin: 10px auto 0;
      // background-color: red;
    }