From 799f206549b25ca0ae8dee94d21b987fc1e6e26c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 19 十一月 2024 15:21:12 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/device/equipmentInfo.vue | 1094 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 744 insertions(+), 350 deletions(-)
diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index 6740171..742076f 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -1,387 +1,781 @@
<template>
- <div class="app-container">
- <div class="form-header mt">
- <h4 class="dt h4">瀹跺涵璁惧璇︽儏 </h4>
- <el-button type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" :disabled="btn">缂栬緫</el-button>
- </div>
- <!-- 鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佸唴瀹广�佸湴鐐广�佸娉� -->
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" >
- <!-- <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-form-item label="绫诲埆" prop="type">
- <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" :disabled="dsb" >
- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
- :disabled="item.disabled"></el-option>
- </el-select>
- </el-form-item> -->
- <el-form-item label="璁惧鍚嶇О" prop="name">
- <el-input v-model="formData.name" placeholder="璇疯緭鍏ヨ澶囧悕绉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
- </el-form-item>
- <el-form-item label="鏃堕棿" prop="createDate">
- <el-input v-model="formData.createDate" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="璐拱浜�" prop="buyer">
- <el-input v-model="formData.buyer" placeholder="璇疯緭鍏ヨ喘涔颁汉" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="浜嬮」鍐呭" prop="content">
- <el-input v-model="formData.content" placeholder="璇疯緭鍏ヤ簨椤瑰唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="瀛樻斁鍦扮偣" prop="location">
- <el-input v-model="formData.location" placeholder="璇疯緭鍏ュ瓨鏀惧湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
-
-
- <el-form-item label="瀹跺涵鍙�" prop="familyId">
- <el-input v-model="formData.familyId" placeholder="璇疯緭鍏ュ搴彿" :maxlength="11" show-word-limit :disabled="true"
- clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></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: 147px; height: 147px"
- 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="handleDownload(file.url)"
- >
- <i class="el-icon-download"></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-preview="handlePreview"
-
- :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-item size="large">
- <el-button type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
- </el-form-item>
- </el-form>
-
- <el-dialog :visible.sync="dialogVisible">
- <img w-full :src="dialogImageUrl" alt="Preview Image" />
- </el-dialog>
+ <div class="app-container" id="printable-content">
+ <div class="form-header mt">
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
+ <span>瀹跺涵璁惧璇︽儏</span>
+ <div style="display: flex; align-items: center;">
+ <el-button size="mini" type="text" @click="checkNote" v-hasPermi="['person:information:memo']">
+ <div class="form" ><el-icon style="padding-right:110px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">澶囧繕鏈�</span></div>
+ </el-button>
+ <el-button size="mini" type="text" v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+ <div class="form" ><el-icon style="padding-right:110px;"></el-icon>
+ <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鎵撳嵃</span></div>
+ </el-button>
+ </div>
+ </h1>
</div>
- </template>
- <script>
- import { getEquipmentInfo, updateEquipment, uploadPic, download} from "@/api/device/index";
- import {addRole, updateRole} from "@/api/system/role";
- import {blobValidate} from "@/utils/ruoyi";
- import errorCode from "@/utils/errorCode";
- import {Message} from "element-ui";
+ <!-- 鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佸唴瀹广�佸湴鐐广�佸娉� -->
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" >
- export default {
- components: {},
- props: [],
- data() {
- return {
- cdi:"瀹跺涵璁惧淇℃伅",
- udi:"瀹跺涵璁惧淇敼",
- fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
+ <el-form-item label="璁惧鍚嶇О" prop="name">
+ <el-input v-model="formData.name" placeholder="璇疯緭鍏ヨ澶囧悕绉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ <el-form-item label="鏃堕棿" prop="happenTime">
+ <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="璐拱浜�" prop="buyer">
+ <el-input v-model="formData.buyer" placeholder="璇疯緭鍏ヨ喘涔颁汉" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="浜嬮」鍐呭" prop="content">
+ <el-input v-model="formData.content" placeholder="璇疯緭鍏ヤ簨椤瑰唴瀹�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="瀛樻斁鍦扮偣" prop="location">
+ <el-input v-model="formData.location" placeholder="璇疯緭鍏ュ瓨鏀惧湴鍧�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏄惁娉ㄩ攢" prop="status">
+ <el-select v-model="formData.status" placeholder="璇烽�夋嫨鏄�/鍚�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions2" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
- ],
- dsb:true,
- btn:false,
- formData: {
- id: undefined,
- // type: undefined,
- name: undefined,
- location: undefined,
- buyer: undefined,
- content: undefined,
- remark: undefined,
- familyId:undefined,
- url: undefined,
+ </el-form-item>
+
+ <!-- <el-form-item label="瀹跺涵鍙�" prop="familyId">
+ <el-input v-model="formData.familyId" placeholder="璇疯緭鍏ュ搴彿" :maxlength="11" show-word-limit :disabled="true"
+ clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
+ </el-form-item> -->
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="formData.remark" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+
+
+
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <el-upload
+ action="#"
+ list-type="picture-card"
+ multiple
+ :http-request="requestUpload"
+ :file-list="fileList"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+
+ :on-change="handleChange"
+ :auto-upload="false"
+ >
+
+ <i v-if="!uploading" 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
+
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+
+ 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>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ v-if="btn"
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
+ <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+ <el-upload
+ action=""
+
+ class="upload-demo"
+ multiple
+ list-type="picture-card"
+ :on-preview="handleFileCardPreview"
+ ref="upload1"
+ :on-remove="handleRemoveFile"
+ :http-request="requestUpload1"
+ :file-list="fileListOther"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ :disabled="!btn"
+ :class="{ hide: !btn }"
+ >
+
+
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 147px; height: 147px"
+ fit="cover">
+
+ <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+
+ 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="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+
+ </el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ v-if="btn"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
+ <h4 class="form-header"> </h4>
+ <el-form-item size="large">
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+ </el-form-item>
+ </el-form>
+
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
+ </el-dialog>
+ </div>
+</template>
+<script>
+import { getEquipmentInfo, updateEquipment, uploadPic, download} from "@/api/device/index";
+import {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+
+export default {
+ components: {},
+ props: [],
+ data() {
+ return {
+ cdi:"瀹跺涵璁惧淇℃伅",
+ udi:"瀹跺涵璁惧淇敼",
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
+ fileList:[
+ ],
+ fileList1:[],
+ uploadFileList:[],
+ uploadFileList1:[],
+ fileListOther:[
+
+ ],
+ fileListOther1:[],
+ dsb:true,
+ btn:false,
+ isShow:true,
+ uploading: false,
+ formData: {
+
+ name: undefined,
+ location: undefined,
+ buyer: undefined,
+ content: undefined,
+ remark: undefined,
+ status:undefined,
+ url: "",
+ happenTime:undefined
+ },
+ typeOptions2: [
+ {
+ value: '鍚�',
+ label: '鍚�',
},
- dialogImageUrl: '',
- dialogVisible: false,
- disabled: false,
- rules: {
- // id: [{
- // required: true,
- // message: '璇疯緭鍏d',
- // trigger: 'blur'
- // }],
- createDate: [{
- required: true,
- message: '璇烽�夋嫨鏃堕棿',
- trigger: 'change'
- }],
- name: [{
- required: true,
- message: '璇疯緭鍏ヨ澶囧悕绉�',
- trigger: 'blur'
- }],
- familyId: [{
- required: true,
- message: '璇疯緭鍏ュ搴彿',
- trigger: 'blur'
- }],
- buyer: [{
- required: true,
- message: '璇疯緭鍏ヨ喘涔颁汉',
- trigger: 'blur'
- }],
- location: [{
- required: true,
- message: '璇疯緭鍏ュ瓨鏀惧湴鐐�',
- trigger: 'blur'
- }],
- familyId: [{
- required: true,
- message: '璇疯緭鍏ュ搴彿',
- trigger: 'blur'
- }],
- content:[{
- required: true,
- message: '璇疯緭鍏ヤ簨椤瑰唴瀹�',
- trigger: 'blur'
- } ],
- remark: [{
- required: true,
- message: '璇疯緭鍏ュ娉�',
- trigger: 'blur'
- }],
+ {
+ value: '鏄�',
+ label: '鏄�',
+ }
+ ],
+ desurl:'',
+ dialogImageUrl: '',
+ dialogVisible: false,
+ disabled: false,
+ rules: {
- },
- typeOptions: [],
- }
- },
- //鍦╟reated锛堬級涓皟鐢ㄦ帴鍙ｏ紝鎷垮埌鏁版嵁
- computed: {},
- watch: {},
- created() {
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
+ trigger: 'change'
+ }],
+ status: [{
+ required: true,
+ message: '璇烽�夋嫨鏄惁娉ㄩ攢',
+ trigger: 'change'
+ }],
+ name: [{
+ required: true,
+ message: '璇疯緭鍏ヨ澶囧悕绉�',
+ trigger: 'blur'
+ }],
+
+ buyer: [{
+ required: true,
+ message: '璇疯緭鍏ヨ喘涔颁汉',
+ trigger: 'blur'
+ }],
+ location: [{
+ required: true,
+ message: '璇疯緭鍏ュ瓨鏀惧湴鐐�',
+ trigger: 'blur'
+ }],
+
+ content:[{
+ required: true,
+ message: '璇疯緭鍏ヤ簨椤瑰唴瀹�',
+ trigger: 'blur'
+ } ],
+ remark: [{
+ // required: true,
+ message: '璇疯緭鍏ュ娉�',
+ trigger: 'blur'
+ }],
+
+ },
+ typeOptions: [],
+ }
+ },
+ //鍦╟reated锛堬級涓皟鐢ㄦ帴鍙ｏ紝鎷垮埌鏁版嵁
+ 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
+ this.isShow=true
+ // document.title = "淇敼瀹跺涵璁惧璇︾粏淇℃伅";
+ this.$route.meta.title = "淇敼瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ }
+ else{
+ // document.title = "瀹跺涵璁惧璇︾粏淇℃伅";
+ this.$route.meta.title = "瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
+ this.btn = false;
+ this.isShow=false
+ }
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getEquipmentInfo(id).then((response) => {
+
+ this.formData = response.data;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+ 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)
+ // alert(pth)
+ if (_this.fot.includes(pth) === true)
+ // {
+ // if(paths[i][0]=="/")
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ // else
+ // _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ // }
+ {
+ if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: paths[i],res:false})
+ }else{
+ if(paths[i][0]=="/")
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+ }
+
+ }
+ else {
+ // alert(paths[i])
+ // alert()
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+ }
+ }
+ }
+ this.loading = false;
+ });
+ // this.getCateInfor()
+
+ }
+ },
+ mounted() {},
+ methods: {
+ getData(){
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 = "鏌ョ湅瀹跺涵璁惧璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
- }
-
let _this = this
if (id) {
this.loading = true;
getEquipmentInfo(id).then((response) => {
this.formData = response.data;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
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)
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+ // alert(pth)
+ if (_this.fot.includes(pth) === true)
+ {
+ console.log()
+ }
+ else {
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ if(paths[i][0]=="/")
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+ else
+ _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
- 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.fileListOther = _this.fileListOther1
this.loading = false;
});
- // this.getCateInfor()
-
}
},
- mounted() {},
- methods: {
- /** 鏌ヨ绫诲埆淇℃伅 */
- // getCateInfor()
- // {
- // let _this = this
- // getCategory().then(response=>{
+ /** 鏌ヨ绫诲埆淇℃伅 */
+ // 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 => {
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ // })
+ // },
+ submitForm() {
- if (valid) {
- if (this.formData.id != undefined) {
- updateEquipment(this.formData).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- // this.open = false;
- this.btn=false
- });
- } else {
- this.$modal.msgSuccess("淇敼澶辫触");
+ this.$refs['elForm'].validate(valid => {
+if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
- }
+ if (valid) {
+ if (this.formData.id != undefined) {
+ updateEquipment(this.formData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ console.log(this.$route)
+
+ this.$tab.closePage({ path: "/familymodel/zfDevice" })
+ // this.$store.dispatch("tagsView/delView",{ path: "/familymodel/zfDevice" }); //鍏抽棴褰撳墠椤�
+ //this.$store.dispatch('tagsView/addView', { title:"ZfDevice",path: "/familymodel/zfDevice" })
+ //this.$store.dispatch('tagsView/addIframeView', { title:"ZfDevice",ZfDevicepath: "/familymodel/zfDevice" })
+ // this.$tab.refreshPage({ path: "/familymodel/zfDevice" });
+ this.$router.replace({ path: "/familymodel/zfDevice?cache=true" });
+ // this.$router.push("/familymodel/zfDevice");
+ window.location.url="https://www.bendudu.com/familymodel/zfDevice"
+
+ // this.open = false;
+ if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
+ this.btn=false
+ this.$router.replace({ title:"ZfDevice",path: "/familymodel/zfDevice"});
+ // 鍦ㄤ笅涓�涓簨浠跺惊鐜腑鍒锋柊椤甸潰
+ this.$nextTick(() => {
+ window.location.reload();
+ });
+ //this.$router.push("/familymodel/zfDevice");
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+if(this.formData.status==1)
+ this.formData.status = '鏄�'
+ else
+ this.formData.status = '鍚�'
}
- })
- },
- resetForm() {
- this.$refs['elForm'].resetFields()
- },
- handlePreview(file)
+ }
+ })
+ },
+ resetForm() {
+ this.$refs['elForm'].resetFields()
+ },
+ 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 = 'equipment_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+ handleRemoveFile(file) {
+ //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
+ for(let i = 0; i < this.fileListOther.length; i++)
{
- 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 = 'equipment_'+nt+'.'+suffix
- const blob = new Blob([response])
- saveAs(blob, filename)
- })
- },
- handleRemoveFile(file) {
- alert(23)
- },
- handleRemove(file) {
- alert(323)
- },
- handlePictureCardPreview(file) {
- this.dialogImageUrl = file.url;
- this.dialogVisible = true;
- },
- //鐐瑰嚮涓嬭浇鍑芥暟
- handleDownload(url) {
- var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+ if(this.fileListOther[i].url==file.url)
+ {
+ if(this.fileListOther[i].res==false)
+ res = true
+ else
+ {
+ this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+ }
+ this.$delete(this.fileListOther,i);
- 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 = 'equipment_'+nt+'.'+suffix
- const blob = new Blob([response])
- saveAs(blob, filename)
- })
- },
- handleEdit()
- {
- this.dsb = false
- this.btn = true
- },
- 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})
-
- }
- })
-
+ }
}
- }
- }
+ let ul = ""
+ this.fileList.map(function (elem){
+ if(elem.res==false)
+ ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ let uls = ""
+ this.fileListOther.map(function (elem){
+ if(elem.res==false)
+ uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ this.formData.url = ul+","+uls;
+ // alert(this.formData.url)
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
- </script>
- <style>
- .mt
- {
- position: relative;
- }
- .dt{
- display: block;
+ if(res==true){
+ updateEquipment(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ // this.open = false;
+ });
+ }
+ },
+ handleRemove(file) {
+ //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+ let res = false
+ // alert(this.fileList.length)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ {
+ //鍘熸潵鍥惧儚鏍囪涓篺alse
+ //alert(this.fileList[i].res)
+ if(this.fileList[i].res==false)
+ res = true
+ else
+ {
+ // alert(this.uploadFileList.length)
+ // alert(87)
+ this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+ // alert(this.uploadFileList.length)
+ }
+ this.$delete(this.fileList,i);
+
+ }
+ }
+ let ul = ""
+ this.fileList.map(function (elem){
+ if(elem.res==false)
+ ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ let uls = ""
+ this.fileListOther.map(function (elem){
+ if(elem.res==false)
+ uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ })
+ this.formData.url = ul+","+uls;
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+
+ if(res==true){
+ updateEquipment(this.formData).then(response => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ });
+ }
+
+ },
+ handleFileCardPreview(file){
+ this.dialogFileUrl = file.url;
+ // alert(file.url)
+ // this.dialogFileUrl = 'https://www.bendudu.com:8080/profile/upload/2023/10/18/20231018214647A011.doc'
+ // this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
+ if(this.dialogFileUrl.includes("47.93.189.255")==true)
+ this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+ //alert(this.dialogFileUrl)
+ const Base64 = require('js-base64').Base64
+
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ let 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 = 'equipment_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+ handleEdit()
+ {
+ this.dsb = false
+ this.btn = true
+ },
+ //鏌ョ湅澶囧繕鏈�
+ checkNote(row){
+
+ const id = this.$route.params && this.$route.params.id;
+
+ this.$router.push("/familymodel/Device/memo/" + id );
+ },
+
+ //鑷畾涔変笂浼犳柟娉�
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url,res:true})
+ },
+ //鑷畾涔変笂浼犳柟娉�
+ handleChange1(file, fileListOther12) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url,res:true})
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ fileUpload(){
+ // var file = params.file;
+
+ var formData = new FormData();
+ //this.$refs.upload1.submit();
+ // alert(this.uploadFileList1.length)
+ // formData.append('uploadFile', file);
+ if(this.uploadFileList1.length==0){
+ this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
+
+ this.uploadFileList1.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ console.log(this.uploadFileList1)
+ let _this = this
+
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ _this.uploadFileList1 = []
+ if(_this.formData.status=='鏄�')
+ _this.formData.status = 1
+ else
+ _this.formData.status = 0
+
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ updateEquipment(_this.formData).then(response => {
+ this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+ // this.open = false;
+ this.getData()
+ this.fileListOther1=[]
+ });
+ })
+
+ },
+ picUpload()
+ {
+
+ var formData = new FormData();
+ //this.$refs.upload.submit();
+ //alert(this.uploadFileList.length)
+ if(this.uploadFileList.length==0){
+ this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
+
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ let _this = this
+
+
+ uploadPic(formData).then(response => {
+ // console.log(response.originalFilenames)
+ // console.log(response.urls)
+ // console.log(response.fileNames)
+ // console.log(response.newFileNames)
+ // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ // _this.uploading1= false;
+ // console.log(_this.fot.includes(pth))
+ // // debugger
+ // if(_this.fot.includes(pth) === true)
+ // {
+ // _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ // 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(",")
+ //console.log(_this.fileList)
+ // alert(response.fileNames)
+ _this.formData.url = _this.formData.url+","+response.fileNames
+ _this.uploadFileList = []
+ // alert(87)
+ if(_this.formData.status=='鏄�')
+ _this.formData.status = 1
+ else
+ _this.formData.status = 0
+
+ updateEquipment(_this.formData).then(response => {
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+ // this.open = false;
+
+ });
+ // }
+ // else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ // }
+ });
+ },
+ requestUpload(params)
+ {
+ // alert(124)
+ // this.uploadFileList.push(params.file);
+
+ //alert(34)
+
+
+ },
+ requestUpload1(params)
+ {
+ // alert(123)
+ // this.uploadFileList1.push(params.file);
+ // console.log("-----------")
+ //console.log(this.uploadFileList1)
+ },
}
- .pt{
- right: 10px;
- top:-3px;
- display: block;
- position: absolute;
- }
- </style>
+}
+
+</script>
+<style scoped>
+.mt
+{
+ position: relative;
+}
+.dt{
+ display: block;
+
+}
+.hide /deep/ .el-upload--picture-card {
+ display: none;
+}
+.form{
+ background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
+.pt{
+ right: 10px;
+ top:-3px;
+ display: block;
+ position: absolute;
+}
+</style>
--
Gitblit v1.9.1