Skip to content

M
mes-ui
Commit a7030a13 authored by renjintao's avatar renjintao
Browse files
Options

starOrer

parent 4cc501a4
Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 89 deletions
package-lock.json
View file @ a7030a13
...@@ -21584,6 +21584,11 @@ ...@@ -21584,6 +21584,11 @@
"integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=", "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
"dev": true "dev": true
}, },
"throttle-debounce": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-2.1.0.tgz",
"integrity": "sha1-JX5kjwpWvZ5U/g8TLEq4YR304dU="
},
"through": { "through": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
...@@ -22119,6 +22124,15 @@ ...@@ -22119,6 +22124,15 @@
"resolved": "http://r.cnpmjs.org/v-click-outside-x/download/v-click-outside-x-3.7.1.tgz", "resolved": "http://r.cnpmjs.org/v-click-outside-x/download/v-click-outside-x-3.7.1.tgz",
"integrity": "sha1-qgPqoOQeRMtSB9z4bC2fDdZAhME=" "integrity": "sha1-qgPqoOQeRMtSB9z4bC2fDdZAhME="
}, },
"v-viewer": {
"version": "1.5.1",
"resolved": "https://registry.npm.taobao.org/v-viewer/download/v-viewer-1.5.1.tgz?cache=0&sync_timestamp=1576116938938&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fv-viewer%2Fdownload%2Fv-viewer-1.5.1.tgz",
"integrity": "sha1-lIBNg4FMylZuaRM5/h5keTSG8gA=",
"requires": {
"throttle-debounce": "^2.0.1",
"viewerjs": "^1.5.0"
}
},
"validate-npm-package-license": { "validate-npm-package-license": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "http://r.cnpmjs.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz", "resolved": "http://r.cnpmjs.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz",
...@@ -22164,6 +22178,11 @@ ...@@ -22164,6 +22178,11 @@
"v-click-outside-x": "^3.7.1" "v-click-outside-x": "^3.7.1"
} }
}, },
"viewerjs": {
"version": "1.5.0",
"resolved": "https://registry.npm.taobao.org/viewerjs/download/viewerjs-1.5.0.tgz",
"integrity": "sha1-3r6pSSGJ+kEiPMVn3pFdeUNYmdA="
},
"vm-browserify": { "vm-browserify": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "http://r.cnpmjs.org/vm-browserify/download/vm-browserify-1.1.2.tgz", "resolved": "http://r.cnpmjs.org/vm-browserify/download/vm-browserify-1.1.2.tgz",
......
package.json
View file @ a7030a13
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
"quill-image-resize-module": "^3.0.0", "quill-image-resize-module": "^3.0.0",
"screenfull": "^5.0.2", "screenfull": "^5.0.2",
"ua-parser-js": "^0.7.18", "ua-parser-js": "^0.7.18",
"v-viewer": "^1.5.1",
"view-design": "^4.1.3", "view-design": "^4.1.3",
"vue-echarts": "^4.0.3", "vue-echarts": "^4.0.3",
"vue-i18n": "^8.15.5", "vue-i18n": "^8.15.5",
......
pages/produce/execute/starOrder/index.vue
View file @ a7030a13
<template> <template>
<div class=""> <div class>
<div class="star" v-if="!starmodal"> <div class="star" v-if="!starmodal">
<a class="start" @click="starFun" > <a class="start" @click="starFun">
<Icon type="md-play" /> <Icon type="md-play" />开工
开工</a> </a>
</div> </div>
<div class="star" v-else-if="starmodal"> <div class="star" v-else-if="starmodal">
<div class=" flex fc-b"> <div class="flex fc-b">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button> <Button class="button" size="large" type="primary">
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button> <Icon type="ios-pause" />暂停
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button> </Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button> <Button class="button" size="large" type="primary">
</div> <Icon type="logo-angular" />交检
<div class="star_step"> </Button>
<div class="step_item" v-for="i of 6" :key="i"> <Button class="button" size="large" type="primary">
<p class="icon_A" v-if="i>=4"> <Icon type="ios-checkmark-circle-outline" />完工
<Icon type="md-checkmark-circle" /> </Button>
</p> <Button class="button" size="large" type="primary">
<p class="icon_B" v-else> <Icon type="md-swap" />转序交接
<Icon type="md-arrow-dropright-circle" /> </Button>
</p> </div>
<p><a> 开工</a></p> <div class="star_step">
<ul> <div class="step_item" v-for="i of 6" :key="i">
<li>暂停 2020-02-06 15:35</li> <p class="icon_A" v-if="i>=4">
<li>继续 2020-02-06 15:35</li> <Icon type="md-checkmark-circle" />
</ul> </p>
</div> <p class="icon_B" v-else>
<!-- <p><span></span> <Icon type="md-arrow-dropright-circle" />
</p>
<p>
<a>开工</a>
</p>
<ul>
<li>暂停 2020-02-06 15:35</li>
<li>继续 2020-02-06 15:35</li>
</ul>
</div>
<!-- <p><span></span>
2020-02-06 15:35 2020-02-06 15:35
</p> --> </p>-->
<!-- <Steps :current="6"> <!-- <Steps :current="6">
<Step icon="md-arrow-dropright-circle" v-for="i of 6" :key="i" :content="contentMsge"></Step> <Step icon="md-arrow-dropright-circle" v-for="i of 6" :key="i" :content="contentMsge"></Step>
</Steps> --> </Steps>-->
</div> </div>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div> </div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl" style="background:#DDD" >
<vie />
</div>
</div>
</div>
</template> </template>
<script> <script>
import Vie from '../../../test/viewer'
export default { export default {
name:'starOrder', name: "starOrder",
data(){ components: {
return{ Vie
starmodal: true,
contentMsge:"<ul><li>暂停 2020-02-06 15:35</li><li>继续 2020-02-06 15:35</li></ul>",
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() { data() {
window.onresize = () => { return {
///浏览器窗口大小变化 starmodal: true,
return (() => { contentMsge:
this.treeHeight = window.innerHeight - 120; "<ul><li>暂停 2020-02-06 15:35</li><li>继续 2020-02-06 15:35</li></ul>",
})(); };
}; },
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun() {
this.$Message.success("开工...");
}, },
methods: { inited(viewer) {
starFun(){ this.$viewer = viewer;
this.$Message.success("开工...")
},
}, },
} show() {
this.$viewer.show();
}
}
};
</script> </script>
pages/test/viewer.vue 0 → 100644
View file @ a7030a13
<template>
<div>
<viewer :options="options" :images="images" @inited="inited" class="viewer" ref="viewer">
<template slot-scope="scope">
<figure class="images">
<div
class="image-wrapper"
v-for="{source, thumbnail} in scope.images"
:key="source"
>
<img
class="image"
:src="thumbnail"
:data-source="source"
:alt="source.split('?image=').pop()"
/>
</div>
</figure>
</template>
</viewer>
</div>
</template>
<script>
export default {
data() {
return {
options: {
inline: true,
button: true,
navbar: true,
title: false,
toolbar: true,
tooltip: true,
movable: true,
zoomable: true,
rotatable: true,
scalable: true,
transition: true,
fullscreen: true,
keyboard: true,
url: "data-source"
},
// images: [...sourceImages].splice(0, 5)
images: [
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=451a44399616dbbdd4715c516122d88b&imgtype=0&src=http%3A%2F%2Fa3.att.hudong.com%2F14%2F75%2F01300000164186121366756803686.jpg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=451a44399616dbbdd4715c516122d88b&imgtype=0&src=http%3A%2F%2Fa3.att.hudong.com%2F14%2F75%2F01300000164186121366756803686.jpg"
},
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=ed7471e3ffd2cd33ebd12d915a002070&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=ed7471e3ffd2cd33ebd12d915a002070&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg"
},
{
thumbnail: "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2631377660,2065981666&fm=26&gp=0.jpg",
source: "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2631377660,2065981666&fm=26&gp=0.jpg"
},
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269201766&di=461437985d347920db7998b8c6e432aa&imgtype=0&src=http%3A%2F%2F7.tjoys.net%2Fslh_qn_item2_2015_12_30_292_kanazuw3cfwjawqxrjhhisokzhijnn98.jpeg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269201766&di=461437985d347920db7998b8c6e432aa&imgtype=0&src=http%3A%2F%2F7.tjoys.net%2Fslh_qn_item2_2015_12_30_292_kanazuw3cfwjawqxrjhhisokzhijnn98.jpeg"
},
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=451a44399616dbbdd4715c516122d88b&imgtype=0&src=http%3A%2F%2Fa3.att.hudong.com%2F14%2F75%2F01300000164186121366756803686.jpg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=451a44399616dbbdd4715c516122d88b&imgtype=0&src=http%3A%2F%2Fa3.att.hudong.com%2F14%2F75%2F01300000164186121366756803686.jpg"
},
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=ed7471e3ffd2cd33ebd12d915a002070&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=ed7471e3ffd2cd33ebd12d915a002070&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg"
},
{
thumbnail: "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2631377660,2065981666&fm=26&gp=0.jpg",
source: "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2631377660,2065981666&fm=26&gp=0.jpg"
},
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269201766&di=461437985d347920db7998b8c6e432aa&imgtype=0&src=http%3A%2F%2F7.tjoys.net%2Fslh_qn_item2_2015_12_30_292_kanazuw3cfwjawqxrjhhisokzhijnn98.jpeg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269201766&di=461437985d347920db7998b8c6e432aa&imgtype=0&src=http%3A%2F%2F7.tjoys.net%2Fslh_qn_item2_2015_12_30_292_kanazuw3cfwjawqxrjhhisokzhijnn98.jpeg"
},
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=451a44399616dbbdd4715c516122d88b&imgtype=0&src=http%3A%2F%2Fa3.att.hudong.com%2F14%2F75%2F01300000164186121366756803686.jpg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=451a44399616dbbdd4715c516122d88b&imgtype=0&src=http%3A%2F%2Fa3.att.hudong.com%2F14%2F75%2F01300000164186121366756803686.jpg"
},
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=ed7471e3ffd2cd33ebd12d915a002070&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=ed7471e3ffd2cd33ebd12d915a002070&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg"
},
{
thumbnail: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=ed7471e3ffd2cd33ebd12d915a002070&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg",
source: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591269122489&di=ed7471e3ffd2cd33ebd12d915a002070&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg"
},
]
};
},
computed: {},
methods: {
inited(viewer) {
this.$viewer = viewer;
},
}
};
</script>
<style lang="less" scoped>
.viewer {
height: 100%;
.images {
height: 100%;
display: flex;
justify-content: center;
align-content: center;
align-items: center;
flex-wrap: wrap;
padding: 5px;
.image-wrapper {
display: inline-block;
width: calc(10% - 20px);
margin: 5px 5px 0 5px;
.image {
width: 100%;
cursor: pointer;
display: inline-block;
}
}
}
}
</style>
\ No newline at end of file
plugins/iview.js
View file @ a7030a13
...@@ -14,6 +14,12 @@ import iViewPro from '../iview-pro/src/index.js'; ...@@ -14,6 +14,12 @@ import iViewPro from '../iview-pro/src/index.js';
import '@/libs/iview-pro/iview-pro.css'; import '@/libs/iview-pro/iview-pro.css';
import '@/styles/index.less'; import '@/styles/index.less';
import 'viewerjs/dist/viewer.css'
import Viewer from 'v-viewer'
import Tools from '@/components/page/tool.vue' import Tools from '@/components/page/tool.vue'
import State from '@/components/page/state.vue' import State from '@/components/page/state.vue'
import Dictionary from '@/components/page/dictionary.vue' import Dictionary from '@/components/page/dictionary.vue'
...@@ -61,6 +67,11 @@ import echarts from 'echarts' ...@@ -61,6 +67,11 @@ import echarts from 'echarts'
// lang: 'zh-CN' // lang: 'zh-CN'
// }) // })
Vue.use(VueEditor) Vue.use(VueEditor)
Vue.use(Viewer)
Viewer.setDefaults({
zIndexInline: 2017
})
// Vue.use(Element, { // Vue.use(Element, {
// size: 'small', // size: 'small',
// zIndex: 3000 // zIndex: 3000
......
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