完善

src/api/sb/info.js

@@ -244,6 +244,22 @@ export function fetchSbInfo (parameter) {
   })
 }
 
+/**
+ * fetch single func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function fetchSbWorkplaceData () {
+  return axios({
+    url: '/sb/infos/workplace',
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
 /**
  * fetch single func
  * parameter: { }

src/router/generator-platform-routers.js

@@ -292,6 +292,8 @@ const constantRouterComponents = {
   'RepairReportFee': () => import('@/views/dashboard/RepairReportFee'), // 费用按月统计
   'StoreReport1': () => import('@/views/dashboard/StoreReport1'), // 仓库报表
   'RepairScreen': () => import('@/views/big-screen/RepairScreen'), // 车间大屏
+  // 工作台
+  'SbInfoWorkplaceBacklog': () => import('@/views/workplace/backlog/SbInfoWorkplaceBacklog'), // 设备工作台
   // 自定义管理
   'CustomizeReport': () => import('@/views/customize/report/CustomizeReport'), // 自定义报表
   'CustomFieldTemplate': () => import('@/views/customize/fieldTemplate/CustomFieldTemplate'), // 自定义模板

src/views/operate/article/modules/BaseForm.vue

@@ -243,12 +243,12 @@ export default {
           status: this.status,
           content: this.resultContent ? this.resultContent : this.content
         }
-        if (this.type === 2) {
+        /*if (this.type === 2) {
           if (values.parentId == null) {
             this.$message.error('请选择父文章')
             return
           }
-        }
+        }*/
         if (this.BaseTool.String.isBlank(values.id)) {
           addArticle(values)
             .then(() => {

src/views/workplace/backlog/SbInfoWorkplaceBacklog.vue

@@ -0,0 +1,500 @@
+<template>
+  <div>
+    <div class="gutter-example">
+      <a-row :gutter="20">
+        <a-col class="gutter-row" :span="8">
+          <div class="gutter-box">
+            <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
+              <a-col>数量汇总</a-col>
+              <a-col>{{ record.totalDNumber }}</a-col>
+            </a-row>
+            <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
+              <a-col >
+                <a-badge color="#E4007F"/>
+                <span style="color:#E4007F;">待调拨 &nbsp; {{ record.dbNumber }}</span>
+              </a-col>
+              <a-col >
+                <a-badge color="#5864FF"/>
+                <span style="color:#5864FF;">待报废 &nbsp; {{ record.bfNumber }}</span>
+
+              </a-col>
+            </a-row>
+            <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
+              <a-col >
+                <a-badge color="#F19149"/>
+                <span style="color:#F19149;">待停机 &nbsp; {{ record.stopNumber }}</span>
+
+              </a-col>
+              <a-col>
+                <a-badge color="#009944"/>
+                <span style="color:#009944;">待盘点 &nbsp; {{ record.pdNumber }}</span>
+              </a-col>
+            </a-row>
+          </div>
+        </a-col>
+        <a-col class="gutter-row" :span="8">
+          <div class="gutter-box">
+            <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
+              <a-col>设备维修</a-col>
+              <a-col>{{ record.totalRepairNumber }}</a-col>
+            </a-row>
+            <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
+              <a-col >
+                <a-badge color="#E4007F"/>
+                <span style="color:#E4007F;">计划性 &nbsp; {{ record.planNumber }}</span>
+              </a-col>
+              <a-col >
+                <a-badge color="#5864FF"/>
+                <span style="color:#5864FF;">非计划性 &nbsp; {{ record.notPlanNumber }}</span>
+
+              </a-col>
+            </a-row>
+            <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
+              <a-col >
+                <a-badge color="#F19149"/>
+                <span style="color:#F19149;">其他 &nbsp; {{ record.otherNumber }}</span>
+              </a-col>
+              <a-col>
+                <a-badge color="#009944"/>
+                <span style="color:#009944;">未设置 &nbsp; {{ record.noIdeaNumber }}</span>
+              </a-col>
+            </a-row>
+          </div>
+        </a-col>
+        <a-col class="gutter-row" :span="8">
+          <div style="display:flex;text-align:center;background:#fff;height: 170px;">
+            <div style="width:48%;margin:auto;font-size:30px; line-height: 60px;">
+              <div>设备总数</div>
+              <div style="font-size:24px;">{{ record.totalNumber }}</div>
+            </div>
+            <div style="width: 1px;height: 70px;background: #999999;margin:auto;"></div>
+            <div style="width:48%;margin:auto; font-size:30px;line-height: 60px;">
+              <div>在用总数</div>
+              <div style="font-size:24px;">{{ record.useNumber }}</div>
+            </div>
+          </div>
+        </a-col>
+      </a-row>
+    </div>
+    <div class="gutter-example">
+      <a-row :gutter="[20,40]">
+        <a-col class="gutter-row" :span="6">
+          <div style="height: 471px;background: #FFFFFF;padding:24px">
+            <div style="display:flex;justify-content: space-between;height: 18px; font-size:16px;color: #555555; ">
+              <div>设备状态一览图</div>
+              <!-- <div>设备总数100</div> -->
+            </div>
+            <div id="container-pie"></div>
+          </div>
+        </a-col>
+        <a-col class="gutter-row" :span="12">
+          <div style="height: 471px;background: #FFFFFF; padding:24px;">
+            <div style="justify-content: space-between;height: 18px; font-size:16px;color: #555555; margin-bottom:80px;">
+              <div style="width: 7px;background: #4D86ED;"></div>
+              <div>近一周设备故障统计（截止到今天的一周）</div>
+            </div>
+            <div id="container-line"></div>
+          </div>
+        </a-col>
+        <a-col class="gutter-row" :span="6">
+          <div style="height: 471px;display:flex;flex-direction:column;justify-content: space-between">
+            <div class="btn" style="background:linear-gradient(to right,#36B5FA,#26ECF5);">
+              <my-icon type="icon-chukuguanli" style="font-size:58px;"/>
+              <span>调拨</span>
+            </div>
+            <div class="btn" style="background:linear-gradient(to right,#FF416D,#FF847F);">
+              <my-icon type="icon-rukuguanli" style="font-size:58px;"/>
+              <span>报废</span>
+            </div>
+            <div class="btn" style="background:linear-gradient(to right,#FB47D1,#F96EFE);">
+              <my-icon type="icon-zichanguanli-zichantiaobo" style="font-size:58px;"/>
+              <span>停机</span>
+            </div>
+            <div class="btn" style="background:linear-gradient(to right,#941FFF,#BC72FB);">
+              <my-icon type="icon-xinzengyugengxinhuopindangan-copy" style="font-size:58px;"/>
+              <span>盘点</span>
+            </div>
+          </div>
+        </a-col>
+      </a-row>
+    </div>
+    <div class="gutter-example">
+      <a-row :gutter="20">
+        <a-col class="gutter-row" :span="6">
+          <div class="information">
+            <div style="display:flex;justify-content: space-between;align-items: center; padding-bottom:20px;">
+              <div style="display:flex; width:65px;height:17px;justify-content: space-between;align-items: center;">
+                <div style=" width: 17px;height: 17px;background: #3462FD;border-radius: 50%;"></div>
+                <div style="font-size: 18px;font-weight: 800;color: #333333;">资料</div>
+              </div>
+              <div >
+                查看全部
+                <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/>
+              </div>
+            </div>
+            <div
+              class="demo-infinite-container"
+            >
+              <a-list size="small" bordered :data-source="information">
+                <a-list-item slot="renderItem" slot-scope="item,index" :class="{discolor: index%2}">
+                  <a-list-item-meta>
+                    <div slot="title" :href="item.href">{{ item.name }}</div>
+                  </a-list-item-meta>
+                  <div>{{ item.time }}</div>
+                </a-list-item>
+              </a-list>
+            </div>
+          </div>
+        </a-col>
+        <a-col class="gutter-row" :span="18">
+          <div class="information">
+            <s-table
+              ref="table"
+              size="small"
+              bordered
+              rowKey="id"
+              :columns="columns"
+              :data="loadData"
+              :pageSize="10"
+              :scroll="{ y: 190 }"
+            >
+              <span slot="action" slot-scope="record">
+                <template>
+                  <a @click="handle(record)">详情</a>
+                  <a-divider v-if="record.status === 1" type="vertical" />
+                  <a v-if="record.status === 1" @click="dealJumpDetail(record)">跳转</a>
+                </template>
+              </span>
+              <span slot="content" slot-scope="text" v-html="text">
+              </span>
+            </s-table>
+          </div>
+        </a-col>
+      </a-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import { STable } from '@/components'
+import { getWorkplaceBacklogUserPage } from '@/api/workplace/backlog'
+import { Chart } from '@antv/g2'
+import { fetchSbWorkplaceData } from '@/api/sb/info'
+export default {
+  name: 'SbInfoWorkplaceBacklog',
+  components: {
+    STable,
+    Chart
+  },
+  data () {
+    return {
+      record: null,
+      equipmentData: [
+        { item: '使用', count: 40, percent: 0.4 },
+        { item: '维修', count: 21, percent: 0.21 },
+        { item: '在库', count: 17, percent: 0.17 },
+        { item: '调拨', count: 13, percent: 0.13 },
+        { item: '借出', count: 9, percent: 0.09 }
+      ],
+      lineData: [
+        { day: '周一', num: 3 },
+        { day: '周二', num: 4 },
+        { day: '周三', num: 7.5 },
+        { day: '周四', num: 5 },
+        { day: '周五', num: 4.9 },
+        { day: '周六', num: 6 },
+        { day: '周日', num: 7 }
+      ],
+      allCount: 100,
+      chartPie: null,
+      chartLine: null,
+      queryParam: {
+        status: 1
+      },
+      information: [
+        {
+          name: '项目管理通知',
+          time: '2022-4-7'
+        },
+        {
+          name: '项目管理通知',
+          time: '2022-4-7'
+        },
+        {
+          name: '项目管理通知',
+          time: '2022-4-7'
+        },
+        {
+          name: '项目管理通知',
+          time: '2022-4-7'
+        }, {
+          name: '项目管理通知',
+          time: '2022-4-7'
+        },
+        {
+          name: '项目管理通知',
+          time: '2022-4-7'
+        },
+        {
+          name: '项目管理通知',
+          time: '2022-4-7'
+        }
+      ],
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          align: 'center',
+          width: 50,
+          customRender: (text, record, index) => {
+            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
+          }
+        },
+        {
+          title: '类型',
+          dataIndex: 'type',
+          align: 'center',
+          width: 100,
+          customRender: (text, record, index) => {
+            return this.typeDict[text]
+          }
+        },
+        {
+          title: '详细类型',
+          dataIndex: 'detailType',
+          align: 'center',
+          width: 140,
+          customRender: (text, record, index) => {
+            return this.typeDetailDict[text]
+          }
+        },
+        {
+          title: '内容',
+          dataIndex: 'content',
+          align: 'center',
+          width: 460,
+          ellipsis: true,
+          scopedSlots: { customRender: 'content' }
+        },
+        {
+          title: '时间',
+          align: 'center',
+          width: 160,
+          dataIndex: 'createdTime'
+        },
+        {
+          title: '状态',
+          align: 'center',
+          dataIndex: 'status',
+          width: 100,
+          customRender: (text, record, index) => {
+            return (text === 1 ? '未读' : '已读')
+          }
+        },
+        {
+          title: '操作',
+          key: 'action',
+          width: 150,
+          align: 'center',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        parameter = {
+          ...parameter,
+          ...this.queryParam
+        }
+        return getWorkplaceBacklogUserPage(parameter)
+          .then(res => {
+            return res.data
+          })
+      }
+    }
+  },
+  created () {
+    this.getDict()
+    // this.getData()
+  },
+  mounted () {
+    this.$nextTick(function () {
+      this.getData()
+    })
+  },
+  methods: {
+    getDict () {
+      this.typeDict = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.WORKPLACE_BACKLOG_TYPE)
+      this.typeDetailDict = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE)
+    },
+    getData () {
+      console.log('测试开始1')
+      fetchSbWorkplaceData().then(res => {
+        this.record = res.data
+        // this.equipmentData = JSON.parse(this.record.pieDataList)
+        // this.lineData = JSON.parse(this.record.lineDataList)
+        this.getInfo()
+      })
+    },
+    getInfo () {
+      console.log('测试开始3')
+      this.getPieCharts('container-pie', this.equipmentData)
+      this.getLineCharts('container-line', this.lineData)
+    },
+    getPieCharts (id, data) {
+      this.chartPie && this.chartPie.destroy()// 防止点击搜索按钮新增一个
+      this.chartPie = new Chart({
+        container: id,
+        autoFit: true,
+        height: 400
+      })
+      this.chartPie.data(data)
+      this.chartPie.scale('count', {
+        nice: true
+      })
+      this.chartPie.coordinate('theta', {
+        radius: 0.6,
+        innerRadius: 0.5
+      })
+      this.chartPie.tooltip({
+        showTitle: false,
+        showMarkers: false,
+        itemTpl: `<li class="g2-tooltip-list-item">
+                     <span style="background-color:{color};" class="g2-tooltip-marker"></span>
+                     {name}: {value}
+                  </li>`
+      })
+      // 辅助文本
+      this.chartPie
+        .annotation()
+        .text({
+          position: ['50%', '50%'],
+          content: '主机',
+          style: {
+            fontSize: 14,
+            fill: '#8c8c8c',
+            textAlign: 'center'
+          },
+          offsetY: -20
+        })
+        .text({
+          position: ['50%', '50%'],
+          content: '100',
+          style: {
+            fontSize: 20,
+            fill: '#8c8c8c',
+            textAlign: 'center'
+          },
+          offsetX: -10,
+          offsetY: 20
+        })
+        .text({
+          position: ['50%', '50%'],
+          content: '台',
+          style: {
+            fontSize: 14,
+            fill: '#8c8c8c',
+            textAlign: 'center'
+          },
+          offsetY: 20,
+          offsetX: 20
+        })
+      this.chartPie
+        .interval()
+        .adjust('stack')
+        .position('percent')
+        .color('item')
+        .label('percent', (percent) => {
+          return {
+            content: (data) => {
+              return `${data.item}: ${percent * 100}`
+            }
+          }
+        })
+        .tooltip('item*count', (item, count) => {
+          return {
+            name: item,
+            value: count
+          }
+        })
+      // this.chartPie.interaction('element-active')
+      this.chartPie.interaction('active-region')
+      this.chartPie.render()
+    },
+    getLineCharts (id, data) {
+      this.chartLine = new Chart({
+        container: id,
+        autoFit: true,
+        height: 300
+      })
+
+      this.chartLine.data(data)
+      this.chartLine.scale({
+        day: {
+          range: [0, 1]
+        },
+        value: {
+          min: 0,
+          nice: true
+        }
+      })
+
+      this.chartLine.tooltip({
+        showCrosshairs: true, // 展示 Tooltip 辅助线
+        shared: true
+      })
+
+      this.chartLine.axis('num', {
+        label: {
+          formatter: (val) => {
+            return val + 'k'
+          }
+        }
+      })
+
+      this.chartLine.area().position('day*num')
+      this.chartLine.line().position('day*num')
+      this.chartLine.render()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.gutter-example >>> .ant-row > div {
+  background: transparent;
+  border: 0;
+  font-family: PingFang SC;
+}
+.gutter-box {
+  display:flex;
+  flex-direction:column;
+  justify-content: space-between;
+  background: #fff;
+  padding: 18px 41px;
+  height: 170px;
+}
+.btn{
+height: 113px;
+width: 100%;
+color: #fff!important;
+font-size:28px;
+border-radius: 20px;
+display:flex;
+align-items: center;
+justify-content: space-around;
+}
+.information{
+  background: #fff;
+  padding: 30px 12px;
+  height: 260px;
+  color:#666;
+}
+.discolor{
+  background: #EFEFFB;
+}
+.demo-infinite-container {
+  overflow: auto;
+  height: 190px;
+}
+::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
+</style>