Skip to content

A
assets
Commit 306e199d authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 1932f2da
Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 220 deletions
package-lock.json
View file @ 306e199d
...@@ -1961,6 +1961,14 @@ ...@@ -1961,6 +1961,14 @@
"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
"dev": true "dev": true
}, },
"browser-md5-file": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/browser-md5-file/-/browser-md5-file-1.1.1.tgz",
"integrity": "sha512-9h2UViTtZPhBa7oHvp5mb7MvJaX5OKEPUsplDwJ800OIV+In7BOR3RXOMB78obn2iQVIiS3WkVLhG7Zu1EMwbw==",
"requires": {
"spark-md5": "^2.0.2"
}
},
"browser-process-hrtime": { "browser-process-hrtime": {
"version": "0.1.3", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
...@@ -13742,6 +13750,11 @@ ...@@ -13742,6 +13750,11 @@
"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
"dev": true "dev": true
}, },
"spark-md5": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-2.0.2.tgz",
"integrity": "sha1-N7djhHdjrn56zvLKUjPQHmSaeLc="
},
"spdx-correct": { "spdx-correct": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
......
package.json
View file @ 306e199d
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "^0.4.0", "@riophae/vue-treeselect": "^0.4.0",
"axios": "^0.19.0", "axios": "^0.19.0",
"browser-md5-file": "^1.1.1",
"echarts": "^4.5.0", "echarts": "^4.5.0",
"element-ui": "^2.13.0", "element-ui": "^2.13.0",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
......
src/App.vue
View file @ 306e199d
...@@ -15,10 +15,13 @@ export default { ...@@ -15,10 +15,13 @@ export default {
<style> <style>
@import "//at.alicdn.com/t/font_1544586_n4jd8ww9mz.css"; @import "//at.alicdn.com/t/font_1544586_n4jd8ww9mz.css";
@import "./assets/css/common.css"; @import "./assets/css/common.css";
@import './assets/global/font.css';
@import "./assets/css/reset.css";
@import "./assets/css/vxetable.css";
body,html{ body,html{
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
font-family:'微软雅黑',' Microsoft YaHei','PingFang','PingFangR'; font-family:'微软雅黑',' Microsoft YaHei','pingfang','PingFangR';
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
height: 100%; height: 100%;
} }
......
src/assets/css/common.css
View file @ 306e199d
...@@ -72,12 +72,12 @@ ...@@ -72,12 +72,12 @@
font-family: "宋体"!important; font-family: "宋体"!important;
} }
.myTable thead th{ .myTable thead th{
color:#A6C6C6; color:#000000;
padding-left: 20px; padding-left: 20px;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
font-weight:bold;
text-align: left; text-align: left;
font-family: "PingFangR";
} }
.myTable thead tr{ .myTable thead tr{
background:transparent!important; background:transparent!important;
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
color:#00D2D6; color:#00D2D6;
} }
.bold{ .bold{
font-family: "PingFangSC" font-family: "PingFangR"
} }
.clearfix:after {content: "\0020";display: block;height: 0;clear: both;} .clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
...@@ -186,9 +186,7 @@ ...@@ -186,9 +186,7 @@
.cred{ .cred{
color:#F56C6C; color:#F56C6C;
} }
.bold{
font-family: "PingFangR";
}
/* 头部切换 */ /* 头部切换 */
.ChangeTable{ .ChangeTable{
...@@ -384,9 +382,8 @@ ...@@ -384,9 +382,8 @@
display: none; display: none;
} }
.myTborderTableable tr{ .borderTable tr{
background:#fff; background:#fff;
border-bottom: 4px solid #F8FAFB;
cursor: pointer; cursor: pointer;
} }
......
src/assets/css/reset.css
View file @ 306e199d
...@@ -38,31 +38,32 @@ ...@@ -38,31 +38,32 @@
} }
/* 分页 */ /* 分页 */
.el-pagination{ .el-pagination{
margin-top: 20px; margin-top: 20px!important;
text-align: right; text-align: right!important;
} }
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{ .el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{
background: #fff; background: #fff!important;
margin: 0; margin: 0!important;
border-right: 1px solid #F0F2FA; border-right: 1px solid #F0F2FA!important;
color:#666666; color:#666666!important;
font-size: 14px; font-size: 14px!important;
font-weight:100; font-weight:100!important;
} }
.el-pagination.is-background .el-pager li:not(.disabled).active{ .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #28CACC; background-color: #28CACC!important;
color:#fff!important;
} }
.el-pager li{ .el-pager li{
padding: 0; padding: 0!important;
font-size: 14px; font-size: 14px!important;
width: 38px; width: 38px!important;
height: 28px; height: 28px!important;
line-height: 28px; line-height: 28px!important;
text-align: center; text-align: center!important;
} }
.el-pagination button, .el-pagination span:not([class*=suffix]){ .el-pagination button, .el-pagination span:not([class*=suffix]){
height: 28px; height: 28px!important;
line-height: 28px; line-height: 28px!important;
} }
/* 图片上传 */ /* 图片上传 */
...@@ -98,20 +99,20 @@ ...@@ -98,20 +99,20 @@
align-items: center; align-items: center;
} }
.el-dialog__body{ .el-dialog__body{
padding:0 20px 15px 20px; padding:0 20px 15px 20px!important;
} }
.el-dialog{ .el-dialog{
background:rgba(248,250,251,1); background:rgba(248,250,251,1)!important;
border-radius:20px; border-radius:20px!important;
max-height:75%; max-height:75%;
overflow-y: scroll; overflow-y: scroll;
} }
.el-dialog__headerbtn .el-dialog__close{ .el-dialog__headerbtn .el-dialog__close{
color:#111111; color:#111111!important;
} }
.el-dialog__title{ .el-dialog__title{
font-size: 12px; font-size: 14px!important;
font-family: "宋体"; font-family: "PingFangR";
} }
/* form MyEditForm */ /* form MyEditForm */
.MyEditForm .el-form-item{ .MyEditForm .el-form-item{
...@@ -283,7 +284,7 @@ ...@@ -283,7 +284,7 @@
} }
/* select */ /* select */
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{ .el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
background: #28CACC; background: #28CACC!important;
color:#fff!important; color:#fff!important;
} }
.el-select-dropdown__item.selected{ .el-select-dropdown__item.selected{
...@@ -375,4 +376,11 @@ ...@@ -375,4 +376,11 @@
.el-tree-node__expand-icon.is-leaf::before .el-tree-node__expand-icon.is-leaf::before
{ {
display: none; display: none;
}
/* 日历 */
.el-date-table td.end-date span, .el-date-table td.start-date span{
background-color: #28CACC!important;
}
.el-date-table td.available:hover{
color: #28CACC!important;
} }
\ No newline at end of file
src/assets/css/vxetable.css
View file @ 306e199d
.vxe-table{ .vxe-table{
border: none; border: none!important;
background-color:transparent; background-color:transparent!important;
font-size: 12px; font-size: 12px!important;
font-family: '宋体'; font-family: '宋体';
color:#000000;
} }
.vxe-table .vxe-body--column:not(.col--ellipsis), .vxe-table .vxe-body--column:not(.col--ellipsis),
.vxe-table .vxe-footer--column:not(.col--ellipsis), .vxe-table .vxe-footer--column:not(.col--ellipsis),
.vxe-table .vxe-header--column:not(.col--ellipsis){ .vxe-table .vxe-header--column:not(.col--ellipsis){
padding:7px 0; padding:7px 0!important;
} }
.vxe-table:after, .vxe-table:before{ .vxe-table:after, .vxe-table:before{
background-color:transparent; background-color:transparent!important;
} }
.vxe-table .vxe-body--row .vxe-body--column{ .vxe-table .vxe-body--row .vxe-body--column{
border-bottom: 4px solid #F8FAFB; border-bottom: 4px solid #F8FAFB!important;
} }
.vxe-table .vxe-table--footer-wrapper, .vxe-table .vxe-table--header-wrapper{ .vxe-table .vxe-table--footer-wrapper, .vxe-table .vxe-table--header-wrapper{
border:none; border:none!important;
} }
.vxe-table--header-wrapper{ .vxe-table--header-wrapper{
background: transparent; background: transparent!important;
} }
.vxe-table .vxe-header--column .vxe-cell{ .vxe-table .vxe-header--column .vxe-cell{
color:#A6C6C6; color:#A6C6C6;
} }
.vxe-table--header-wrapper .vxe-table--repair{ .vxe-table--header-wrapper .vxe-table--repair{
height: 0; height: 0!important;
} }
.vxe-table .vxe-body--row:hover{ .vxe-table .vxe-body--row:hover{
box-shadow:0px 0px 20px 0px rgba(176,176,176,0.2);
transition: transform .2s ease;
cursor: pointer; cursor: pointer;
transform: scale(1.005); box-shadow:0px 0 20px 0px rgba(176,176,176,0.2);
transition: transform .2s linear;
transform: scale(1);
/* zoom:1.02; */ /* zoom:1.02; */
} }
.vxe-table .vxe-cell{ .vxe-table .vxe-cell{
...@@ -54,37 +55,41 @@ ...@@ -54,37 +55,41 @@
border-radius:0 0 20px 0; border-radius:0 0 20px 0;
} }
.vxe-icon--menu{ .vxe-icon--menu{
color:rgba(0,210,214,1); color:rgba(0,210,214,1)!important;
} }
.vxe-toolbar .vxe-custom--setting-btn:hover{ .vxe-toolbar .vxe-custom--setting-btn:hover{
background: transparent; background: transparent;
} }
.vxe-checkbox>input:checked+.vxe-checkbox--icon+.vxe-checkbox--label{ .vxe-checkbox>input:checked+.vxe-checkbox--icon+.vxe-checkbox--label{
color: rgba(0,210,214,1); color: rgba(0,210,214,1)!important;
} }
.vxe-checkbox>input:checked+.vxe-checkbox--icon { .vxe-checkbox>input:checked+.vxe-checkbox--icon {
background-color: rgba(0,210,214,1); background-color: rgba(0,210,214,1)!important;
border-color: rgba(0,210,214,1); border-color: rgba(0,210,214,1)!important;
} }
.vxe-checkbox .vxe-checkbox--label{ .vxe-checkbox .vxe-checkbox--label{
font-size: 12px; font-size: 12px!important;
font-family: '宋体'; font-family: '宋体'!important;
font-weight: 100; font-weight: 100;
} }
.vxe-table--loading .vxe-table--spinner:after, .vxe-table--loading .vxe-table--spinner:before{ .vxe-table--loading .vxe-table--spinner:after, .vxe-table--loading .vxe-table--spinner:before{
background-color: #28CACC; background-color: #28CACC!important;
opacity:.4; opacity:.4!important;
} }
.vxe-table--loading{ .vxe-table--loading{
background-color: rgba(255,255,255,.9); background-color: rgba(255,255,255,.9)!important;
} }
.vxe-table table{ .vxe-table table{
overflow: hidden; overflow: hidden;
} }
.vxe-checkbox.is--indeterminate>input:not(:checked)+.vxe-checkbox--icon{ .vxe-checkbox.is--indeterminate>input:not(:checked)+.vxe-checkbox--icon{
background-color: #28CACC; background-color: #28CACC!important;
border-color: #28CACC; border-color: #28CACC!important;
} }
.vxe-toolbar.is--loading:before{ .vxe-toolbar.is--loading:before{
background-color: rgba(0,0,0,0); background-color: rgba(0,0,0,0)!important;
} }
.vxe-table .vxe-table--empty-block, .vxe-table .vxe-table--empty-placeholder{
background: #fff!important;
min-height: 50px!important;
}
\ No newline at end of file
src/assets/global/font.css
View file @ 306e199d
@font-face{ @font-face{
font-family:'pingfang'; font-family: 'pingfang';
src:url('../fonts/pingfang.ttf') format('truetype'); src:url('../fonts/pingfang.woff2') format('woff');
font-style: normal;
font-weight: normal;
}
@font-face{
font-family:'songti';
src:url('../fonts/HYXuJingXingKaiW.ttf') format('truetype');
font-style: normal;
font-weight: normal;
} }
@font-face { @font-face {
font-family: "PingFangR"; font-family: "PingFangR";
src: url("../fonts/PingFangR.eot"); /* IE9 */ src: url("../fonts/Semibold.eot"); /* IE9 */
src: url("../fonts/PingFangR.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ src: url("../fonts/Semibold.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */
url("../fonts/PingFangR.woff") format("woff"), /* chrome, firefox */ url("../fonts/Semibold.woff") format("woff"), /* chrome, firefox */
url("../fonts/PingFangR.ttf") format("truetype"); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ url("../fonts/Semibold.ttf") format("truetype"); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
font-style: normal;
font-weight: normal;
} }
@font-face { /* @font-face {
font-family: "FZDBSJW"; font-family: "FZDBSJW";
src: url("../fonts/FZDBSJW.woff") format("woff"), src: url("../fonts/FZDBSJW.woff") format("woff"),
url("../fonts/FZDBSJW.TTF") format("truetype"), url("../fonts/FZDBSJW.TTF") format("truetype"),
url("../fonts/FZDBSJW.svg") format('svg'); url("../fonts/FZDBSJW.svg") format('svg');
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
} } */
@font-face{ @font-face{
font-family:'方正大标宋简体'; font-family:'方正大标宋简体';
src:url('../fonts/FZDBSJW.woff') format('woff') src:url('../fonts/FZDBSJW.woff') format('woff')
...@@ -32,19 +26,4 @@ ...@@ -32,19 +26,4 @@
@font-face{ @font-face{
font-family:'方正宋三简体'; font-family:'方正宋三简体';
src:url('../fonts/FZSSJ.ttf') format('truetype') src:url('../fonts/FZSSJ.ttf') format('truetype')
}
@font-face {
font-family: "PingFangSC";
src: url("../fonts/PingFangR.eot"); /* IE9 */
src: url("../fonts/PingFangR.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */
url("../fonts/PingFangR.woff") format("woff"), /* chrome, firefox */
url("../fonts/PingFangR.ttf") format("truetype"); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
font-style: normal;
font-weight: normal;
}
@font-face {
font-family: "PINGFANG";
src:url("../fonts/PingFangR.ttf") format("truetype"); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
font-style: normal;
font-weight: normal;
} }
\ No newline at end of file
src/components/Home.vue
View file @ 306e199d
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<img style="width:100%;" src="../assets/img/banner.png" alt=""> <img style="width:100%;" src="../assets/img/banner.png" alt="">
</div> </div>
<div class="zcState"> <div class="zcState">
<p style="padding-left:25px;padding-top:20px;" class="c11 f14 bold">资产状态占比</p> <p style="padding-left:25px;padding-top:20px;" class="c11 bold">资产状态占比</p>
<el-row v-for="(item,index) in StatusList" :key="index" class="ziItem"> <el-row v-for="(item,index) in StatusList" :key="index" class="ziItem">
<el-col :span="14"> <el-col :span="14">
<p>资产{{item.Name}}</p> <p>资产{{item.Name}}</p>
...@@ -71,14 +71,14 @@ ...@@ -71,14 +71,14 @@
</div> </div>
<div class="right"> <div class="right">
<div class="firstDiv assetsgk" style="padding:20px 0"> <div class="firstDiv assetsgk" style="padding:20px 0">
<p class="f12" style="padding-left:30px;">资产概况</p> <p class="f14 bold" style="padding-left:30px;">资产概况</p>
<el-row style="margin-top:20px"> <el-row style="margin-top:20px">
<el-col :span="12"> <el-col :span="12">
<div style="text-align:center"> <div style="text-align:center">
<el-progress class="progressDiv" type="circle" :percentage="SituationInfo.Norpercent" color="#00D2D6" :stroke-width="18" :width="150"></el-progress> <el-progress class="progressDiv Zyprogress" type="circle" :percentage="SituationInfo.Norpercent" color="#00D2D6" :stroke-width="18" :width="150"></el-progress>
</div> </div>
<div class="f12 c11" style="padding-left:10%;margin-top:20px;border-right:1px solid #00D2D6"> <div class="f12 c11" style="padding-left:10%;margin-top:20px;border-right:1px solid #00D2D6">
<span style="color:#A6C6C6">在用：</span> <span class="bold" style="color:#A6C6C6">在用：</span>
<span class="Circle" style="background:#00D2D6"></span> <span class="Circle" style="background:#00D2D6"></span>
<span>金额 ￥{{SituationInfo.NorMoney}}</span> <span>金额 ￥{{SituationInfo.NorMoney}}</span>
<span class="Circle" style="background:#BEEFF0"></span> <span class="Circle" style="background:#BEEFF0"></span>
...@@ -87,10 +87,10 @@ ...@@ -87,10 +87,10 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div style="text-align:center"> <div style="text-align:center">
<el-progress class="progressDiv" type="circle" :percentage="SituationInfo.Idlepercent" color="#FFA475" :stroke-width="18" :width="150"></el-progress> <el-progress class="progressDiv Xzprogress" type="circle" :percentage="SituationInfo.Idlepercent" color="#FFA475" :stroke-width="18" :width="150"></el-progress>
</div> </div>
<div class="f12 c11" style="padding-left:10%;margin-top:20px;"> <div class="f12 c11" style="padding-left:10%;margin-top:20px;">
<span style="color:#A6C6C6">闲置：</span> <span class="bold" style="color:#A6C6C6">闲置：</span>
<span class="Circle" style="background:#FFA475"></span> <span class="Circle" style="background:#FFA475"></span>
<span>金额 ￥{{SituationInfo.IdleMoney}}</span> <span>金额 ￥{{SituationInfo.IdleMoney}}</span>
...@@ -102,10 +102,10 @@ ...@@ -102,10 +102,10 @@
</div> </div>
<div class="firstDiv" style="height:370px;margin-top:30px"> <div class="firstDiv" style="height:370px;margin-top:30px">
<el-row class="chartTitle"> <el-row class="chartTitle">
<el-col :span="12" class="f14 c11">资产入库领用情况<span style="color:#969696;margin-left:14px">固定资产</span></el-col> <el-col :span="10" class="f14 bold c11">资产入库领用情况<span style="color:#969696;margin-left:14px">固定资产</span></el-col>
<el-col class="f12 c11" :span="12" style="text-align:right;cursor: pointer"> <el-col class="f12 c11" :span="14" style="text-align:right;cursor: pointer">
<span @click="SetTimeType(1,1)" :class="IntimeType==1?'Active':''">最近一年</span> <span @click="SetTimeType(1,1)" :class="IntimeType==1?'Active':''">最近一年</span>
<span @click="SetTimeType(2,1)" :class="IntimeType==2?'Active':''">最近半年</span> <span style="margin:0 10px" @click="SetTimeType(2,1)" :class="IntimeType==2?'Active':''">最近半年</span>
<span @click="SetTimeType(3,1)" :class="IntimeType==3?'Active':''">最近三月</span> <span @click="SetTimeType(3,1)" :class="IntimeType==3?'Active':''">最近三月</span>
<el-select @change="getPropertyInStock" v-model="InStockMsg.LogType" placeholder="请选择"> <el-select @change="getPropertyInStock" v-model="InStockMsg.LogType" placeholder="请选择">
<el-option key="1" label="入库" :value="1"> </el-option> <el-option key="1" label="入库" :value="1"> </el-option>
...@@ -118,12 +118,12 @@ ...@@ -118,12 +118,12 @@
<div class="firstDiv" style="height:360px;margin-top:30px"> <div class="firstDiv" style="height:360px;margin-top:30px">
<el-row class="chartTitle"> <el-row class="chartTitle">
<el-col :span="12" class="f14 c11">耗材入库出库情况<span style="color:#969696;margin-left:14px">固定资产</span></el-col> <el-col :span="10" class="f14 bold c11">耗材入库出库情况<span style="color:#969696;margin-left:14px">固定资产</span></el-col>
<el-col class="f12 c11" :span="12" style="text-align:right;cursor: pointer"> <el-col class="f12 c11" :span="14" style="text-align:right;cursor: pointer">
<span @click="SetTimeType(1,2)" :class="IntimesuppleType==1?'Active':''">最近一年</span> <span @click="SetTimeType(1,2)" :class="IntimesuppleType==1?'Active':''">最近一年</span>
<span @click="SetTimeType(2,2)" :class="IntimesuppleType==2?'Active':''">最近半年</span> <span style="margin:0 10px" @click="SetTimeType(2,2)" :class="IntimesuppleType==2?'Active':''">最近半年</span>
<span @click="SetTimeType(3,2)" :class="IntimesuppleType==3?'Active':''">最近三月</span> <span @click="SetTimeType(3,2)" :class="IntimesuppleType==3?'Active':''">最近三月</span>
<el-select @change="getSuppliesInStock" v-model="InStockSuppleMsg.LogType" placeholder="请选择"> <el-select @change="getSuppliesInStock" v-model="InStockSuppleMsg.Type" placeholder="请选择">
<el-option key="1" label="入库" :value="1"> </el-option> <el-option key="1" label="入库" :value="1"> </el-option>
<el-option key="2" label="出库" :value="2"> </el-option> <el-option key="2" label="出库" :value="2"> </el-option>
</el-select> </el-select>
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
EndTime:moment().format("YYYY-MM"), EndTime:moment().format("YYYY-MM"),
}, },
InStockSuppleMsg:{ InStockSuppleMsg:{
LogType:1, Type:1,
StartTime:moment().subtract(3, "month").format("YYYY-MM"), StartTime:moment().subtract(3, "month").format("YYYY-MM"),
EndTime:moment().format("YYYY-MM"), EndTime:moment().format("YYYY-MM"),
}, },
...@@ -392,17 +392,19 @@ export default { ...@@ -392,17 +392,19 @@ export default {
} }
}, },
legend: { legend: {
x:'right', x:'left',
y:'bottom',
type:'scroll', type:'scroll',
padding: [5, 30, 20, 30] ,
data:that.CategoryNameList, data:that.CategoryNameList,
// data:["邮件营销","联盟广告"], // data:["邮件营销","联盟广告"],
selected:this.Stocklegend selected:this.Stocklegend
}, },
grid:{ grid:{
left: 75, // 默认10%，给24就挺合适的。 left: 75, // 默认10%，给24就挺合适的。
top: 50, // 默认60 top: 30, // 默认60
right: 75, // 默认10% right: 75, // 默认10%
bottom: 50, // 默认60 bottom: 70, // 默认60
}, },
xAxis: { xAxis: {
...@@ -516,10 +518,8 @@ export default { ...@@ -516,10 +518,8 @@ export default {
); );
}, },
LineChart1(){ LineChart1(){
var that = this; var that = this;
var myChart1 = this.$echarts.init(document.getElementById('chartsMap1'));
var myChart = this.$echarts.init(document.getElementById('chartsMap1'));
var option={ var option={
color:that.colorList, color:that.colorList,
tooltip : { tooltip : {
...@@ -548,7 +548,11 @@ export default { ...@@ -548,7 +548,11 @@ export default {
} }
}, },
legend: { legend: {
x:'right', x:'left',
y:'bottom',
type:'scroll',
icon: "circle",
padding: [5, 30, 20, 30] ,
type:'scroll', type:'scroll',
data:that.SuppliesNameList, data:that.SuppliesNameList,
selected:this.Stocklegend1 selected:this.Stocklegend1
...@@ -556,9 +560,9 @@ export default { ...@@ -556,9 +560,9 @@ export default {
}, },
grid: { grid: {
left: 75, // 默认10%，给24就挺合适的。 left: 75, // 默认10%，给24就挺合适的。
top: 50, // 默认60 top: 30, // 默认60
right: 75, // 默认10% right: 75, // 默认10%
bottom: 50, // 默认60 bottom: 70, // 默认60
}, },
xAxis : [ xAxis : [
...@@ -606,7 +610,7 @@ export default { ...@@ -606,7 +610,7 @@ export default {
series:that.InStockData1 series:that.InStockData1
}; };
myChart.setOption(option,true); myChart1.setOption(option,true);
}, },
getTask(){ getTask(){
this.Allload=true; this.Allload=true;
...@@ -632,8 +636,14 @@ export default { ...@@ -632,8 +636,14 @@ export default {
total+=item.Count; total+=item.Count;
}) })
data.forEach(item=>{ data.forEach(item=>{
item.percent=Number((( item.Count / total) *100).toFixed(2)); if(total==0){
item.percent=0;
}
else{
item.percent=Number((( item.Count / total) *100).toFixed(2));
}
}) })
this.StatusList=data; this.StatusList=data;
} else { } else {
...@@ -648,8 +658,15 @@ export default { ...@@ -648,8 +658,15 @@ export default {
res => { res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let data=res.data.data; let data=res.data.data;
data.Norpercent=Number(((data.NorCount / data.TotalCount) * 100).toFixed(2)); if(data.TotalCount==0){
data.Idlepercent=Number(((data.IdleCount / data.TotalCount) * 100).toFixed(2)); data.Norpercent=0;
data.Idlepercent=0;
}else{
data.Norpercent=Number(((data.NorCount / data.TotalCount) * 100).toFixed(2));
data.Idlepercent=Number(((data.IdleCount / data.TotalCount) * 100).toFixed(2));
}
this.SituationInfo=data; this.SituationInfo=data;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -664,6 +681,12 @@ export default { ...@@ -664,6 +681,12 @@ export default {
<!-- Add "scoped" attribute to limit CSS to this component only --> <!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped> <style scoped>
.Zyprogress >>> svg path:first-child{
stroke: rgb(190, 239, 240)!important;
}
.Xzprogress >>> svg path:first-child{
stroke: rgb(255, 228, 213)!important;
}
.homeContent .assetsgk .Circle{ .homeContent .assetsgk .Circle{
display: inline-block; display: inline-block;
width:14px; width:14px;
...@@ -715,7 +738,7 @@ export default { ...@@ -715,7 +738,7 @@ export default {
position: relative; position: relative;
} }
.chartTitle{ .chartTitle{
padding: 25px 30px 0 30px; padding: 20px 30px 0 30px;
} }
.chartTitle .circle{ .chartTitle .circle{
display: inline-block; display: inline-block;
......
src/components/Materialman/Archivesmaterials.vue
View file @ 306e199d
...@@ -14,12 +14,25 @@ ...@@ -14,12 +14,25 @@
新增</span> 新增</span>
</div> </div>
<ul v-show="morequery" class="queryul"> <ul v-show="morequery" class="queryul">
<li style="float:left">
<!-- :alwaysOpen="true" -->
<treeselect style="height:50px;width:200px;" :options="treedata" v-model="msg.CategoryId" placeholder="分类"
:normalizer="normalizer" />
</li>
<li> <li>
<el-input class="w200" size="small" v-model="msg.Name" placeholder="档案名称"></el-input> <el-input class="w200" size="small" v-model="msg.Name" placeholder="档案名称"></el-input>
</li> </li>
<li> <li>
<el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="物料编码"></el-input> <el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="物料编码"></el-input>
</li> </li>
<li>
<el-input class="w200" size="small" v-model="msg.BrandName" placeholder="品牌"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商名称"></el-input>
</li>
</ul> </ul>
<table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="myTable" v-loading="loading" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
...@@ -89,58 +102,60 @@ ...@@ -89,58 +102,60 @@
:title="dialogtitle" :title="dialogtitle"
:visible.sync="dialogState" :visible.sync="dialogState"
:before-close="closeChangeMachie" :before-close="closeChangeMachie"
top="3%" top="0"
width="975px"> width="975px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
<el-form-item prop="Name"> <div class="basefix">
<span class="label">档案名称</span> <el-form-item prop="Name">
<el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input> <span class="label">档案名称</span>
</el-form-item> <el-input size="small" v-model="addMsg.Name" placeholder="请输入"></el-input>
<el-form-item> </el-form-item>
<span class="label">档案编码</span> <!-- <el-form-item>
<el-input size="small" v-model="addMsg.SuppliesNum" placeholder="请输入"></el-input> <span class="label">档案编码</span>
</el-form-item> <el-input size="small" v-model="addMsg.SuppliesNum" placeholder="请输入"></el-input>
<el-form-item prop="BrandName"> </el-form-item> -->
<span class="label">品牌名称</span> <el-form-item prop="BrandName">
<el-input size="small" v-model="addMsg.BrandName" placeholder="请输入"></el-input> <span class="label">品牌名称</span>
</el-form-item> <el-input size="small" v-model="addMsg.BrandName" placeholder="请输入"></el-input>
<el-form-item class="treeItem" style="float:left;"> </el-form-item>
<span class="label">分类</span> <el-form-item class="treeItem" style="float:left;">
<treeselect style="height:28px;width:100%" :options="treedata" v-model="addMsg.CategoryId" placeholder="不限" <span class="label">分类</span>
:normalizer="normalizer" @select='treeClick' /> <treeselect style="height:28px;width:100%" :options="treedata" v-model="addMsg.CategoryId" placeholder="不限"
</el-form-item> :normalizer="normalizer" @select='treeClick' />
<el-form-item> </el-form-item>
<span class="label">供应商名称</span> <el-form-item>
<el-input size="small" v-model="addMsg.SupplierName" placeholder="请输入"></el-input> <span class="label">供应商名称</span>
</el-form-item> <el-input size="small" v-model="addMsg.SupplierName" placeholder="请输入"></el-input>
<el-form-item> </el-form-item>
<span class="label">安全库存</span> <el-form-item prop="SafetyStock">
<el-input size="small" v-model="addMsg.SafetyStock" placeholder="请输入"></el-input> <span class="label">安全库存</span>
</el-form-item> <el-input @keyup.native="checkInteger(addMsg,'SafetyStock')" size="small" v-model="addMsg.SafetyStock" placeholder="请输入"></el-input>
<el-form-item> </el-form-item>
<span class="label">预警预存</span> <el-form-item prop="ReservedStock">
<el-input size="small" v-model="addMsg.ReservedStock" placeholder="请输入"></el-input> <span class="label">预警预存</span>
</el-form-item> <el-input @keyup.native="checkInteger(addMsg,'ReservedStock')" size="small" v-model="addMsg.ReservedStock" placeholder="请输入"></el-input>
<el-form-item> </el-form-item>
<span class="label">型号</span> <el-form-item>
<el-input size="small" v-model="addMsg.SuppliesModel" placeholder="请输入"></el-input> <span class="label">型号</span>
</el-form-item> <el-input size="small" v-model="addMsg.SuppliesModel" placeholder="请输入"></el-input>
<el-form-item> </el-form-item>
<span class="label">单位</span> <el-form-item>
<el-input size="small" v-model="addMsg.Units" placeholder="请输入"></el-input> <span class="label">单位</span>
</el-form-item> <el-input size="small" v-model="addMsg.Units" placeholder="请输入"></el-input>
<el-form-item prop="Money"> </el-form-item>
<span class="label">成本价</span> <el-form-item prop="Money">
<el-input size="small" v-model="addMsg.Money" placeholder="请输入"></el-input> <span class="label">成本价</span>
</el-form-item> <el-input size="small" v-model="addMsg.Money" placeholder="请输入"></el-input>
<el-form-item> </el-form-item>
<span class="label">条形码号</span> <el-form-item>
<el-input size="small" v-model="addMsg.Barcode" placeholder="请输入"></el-input> <span class="label">条形码号</span>
</el-form-item> <el-input size="small" v-model="addMsg.Barcode" placeholder="请输入"></el-input>
<el-form-item> </el-form-item>
<span class="label">备注</span> <el-form-item>
<el-input size="small" v-model="addMsg.Remark" placeholder="请输入"></el-input> <span class="label">备注</span>
</el-form-item> <el-input size="small" v-model="addMsg.Remark" placeholder="请输入"></el-input>
</el-form-item>
</div>
<div class="_addUpload_box"> <div class="_addUpload_box">
<ul class="uploadUl"> <ul class="uploadUl">
<li v-for="(item,index) in addMsg.ImageList" :key="index"> <li v-for="(item,index) in addMsg.ImageList" :key="index">
...@@ -202,7 +217,7 @@ export default { ...@@ -202,7 +217,7 @@ export default {
Name:'', Name:'',
SuppliesNum:"", SuppliesNum:"",
BrandName:'', BrandName:'',
CategoryId:'', CategoryId:null,
SupplierName:'' SupplierName:''
}, },
addMsg:{ addMsg:{
...@@ -331,6 +346,8 @@ export default { ...@@ -331,6 +346,8 @@ export default {
this.Success(res.data.message) this.Success(res.data.message)
this.dialogState=false; this.dialogState=false;
this.initMsg(); this.initMsg();
this.$refs[formName].resetFields();
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/Materialman/ConsumRecipients.vue
View file @ 306e199d
...@@ -282,7 +282,6 @@ export default { ...@@ -282,7 +282,6 @@ export default {
<style > <style >
.ConsumRecipients{ .ConsumRecipients{
padding:20px 30px;
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB; background: #F8FAFB;
} }
......
src/components/Materialman/Materialwarehouse.vue
View file @ 306e199d
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
<el-dialog <el-dialog
:title="dialogtitle" :title="dialogtitle"
top="0"
:visible.sync="dialogState" :visible.sync="dialogState"
width="400px"> width="400px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0">
......
src/components/Materialman/SpotQuery.vue
View file @ 306e199d
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<vxe-table-column field="UnitPrice" title="单价"></vxe-table-column> <vxe-table-column field="UnitPrice" title="单价"></vxe-table-column>
<vxe-table-column field="Number" title="库存数量"> <vxe-table-column field="Number" title="库存数量">
<template v-slot="{ row }"> <template v-slot="{ row }">
<span v-if="row.Number < row.SafetyStock" style="color:red;font-weight:700">{{row.Number}}</span> <span class="bold" v-if="row.Number < row.SafetyStock" style="color:red">{{row.Number}}</span>
<span v-else>{{row.Number}}</span> <span v-else>{{row.Number}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<el-dialog <el-dialog
title="操作日志" title="操作日志"
:visible.sync="caozuoState" :visible.sync="caozuoState"
top="3%" top="0"
width="650px" width="650px"
> >
<div class="f12"> <div class="f12">
......
src/components/Materialman/chukudan.vue
View file @ 306e199d
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</template> </template>
<tr v-show="tableData.length==0"> <tr v-show="tableData.length==0">
<td colspan="12" align="center">暂无数据</td> <td colspan="14" align="center">暂无数据</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<el-dialog <el-dialog
title="出库管理" title="出库管理"
:visible.sync="dialogState" :visible.sync="dialogState"
top="2%" top="0"
width="1004px"> width="1004px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix"> <div class="basefix">
...@@ -228,10 +228,29 @@ ...@@ -228,10 +228,29 @@
<el-dialog <el-dialog
title="选择物料" title="选择物料"
:visible.sync="wuliaodig" :visible.sync="wuliaodig"
top="3%" top="0"
width="750px"> width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px"> <el-form style="position:relative" class="MyEditForm" :model="addMsg" label-width="0px">
<span class="zcSpanQuery" @click="getWuliao">查询</span>
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<ul class="dialogul">
<li>
<el-input
class="w200"
size="small"
v-model="wuliaomsg.Name"
placeholder="名称"
></el-input>
</li>
<li>
<el-input
class="w200"
size="small"
v-model="wuliaomsg.PropertyNum"
placeholder="编码"
></el-input>
</li>
</ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
......
src/components/Materialman/rukudan.vue
View file @ 306e199d
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</template> </template>
<tr v-show="tableData.length==0"> <tr v-show="tableData.length==0">
<td colspan="12" align="center">暂无数据</td> <td colspan="14" align="center">暂无数据</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<el-dialog <el-dialog
title="入库管理" title="入库管理"
:visible.sync="dialogState" :visible.sync="dialogState"
top="2%" top="0"
width="815px"> width="815px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix"> <div class="basefix">
...@@ -143,10 +143,6 @@ ...@@ -143,10 +143,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="">
<span class="label">入库金额</span>
<el-input size="small" v-model="addMsg.Money" placeholder="请输入" :readonly="true"></el-input>
</el-form-item>
<el-form-item label="" prop="StockInDate"> <el-form-item label="" prop="StockInDate">
<span class="label">入库时间</span> <span class="label">入库时间</span>
<el-date-picker <el-date-picker
...@@ -165,6 +161,10 @@ ...@@ -165,6 +161,10 @@
<span class="label">备注</span> <span class="label">备注</span>
<el-input size="small" v-model="addMsg.Remark" placeholder="请输入"></el-input> <el-input size="small" v-model="addMsg.Remark" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="">
<span class="label">入库金额</span>
<el-input size="small" v-model="addMsg.Money" placeholder="总金额" :readonly="true"></el-input>
</el-form-item>
</div> </div>
<div class="chooseDiv"> <div class="chooseDiv">
<span @click="OpenWldig"> <span @click="OpenWldig">
...@@ -221,10 +221,29 @@ ...@@ -221,10 +221,29 @@
<el-dialog <el-dialog
title="选择物料" title="选择物料"
:visible.sync="wuliaodig" :visible.sync="wuliaodig"
top="3%" top="0"
width="750px"> width="750px">
<el-form class="MyEditForm" :model="addMsg" label-width="0px"> <el-form style="position:relative" class="MyEditForm" :model="addMsg" label-width="0px">
<span class="zcSpanQuery" @click="getWuliao">查询</span>
<div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:500px;margin-top:20px">
<ul class="dialogul">
<li>
<el-input
class="w200"
size="small"
v-model="wuliaomsg.Name"
placeholder="名称"
></el-input>
</li>
<li>
<el-input
class="w200"
size="small"
v-model="wuliaomsg.PropertyNum"
placeholder="编码"
></el-input>
</li>
</ul>
<table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
...@@ -383,13 +402,16 @@ export default { ...@@ -383,13 +402,16 @@ export default {
); );
}, },
NumberChange(item,index){ NumberChange(item,index){
item.Number = item.Number.replace(this.$commonUtils.Regex.isInteger, "");
if(item.Number!='0' && item.Number!='' && item.Money!='0' && item.Money!=''){ if(item.Number!='0' && item.Number!='' && item.Money!='0' && item.Money!=''){
this.wlItemList[index].UnitPrice=(Number(item.Money) / Number(item.Number)).toFixed(2); this.wlItemList[index].UnitPrice=(Number(item.Money) / Number(item.Number)).toFixed(2);
} }
this.addMsg.Money=0; this.addMsg.Money=0;
this.wlItemList.forEach(x=>{ this.wlItemList.forEach(x=>{
this.addMsg.Money+=Number(x.Money) this.addMsg.Money+=Number(x.Money)
}) })
this.$forceUpdate()
}, },
MoneyChange(item,index){ MoneyChange(item,index){
if(item.Number!='0' && item.Number!='' && item.Money!='0' && item.Money!=''){ if(item.Number!='0' && item.Number!='' && item.Money!='0' && item.Money!=''){
...@@ -399,6 +421,7 @@ export default { ...@@ -399,6 +421,7 @@ export default {
this.wlItemList.forEach(x=>{ this.wlItemList.forEach(x=>{
this.addMsg.Money+=Number(x.Money) this.addMsg.Money+=Number(x.Money)
}) })
this.$forceUpdate()
}, },
ItemcheckOne(){ ItemcheckOne(){
if(this.ItemCheckList.length < this.wlItemList.length) { if(this.ItemCheckList.length < this.wlItemList.length) {
...@@ -487,9 +510,9 @@ export default { ...@@ -487,9 +510,9 @@ export default {
let data=res.data.data.pageData; let data=res.data.data.pageData;
this.wuliaototal=res.data.data.count; this.wuliaototal=res.data.data.count;
data.forEach(item=>{ data.forEach(item=>{
item.Number=''; item.Number=1;
item.UnitPrice=0; item.UnitPrice=0;
item.Money=''; item.Money=0;
item.Remark=''; item.Remark='';
item.SuppliesId=item.Id; item.SuppliesId=item.Id;
item.SuppliesName=item.Name; item.SuppliesName=item.Name;
......
src/components/Systemman/Supplierman.vue
View file @ 306e199d
...@@ -257,7 +257,6 @@ export default { ...@@ -257,7 +257,6 @@ export default {
<style scoped> <style scoped>
.Supplierman{ .Supplierman{
padding:20px 30px;
box-sizing: border-box; box-sizing: border-box;
background: #F8FAFB; background: #F8FAFB;
} }
......
src/components/approval/SignMan.vue
View file @ 306e199d
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td> <td :rowspan="item.DetailList.length" v-if="index==0">{{item.SourceName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0"> <td :rowspan="item.DetailList.length" v-if="index==0">
<span class="underline" v-if="item.TempleteId>0" @click="See(item,'approvalDetails','approvalMan','chakan')">{{item.OrderCode}}</span> <span class="underline" v-if="item.TempleteId>0" @click="See(item,'approvalDetails','SignMan','chakan')">{{item.OrderCode}}</span>
<span v-else>{{item.OrderCode}}</span> <span v-else>{{item.OrderCode}}</span>
</td> </td>
...@@ -126,14 +126,14 @@ ...@@ -126,14 +126,14 @@
</td> </td>
<td :rowspan="item.DetailList.length" v-if="index==0"> <td :rowspan="item.DetailList.length" v-if="index==0">
<el-tooltip class="item" effect="dark" content="流程查看" placement="top"> <el-tooltip class="item" effect="dark" content="流程查看" placement="top">
<img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','approvalMan','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt=""> <img v-if="item.TempleteId>0" @click="See(item,'approvalDetails','SignMan','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="审批" placement="top"> <el-tooltip class="item" effect="dark" content="签名" placement="top">
<img v-show="showTable==1" @click="See(item,'approvalDetails','approvalMan','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt=""> <img v-show="showTable==1" @click="See(item,'approvalDetails','SignMan','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="转交" placement="top"> <!-- <el-tooltip class="item" effect="dark" content="转交" placement="top">
<img v-show="showTable==1" @click="ZhuanJiao(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt=""> <img v-show="showTable==1" @click="ZhuanJiao(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
</el-tooltip> </el-tooltip> -->
<!-- <span class="commonStyle hoverSpan2"></span> --> <!-- <span class="commonStyle hoverSpan2"></span> -->
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px"> <el-dialog title="资产详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
......
src/components/approval/approvalDetails.vue
View file @ 306e199d
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
</div> </div>
</div> </div>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px"> <el-dialog title="资产详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer"> <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
...@@ -517,10 +517,48 @@ export default { ...@@ -517,10 +517,48 @@ export default {
this.canvasTxt.clearRect(0, 0, this.$refs.canvasF.width, this.$refs.canvasF.height) this.canvasTxt.clearRect(0, 0, this.$refs.canvasF.width, this.$refs.canvasF.height)
this.points = [] this.points = []
}, },
uuid(len, radix) {
var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
var uuid = [],
i;
radix = radix || chars.length;
if (len) {
// Compact form
for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
} else {
var r;
uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
uuid[14] = '4';
for (i = 0; i < 36; i++) {
if (!uuid[i]) {
r = 0 | Math.random() * 16;
uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
}
}
}
return uuid.join('');
},
dataURLtoFile(dataurl, filename) {//将base64转换为文件
var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
while(n--){
u8arr[n] = bstr.charCodeAt(n);
}
return new File([u8arr], filename, {type:mime});
},
//提交签名 //提交签名
commit() { commit() {
this.addMsg.SignImage =this.$refs.canvasF.toDataURL(); let that=this;
this.signState=false; let imgUrl =this.$refs.canvasF.toDataURL();
let newArr = [];
var fileName = `${that.uuid(10,10)}.png`;
var path = `/assets/sign/`;
newArr.push(this.dataURLtoFile(imgUrl,fileName))
this.UploadSelfFileT(path, newArr, x => {
this.addMsg.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath;
}, 1);
this.signState=false;
}, },
mouseDown(ev) { mouseDown(ev) {
ev = ev || event ev = ev || event
......
src/components/approval/approvalMan.vue
View file @ 306e199d
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px"> <el-dialog title="资产详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
......
src/components/assetsman/LendReturn.vue
View file @ 306e199d
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
<el-dialog <el-dialog
title="借出单" title="借出单"
:visible.sync="dialogState" :visible.sync="dialogState"
top="2%" top="0"
width="815px"> width="815px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px"> <el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix"> <div class="basefix">
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
<el-dialog <el-dialog
title="归还单" title="归还单"
:visible.sync="dialogState1" :visible.sync="dialogState1"
top="2%" top="0"
width="815px"> width="815px">
<el-form class="MyEditForm" :model="addMsg1" :rules="rules2" ref="addMsg1" label-width="0px"> <el-form class="MyEditForm" :model="addMsg1" :rules="rules2" ref="addMsg1" label-width="0px">
<div class="basefix"> <div class="basefix">
...@@ -450,7 +450,7 @@ ...@@ -450,7 +450,7 @@
<el-dialog <el-dialog
title="选择资产" title="选择资产"
:visible.sync="wuliaodig" :visible.sync="wuliaodig"
top="3%" top="0"
width="750px"> width="750px">
<el-form style="position:relative" class="MyEditForm" :model="addMsg" label-width="0px"> <el-form style="position:relative" class="MyEditForm" :model="addMsg" label-width="0px">
<span class="zcSpanQuery" @click="getWuliao">查询</span> <span class="zcSpanQuery" @click="getWuliao">查询</span>
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px"> <el-dialog title="资产详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
......
src/components/assetsman/PaiTui.vue
View file @ 306e199d
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
<el-dialog <el-dialog
title="选择资产" title="选择资产"
:visible.sync="wuliaodig" :visible.sync="wuliaodig"
top="3%" top="0"
width="750px"> width="750px">
<el-form style="position:relative" class="MyEditForm" :model="addMsg" label-width="0px"> <el-form style="position:relative" class="MyEditForm" :model="addMsg" label-width="0px">
<span class="zcSpanQuery" @click="getWuliao">查询</span> <span class="zcSpanQuery" @click="getWuliao">查询</span>
...@@ -520,7 +520,7 @@ ...@@ -520,7 +520,7 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px"> <el-dialog title="资产详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
</div> </div>
......
src/components/assetsman/assetsList.vue
View file @ 306e199d
...@@ -504,7 +504,7 @@ ...@@ -504,7 +504,7 @@
<el-dialog <el-dialog
title="操作日志" title="操作日志"
:visible.sync="caozuoState" :visible.sync="caozuoState"
top="3%" top="0"
width="850px" width="850px"
> >
<div class="f12"> <div class="f12">
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
</el-pagination> </el-pagination>
</el-dialog> </el-dialog>
<!-- --> <!-- -->
<el-dialog title="详情" :visible.sync="CheckDetailState" width="1150px"> <el-dialog title="资产详情" :visible.sync="CheckDetailState" width="1150px">
<CheckDetails ref="mychild"></CheckDetails> <CheckDetails ref="mychild"></CheckDetails>
</el-dialog> </el-dialog>
<!-- biangeng --> <!-- biangeng -->
......
src/components/global/CheckDetails.vue
View file @ 306e199d
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<img v-else style="width:100%;height:500px;border: 1px solid #ccc;" src="../../assets/img/noimg.png" alt=""> <img v-else style="width:100%;height:500px;border: 1px solid #ccc;" src="../../assets/img/noimg.png" alt="">
</div> </div>
<div class="right overflowY" style="height:500px"> <div class="right overflowY" style="height:500px">
<div class="baseTitle f12">使用信息</div> <div class="baseTitle">使用信息</div>
<div class="desItem"> <div class="desItem">
<p>使用人</p> <p>使用人</p>
<p> <p>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<span v-else>无</span> <span v-else>无</span>
</p> </p>
</div> </div>
<div class="baseTitle f12">基本信息</div> <div class="baseTitle">基本信息</div>
<div class="baseDiv"> <div class="baseDiv">
<div class="desItem"> <div class="desItem">
<p>资产名称</p> <p>资产名称</p>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="baseTitle f12">操作记录</div> <div class="baseTitle">操作记录</div>
<table v-loading="detailLoad" class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" > <table v-loading="detailLoad" class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" >
<thead> <thead>
<th>类型</th> <th>类型</th>
...@@ -254,7 +254,9 @@ export default { ...@@ -254,7 +254,9 @@ export default {
.CheckDetails .baseTitle{ .CheckDetails .baseTitle{
padding:5px 0; padding:5px 0;
border-bottom: 1px dashed #ccc; border-bottom: 1px dashed #ccc;
margin-bottom:10px margin-bottom:10px;
font-family: "PingFangR";
} }
.CheckDetails>div{ .CheckDetails>div{
float: left; float: left;
......
src/components/global/Nav.vue
View file @ 306e199d
...@@ -211,8 +211,8 @@ export default { ...@@ -211,8 +211,8 @@ export default {
} }
.HeadNav .el-menu-item, .HeadNav .el-submenu__title{ .HeadNav .el-menu-item, .HeadNav .el-submenu__title{
height:34px; height:34px!important;
line-height:34px; line-height:34px!important;
margin-bottom:15px; margin-bottom:15px;
} }
.HeadNav .itemgroup{ .HeadNav .itemgroup{
......
src/components/global/index.vue
View file @ 306e199d
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
</ul> </ul>
<span slot="reference" style="display: inline-flex;align-items: center;cursor: pointer;"> <span slot="reference" style="display: inline-flex;align-items: center;cursor: pointer;">
<span style="margin-left:30px" class="f14"><span style="color:#BEBEBE">Hello</span>,{{zcuserInfo.emName}}</span> <span style="margin-left:30px" class="f14"><span style="color:#BEBEBE">Hello</span>,{{zcuserInfo.emName}}</span>
<img v-if="zcuserInfo.GroupPic!='' " :src="zcuserInfo.GroupPic" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:29px" alt=""> <img v-if="zcuserInfo.Icon && zcuserInfo.Icon!='' " :src="zcuserInfo.Icon" :onerror="defaultHeadImg" style="width:44px;height:44px;margin-left:29px;border-radius:50%" alt="">
<img v-else src="../../assets/img/defaultperson.png" style="width:44px;height:44px;margin-left:29px;border-radius:50%" alt="">
</span> </span>
</el-popover> </el-popover>
...@@ -82,8 +83,7 @@ export default { ...@@ -82,8 +83,7 @@ export default {
</script> </script>
<style> <style>
@import "../../assets/css/reset.css";
@import "../../assets/css/vxetable.css";
.appContent .routerContent{ .appContent .routerContent{
padding-top: 90px; padding-top: 90px;
position: relative; position: relative;
......
src/plugins/index.js
View file @ 306e199d
...@@ -16,12 +16,12 @@ export default { ...@@ -16,12 +16,12 @@ export default {
var domainUrl = "http://192.168.2.17:8087"; //主域名 var domainUrl = "http://192.168.2.17:8087"; //主域名
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo=""; let javaUrldo="";
javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.17:8087"; javaUrldo=locationName.indexOf('zcyx') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://property.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.17:8087";
if (this.isOnline()) { if (this.isOnline()) {
if (window.location.host.indexOf('testb2b.oytour.com') != -1) if (window.location.host.indexOf('testb2b.oytour.com') != -1)
domainUrl = "http://testapi.oytour.com" domainUrl = "http://testapi.oytour.com"
else if (window.location.host.indexOf('oytour.com') != -1) else if (window.location.host.indexOf('oytour.com') != -1)
domainUrl = "https://reborn.oytour.com" domainUrl = "http://property.oytour.com"
} }
var obj = { var obj = {
//主地址 //主地址
...@@ -29,11 +29,12 @@ export default { ...@@ -29,11 +29,12 @@ export default {
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", PostUrl: domainUrl + "/api/common/post",
// javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000", // javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
// javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000", javaUrl: locationName.indexOf('zcyx') == -1 ? "http://192.168.2.17:8087" : locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://property.oytour.com" : "http://192.168.2.17:8087",
javaUrl: "http://192.168.2.17:8087", // javaUrl: "http://192.168.2.17:8087",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130', // javaUrl: "http://property.oytour.com",
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120", ViittoFileUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
// UploadUrl: "http://uploadfile.oytour.com", // UploadUrl: "http://uploadfile.oytour.com",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
JavaLocalFileStreamDownLoadUrl: javaUrldo, JavaLocalFileStreamDownLoadUrl: javaUrldo,
...@@ -274,7 +275,8 @@ export default { ...@@ -274,7 +275,8 @@ export default {
key = this.getLocalStorage().secretKey; key = this.getLocalStorage().secretKey;
} }
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase(); var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`); var md5Str = md5(`msg=YXZCGL2020&timestamp=${timestamp}&token=${token}&key=${key}`);
// var md5Str = md5(`msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = { var postData = {
"msg": msg, "msg": msg,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment