diff --git a/src/views/banner/applet/index.vue b/src/views/banner/applet/index.vue new file mode 100644 index 0000000..0451cd3 --- /dev/null +++ b/src/views/banner/applet/index.vue @@ -0,0 +1,3 @@ +<template> + <div>小程序</div> +</template> \ No newline at end of file diff --git a/src/views/banner/menuScreen/index.vue b/src/views/banner/menuScreen/index.vue new file mode 100644 index 0000000..6c7427d --- /dev/null +++ b/src/views/banner/menuScreen/index.vue @@ -0,0 +1,3 @@ +<template> + <div>菜单屏</div> +</template> \ No newline at end of file diff --git a/src/views/banner/orderScreen/index.vue b/src/views/banner/orderScreen/index.vue new file mode 100644 index 0000000..35d8e5d --- /dev/null +++ b/src/views/banner/orderScreen/index.vue @@ -0,0 +1,3 @@ +<template> + <div>点单屏</div> +</template> \ No newline at end of file diff --git a/src/views/machine/machineDetails/machineDetailsAttribute.vue b/src/views/machine/machineDetails/machineDetailsAttribute.vue index e9f0d81..f1d9df3 100644 --- a/src/views/machine/machineDetails/machineDetailsAttribute.vue +++ b/src/views/machine/machineDetails/machineDetailsAttribute.vue @@ -36,15 +36,16 @@ <el-dialog title="添加经验值" :visible.sync="experienceValueDiaLog" width="500px" append-to-body> <div> <el-row v-for="(item,idx) in experienceList" :key="idx"> - <el-col :span="5" style="display: flex; align-items: center;"> + <el-col :span="6" style="display: flex; align-items: center;"> <div> <el-input v-model="item.milli_second"/> </div> - <div style="margin-left: 10px;"> - <span>秒</span> + <div style="margin-left: 10px;display: flex; "> + <div>毫</div> + <div>秒</div> </div> </el-col> - <el-col :span="5" style="display: flex; align-items: center;margin-left: 10px;"> + <el-col :span="6" style="display: flex; align-items: center;margin-left: 10px;"> <div> <el-input v-model="item.quantity"/> </div> diff --git a/src/views/system/base/index.vue b/src/views/system/base/index.vue index ddcd415..8306d6d 100644 --- a/src/views/system/base/index.vue +++ b/src/views/system/base/index.vue @@ -1,9 +1,9 @@ <template> <div class="app-container"> <el-tabs tab-position="left" v-model="activeName"> - <el-tab-pane label="左侧图片" name="first"> + <!-- <el-tab-pane label="左侧图片" name="first"> <LeftImg :initValue="workValue['menu.left']" /> - </el-tab-pane> + </el-tab-pane> --> <!-- <el-tab-pane label="右侧图片" name="second"> <Right :initValue="workValue['menu.right']" /> </el-tab-pane> --> @@ -35,7 +35,7 @@ export default { components: { LeftImg, Right, Other }, data() { return { - activeName: 'first', + activeName: 'third', workValue: { "menu.left": {}, "menu.right": {},