src/views/console/authority/apiscope.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/home/widgets/components/ver.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/home/widgets/components/welcome.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/mdc/components/recordChartsByDate.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/mdc/components/recordChartsByWorkstation.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/mdc/state-feedback.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/mdc/station-live.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/mdc/status-record.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/mdc/time-analysis.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/console/authority/apiscope.vue
@@ -2,7 +2,7 @@ * @Author: lzhe lzhe@example.com * @Date: 2024-03-26 10:28:33 * @LastEditors: lzhe lzhe@example.com * @LastEditTime: 2024-04-17 17:52:50 * @LastEditTime: 2024-06-05 11:36:50 * @FilePath: /smart-web/src/views/master/person/main/index.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -18,7 +18,6 @@ <el-button type="danger" plain @click="delData">删除</el-button> </div> <div class="right-content" v-if="searchDataList.length == 0"> <img src="./quesheng.bd026700.png" /> <div> <span>暂无数据</span> <!-- <span @click="addData">添加规则</span> --> src/views/home/widgets/components/ver.vue
@@ -100,7 +100,9 @@ this.titleList = []; var data = this.$TOOL.data.get("MENU"); this.workid = data[0].children[0].id; //记录第一个children的id this.CARD_INFO = this.$TOOL.data.get("CARD_INFO").split(","); if(this.$TOOL.data.get("CARD_INFO") != null) { this.CARD_INFO = this.$TOOL.data.get("CARD_INFO").split(","); } var obj = {}; //取最后一级菜单 data.forEach((item,index)=> { src/views/home/widgets/components/welcome.vue
@@ -1,7 +1,15 @@ <!-- * @Author: lzhe lzhe@example.com * @Date: 2024-04-16 15:22:46 * @LastEditors: lzhe lzhe@example.com * @LastEditTime: 2024-06-05 11:36:56 * @FilePath: /src/views/home/widgets/components/welcome.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> <template> <el-card shadow="hover" header="公告"> <div class="announcement"> <img src="./quesheng.bd026700.png"> <!-- <img src="./quesheng.bd026700.png"> --> <div>暂无内容</div> </div> </el-card> src/views/mdc/components/recordChartsByDate.vue
@@ -16,14 +16,6 @@ components: {saveDialog}, props: ['achievements','date','workstationInfoList'], watch: { date(val) { this.current = "1"; this.getCharts(); }, workstationInfoList(val) { this.current = "1"; this.getCharts(); } }, data() { return { @@ -93,6 +85,8 @@ return stauts; }, getCharts() { console.log(this.workstationInfoList.length == 0,this.date == "",this.date,333) if(this.date == "") return; var obj = { date: this.date, humanFeedback: true, src/views/mdc/components/recordChartsByWorkstation.vue
@@ -13,14 +13,14 @@ export default { props: ['setWork','achievements',"select"], watch: { setWork(val) { this.current = "1"; this.getCharts(); }, select(val) { this.current = "1"; this.getCharts(); } // setWork(val) { // this.current = "1"; // this.getCharts(); // }, // select(val) { // this.current = "1"; // this.getCharts(); // } }, data() { return { @@ -86,6 +86,7 @@ }, getCharts() { if(!this.setWork) return; if(this.select.length == 0) return; this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-workstation?current=${this.current}&size=${this.size}`,this.setWork).then(res => { if (res.code === 200) { var yAxisData = []; src/views/mdc/state-feedback.vue
@@ -2,7 +2,7 @@ * @Author: lzhe lzhe@example.com * @Date: 2024-03-26 10:28:33 * @LastEditors: lzhe lzhe@example.com * @LastEditTime: 2024-04-19 18:18:19 * @LastEditTime: 2024-06-05 11:37:06 * @FilePath: /smart-web/src/views/master/person/main/index.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -27,7 +27,7 @@ </div> </div> <div class="right-content" v-if="searchDataList.length == 0"> <img src="./quesheng.bd026700.png" /> <!-- <img src="./quesheng.bd026700.png" /> --> <div> <span>暂无反馈状态数据</span> </div> src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@ * @Author: lzhe lzhe@example.com * @Date: 2024-03-26 10:28:33 * @LastEditors: lzhe lzhe@example.com * @LastEditTime: 2024-05-15 16:25:52 * @LastEditTime: 2024-06-05 11:37:17 * @FilePath: /smart-web/src/views/master/person/main/index.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -38,9 +38,9 @@ <div class="collect-info-panel"> <div class="fact-analysis-realtim"> <div class="wimi-empty" style="background-color: rgb(255, 255, 255);" v-if="dmpList.length == 0"> <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <!-- <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;"> </div> </div> --> <div class="empty-description"> <div>暂无数据</div> </div> src/views/mdc/status-record.vue
@@ -2,84 +2,91 @@ * @Author: lzhe lzhe@example.com * @Date: 2024-04-26 09:36:18 * @LastEditors: lzhe lzhe@example.com * @LastEditTime: 2024-05-14 18:41:53 * @LastEditTime: 2024-06-05 11:49:48 * @FilePath: /smart-web/src/views/mdc/status-record.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> <template> <div class="aposcope-main"> <div class="aposcope-left"> <div class="left-title">查询条件</div> <div class="left-title-col">日期</div> <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;" value-format="YYYY-MM-DD"/> <div class="left-title-col">工位</div> <div class="MYTree"> <MYTree getAll v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree> </div> <div class="footer"> <el-button @click="query" type="primary">查询</el-button> <el-button @click="exportData">导出</el-button> </div> </div> <div class="aposcope-right"> <el-tabs tab-position="top" v-model="activeName" type="card" @tab-change="tabChange"> <el-tab-pane label="按日期查看" name="shift"> <el-button-group> <el-button @click="changeTab(item)" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button> </el-button-group> <div class="status"> <div class="status-wrap align-left"> <div class="collect-status">采集状态</div> <div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div> </div> <div class="status-wrap"> <el-checkbox v-model="checked1" label="人工反馈状态" size="large" /> <div class="status-con"> <div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div> <el-main style="height: 100%;"> <el-card shadow="never" style="height: 100%;" body-style="height: 100%;padding: 0;"> <el-container style="height: 100%;"> <el-aside width="300px" style="height: 100%;"> <el-container> <div class="left-title">查询条件</div> <el-main style="padding: 20px;"> <div class="left-title-col">日期</div> <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;" value-format="YYYY-MM-DD"/> <div class="left-title-col">工位</div> <div class="MYTree"> <MYTree getAll v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree> </div> </div> </div> <!-- collectionstatus 反馈状态 date 日期 workstationInfoList 工位list --> <record-charts-by-date :achievements="allwcs" :date="date" :workstationInfoList="workstationInfoList" v-if="achievements.length != 0"></record-charts-by-date> </el-tab-pane> <el-tab-pane label="按工位查看" name="time"> <div class="fact-analysis-realtim"> <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);"> <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;"> </div> <div class="empty-description"> <div>暂无数据</div> </div> </div> <div v-if="!isshowempty"> <el-button-group> <el-button @click="changeTabGongwei(item)" :type="btnGongweiListActive == item.id ? 'primary' : ''" v-for="item in btnGongweiList" :key="item.id" size="small">{{item.name }}</el-button> </el-button-group> <div class="status"> <div class="status-wrap align-left"> <div class="feed-button" @click="table_edit">状态反馈</div> <div class="collect-status">采集状态</div> <div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div> </div> <div class="status-wrap"> <el-checkbox v-model="checked1" label="人工反馈状态" size="large" /> <div class="status-con"> <div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div> </el-main> <el-footer> <el-button @click="query" type="primary">查询</el-button> <el-button @click="exportData">导出</el-button> </el-footer> </el-container> </el-aside> <el-container> <el-main> <el-tabs tab-position="top" v-model="activeName" type="card" @tab-change="tabChange"> <el-tab-pane label="按日期查看" name="shift"> <el-button-group> <el-button @click="changeTab(item)" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button> </el-button-group> <div class="status"> <div class="status-wrap align-left"> <div class="collect-status">采集状态</div> <div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div> </div> <div class="status-wrap"> <el-checkbox v-model="checked1" label="人工反馈状态" size="large" /> <div class="status-con"> <div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div> </div> </div> </div> </div> <!-- setWork 入参 --> <record-charts-by-workstation :setWork="setWork" :select="select" :achievements="allwcs" v-if="!isshowempty"></record-charts-by-workstation> </div> </div> <save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog> </el-tab-pane> </el-tabs> </div> </div> <!-- collectionstatus 反馈状态 date 日期 workstationInfoList 工位list --> <record-charts-by-date :achievements="allwcs" :date="date" :workstationInfoList="workstationInfoList" v-if="date != ''" ref="chart01"></record-charts-by-date> </el-tab-pane> <el-tab-pane label="按工位查看" name="time"> <div class="fact-analysis-realtim"> <div class="wimi-empty" style="background-color: rgb(255, 255, 255);" v-show="isshowempty"> <div class="empty-description"> <div>暂无数据</div> </div> </div> <div v-show="!isshowempty"> <el-button-group> <el-button @click="changeTabGongwei(item)" :type="btnGongweiListActive == item.id ? 'primary' : ''" v-for="item in btnGongweiList" :key="item.id" size="small">{{item.name }}</el-button> </el-button-group> <div class="status"> <div class="status-wrap align-left"> <div class="feed-button" @click="table_edit">状态反馈</div> <div class="collect-status">采集状态</div> <div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div> </div> <div class="status-wrap"> <el-checkbox v-model="checked1" label="人工反馈状态" size="large" /> <div class="status-con"> <div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div> </div> </div> </div> <!-- setWork 入参 --> <record-charts-by-workstation :setWork="setWork" :select="workSelect" :achievements="allwcs" ref="chart02"></record-charts-by-workstation> </div> </div> <save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog> </el-tab-pane> </el-tabs> </el-main> </el-container> </el-container> </el-card> </el-main> </template> <script> @@ -106,10 +113,11 @@ }, data() { return { isshowempty: true, dialog: { save: false }, isshowempty: true, workSelect: [], select: [], workstationInfoList: [], date: "", @@ -189,10 +197,23 @@ }) }, tabChange(val) { if(val == "time") { //按工位查看 }else if(val == "shift") { //按日期查看 if(val == "shift") { //按日期查看 this.$refs.chart01.getCharts(); }else if(val == "time") { //按工位查看 if(this.btnGongweiList.length != 0) { //有选工位才能展示工位 this.btnGongweiListActive = this.btnGongweiList[0].id; //工位 this.lastLevelId = this.btnGongweiListActive; this.setWork = { //工位 endDate: this.time[1], startDate: this.time[0], humanFeedback: true, machineFeedback: true, workstationId: this.select[0].id, workstationName: this.btnGongweiList[0].name } this.workSelect = this.select; this.$refs.chart02.getCharts(); } } }, exportData() { //导出 @@ -210,6 +231,9 @@ changeTab(item) { this.btnListActive = item.id; this.date = item.id; this.$nextTick(()=> { this.$refs.chart01.getCharts(); }) }, changeTabGongwei(item) { //按工位查询 this.btnGongweiListActive = item.id; @@ -228,6 +252,9 @@ workstationId: item.id, workstationName: workstationName } this.$nextTick(()=> { this.$refs.chart02.getCharts(); }) }, getachievements() { //班次状态记录采集状态 this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> { @@ -249,23 +276,24 @@ }) }, getTime(data) { this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', { ...data }).then(res => { if (res.code === 200) { var today = moment().format('YYYY-MM-DD'); var yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD'); res.data.forEach(item=> { if(item.title == today) { item.title = "今天"; } if(item.title == yesterday) { item.title = "昨天"; } }) this.btnList = res.data.reverse(); this.btnListActive = res?.data?.[0]?.id } return new Promise(resolve=> { this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {...data}).then(res => { if (res.code === 200) { var today = moment().format('YYYY-MM-DD'); var yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD'); res.data.forEach(item=> { if(item.title == today) { item.title = "今天"; } if(item.title == yesterday) { item.title = "昨天"; } }) this.btnList = res.data.reverse(); this.btnListActive = res?.data?.[0]?.id resolve(); } }) }) }, init() { @@ -277,22 +305,35 @@ }, query() { this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'}); this.workstationInfoList = this.select; if(this.select.length != 0) { //选了值显示工位 this.btnGongweiList = this.select; this.btnGongweiListActive = this.btnGongweiList[0].id; this.lastLevelId = this.btnGongweiListActive; this.setWork = { endDate: this.time[1], startDate: this.time[0], humanFeedback: true, machineFeedback: true, workstationId: this.select[0].id, workstationName: this.btnGongweiList[0].name this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'}).then(()=> { this.workstationInfoList = this.select; this.btnGongweiList = this.select; //工位 this.date = this.btnList[0].id; if(this.activeName == "shift") { this.$nextTick(()=> { this.$refs.chart01.getCharts(); }) }else { if(this.btnGongweiList.length != 0) { //有选工位才能展示工位 this.isshowempty = false; console.log(this.btnGongweiList,122) this.btnGongweiListActive = this.btnGongweiList[0].id; //工位 this.lastLevelId = this.btnGongweiListActive; this.setWork = { //工位 endDate: this.time[1], startDate: this.time[0], humanFeedback: true, machineFeedback: true, workstationId: this.select[0].id, workstationName: this.btnGongweiList[0].name } this.workSelect = this.select; this.$nextTick(()=> { this.$refs.chart02.getCharts(); }) } } this.isshowempty = false; } }); } } } src/views/mdc/time-analysis.vue
@@ -2,20 +2,20 @@ * @Author: lzhe lzhe@example.com * @Date: 2024-04-26 09:36:18 * @LastEditors: lzhe lzhe@example.com * @LastEditTime: 2024-06-03 11:21:32 * @LastEditTime: 2024-06-05 11:37:24 * @FilePath: /smart-web/src/views/mdc/status-record.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> <template> <el-main style="height: 100%;"> <el-card shadow="never" style="height: 100%;" body-style="height: 100%"> <el-card shadow="never" style="height: 100%;" body-style="height: 100%;padding: 0;"> <el-container style="height: 100%;"> <el-aside width="300px" style="height: 100%;"> <el-container> <el-main class="nopadding"> <div class="left-title">查询条件</div> <div class="left-title">查询条件</div> <el-main style="padding: 20px;"> <el-row> <el-col style="margin-top: 14px;">日期</el-col> <el-col style="margin-bottom: 12px;">日期</el-col> <el-col> <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;" value-format="YYYY-MM-DD"/> </el-col> @@ -49,9 +49,9 @@ </el-button-group> <div class="fact-analysis-realtim" v-if="setTitle.length == 0"> <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);"> <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <!-- <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;"> </div> </div> --> <div class="empty-description"> <div>暂无数据</div> </div> @@ -82,9 +82,9 @@ <el-tab-pane label="按时间周期统计" name="time"> <div class="fact-analysis-realtim" v-if="setTitle.length == 0"> <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);"> <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <!-- <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;"> </div> </div> --> <div class="empty-description"> <div>暂无数据</div> </div> @@ -121,91 +121,6 @@ </el-container> </el-card> </el-main> <!-- <div class="aposcope-main"> <div class="aposcope-left"> <div class="left-title">查询条件</div> <div class="left-title-col">日期</div> <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;" value-format="YYYY-MM-DD"/> <div class="left-title-col">工位</div> <el-button-group > <el-button @click="changeLeftTab(item)" :type="btnLeftctive == item.id ? 'primary' : ''" v-for="item in btnLeftList" :key="item.id" size="small">{{item.title }}</el-button> </el-button-group> <div class="MYTree"> <MYTree v-if="btnLeftctive == '1'" getAll v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree> <el-tree v-if="btnLeftctive == '2'" :data="tree2" :expand-on-click-node="false" default-expand-all show-checkbox :props="{label: 'name', children: 'children'}" class="treeActive" @check="treeListNode" /> </div> <div class="footer"> <el-button @click="query" type="primary">查询</el-button> <el-button @click="exportData">导出</el-button> </div> </div> <div class="aposcope-right"> <el-tabs tab-position="top" v-model="activeName" type="card" @tab-change="tabChange"> <el-tab-pane label="按班次统计" name="shift"> <el-button-group> <el-button @click="changeTab(item)" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button> </el-button-group> <div class="fact-analysis-realtim" v-if="setTitle.length == 0"> <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);"> <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;"> </div> <div class="empty-description"> <div>暂无数据</div> </div> </div> </div> <div id="analysisA" v-if="setTitle.length != 0"> <div class="demo-collapse"> <el-collapse v-model="activeNames" accordion> <el-collapse-item v-for="(item,index) in setTitle" :name="index + 1"> <template #title> <el-icon size="16" color="#3b8e8e"><Memo /></el-icon> <span class="collr-title">班次{{index + 1}}</span> <el-button size="small">{{item.indexName}}</el-button> </template> <div> <div :id="'recordwork' + item.shiftIndex" style="height:300px;"></div> </div> </el-collapse-item> </el-collapse> </div> </div> </el-tab-pane> <el-tab-pane label="按时间周期统计" name="time"> <div class="fact-analysis-realtim" v-if="setTitle.length == 0"> <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);"> <div class="wimi-empty-img" style="width: 150px; height: 150px;"> <img src="./quesheng.bd026700.png" style="height: auto; width: 100%;"> </div> <div class="empty-description"> <div>暂无数据</div> </div> </div> </div> <div id="analysisA" v-if="setTitle.length != 0"> <div class="demo-collapse"> <el-collapse v-model="activeNames1" accordion> <el-collapse-item v-for="(item,index) in setTitle1" :name="index + 1"> <template #title> <el-icon size="16" color="#3b8e8e"><Memo /></el-icon> <span class="collr-title">{{item.name}}</span> <el-button size="small" v-if="index != 0">{{item.indexName}}</el-button> </template> <div> <el-button-group> <el-button @click="changeTabB(item1,index,index1)" :type="item.btnListActive == item1.id ? 'primary' : ''" v-for="(item1,index1) in item.btnList" :key="item1.id" size="small">{{item1.title }}</el-button> </el-button-group> <div :id="'chartsB' + index" style="height:300px;"></div> </div> </el-collapse-item> </el-collapse> </div> </div> </el-tab-pane> </el-tabs> </div> </div> --> </template> <script>