朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 c93043a4243a63ab8d68d1db441590c4a7090658 1 个父辈 90048340

Merge branch 'master' of /Users/mrz/Documents/java项目/test/vue-admin-master with conflicts.

内嵌 并排对比
正在显示 2 个修改的文件 包含 59 行增加 和 5 行删除
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 </el-form-item> 62 </el-form-item>
63 </el-col> 63 </el-col>
64 </el-row> 64 </el-row>
65 - <el-divider content-position="left"><i class="el-icon-s-home"></i> 入库相关</el-divider> 65 + <el-divider content-position="left"><i class="el-icon-house"></i> 入库相关</el-divider>
66 <el-row> 66 <el-row>
67 <el-col :span="6"> 67 <el-col :span="6">
68 <el-form-item label=" " :label-width="formLabelWidth" prop="area"> 68 <el-form-item label=" " :label-width="formLabelWidth" prop="area">
@@ -217,8 +217,20 @@ @@ -217,8 +217,20 @@
217 </el-form-item> 217 </el-form-item>
218 </el-col> 218 </el-col>
219 </el-row> 219 </el-row>
  220 + <el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider>
220 <el-row> 221 <el-row>
221 - <el-col :span="8"> 222 + <el-col :span="6">
  223 + <el-form-item label=" " :label-width="formLabelWidth" prop="picUrl">
  224 + <el-input v-model="addForm.picUrl" autocomplete="off" suffix-icon="el-icon-document" clearable>
  225 + <template slot="prepend">图片地址</template>
  226 + </el-input>
  227 + </el-form-item>
  228 + </el-col>
  229 + <el-col :span="6">
  230 + <el-button type="success" icon="el-icon-edit" @click="drawerVisible = true">入库图像</el-button>
  231 + </el-col>
  232 +
  233 +<!-- <el-col :span="8">-->
222 <!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">--> 234 <!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->
223 <!-- <el-input v-model="addForm.status" autocomplete="off" style="width: 300px">--> 235 <!-- <el-input v-model="addForm.status" autocomplete="off" style="width: 300px">-->
224 <!-- <template slot="prepend">状&emsp;&emsp;态</template>--> 236 <!-- <template slot="prepend">状&emsp;&emsp;态</template>-->
@@ -425,6 +437,15 @@ @@ -425,6 +437,15 @@
425 </el-pagination> 437 </el-pagination>
426 </el-row> 438 </el-row>
427 </el-card> 439 </el-card>
  440 + <el-drawer
  441 + title="我是标题"
  442 + :visible.sync="drawerVisible"
  443 + :with-header="false">
  444 + <video width="100%" height="200" autoplay loop controls id="videos">
  445 + <source src="/static/login/New-jumbo.mp4" type="video/mp4">
  446 + </video>
  447 + <el-button class="btns" @click="screenshot">一键截屏</el-button>
  448 + </el-drawer>
428 </el-row> 449 </el-row>
429 </template> 450 </template>
430 451
@@ -470,6 +491,7 @@ @@ -470,6 +491,7 @@
470 // 编辑对话框 491 // 编辑对话框
471 editDialog: false 492 editDialog: false
472 }, 493 },
  494 + drawerVisible: false,
473 addForm: { 495 addForm: {
474 area: '', 496 area: '',
475 billweight: '', 497 billweight: '',
@@ -498,6 +520,7 @@ @@ -498,6 +520,7 @@
498 remark3:'', 520 remark3:'',
499 remark4:'', 521 remark4:'',
500 remark5:'', 522 remark5:'',
  523 + picUrl:''
501 }, 524 },
502 options: [{ 525 options: [{
503 value: '板箱', 526 value: '板箱',
@@ -806,6 +829,9 @@ @@ -806,6 +829,9 @@
806 } 829 }
807 }; 830 };
808 }, 831 },
  832 + screenshot(){
  833 +
  834 + }
809 }, 835 },
810 mounted() { 836 mounted() {
811 this.getAreaList(); 837 this.getAreaList();
@@ -345,12 +345,12 @@ @@ -345,12 +345,12 @@
345 key2: +new Date(), 345 key2: +new Date(),
346 formResource: { 346 formResource: {
347 "fields": [], 347 "fields": [],
348 - "formRef": "wms_truck_plan",  
349 - "formModel": "wms_truck_plan_Data", 348 + "formRef": "formRef",
  349 + "formModel": "formModel",
350 "size": "mini", 350 "size": "mini",
351 "labelPosition": "left", 351 "labelPosition": "left",
352 "labelWidth": 100, 352 "labelWidth": 100,
353 - "formRules": "rules", 353 + "formRules": "",
354 "gutter": 5, 354 "gutter": 5,
355 "disabled": false, 355 "disabled": false,
356 "span": 12, 356 "span": 12,
@@ -511,10 +511,38 @@ @@ -511,10 +511,38 @@
511 _this.key2 = +new Date() 511 _this.key2 = +new Date()
512 _this.formResource = JSON.parse(data) 512 _this.formResource = JSON.parse(data)
513 }else { 513 }else {
  514 + _this.formResource = {
  515 + "fields": [],
  516 + "formRef": "formRef",
  517 + "formModel": "formModel",
  518 + "size": "mini",
  519 + "labelPosition": "left",
  520 + "labelWidth": 100,
  521 + "formRules": "",
  522 + "gutter": 5,
  523 + "disabled": false,
  524 + "span": 12,
  525 + "formBtns": true,
  526 + "unFocusedComponentBorder": true
  527 + }
514 console.log("此任务没有表单定义") 528 console.log("此任务没有表单定义")
515 } 529 }
516 }).catch(err => { 530 }).catch(err => {
517 _this.$message.error(err) 531 _this.$message.error(err)
  532 + _this.formResource = {
  533 + "fields": [],
  534 + "formRef": "formRef",
  535 + "formModel": "formModel",
  536 + "size": "mini",
  537 + "labelPosition": "left",
  538 + "labelWidth": 100,
  539 + "formRules": "",
  540 + "gutter": 5,
  541 + "disabled": false,
  542 + "span": 12,
  543 + "formBtns": true,
  544 + "unFocusedComponentBorder": true
  545 + }
518 }); 546 });
519 }) 547 })
520 548