角色管理

Reviewed-on: #13

.env.dev

@@ -1,3 +1,10 @@
+###
+ # @Author: zhp
+ # @Date: 2024-04-28 13:42:51
+ # @LastEditTime: 2024-05-10 08:42:44
+ # @LastEditors: zhp
+ # @Description:
+###
 # 开发环境配置
 ENV = 'development'
 
@@ -5,8 +12,8 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.61:48080'
-# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -42,6 +42,7 @@
   },
   "dependencies": {
     "@babel/parser": "7.18.4",
+    "@jiaminghi/data-view": "^2.10.0",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "^1.6.8",
     "clipboard": "2.0.8",

src/api/cost/index.js

@@ -0,0 +1,32 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-04-26 14:53:45
+ * @LastEditTime: 2024-05-06 14:55:33
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 查询部门列表
+export function getOrderList(data) {
+  return request({
+    url: 'ip/prod-order/prodOrderList',
+    method: 'post',
+    data: data
+  })
+}
+export function getCostPage(data) {
+  return request({
+    url: 'ip/cost/costPage',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getCostList(data) {
+  return request({
+    url: 'ip/cost/costList',
+    method: 'post',
+    data: data
+  })
+}

src/api/energy/index.js

@@ -0,0 +1,15 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-04-28 09:28:12
+ * @LastEditTime: 2024-04-28 09:43:40
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+export function getEnergyPage(data) {
+  return request({
+    url: 'ip/energy/page',
+    method: 'post',
+    data: data
+  })
+}

src/api/greenest/index.js

@@ -0,0 +1,32 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-04-26 14:53:45
+ * @LastEditTime: 2024-05-06 14:53:04
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 查询部门列表
+export function getOrderList(data) {
+  return request({
+    url: 'ip/prod-order/prodOrderList',
+    method: 'post',
+    data: data
+  })
+}
+export function getEpPage(data) {
+  return request({
+    url: 'ip/environment-protection/environmentPage',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getCostList(data) {
+  return request({
+    url: 'ip/cost/costList',
+    method: 'post',
+    data: data
+  })
+}

src/api/produceData/index.js

@@ -0,0 +1,40 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-05-07 08:54:59
+ * @LastEditTime: 2024-05-07 09:34:17
+ * @LastEditors: zhp
+ * @Description:
+ */
+/*
+ * @Author: zhp
+ * @Date: 2024-04-26 14:53:45
+ * @LastEditTime: 2024-05-06 14:53:04
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+
+// 查询部门列表
+export function getProduceDataPage(data) {
+  return request({
+    url: 'ip/prod-output/prodOutputDataPage',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getProduceDataDetail(data){
+  return request({
+     url: '/ip/prod-output/get=' + id,
+    method: 'get',
+    query: data
+  })
+}
+
+export function cockpitDataMonitor(data) {
+  return request({
+    url: '/ip/prod-output/cockpitDataMonitor',
+    method: 'post',
+    data: data
+  })
+}

src/api/wareHouse/index.js

@@ -0,0 +1,15 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-04-28 09:28:12
+ * @LastEditTime: 2024-04-28 15:52:36
+ * @LastEditors: zhp
+ * @Description:
+ */
+import request from '@/utils/request'
+export function getStockPage(data) {
+  return request({
+    url: 'ip/stock/page',
+    method: 'post',
+    data: data
+  })
+}

src/assets/icons/svg/orgTreeIcon.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>菜单</title>
+    <g id="10系统管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="用户管理" transform="translate(-284.000000, -164.000000)" fill-rule="nonzero">
+            <g id="编组-7" transform="translate(284.000000, 162.000000)">
+                <g id="菜单" transform="translate(0.000000, 2.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M3.00057813,4.49926562 L13.0025156,4.49926562 C13.2786563,4.49926562 13.5025156,4.27540625 13.5025156,3.99926563 C13.5025156,3.723125 13.2786563,3.49926563 13.0025156,3.49926563 L3.00057813,3.49926563 C2.7244375,3.49926563 2.50057813,3.723125 2.50057813,3.99926563 C2.50057813,4.27540625 2.7244375,4.49926562 3.00057813,4.49926562 Z M3.0004375,8.48703125 L12.9786875,8.48703125 C13.2548281,8.48703125 13.4786875,8.26317187 13.4786875,7.98703125 C13.4786875,7.71089062 13.2548281,7.48703125 12.9786875,7.48703125 L3.0004375,7.48703125 C2.72429687,7.48703125 2.5004375,7.71089062 2.5004375,7.98703125 C2.5004375,8.26317187 2.72429687,8.48703125 3.0004375,8.48703125 Z M13.0025156,11.4969063 L3.00057813,11.4969063 C2.7244375,11.4969063 2.50057813,11.7207656 2.50057813,11.9969063 C2.50057813,12.2730469 2.7244375,12.4969063 3.00057813,12.4969063 L13.0025156,12.4969063 C13.2786563,12.4969063 13.5025156,12.2730469 13.5025156,11.9969063 C13.5025156,11.7207656 13.2786563,11.4969063 13.0025156,11.4969063 L13.0025156,11.4969063 Z" id="形状" fill="#373738"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/orgTreeIcon2.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="127.000000pt" height="127.000000pt" viewBox="0 0 127.000000 127.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,127.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M520 831 c-19 -10 -48 -35 -64 -55 -25 -30 -31 -48 -34 -100 -8 -122
+69 -206 188 -206 119 0 196 84 188 205 -5 74 -36 123 -98 155 -51 26 -133 26
+-180 1z m137 -32 c67 -25 111 -99 98 -165 -8 -45 -57 -100 -101 -114 -100 -33
+-209 62 -190 165 12 62 82 124 143 125 12 0 34 -5 50 -11z"/>
+</g>
+</svg>

src/assets/styles/index.scss

@@ -123,7 +123,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 16px;
+  // padding: 16px;
 }
 
 .components-container {

src/assets/styles/login.scss

@@ -133,8 +133,8 @@ $base1px: 0.15vh; // 1px / 1080px;
         width: 100%;
         clear: both;
         position: relative;
-        top: calc(56 * #{$base1px});
-        height: calc(128 * #{$base1px});
+        top: calc(#{$base1px});
+        height: calc(100 * #{$base1px});
         display: flex;
         align-items: center;
         justify-content: center;
@@ -189,7 +189,7 @@ $base1px: 0.15vh; // 1px / 1080px;
         height: calc(16 * 0.12vh);
         line-height: calc(16 * 0.12vh);
         font-size: calc(12 * 0.12vh);
-        color: #8c8c8c;
+        color: #C7C7C7;
 
         a,
         a:hover,

src/layout/components/AppMain.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-12 11:13:06
- * @LastEditTime: 2024-04-15 13:52:16
+ * @LastEditTime: 2024-05-08 13:37:05
  * @LastEditors: zhp
  * @Description:
 -->
@@ -17,20 +17,20 @@
 </template>
 
 <script>
-import iframeToggle from "./IframeToggle/index"
+import iframeToggle from "./IframeToggle/index";
 
 export default {
-  name: 'AppMain',
+  name: "AppMain",
   components: { iframeToggle },
   computed: {
     cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+      return this.$store.state.tagsView.cachedViews;
     },
     key() {
-      return this.$route.path
-    }
-  }
-}
+      return this.$route.path;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -45,7 +45,7 @@ export default {
   // background-color: #fff;
 }
 
-.fixed-header+.app-main {
+.fixed-header + .app-main {
   padding-top: 56px;
 }
 
@@ -57,7 +57,7 @@ export default {
     flex-direction: column;
   }
 
-  .fixed-header+.app-main {
+  .fixed-header + .app-main {
     padding-top: 90px;
   }
 }

src/main.js

@@ -18,6 +18,7 @@ import store from "./store";
 import router from "./router";
 import directive from "./directive"; // directive
 import plugins from "./plugins"; // plugins
+import { scrollBoard } from '@jiaminghi/data-view'
 
 import "./assets/icons"; // icon
 import "./permission"; // permission control
@@ -55,6 +56,9 @@ Vue.prototype.DICT_TYPE = DICT_TYPE;
 Vue.prototype.handleTree = handleTree;
 Vue.prototype.addBeginAndEndTime = addBeginAndEndTime;
 Vue.prototype.divide = divide;
+Vue.prototype.tableHeight = function (n) {
+	return window.innerHeight - n;
+};
 
 // 全局组件挂载
 Vue.component("DictTag", DictTag);
@@ -69,6 +73,7 @@ Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
 Vue.use(CodeBrickZj);
+Vue.use(scrollBoard)
 // Form Generator 组件需要使用到 tinymce
 import Tinymce from "@/components/tinymce/index.vue";
 Vue.component("tinymce", Tinymce);

src/mixins/chart.js

@@ -1,6 +1,7 @@
 import * as echarts from "echarts";
 
 function __resizeHandler(entries) {
+  console.log(entries);
   for (const entry of entries) {
     if (entry.contentBoxSize) {
       // manipulate contentBoxSize
@@ -32,7 +33,7 @@ export default {
     const resizeObserver = new ResizeObserver(__resizeHandler.bind(this));
 
     return {
-      MIN_WIDTH: 400,
+      MIN_WIDTH: 390,
       chart_mixin_chartInstance: null,
       chart_mixin_observer: resizeObserver,
       chart_mixin_options: {

src/mixins/code-filter.js

@@ -0,0 +1,87 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-04-28 15:18:21
+ * @LastEditTime: 2024-04-28 15:18:21
+ * @LastEditors: zhp
+ * @Description:
+ */
+
+/*
+ * @Date: 2020-12-29 16:49:28
+ * @LastEditors: DY
+ * @LastEditTime: 2024-02-23 14:50:22
+ * @FilePath: \basic-admin\src\filters\basicData\index.js
+ * @Description:
+ */
+
+const table = {
+  lineStatus: {
+    1: '生产中',
+    2: '停止',
+    3: '未知',
+  },
+  reportType: {
+    1: '日',
+    2: '周',
+    3: '月'
+  }
+}
+
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.\d{3}/gm),'');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
+
+export function toDay(time) {
+  if (time < 24) {
+    return time + '小时'
+  } else {
+    const day = ~~(time / 24)
+    const hour = time % 24
+    return day + '天' + hour + '小时'
+  }
+}
+
+export default function (dictTable) {
+  return function (val) {
+    return table?.[dictTable]?.[val]
+  }
+}

src/mixins/tableHeightMixin.js

@@ -0,0 +1,20 @@
+export default {
+	data() {
+		return {
+			tableH: this.tableHeight(260),
+		};
+	},
+	created() {
+		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+		window.addEventListener('resize', this._setTableHeight);
+	},
+	destroyed() {
+		window.removeEventListener('resize', this._setTableHeight);
+	},
+	methods: {
+		_setTableHeight() {
+			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+			// this.tableH = this.tableHeight(260);
+		},
+	},
+};

src/store/modules/home.js

@@ -1,3 +1,4 @@
+
 import axios from "@/utils/request";
 import { deepClone } from "../../utils";
 
@@ -66,6 +67,7 @@ const mutations = {
         state.copilot.energy = payload.data;
         break;
       case "efficiency":
+        console.log('222222', payload)
         state.copilot.efficiency.chipOee = payload.chipOee;
         state.copilot.efficiency.transformRate = payload.transformRate;
         state.copilot.efficiency.chipRate = payload.chipRate;
@@ -79,8 +81,8 @@ const actions = {
   /** 初始化首页数据 */
   async initHome({ commit }) {
     const dataArr = await getHomeInfo();
-    const targetArr = await getHomeTarget();
-    const payload = splitCurrentAndPrevious(dataArr, targetArr);
+    const targetArr = await getHomeInfo();
+    const payload = splitCurrentAndPrevious(dataArr.prodOutputResultDO, targetArr.prodTargetDO);
     commit("SET_HOME_INFO", payload);
   },
   /** 初始化驾驶舱数据 */
@@ -96,16 +98,25 @@ const actions = {
       yield: splitCurrentAndPrevious,
       comprehensive: () => null,
       efficiency: splitCurrentAndPreviousA,
-    }[source];
+    }[source]
+    console.log(handler)
     // 获取产量数据
-    let { data: factoryList, type } = await fetcher(period);
+    // console.log('qqqqqq',handler)
+    let { data: factoryList, type } = await fetcher(period)
+    console.log(factoryList,type);
     let targetList = null;
     if (source === "yield" || source === "efficiency") {
       // 获取目标数据
-      let { data } = await fetcher(period, true);
-      targetList = data;
+      let { data } = await fetcher(period, true)
+      // console.log('11111',data)
+      targetList = data
     }
-    const payload = handler(factoryList, targetList);
+    let factoryData = factoryList.prodOutputResultDO ? factoryList.prodOutputResultDO : factoryList.prodOutputRateDO
+    let targetData = targetList.ProdTargetDO ? targetList.ProdTargetDO : targetList.ProdTargetDO
+    console.log(factoryList.ProdOutputDO)
+    console.log('ryf',factoryList)
+    const payload = handler(factoryData, targetData)
+    console.log(payload)
     commit("SET_COPILOT_INFO", { type, payload });
   },
 };
@@ -118,60 +129,66 @@ export default {
 };
 
 function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
+  console.log('工厂',factoryListResponse);
+  // console.log('工厂',factoryListResponse);
+
   // 初始数据
   const { chipOee, transformRate, chipRate, stdRate } = initA();
-  factoryListResponse = [
-    {
-      factory: 0,
-      oee: 0.8,
-      previousYearOee: 0.7,
-      componentConversionEfficiency: 0.8,
-      previousYearComponentConversionEfficiency: 0.7,
-      glassType: 0,
-      yieldRate: 0.8,
-      previousYearYieldRate: 0.7,
-      chipYieldRate: 0.38,
-      componentYieldRate: 0.73,
-    },
-    {
-      factory: 1,
-      oee: 0.8,
-      previousYearOee: 0.7,
-      componentConversionEfficiency: 0.8,
-      previousYearComponentConversionEfficiency: 0.7,
-      glassType: 1,
-      yieldRate: 0.8,
-      previousYearYieldRate: 0.7,
-      chipYieldRate: 0.38,
-      componentYieldRate: 0.73,
-    },
-    {
-      factory: 2,
-      oee: 0.8,
-      previousYearOee: 0.7,
-      componentConversionEfficiency: 0.8,
-      previousYearComponentConversionEfficiency: 0.7,
-      glassType: 1,
-      yieldRate: 0.8,
-      previousYearYieldRate: 0.7,
-      chipYieldRate: 0.38,
-      componentYieldRate: 0.73,
-    },
-    {
-      factory: 3,
-      oee: 0.8,
-      previousYearOee: 0.7,
-      componentConversionEfficiency: 0.8,
-      previousYearComponentConversionEfficiency: 0.7,
-      glassType: 0,
-      yieldRate: 0.8,
-      previousYearYieldRate: 0.7,
-      chipYieldRate: 0.38,
-      componentYieldRate: 0.73,
-    },
-  ];
+  // factoryListResponse = [
+  //   {
+  //     factory: 0,
+  //     oee: 0.8,
+  //     previousYearOee: 0.7,
+  //     componentConversionEfficiency: 0.8,
+  //     previousYearComponentConversionEfficiency: 0.7,
+  //     glassType: 0,
+  //     yieldRate: 0.8,
+  //     previousYearYieldRate: 0.7,
+  //     chipYieldRate: 0.38,
+  //     componentYieldRate: 0.73,
+  //   },
+  //   {
+  //     factory: 1,
+  //     oee: 0.8,
+  //     previousYearOee: 0.7,
+  //     componentConversionEfficiency: 0.8,
+  //     previousYearComponentConversionEfficiency: 0.7,
+  //     glassType: 1,
+  //     yieldRate: 0.8,
+  //     previousYearYieldRate: 0.7,
+  //     chipYieldRate: 0.38,
+  //     componentYieldRate: 0.73,
+  //   },
+  //   {
+  //     factory: 2,
+  //     oee: 0.8,
+  //     previousYearOee: 0.7,
+  //     componentConversionEfficiency: 0.8,
+  //     previousYearComponentConversionEfficiency: 0.7,
+  //     glassType: 1,
+  //     yieldRate: 0.8,
+  //     previousYearYieldRate: 0.7,
+  //     chipYieldRate: 0.38,
+  //     componentYieldRate: 0.73,
+  //   },
+  //   {
+  //     factory: 3,
+  //     oee: 0.8,
+  //     previousYearOee: 0.7,
+  //     componentConversionEfficiency: 0.8,
+  //     previousYearComponentConversionEfficiency: 0.7,
+  //     glassType: 0,
+  //     yieldRate: 0.8,
+  //     previousYearYieldRate: 0.7,
+  //     chipYieldRate: 0.38,
+  //     componentYieldRate: 0.73,
+  //   },
+  // ];
   if (factoryListResponse) {
     for (const factory of factoryListResponse) {
+        if (factory.glassType === 1) {
+        console.log(factory.yieldRate)
+      }
       const fId = getFactoryId(factory);
       // 获取目标值
       if (targetListResponse) {
@@ -185,13 +202,13 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
         chipRate.target[fId] = componentYieldRate;
       }
       // 芯片OEE
-      chipOee.current[fId] = factory.oee || random_default();
-      chipOee.previous[fId] = factory.previousYearOee || random_default();
+      chipOee.current[fId] = factory.oee * 100 || random_default();
+      chipOee.previous[fId] = factory.previousYearOee * 100 || random_default();
       // 转化效率
       transformRate.current[fId] =
-        factory.componentConversionEfficiency || random_default();
+        factory.componentConversionEfficiency * 100 || random_default();
       transformRate.previous[fId] =
-        factory.previousYearComponentConversionEfficiency || random_default();
+        factory.previousYearComponentConversionEfficiency * 100 || random_default();
       // 芯片良率 与 标准组件良率
       if (![0, 1].includes(factory.glassType)) continue;
       const _t = [chipRate, stdRate][factory.glassType];
@@ -209,10 +226,13 @@ function splitCurrentAndPreviousA(factoryListResponse, targetListResponse) {
 }
 
 function splitCurrentAndPrevious(factoryListResponse, targetListResponse) {
+  console.log('工厂',factoryListResponse);
+
   // 初始数据
   const { chipInvest, ftoInvest, chipOutput, stdOutput, bipvOutput } = init();
   if (factoryListResponse) {
     for (const factory of factoryListResponse) {
+
       const fId = getFactoryId(factory);
       // 获取目标值
       if (targetListResponse) {
@@ -308,7 +328,6 @@ function initA() {
   };
   // 芯片良率
   const chipRate = deepClone(stdRate);
-
   return {
     chipOee,
     transformRate,
@@ -360,7 +379,7 @@ function random_default(min = 0, max = 1) {
 
 /* 接口 */
 async function getHomeInfo() {
-  const { code, data } = await axios.post("/ip/prod-output/query-by-date", {
+  const { code, data } = await axios.post("ip/prod-output/cockpitData", {
     factorys: [],
     date: 4,
   });
@@ -392,14 +411,14 @@ function getUrl(copilot_module) {
   };
   switch (copilot_module) {
     case "yield":
-      url.comparison = "/ip/prod-output/query-by-date";
-      url.target = "/ip/prod-target/query-by-date";
+      url.comparison = "ip/prod-output/cockpitData";
+      // url.target = "/ip/prod-target/query-by-date";
       break;
     case "energy":
       break;
     case "efficiency":
-      url.comparison = "/ip/prod-output/query-Rate-List";
-      url.target = "/ip/prod-target/query-rate-target";
+      url.comparison = "ip/prod-output/cockpitDataRate";
+      // url.target = "/ip/prod-target/query-rate-target";
       break;
   }
 
@@ -409,7 +428,7 @@ function getUrl(copilot_module) {
 async function doFetch(copilot_module = "yield", fetch_target, params) {
   const url = getUrl(copilot_module);
   const { code, data } = await axios.post(
-    fetch_target ? url.target : url.comparison,
+    url.comparison,
     {
       ...params,
     }

src/views/copilot/components/BarChartBase.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: BarChartBase.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -18,7 +18,7 @@
     </div>
     <div
       ref="chart"
-      style="max-width: 50vw"
+      style="max-width: 40vw"
       :style="{ height: vHeight + 'vh' }"
     ></div>
   </chart-container>
@@ -199,6 +199,7 @@ export default {
         return;
       }
       const actualOptions = JSON.parse(JSON.stringify(this.options));
+      console.log('actualOptions', this.options)
       actualOptions.series[0].data = val[0].data;
       actualOptions.series[0].name = val[0].name;
       actualOptions.series[1].data = val?.[1]?.data || [];

src/views/copilot/components/Container.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: Container.vue
     author: liubin
     date: 2024-04-09 10:44:09
-    description: 
+    description:
 -->
 
 <template>

src/views/copilot/components/ContainerIcon.vue

@@ -1,8 +1,9 @@
-<!-- 
-    filename: ContainerIcon.vue
-    author: liubin
-    date: 2024-04-09 16:41:36
-    description: 
+<!--
+ * @Author: zhp
+ * @Date: 2024-04-28 13:42:51
+ * @LastEditTime: 2024-05-07 16:54:54
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
@@ -14,8 +15,13 @@ import cube from "@/assets/images/homeindex/fto-icon.png";
 import chip from "@/assets/images/homeindex/chip-icon.png";
 import chip2 from "@/assets/images/homeindex/chip-icon-2.png";
 import bipv from "@/assets/images/homeindex/bipv-icon.png";
+import water from "@/assets/images/homeindex/water-icon.png";
+import gas from "@/assets/images/homeindex/gas-icon.png";
+import ware from "@/assets/images/homeindex/ware-icon.png";
+import flash from "@/assets/images/homeindex/flash-icon.png";
 import std from "@/assets/images/homeindex/std-icon.png";
 
+
 export default {
   name: "ContainerIcon",
   components: {},
@@ -40,6 +46,10 @@ export default {
         bipv:
           "background: url(" + bipv + ") no-repeat center center / 100% 100%",
         std: "background: url(" + std + ") no-repeat center center / 100% 100%",
+        water: "background: url(" + water + ") no-repeat center center / 100% 100%",
+        gas: "background: url(" + gas + ") no-repeat center center / 100% 100%",
+        flash: "background: url(" + flash + ") no-repeat center center / 100% 100%",
+        ware: "background: url(" + ware + ") no-repeat center center / 100% 100%",
       }[this.icon];
     },
   },

src/views/copilot/components/CopilotHeader.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: CopilotHeader.vue
     author: liubin
     date: 2024-04-16 15:14:01
-    description: 
+    description:
 -->
 
 <template>
@@ -63,7 +63,7 @@ export default {
     toggleFullScreen() {
       this.isFullscreen = !this.isFullscreen;
 
-      screenfull.toggle(document.querySelector(".copilot-layout"));
+      screenfull.toggle(document.querySelector(".copilot-layout"))
       // 矫正宽度
       // const el = document.querySelector(".copilot-layout");
       // el.style.width = this.isFullscreen ? "100vw" : "calc(100vw - 54px)";

src/views/copilot/components/FactoryDataHeader.vue

@@ -0,0 +1,131 @@
+<template>
+  <div class="factory-header">
+    <section class="menu1">
+      <FactorySelect
+        :companyName="companyName"
+        :companyId="companyId"
+        @updateCompany="updateCompany"
+      />
+    </section>
+    <section class="menu2">
+      <CopilotButton
+        v-for="i in ['日', '周', '月', '年']"
+        :key="i"
+        :label="i"
+        :active="i === period"
+        @click="() => $emit('update:period', i)"
+      />
+      <div class="btn-group">
+        <button type="button" class="export-btn" />
+        <button
+          type="button"
+          class="fullscreen-btn"
+          :class="[isFullscreen ? 'exit-fullscreen' : '']"
+          @click="toggleFullScreen"
+        />
+      </div>
+    </section>
+    <div class="page-title">{{ companyName }}</div>
+  </div>
+</template>
+
+<script>
+import CopilotButton from "./button.vue";
+import FactorySelect from "./FactorySelect.vue";
+import screenfull from "screenfull";
+
+export default {
+  name: "FactoryDataHeader",
+  components: { CopilotButton, FactorySelect },
+  props: {
+    companyName: {
+      type: String,
+    },
+    companyId: {
+      type: String,
+    },
+    period: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      isFullscreen: false,
+    };
+  },
+  computed: {},
+  methods: {
+    toggleFullScreen() {
+      this.isFullscreen = !this.isFullscreen;
+
+      screenfull.toggle(document.querySelector(".factory-layout"));
+      // 矫正宽度
+      // const el = document.querySelector(".factory-layout");
+      // el.style.width = this.isFullscreen ? "100vw" : "calc(100vw - 54px)";
+      // el.style.left = this.isFullscreen ? "0" : "54px";
+    },
+    updateCompany(obj) {
+      this.$emit("updateCompany", obj);
+    },
+  },
+};
+</script>
+
+<style scoped>
+@font-face {
+  font-family: 优设标题黑;
+  src: url(../../../assets/YouSheBiaoTiHei-2.ttf);
+}
+
+.factory-header {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+}
+
+.factory-header > .menu1 {
+  width: 24vw;
+  /* display: flex;
+  align-items: center;
+  gap: 8px; */
+}
+.factory-header > .menu2 {
+  width: 30vw;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.export-btn,
+.fullscreen-btn {
+  width: 32px;
+  height: 32px;
+  margin-left: 24px;
+  cursor: pointer;
+}
+
+.export-btn {
+  background: url(../../../assets/images/export-icon.png) 0 0 / 100% 100%
+    no-repeat;
+}
+
+.fullscreen-btn {
+  background: url(../../../assets/images/full-icon.png) 0 0 / 100% 100%
+    no-repeat;
+}
+.exit-fullscreen {
+  background: url(../../../assets/images/homeindex/exit-fullscreen.png) 0 0 /
+    100% 100% no-repeat;
+}
+
+.page-title {
+  flex: 1;
+  font-size: 40px;
+  line-height: 70px;
+  letter-spacing: 5px;
+  font-family: 优设标题黑;
+  color: #6db6ff;
+  text-align: right;
+  user-select: none;
+}
+</style>

src/views/copilot/components/FactorySelect.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="factory-select">
+    <div class="label-box" @click="openList">
+      <span>{{ companyName }}</span>
+      <span
+        class="triangle"
+        :style="{ transform: isOpen ? 'rotate(90deg)' : 'rotate(0deg)' }"
+      ></span>
+    </div>
+    <div class="option-list" v-show="isOpen">
+      <div
+        v-for="item in company"
+        :key="item.id"
+        @click="chooseCompany(item.id, item.name)"
+      >
+        {{ item.name }}
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "FactorySelect",
+  props: {
+    companyName: {
+      type: String,
+    },
+    companyId: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      isOpen: false,
+      company: [
+        { id: "1", name: "瑞昌中建材光电材料有限公司" },
+        { id: "2", name: "邯郸中建材光电材料有限公司" },
+        { id: "3", name: "株洲中建材光电材料有限公司" },
+        { id: "4", name: "佳木斯中建材光电材料有限公司" },
+        { id: "5", name: "成都中建材光电材料有限公司" },
+        { id: "6", name: "凯盛中建材光电材料有限公司" },
+        { id: "7", name: "蚌埠中建材光电材料有限公司" },
+      ],
+    };
+  },
+  methods: {
+    openList() {
+      this.isOpen = !this.isOpen;
+    },
+    chooseCompany(id, name) {
+      // this.companyId = id;
+      // this.companyName = name;
+      this.$emit("updateCompany", { companyName: name, companyId: id });
+      this.isOpen = false;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-select {
+  width: 100%;
+  position: relative;
+  .label-box {
+    flex: 1;
+    position: relative;
+    background: #006acd40;
+    backdrop-filter: blur(3px);
+    padding: 12px;
+    padding-left: 20px;
+    color: #fff;
+    font-size: 22px;
+    cursor: pointer;
+  }
+  .label-box::before,
+  .label-box::after {
+    content: "";
+    position: absolute;
+    width: 16px;
+    height: 16px;
+    top: 0;
+    background: transparent;
+    border-style: solid;
+    border-width: 2px;
+    border-color: transparent;
+    border-top-color: #007be4;
+  }
+
+  .label-box::before {
+    left: 0;
+    border-left-color: #007be4;
+  }
+
+  .label-box::after {
+    right: 0;
+    border-right-color: #007be4;
+  }
+  .triangle {
+    position: absolute;
+    right: 15px;
+    top: 18px;
+    display: inline-block;
+    width: 0;
+    height: 0;
+    border-top: 12px solid transparent;
+    border-bottom: 12px solid transparent;
+    border-left: 12px solid #1d74d8;
+  }
+  .option-list {
+    width: 100%;
+    position: absolute;
+    z-index: 1000;
+    div {
+      padding-left: 23px;
+      font-size: 20px;
+      width: 100%;
+      height: 44px;
+      line-height: 44px;
+      background-color: rgba(1, 34, 86, 0.8);
+      cursor: pointer;
+    }
+    div:hover {
+      background-color: rgba(0, 106, 205, 0.61);
+    }
+  }
+  .option-list::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(1, 34, 86, 0.9);
+    filter: blur(2px);
+    z-index: -1;
+  }
+}
+</style>

src/views/copilot/container.vue

@@ -1,23 +1,18 @@
-<!-- 
+
+<!--
     filename: container.vue
     author: liubin
     date: 2024-04-16 14:51:25
-    description: 
+    description:
 -->
 
 <template>
-  <div class="copilot-layout">
-    <CopilotHeaderVue
-      :active="page"
-      :period="period"
-      @update:active="page = $event"
-      @update:period="period = $event"
-    />
+  <div class="copilot-layout" ref="copilot-layout" :class="[ page== '产量' ? 'produce': 'other' ]">
+    <CopilotHeaderVue :active="page" :period="period" @update:active="page = $event" @update:period="period = $event" />
 
     <YieldCopilot v-if="page == '产量'" :period="period" />
     <EnergyCopilot v-if="page == '综合'" :period="period" />
     <EfficiencyCopilot v-if="page == '效率'" :period="period" />
-
     <div class="copilot-footer">© 中建材智能自动化研究院有限公司</div>
   </div>
 </template>
@@ -40,8 +35,24 @@ export default {
     return {
       page: "产量",
       period: "日",
+      currentsStyles: '',
     };
   },
+  // watch: {
+  //   page(val) {
+  //     if (val === '产量') {
+  //       console.log(val)
+  //       this.currentsStyles =
+  //         'height: calc(100% + 38px)'
+  //       console.log(this.currentsStyles)
+  //     } else {
+  //       console.log(val)
+  //       this.currentsStyles = 'height:100%+38px'
+  //       console.log(this.currentsStyles)
+  //     }
+  //     immediate: true
+  //   }
+  // }
   // mounted() {
   //   document.body.style.minHeight = "1024px";
   //   document.body.style.minWidth = "1550px";
@@ -52,15 +63,14 @@ export default {
   // },
 };
 </script>
-
 <style>
+
 .copilot-layout {
   padding: 16px;
   background: url(../../assets/images/copilot-bg.png) 0 0 / 100% 100% no-repeat;
   position: absolute;
-  height: calc(100% + 38px);
   left: -16px;
-  top: -8px;
+  /* top: -8px; */
   width: calc(100% + 30px);
   z-index: 1001;
   color: #fff;
@@ -69,6 +79,12 @@ export default {
   gap: 8px;
 }
 
+.produce{
+  height: calc(100% + 38px);
+}
+.other {
+  height: 100vh + 50px;
+}
 .copilot-footer {
   /** position: absolute;
   bottom: 10px; **/

src/views/copilot/efficiency/components/BipvOutput.vue

@@ -0,0 +1,38 @@
+<!-- 
+    filename: BipvOutput.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <DoubleRingWrapperVue data-source="BIPV产出" :period="period" />
+</template>
+
+<script>
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
+
+export default {
+  name: "BipvOutput",
+  components: { DoubleRingWrapperVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-1 {
+  flex: 1;
+}
+
+.stretch {
+  align-self: stretch;
+}
+</style>

src/views/copilot/efficiency/components/ChipInvest.vue

@@ -0,0 +1,106 @@
+<!-- 
+    filename: FtoInvest.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="ChipInvest"
+    class="chip-invest-chart"
+  />
+</template>
+
+<script>
+import BarChartBase from "./sub/bar/BarChartBase.vue";
+
+export default {
+  name: "ChipInvest",
+  components: { BarChartBase },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  computed: {
+    legend() {
+      switch (this.period) {
+        case "日":
+          return [{ label: "昨日", color: "#12f7f1" }];
+        case "周":
+          return [{ label: "本周", color: "#12f7f1" }];
+        case "月": {
+          const year = new Date().getFullYear();
+          const month = new Date().getMonth() + 1;
+          return [
+            { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${month}月`, color: "#58adfa" },
+          ];
+        }
+        case "年": {
+          const year = new Date().getFullYear();
+          return [
+            { label: `${year - 1}年`, color: "#12f7f1" },
+            { label: `${year}年`, color: "#58adfa" },
+          ];
+        }
+        default:
+          return [
+            { label: `${year - 1}年`, color: "#12f7f1" },
+            { label: `${year}年`, color: "#58adfa" },
+          ];
+      }
+    },
+    series() {
+      const { chipInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = chipInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = chipInvest?.pervious;
+          dataList[1] = chipInvest?.current;
+      }
+      return getTemplate(this.period, dataList);
+    },
+  },
+};
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  const month = new Date().getMonth() + 1;
+  return period == "日" || period == "周"
+    ? [
+        {
+          name: period == "日" ? "昨日" : "本周",
+          data: dataList ?? [],
+        },
+      ]
+    : [
+        {
+          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
+          data: dataList ? dataList[0] : [],
+        },
+        {
+          name: period == "年" ? `${year}年` : `${year}年${month}月`,
+          data: dataList ? dataList[1] : [],
+          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+        },
+      ];
+}
+</script>

src/views/copilot/efficiency/components/ChipOee.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: ChipOee.vue
     author: liubin
     date: 2024-04-29 08:51:04
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
+import BarChartBase from "@/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue";
 export default {
   name: "ChipOEE",
   components: { BarChartBase },
@@ -63,20 +63,22 @@ export default {
       }
     },
     series() {
-      const { ftoInvest } = this.$store.getters.copilot.yield;
+      // console.log('aaaaaaaa', this.$store.getters.copilot.efficiency.chipOee);
+      const { chipOee } = this.$store.getters.copilot.efficiency;
       let dataList = null;
-
       switch (this.period) {
         case "日":
         case "周":
-          dataList = ftoInvest?.current;
+          dataList = chipOee?.current;
+        case "周":
+          dataList = chipOee?.current;
           break;
         default:
           dataList = [];
-          dataList[0] = ftoInvest?.pervious;
-          dataList[1] = ftoInvest?.current;
+          dataList[0] = chipOee?.previous;
+          dataList[1] = chipOee?.current;
       }
-
+      // console.log(dataList)
       return getTemplate(this.period, dataList);
     },
   },
@@ -86,6 +88,7 @@ export default {
 function getTemplate(period, dataList) {
   const year = new Date().getFullYear();
   const month = new Date().getMonth() + 1;
+  // console.log('11111', dataList);
   return period == "日" || period == "周"
     ? [
         {

src/views/copilot/efficiency/components/ChipOutput.vue

@@ -0,0 +1,38 @@
+<!-- 
+    filename: ChipOutput.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <DoubleRingWrapperVue data-source="芯片产出" :period="period" />
+</template>
+
+<script>
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
+
+export default {
+  name: "ChipOutput",
+  components: { DoubleRingWrapperVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-1 {
+  flex: 1;
+}
+
+.stretch {
+  align-self: stretch;
+}
+</style>

src/views/copilot/efficiency/components/FtoInvest.vue

@@ -0,0 +1,108 @@
+<!-- 
+    filename: FtoInvest.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <BarChartBase
+    :legend="legend"
+    :series="series"
+    :xAxis="xAxis"
+    in="ftoInvest"
+    class="fto-chart"
+  />
+</template>
+
+<script>
+import BarChartBase from "./sub/bar/BarChartBase.vue";
+
+export default {
+  name: "FtoInvest",
+  components: { BarChartBase },
+  data() {
+    // 城市数组的顺序必须是固定的
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      xAxis: cities,
+    };
+  },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  computed: {
+    legend() {
+      switch (this.period) {
+        case "日":
+          return [{ label: "昨日", color: "#12f7f1" }];
+        case "周":
+          return [{ label: "本周", color: "#12f7f1" }];
+        case "月": {
+          const year = new Date().getFullYear();
+          const month = new Date().getMonth() + 1;
+          return [
+            { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+            { label: `${year}年${month}月`, color: "#58adfa" },
+          ];
+        }
+        case "年": {
+          const year = new Date().getFullYear();
+          return [
+            { label: `${year - 1}年`, color: "#12f7f1" },
+            { label: `${year}年`, color: "#58adfa" },
+          ];
+        }
+        default:
+          return [
+            { label: `${year - 1}年`, color: "#12f7f1" },
+            { label: `${year}年`, color: "#58adfa" },
+          ];
+      }
+    },
+    series() {
+      const { ftoInvest } = this.$store.getters.copilot.yield;
+      let dataList = null;
+
+      switch (this.period) {
+        case "日":
+        case "周":
+          dataList = ftoInvest?.current;
+          break;
+        default:
+          dataList = [];
+          dataList[0] = ftoInvest?.pervious;
+          dataList[1] = ftoInvest?.current;
+      }
+
+      return getTemplate(this.period, dataList);
+    },
+  },
+};
+
+function getTemplate(period, dataList) {
+  const year = new Date().getFullYear();
+  const month = new Date().getMonth() + 1;
+  return period == "日" || period == "周"
+    ? [
+        {
+          name: period == "日" ? "昨日" : "本周",
+          data: dataList ?? [],
+        },
+      ]
+    : [
+        {
+          name: period == "年" ? `${year - 1}年` : `${year - 1}年${month}月`,
+          data: dataList ? dataList[0] : [],
+        },
+        {
+          name: period == "年" ? `${year}年` : `${year}年${month}月`,
+          data: dataList ? dataList[1] : [],
+          // : Array.from({ length: 7 }, () => Math.floor(Math.random() * 1000)),
+        },
+      ];
+}
+</script>

src/views/copilot/efficiency/components/StdOutput.vue

@@ -0,0 +1,38 @@
+<!-- 
+    filename: StdOutput.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <DoubleRingWrapperVue data-source="标准组件产出" :period="period" />
+</template>
+
+<script>
+import DoubleRingWrapperVue from "./sub/ring/DoubleRingWrapper.vue";
+
+export default {
+  name: "StdOutput",
+  components: { DoubleRingWrapperVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-1 {
+  flex: 1;
+}
+
+.stretch {
+  align-self: stretch;
+}
+</style>

src/views/copilot/efficiency/components/StdRate.vue

@@ -1,20 +1,18 @@
-<!-- 
-    filename: StdRate.vue
-    author: liubin
-    date: 2024-04-29 08:50:43
-    description: 标准组件良率
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-09 08:44:21
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
   <div class="std-rate">
     <div class="span-2">
-      <StdRateItem :city="cities[5]" />
+      <StdRateItem :period="period" :city="cities[5]" />
     </div>
-    <div
-      v-for="item in cities.filter((val, index) => index != 5)"
-      :key="item.name"
-    >
-      <StdRateItem :city="item" />
+    <div v-for="item in cities.filter((val, index) => index != 5)" :key="item.name">
+      <StdRateItem :period="period" :city="item" />
     </div>
   </div>
 </template>
@@ -24,7 +22,12 @@ import StdRateItem from "./sub/std/StdRateItem.vue";
 export default {
   name: "StdRate",
   components: { StdRateItem },
-  props: {},
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
   data() {
     return {
       cities: [
@@ -38,7 +41,9 @@ export default {
       ],
     };
   },
-  computed: {},
+  computed: {
+
+  },
   methods: {},
 };
 </script>

src/views/copilot/efficiency/components/TransformRate.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: TransformRate.vue
     author: liubin
     date: 2024-04-29 08:50:34
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import BarChartBase from "@/views/copilot/components/BarChartBase.vue";
+import BarChartBase from "@/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue";
 export default {
   name: "TransformRate",
   components: { BarChartBase },
@@ -63,18 +63,18 @@ export default {
       }
     },
     series() {
-      const { ftoInvest } = this.$store.getters.copilot.yield;
+      const { transformRate } = this.$store.getters.copilot.efficiency;
       let dataList = null;
 
       switch (this.period) {
         case "日":
         case "周":
-          dataList = ftoInvest?.current;
+          dataList = transformRate?.current;
           break;
         default:
           dataList = [];
-          dataList[0] = ftoInvest?.pervious;
-          dataList[1] = ftoInvest?.current;
+          dataList[0] = transformRate?.previous;
+          dataList[1] = transformRate?.current;
       }
 
       return getTemplate(this.period, dataList);

src/views/copilot/efficiency/components/sub/bar/BarChartBase.vue

@@ -0,0 +1,257 @@
+<!--
+    filename: BarChartBase.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description:
+-->
+
+<template>
+  <chart-container class="bar-chart-base">
+    <div class="legend">
+      <span
+        v-for="item in legend"
+        :key="item.label"
+        class="legend-item"
+        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
+        >{{ item.label }}</span
+      >
+    </div>
+    <div
+      ref="chart"
+      style="max-width: 50vw"
+      :style="{ height: vHeight + 'vh' }"
+    ></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "../../../../components/ChartContainer.vue";
+import chartMixin from "@/mixins/chart.js";
+
+export default {
+  name: "BarChartBase",
+  components: {
+    ChartContainer,
+  },
+  mixins: [chartMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 34,
+    },
+    legend: {
+      type: Array,
+      required: true,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+    in: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      isFullscreen: false,
+      actualOptions: null,
+      options: {
+        grid: {
+          left: "5%",
+          right: "4%",
+          bottom: "3%",
+          top: "15%",
+          containLabel: true,
+        },
+        tooltip: {},
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          data: this.xAxis,
+        },
+        yAxis: {
+          name: "单位/片",
+          nameTextStyle: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+        },
+        series: [
+          {
+            name: "", // this.series[0].name,
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#12f7f1", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.35,
+                    color: "#12f7f177", // 100% 处的颜色
+                  },
+                  {
+                    offset: 0.75,
+                    color: "#12f7f133", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+          {
+            name: "", // this.series[1].name,
+            type: "bar",
+            barWidth: 12,
+            // tooltip: {
+            //   valueFormatter: function (value) {
+            //     return value + " ml";
+            //   },
+            // },
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#57abf8", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#364BFE66", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[1].data,
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
+    isFullscreen(val) {
+      this.actualOptions.series.map((item) => {
+        item.barWidth = val ? 18 : 12;
+      });
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.initOptions(this.actualOptions);
+    },
+    series(val) {
+      if (!val) {
+        this.initOptions(this.options);
+        return;
+      }
+      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      actualOptions.series[0].data = val[0].data;
+      actualOptions.series[0].name = val[0].name;
+      actualOptions.series[1].data = val?.[1]?.data || [];
+      actualOptions.series[1].name = val?.[1]?.name || "";
+      this.actualOptions = actualOptions;
+      this.initOptions(actualOptions);
+    },
+  },
+  mounted() {
+    this.actualOptions = this.options;
+    this.initOptions(this.options);
+
+    if (screenfull.isEnabled) {
+      screenfull.on("change", () => {
+        this.isFullscreen = screenfull.isFullscreen;
+      });
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.bar-chart-base {
+  // position: relative;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 1vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right: 0.67vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):before {
+    background-color: #12f7f1;
+  }
+
+  .legend-item:nth-child(2):before {
+    background-color: #58adfa;
+  }
+}
+</style>

src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue

@@ -0,0 +1,258 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 13:22:43
+ * @LastEditTime: 2024-05-09 16:22:24
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <chart-container class="bar-chart-base">
+    <div class="legend">
+      <span
+        v-for="item in legend"
+        :key="item.label"
+        class="legend-item"
+        :style="{ fontSize: isFullscreen ? '0.58vw' : '0.54vw' }"
+        >{{ item.label }}</span
+      >
+    </div>
+    <div
+      ref="chart"
+      style="max-width: 40vw"
+      :style="{ height: vHeight + 'vh' }"
+    ></div>
+  </chart-container>
+</template>
+
+<script>
+import screenfull from "screenfull";
+import ChartContainer from "../../../../components/ChartContainer.vue";
+import chartMixin from "@/mixins/chart.js";
+
+export default {
+  name: "BarChartBase",
+  components: {
+    ChartContainer,
+  },
+  mixins: [chartMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 36,
+    },
+    legend: {
+      type: Array,
+      required: true,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+    in: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      isFullscreen: false,
+      actualOptions: null,
+      options: {
+        grid: {
+          left: "5%",
+          right: "4%",
+          bottom: "3%",
+          top: "15%",
+          containLabel: true,
+        },
+        tooltip: {},
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          data: this.xAxis,
+        },
+        yAxis: {
+          name: "单位/%",
+          nameTextStyle: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            color: "#fff",
+            fontSize: 12,
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+        },
+        series: [
+          {
+            name: "", // this.series[0].name,
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#12f7f1", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.35,
+                    color: "#12f7f177", // 100% 处的颜色
+                  },
+                  {
+                    offset: 0.75,
+                    color: "#12f7f133", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+          {
+            name: "", // this.series[1].name,
+            type: "bar",
+            barWidth: 12,
+            // tooltip: {
+            //   valueFormatter: function (value) {
+            //     return value + " ml";
+            //   },
+            // },
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#57abf8", // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#364BFE66", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[1].data,
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
+    isFullscreen(val) {
+      this.actualOptions.series.map((item) => {
+        item.barWidth = val ? 18 : 12;
+      });
+      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.initOptions(this.actualOptions);
+    },
+    series(val) {
+      if (!val) {
+        this.initOptions(this.options);
+        return;
+      }
+      console.log(val)
+      const actualOptions = JSON.parse(JSON.stringify(this.options))
+      actualOptions.series[0].data = val[0].data;
+      actualOptions.series[0].name = val[0].name;
+      actualOptions.series[1].data = val?.[1]?.data || [];
+      actualOptions.series[1].name = val?.[1]?.name || "";
+      this.actualOptions = actualOptions;
+      this.initOptions(actualOptions);
+    },
+  },
+  mounted() {
+    this.actualOptions = this.options;
+    this.initOptions(this.options);
+
+    if (screenfull.isEnabled) {
+      screenfull.on("change", () => {
+        this.isFullscreen = screenfull.isFullscreen;
+      });
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.bar-chart-base {
+  // position: relative;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 1vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right: 0.67vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+
+  .legend-item:nth-child(1):before {
+    background-color: #12f7f1;
+  }
+
+  .legend-item:nth-child(2):before {
+    background-color: #58adfa;
+  }
+}
+</style>

src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: ChipRateItem.vue
     author: liubin
     date: 2024-04-29 14:25:18
-    description: 
+    description:
 -->
 
 <template>
@@ -10,7 +10,9 @@
     <div class="cities">
       <CopilotButtons :options="cities" @update:active="handleCityUpdate" />
     </div>
-    <div class="chart" ref="chart"></div>
+    <!-- <div style="flex:1;padding: 0 20%;"> -->
+      <div class="chart" ref="chart"></div>
+    <!-- </div> -->
     <div class="legend" v-if="period == '月' || period == '年'">
       <div class="legend-item" v-for="lgd in legend" :key="lgd.label">
         <span class="legend-item__value">{{ lgd.value }}</span>
@@ -57,6 +59,7 @@ export default {
     },
     valueTuple() {
       const getter = this.chipRate;
+      console.log(getter)
       if (this.period === "日" || this.period === "周") {
         return [
           getter.previous[this.factoryId],
@@ -122,6 +125,7 @@ export default {
   },
   watch: {
     period() {
+      console.log(this.$store.getters.copilot.efficiency)
       this.initOptions(this.options);
     },
     factoryId() {
@@ -191,4 +195,4 @@ export default {
   }
 }
 </style>
-l
+

src/views/copilot/efficiency/components/sub/city/CityData.vue

@@ -0,0 +1,149 @@
+<!-- 
+    filename: CityData.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <div class="city-data">
+    <div class="headquarter">
+      <div class="inner-shadow w-1"></div>
+      <div class="inner-shadow flex-1 flex">
+        <CityName value="凯盛光伏" />
+        <CityValue :value="headquarterValue" horizontal :period="period" />
+      </div>
+      <div class="inner-shadow w-1"></div>
+    </div>
+
+    <div class="city-item-container">
+      <CityItem
+        v-for="city in cities"
+        :key="city.name"
+        :location="city.name"
+        :value="city.value"
+        :period="period"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import CityItemVue from "./CityItem.vue";
+import CityNameVue from "./CityName.vue";
+import CityValueVue from "./CityValue.vue";
+
+export default {
+  name: "CityData",
+  components: {
+    CityItem: CityItemVue,
+    CityName: CityNameVue,
+    CityValue: CityValueVue,
+  },
+  props: {
+    dataSource: {
+      type: String,
+      default: null,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    headquarterValue() {
+      let getterName = "";
+      switch (this.dataSource) {
+        case "标准组件产出":
+          getterName = "stdOutput";
+          break;
+        case "芯片产出":
+          getterName = "chipOutput";
+          break;
+        case "BIPV产出":
+          getterName = "bipvOutput";
+          break;
+      }
+      return (
+        "" + (this.$store.getters.copilot.yield[getterName]?.current?.[5] ?? 0)
+      );
+    },
+    cities() {
+      let getterName = "";
+      switch (this.dataSource) {
+        case "标准组件产出":
+          getterName = "stdOutput";
+          break;
+        case "芯片产出":
+          getterName = "chipOutput";
+          break;
+        case "BIPV产出":
+          getterName = "bipvOutput";
+          break;
+      }
+      const _cities = [
+        { name: "瑞昌", value: 0 },
+        { name: "邯郸", value: 0 },
+        { name: "株洲", value: 0 },
+        { name: "佳木斯", value: 0 },
+        { name: "成都", value: 0 },
+        { name: "凯盛光伏", value: 0 },
+        { name: "蚌埠兴科", value: 0 },
+      ];
+      this.$store.getters.copilot.yield[getterName]?.current?.forEach(
+        (v, idx) => {
+          _cities[idx].value = v ?? 0;
+        }
+      );
+      // 删掉凯盛光伏
+      _cities.splice(4, 1);
+      return _cities;
+    },
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.city-data {
+  width: 100%;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.headquarter {
+  flex: 1;
+  display: flex;
+  gap: 8px;
+}
+
+.w-1 {
+  width: 70px;
+}
+
+.flex {
+  display: flex;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.inner-shadow {
+  box-shadow: inset 0 0 12px 2px #fff3;
+  border-radius: 4px;
+}
+
+.city-item-container {
+  flex: 3;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 8px;
+}
+</style>

src/views/copilot/efficiency/components/sub/city/CityItem.vue

@@ -0,0 +1,59 @@
+<!-- 
+    filename: CityItem.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <div class="city-item inner-shadow">
+    <CityName :value="location" />
+    <CityValue :value="value + ''" :period="period" />
+  </div>
+</template>
+
+<script>
+import CityNameVue from "./CityName.vue";
+import CityValueVue from "./CityValue.vue";
+import GradientTextVue from "../gradient/GradientText.vue";
+
+export default {
+  name: "CityItem",
+  components: {
+    GradientTextVue,
+    CityName: CityNameVue,
+    CityValue: CityValueVue,
+  },
+  props: {
+    location: {
+      type: String,
+      default: "",
+    },
+    value: {
+      type: Number,
+      default: 0,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.city-item {
+  display: flex;
+}
+
+.inner-shadow {
+  box-shadow: inset 0 0 12px 2px #fff3;
+  border-radius: 4px;
+}
+</style>

src/views/copilot/efficiency/components/sub/city/CityName.vue

@@ -0,0 +1,55 @@
+<!-- 
+    filename: CityName.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <div class="city-name">
+    <img :src="Icon" alt="city icon" />
+    <span>{{ value }}</span>
+  </div>
+</template>
+
+<script>
+import Icon from "../../../assets/icon.png";
+
+export default {
+  name: "CityName",
+  props: {
+    value: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return { Icon };
+  },
+};
+</script>
+
+<style scoped>
+.city-name {
+  min-width: 80px;
+  margin: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  flex: 1;
+}
+
+img {
+  /* width: 32px; */
+  width: 1.543vw;
+}
+
+span {
+  /* font-size: 12px;   */
+  font-size: 0.77vw;
+  letter-spacing: 2px;
+  text-align: center;
+}
+</style>

src/views/copilot/efficiency/components/sub/city/CityValue.vue

@@ -0,0 +1,127 @@
+<!-- 
+    filename: CityValue.vue
+    author: liubin
+    date: 2024-04-10 08:59:28
+    description: 
+-->
+
+<template>
+  <div class="city-value" :class="[horizontal ? 'horizontal' : '']">
+    <span class="hint" :class="[horizontal ? 'horizontal' : '']">{{
+      period == "周" ? "本周产出" : "今日产出"
+    }}</span>
+    <span class="value" :class="[horizontal ? 'horizontal' : '']">{{
+      value | numberFilter
+    }}</span>
+    <!-- <GradientTextVue :text="value" :size="horizontal ? 32 : 26" /> -->
+  </div>
+</template>
+
+<script>
+import GradientTextVue from "../gradient/GradientText.vue";
+
+export default {
+  name: "CityValue",
+  components: { GradientTextVue },
+  props: {
+    period: {
+      type: String,
+      default: "日",
+    },
+    value: {
+      type: String,
+      default: "",
+    },
+    horizontal: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  filters: {
+    numberFilter(value) {
+      if (value != null && !isNaN(parseInt(value))) {
+        return parseInt(value).toLocaleString();
+      } else {
+        return value;
+      }
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped>
+.city-value {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  flex: 2;
+  position: relative;
+}
+
+.city-value.horizontal {
+  flex-direction: row;
+}
+
+.city-value::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 1px;
+  height: 100%;
+  background: linear-gradient(
+    to bottom,
+    transparent 20%,
+    #fff 50%,
+    transparent 80%
+  );
+}
+
+span.hint {
+  margin: 0 0.77vw;
+  font-size: 0.77vw;
+  order: 2;
+  /* margin: 0 12px;
+  width: 32px;
+  font-size: 12px; */
+}
+
+span.hint.horizontal {
+  margin: 0 1.235vw;
+  width: 1.543vw;
+  order: 1;
+  font-size: 0.77vw;
+  /* margin: 0 12px;
+  width: 32px;
+  font-size: 12px; */
+}
+
+.value {
+  color: #4dd2fe;
+  text-align: center;
+  font-size: 1.132vw;
+  order: 1;
+}
+.value.horizontal {
+  text-align: left;
+  flex: 1;
+  font-size: 1.543vw;
+  order: 2;
+}
+
+svg,
+.value {
+  width: 100px;
+  order: 1;
+}
+
+.value.horizontal,
+svg.horizontal {
+  order: 2;
+}
+</style>

src/views/copilot/efficiency/components/sub/gradient/GradientText.vue

@@ -0,0 +1,64 @@
+<!-- 
+    filename: GradientText.vue
+    author: liubin
+    date: 2024-04-24 16:33:25
+    description: 
+-->
+
+<template>
+  <svg :height="size + 8" width="100%">
+    <defs>
+      <linearGradient id="smoke-text" x1="0%" y1="0%" x2="0%" y2="100%">
+        <stop offset="0%" style="stop-color: #00fff4; stop-opacity: 1" />
+        <stop offset="100%" style="stop-color: #37bdfe; stop-opacity: 1" />
+      </linearGradient>
+    </defs>
+    <text
+      x="0"
+      :y="size"
+      fill="url(#smoke-text)"
+      :style="{
+        fontSize: `${size}px`,
+        letterSpacing: spacing || '2px',
+        fontFamily: 'Calibri, Verdana, sans-serif',
+      }"
+    >
+      {{ text | numberFilter }}
+    </text>
+  </svg>
+</template>
+
+<script>
+export default {
+  name: "GradientText",
+  components: {},
+  props: {
+    text: {
+      type: String,
+      default: "Test",
+    },
+    spacing: {
+      type: String,
+      default: "1px",
+    },
+    size: {
+      type: Number,
+      default: 24,
+    },
+  },
+  filters: {
+    numberFilter(value) {
+      if (value != null && !isNaN(parseInt(value))) {
+        return parseInt(value).toLocaleString();
+      } else {
+        return value;
+      }
+    },
+  },
+  data() {
+    return {};
+  },
+};
+</script>
+
+<style scoped lang="scss"></style>

src/views/copilot/efficiency/components/sub/ring/DoubleRingChart.vue

@@ -0,0 +1,221 @@
+<!-- 
+    filename: DoubleRingChart.vue
+    author: liubin
+    date: 2024-04-17 11:01:55
+    description: 
+-->
+
+<template>
+  <div class="double-ring-chart">
+    <div ref="chart" class="double-ring-chart__container"></div>
+    <!-- style="{ height: vHeight + 'vh' }" -->
+    <div class="double-ring-chart__legend">
+      <div v-for="item in legendItems" :key="item.label" class="legend-item">
+        <span class="legend-item__label">{{ item.label }}</span>
+        <span class="legend-item__value">{{ item.value | numberFilter }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import chartMixin from "@/mixins/chart.js";
+import fullscreenMixin from "@/mixins/fullscreen.js";
+import getOptions from "../../../options/double-ring-chart-options";
+
+export default {
+  name: "DoubleRingChart",
+  mixins: [chartMixin, fullscreenMixin],
+  props: {
+    vHeight: {
+      type: Number,
+      default: 24,
+    },
+    factoryId: {
+      type: Number,
+      required: true,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+    dataSource: {
+      type: String,
+      default: null,
+    },
+  },
+  data() {
+    return {};
+  },
+  filters: {
+    numberFilter(val) {
+      if (!isNaN(val)) {
+        return (+val).toLocaleString();
+      }
+      return 0;
+    },
+  },
+  computed: {
+    dataSourceField() {
+      switch (this.dataSource) {
+        case "标准组件产出":
+          return "stdOutput";
+        case "芯片产出":
+          return "chipOutput";
+        case "BIPV产出":
+          return "bipvOutput";
+      }
+    },
+    valueTuple() {
+      // [previousValue, currentValue, sumValue?]
+      const getter = this.$store.getters.copilot.yield[this.dataSourceField];
+      if (this.period === "日" || this.period === "周") {
+        return [
+          getter.previous[this.factoryId],
+          getter.current[this.factoryId],
+        ];
+      }
+      // [100, 200, 200]
+      return [
+        getter.previous[this.factoryId],
+        getter.current[this.factoryId],
+        getter.target[this.factoryId],
+      ];
+    },
+
+    options() {
+      const year = new Date().getFullYear();
+      const month = new Date().getMonth() + 1;
+      const vt = this.valueTuple;
+      let titleValue =
+          vt[0] != null && vt[2] != null && vt[2] !== 0
+            ? `${vt[1] / vt[2]}%`
+            : "0%",
+        subtitle =
+          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+
+      return getOptions({
+        titleValue,
+        subtitle,
+        previousSum: this.valueTuple[0],
+        currentSum: this.valueTuple[1],
+        targetSum: this.valueTuple[2],
+      });
+    },
+
+    legendItems() {
+      return calculateItems(this.period, this.valueTuple);
+    },
+  },
+  watch: {
+    legendItems() {
+      this.initOptions(this.options);
+    },
+  },
+  mounted() {
+    this.initOptions(this.options);
+  },
+  methods: {
+    // fullscreen mixin 需要的回调
+    fullscreenCallback(isFullscreen) {
+      console.log("isFullscreen--->", isFullscreen);
+    },
+  },
+};
+
+function calculateItems(period, valueTuple) {
+  let items = [];
+  const today = new Date().getDate();
+  const month = new Date().getMonth() + 1;
+  const year = new Date().getFullYear();
+  switch (period) {
+    case "日":
+      items = [
+        { label: `${month}月${today}日累计`, value: valueTuple[1] },
+        { label: `去年${month}月${today}日累计`, value: valueTuple[0] },
+      ];
+      break;
+    case "周":
+      items = [
+        { label: `本周累计`, value: valueTuple[1] },
+        { label: `去年本周累计`, value: valueTuple[0] },
+      ];
+      break;
+    case "月":
+      items = [
+        { label: `${month}月累计`, value: valueTuple[1] },
+        { label: `去年${month}月累计`, value: valueTuple[0] },
+        { label: `${month}月目标`, value: valueTuple[2] },
+      ];
+      break;
+    case "年":
+      items = [
+        { label: `${year}年累计`, value: valueTuple[1] },
+        { label: `${year - 1}年累计`, value: valueTuple[0] },
+        { label: `${year}年目标`, value: valueTuple[2] },
+      ];
+      break;
+  }
+  return items;
+}
+</script>
+
+<style scoped>
+.double-ring-chart {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.double-ring-chart__container {
+  flex: 1;
+  height: 0;
+}
+
+.double-ring-chart__legend {
+  padding: 12px;
+  color: #fff;
+  display: flex;
+  justify-content: center;
+  gap: 32px;
+}
+
+.legend-item {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.legend-item__label {
+  position: relative;
+}
+
+.legend-item__label::before {
+  content: "";
+  position: absolute;
+  width: 12px;
+  height: 12px;
+  background: #ccc;
+  border-radius: 2px;
+  top: 6px;
+  left: -18px;
+}
+
+.legend-item:nth-child(1) .legend-item__label::before {
+  background: #12fff5;
+}
+.legend-item:nth-child(1) .legend-item__value {
+  color: #12fff5;
+}
+
+.legend-item:nth-child(2) .legend-item__label::before {
+  background: #0f65ff;
+}
+.legend-item:nth-child(2) .legend-item__value {
+  color: #0f65ff;
+}
+
+.legend-item:nth-child(3) .legend-item__label::before {
+  background: #003982;
+}
+</style>

src/views/copilot/efficiency/components/sub/ring/DoubleRingWrapper.vue

@@ -0,0 +1,86 @@
+<!-- 
+    filename: DoubleRingWrapper.vue
+    author: liubin
+    date: 2024-04-17 09:55:12
+    description: 
+-->
+
+<template>
+  <div class="double-ring-wrapper">
+    <template v-if="period == '月' || period == '年'">
+      <copilot-select
+        @update:active="handleActiveUpdate"
+        :options="cityOptions"
+      />
+      <div class="flex-1 stretch">
+        <DoubleRingChartVue
+          :data-source="dataSource"
+          :period="period"
+          :factoryId="factoryId"
+        />
+      </div>
+    </template>
+    <template v-else>
+      <CityData :data-source="dataSource" :period="period" />
+    </template>
+  </div>
+</template>
+
+<script>
+import CopilotSelect from "@/views/copilot/components/select.vue";
+import DoubleRingChartVue from "./DoubleRingChart.vue";
+import CityData from "../city/CityData.vue";
+
+export default {
+  name: "DoubleRingWrapper",
+  components: { CopilotSelect, DoubleRingChartVue, CityData },
+  props: {
+    dataSource: {
+      type: String,
+      default: null,
+    },
+    period: {
+      type: String,
+      default: "日",
+    },
+  },
+  data() {
+    return {
+      factoryId: 4, // 默认成都
+      cityOptions: [
+        "成都",
+        "邯郸",
+        "株洲",
+        "瑞昌",
+        "佳木斯",
+        "凯盛光伏",
+        "蚌埠兴科",
+      ],
+    };
+  },
+  methods: {
+    handleActiveUpdate(index) {
+      this.factoryId = index;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.double-ring-wrapper {
+  height: 100%;
+  padding: 12px 24px;
+  display: flex;
+  gap: 12px;
+  flex-direction: column;
+  align-items: center;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.stretch {
+  align-self: stretch;
+}
+</style>

src/views/copilot/efficiency/components/sub/std/CityName.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: CityName.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>

src/views/copilot/efficiency/components/sub/std/ProgressBar.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: ProgressBar.vue
     author: liubin
     date: 2024-04-29 09:18:30
-    description: 
+    description:
 -->
 
 <template>

src/views/copilot/efficiency/components/sub/std/StdRateItem.vue

@@ -1,20 +1,38 @@
-<!-- 
-    filename: StdRateItem.vue
-    author: liubin
-    date: 2024-04-29 08:59:33
-    description: 
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-09 09:04:07
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
-  <div class="std-rate-item">
+  <div v-if="period == '日'" class="std-rate-item">
     <CityName :value="city.name" />
     <div class="std-rate-item__value">
-      <ProgressBar title="24年目标" :total="city.target" :value="city.target" />
-      <ProgressBar
-        title="24年累计"
-        :total="city.target"
-        :value="city.thisYear"
-      />
+      <ProgressBar :title="title" :total="city.target" :value="city.target" />
+      <!-- <ProgressBar title="24年累计" :total="city.target" :value="city.thisYear" /> -->
+    </div>
+  </div>
+  <div v-else-if="period == '周'" class="std-rate-item">
+    <CityName :value="city.name" />
+    <div class="std-rate-item__value">
+      <ProgressBar :title="title" :total="city.target" :value="city.target" />
+      <!-- <ProgressBar title="24年累计" :total="city.target" :value="city.thisYear" /> -->
+    </div>
+  </div>
+  <div v-else-if="period == '月'" class="std-rate-item">
+    <CityName :value="city.name" />
+    <div class="std-rate-item__value">
+      <ProgressBar :title="titleEnd" :total="city.target" :value="city.target" />
+      <ProgressBar :title="title" :total="city.target" :value="city.thisYear" />
+    </div>
+  </div>
+  <div v-else="period == '年'" class="std-rate-item">
+    <CityName :value="city.name" />
+    <div class="std-rate-item__value">
+      <ProgressBar :title="titleEnd" :total="city.target" :value="city.target" />
+      <ProgressBar :title="title" :total="city.target" :value="city.thisYear" />
     </div>
   </div>
 </template>
@@ -31,9 +49,55 @@ export default {
       type: Object,
       required: true,
     },
+    period: {
+      type: String,
+      default: "日",
+    }
   },
   data() {
-    return {};
+    return {
+      showDay:true,
+    };
+  },
+  computed: {
+    title() {
+      switch (this.period) {
+        case "日":
+          return "今日"
+        case "周":
+          return  "本周"
+        case "月":
+          const year = new Date().getFullYear();
+          const month = new Date().getMonth() + 1;
+          return `${year - 1}年${month}月累计`
+        case "年": {
+          const year = new Date().getFullYear();
+          // return [
+           return `${year - 1}年累计`
+          // ];
+        }
+        default:
+         return "今日"
+      }
+    },
+    titleEnd() {
+      switch (this.period) {
+        // case "日":
+        //   return "今日"
+        // case "周":
+        //   return "本周"
+        case "月":
+          const year = new Date().getFullYear();
+          const month = new Date().getMonth() + 1;
+          return  `${year}年${month}月目标`
+        case "年": {
+          const year = new Date().getFullYear();
+          // return [
+          return  `${year}年目标`
+          // ];
+        }
+      }
+    }
   },
 };
 </script>

src/views/copilot/efficiency/index.vue

@@ -1,8 +1,9 @@
-<!-- 
-    filename: index.vue
-    author: liubin
-    date: 2024-04-16 14:40:15
-    description: 效率驾驶舱
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:04:53
+ * @LastEditTime: 2024-05-09 08:56:44
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
@@ -72,8 +73,8 @@ export default {
   flex: 1;
   display: grid;
   gap: 16px;
-  grid-template-columns: 1fr 1fr;
-  grid-template-rows: 1fr 1fr;
+  grid-template-columns:repeat(2, 1fr);
+  grid-template-rows: repeat(2, 1fr)
 }
 
 .efficiency-copilot > div {

src/views/copilot/efficiency/options/double-ring-chart-options.js

@@ -0,0 +1,145 @@
+export default ({
+  titleValue,
+  subtitle,
+  previousSum,
+  currentSum,
+  targetSum,
+}) => ({
+  grid: {
+    left: 0,
+    right: 0,
+    bottom: 0,
+    top: 0,
+    containLabel: true,
+  },
+  tooltip: {},
+  title: {
+    text: titleValue,
+    left: "49%",
+    top: "39%",
+    textAlign: "center",
+    textStyle: {
+      fontWeight: 600,
+      fontSize: 32,
+      color: "#fffd",
+    },
+    subtext: `\u2002${subtitle}\u2002`,
+    subtextStyle: {
+      fontSize: 14,
+      fontWeight: 100,
+      color: "#fffd",
+      align: "right",
+    },
+  },
+  series: [
+    // 背景 series
+    {
+      type: "pie",
+      name: "当前目标",
+      radius: ["70%", "85%"],
+      center: ["50%", "52%"],
+      emptyCircleStyle: {
+        color: "#042c5f33",
+      },
+    },
+    // 数据 series
+    {
+      type: "pie",
+      radius: ["70%", "85%"],
+      center: ["50%", "52%"],
+      avoidLabelOvervlap: false,
+      label: {
+        show: false,
+      },
+      labelLine: {
+        show: false,
+      },
+      data: [
+        {
+          value: currentSum,
+          name: "当前累计产出",
+          selected: false,
+          itemStyle: {
+            borderJoin: "round",
+            borderCap: "round",
+            borderWidth: 12,
+            borderRadius: "50%",
+            color: {
+              type: "linear",
+              x: 1,
+              y: 0,
+              x2: 0,
+              y2: 1,
+              colorStops: [
+                { offset: 0, color: "#4CF0E811" },
+                { offset: 1, color: "#4CF0E8" },
+              ],
+            },
+          },
+        },
+        {
+          value:
+            targetSum > currentSum
+              ? targetSum - currentSum
+              : targetSum == 0
+              ? currentSum == 0
+                ? 1
+                : 0
+              : 0,
+
+          name: "未达成累计",
+          itemStyle: { color: "transparent" },
+          label: { show: false },
+        },
+      ],
+    },
+    // 数据 series2 - 2023累计
+    {
+      type: "pie",
+      radius: ["55%", "70%"],
+      center: ["50%", "52%"],
+      avoidLabelOvervlap: false,
+      label: {
+        show: false,
+      },
+      labelLine: {
+        show: false,
+      },
+      data: [
+        {
+          value: previousSum,
+          name: "上期累计产出",
+          selected: false,
+          itemStyle: {
+            borderJoin: "round",
+            borderCap: "round",
+            borderWidth: 12,
+            borderRadius: "50%",
+            color: {
+              type: "linear",
+              x: 1,
+              y: 0,
+              x2: 0,
+              y2: 1,
+              colorStops: [
+                { offset: 0, color: "#1065ff66" },
+                { offset: 1, color: "#1065ff" },
+              ],
+            },
+          },
+        },
+        {
+          value:
+            targetSum > previousSum
+              ? targetSum - previousSum
+              : previousSum == 0
+              ? 1
+              : 0,
+          name: "-",
+          itemStyle: { color: "transparent" },
+          label: { show: false },
+        },
+      ],
+    },
+  ],
+});

src/views/copilot/energy/components/StockMonitor.vue

@@ -1,8 +1,9 @@
-<!-- 
-    filename: StockMonitor.vue
-    author: liubin
-    date: 2024-04-29 16:35:40
-    description: 仓库监控·当前
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-08 09:39:15
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
@@ -25,15 +26,15 @@ export default {
   data() {
     return {
       dhgList: [
-        { name: "总库存", value: "1000" },
-        { name: "已用库存", value: "500" },
-        { name: "剩余库存", value: "500" },
+        { name: "总库存", value: 1000 },
+        { name: "已用库存", value: 500 },
+        { name: "剩余库存", value: 500 },
       ],
       otherList: [
-        { name: "分类1", value: "1000" },
-        { name: "分类2", value: "1000" },
-        { name: "分类3", value: "1000" },
-        { name: "分类4", value: "1000" },
+        { name: "分类1", value: 1000 },
+        { name: "分类2", value: 1000 },
+        { name: "分类3", value: 1000 },
+        { name: "分类4", value: 1000 },
       ],
     };
   },

src/views/copilot/energy/components/sub/monitor/MonitorItem.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: ChipRateItem.vue
     author: liubin
     date: 2024-04-29 14:25:18
-    description: 
+    description:
 -->
 
 <template>
@@ -12,9 +12,12 @@
     </div>
     <div class="chart" ref="chart"></div>
     <div class="legend" v-if="1">
-      <div class="legend-item" v-for="lgd in legendList" :key="lgd.name">
-        <span class="legend-item__label">{{ lgd.name }}</span>
-        <span class="legend-item__value">{{ lgd.value }}</span>
+      <div class="legend-item" v-for="(lgd,index) in legendList" :key="lgd.name">
+        <div >
+          <span :style="'backgroundColor:' + colors[index%5]" class="legend-item__chart"></span>
+          <span :style="'color:' + colors[index%5]" class="legend-item__label">{{ lgd.name }}</span>
+        </div>
+        <div :style="'color:' + colors[index%5]" class="legend-item__value">{{ lgd.value }}</div>
       </div>
     </div>
   </div>
@@ -47,6 +50,7 @@ export default {
   data() {
     return {
       period: "月",
+      colors:['#2760FF', '#5996F7', '#8BC566', '#11FAF0', '#F3C000'],
       valueTuple: [100, 100, 200],
     };
   },
@@ -54,19 +58,23 @@ export default {
     options() {
       const year = new Date().getFullYear();
       const month = new Date().getMonth() + 1;
-      const vt = this.valueTuple;
-      let titleValue =
-          vt[0] != null && vt[2] != null && vt[2] !== 0
-            ? `${((vt[1] / vt[2]) * 100).toFixed(0)}%`
-            : "0%",
-        subtitle =
-          this.period == "月" ? `${month}月累计产出` : `${year}年累计产出`;
+      let arr = []
+      this.legendList.forEach(ele => {
+        arr.push(ele.value)
+      });
+      let vt = arr
+      console.log(arr)
+      let titleValue = vt.reduce(function (prev, cur, index, arr) {
+        return prev + cur
+      })
+      let subtitle = `总计/片`;
 
       return getOptions({
         single: true,
         color: this.color == 1 ? "#4CF0E8" : "#1065ff",
         titleValue,
         subtitle,
+        dataList:this.legendList,
         previousSum: this.valueTuple[0],
         currentSum: this.valueTuple[1],
         targetSum: this.valueTuple[2],
@@ -107,27 +115,31 @@ export default {
   .legend {
     height: 80px;
     display: flex;
-    gap: 40px;
+    gap: 20px;
     justify-content: space-around;
   }
 
   .legend-item {
     display: flex;
+    // width: 90px;
     flex-direction: column;
+    // justify-content: space-around;
+    // justify-content: space-between;
     align-items: center;
+    flex-wrap: wrap;
     gap: 3px;
-
-    &:first-child {
-      .legend-item__value {
-        color: #0e61f5;
-      }
+    .legend-item__chart{
+      display: inline-block;
+      width: 14px;
+      height: 14px;
+      background: #2760FF;
+      border-radius: 2px;
+      // margin-right: 8px;
     }
-
-    &:nth-child(2) {
-      .legend-item__value {
-        color: #0fd5d1;
-      }
+   .legend-item__label {
+      margin-left: 8px;
     }
+    // }
   }
 
   .legend-item__value {

src/views/copilot/energy/index.vue

@@ -1,22 +1,23 @@
-<!-- 
-    filename: index.vue
-    author: liubin
-    date: 2024-04-16 14:40:15
-    description: 综合驾驶舱
+<!--
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-09 08:41:11
+ * @LastEditors: zhp
+ * @Description:
 -->
 
 <template>
   <div class="energy-copilot">
-    <Container title="仓库监控·当前" icon="chip2">
+    <Container title="仓库监控·当前" icon="ware">
       <StockMonitorVue :period="period" />
     </Container>
-    <Container title="天然气能耗" icon="std">
+    <Container title="天然气能耗" icon="gas">
       <NatGasVue :period="period" />
     </Container>
-    <Container title="电能耗" icon="chip">
+    <Container title="电能耗" icon="flash">
       <ElecCostVue :period="period" />
     </Container>
-    <Container title="水能耗" icon="cube">
+    <Container title="水能耗" icon="water">
       <WaterCostVue :period="period" />
     </Container>
   </div>

src/views/copilot/energy/options/monitorOptions.js

@@ -1,156 +1,84 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-05-07 10:25:10
+ * @LastEditTime: 2024-05-08 10:30:06
+ * @LastEditors: zhp
+ * @Description:
+ */
 export default function ({
   single = false,
-  color,
+  colors = ['#2760FF', '#5996F7', '#8BC566', '#11FAF0','#F3C000'],
   titleValue,
   subtitle,
+  dataList,
   previousSum,
   currentSum,
   targetSum,
 }) {
   return {
-    grid: {
-      left: 0,
-      right: 0,
-      bottom: 0,
-      top: 0,
-      containLabel: true,
+  grid: {
+    left: 0,
+    right: 0,
+    bottom: 0,
+    top: 0,
+    containLabel: true,
+  },
+  // tooltip: {},
+  title: {
+    text: titleValue,
+    left: "49%",
+    top: "39%",
+    textAlign: "center",
+    textStyle: {
+      fontWeight: 600,
+      fontSize: 32,
+      color: "#fffd",
     },
-    tooltip: {},
-    title: {
-      text: titleValue,
-      left: "49%",
-      top: "39%",
-      textAlign: "center",
-      textStyle: {
-        fontWeight: 600,
-        fontSize: 32,
-        color: "#fffd",
-      },
-      subtext: `\u2002${subtitle}\u2002`,
-      subtextStyle: {
-        fontSize: 14,
-        fontWeight: 100,
-        color: "#fffd",
-        align: "right",
-      },
+    subtext: `\u2002${subtitle}\u2002`,
+    subtextStyle: {
+      fontSize: 14,
+      fontWeight: 100,
+      color: "#fffd",
+      align: "right",
     },
-    series: [
-      // 背景 series
-      {
-        type: "pie",
-        name: "当前目标",
-        radius: ["70%", "85%"],
-        center: ["50%", "52%"],
-        emptyCircleStyle: {
-          color: "#040c5f45",
-        },
-      },
-      // 数据 series
-      {
-        type: "pie",
-        radius: ["70%", "85%"],
-        center: ["50%", "52%"],
-        avoidLabelOvervlap: false,
-        label: {
-          show: false,
-        },
+  },
+  // legend: {
+  //   top: '5%',
+  //   left: 'center'
+  // },
+  series: [
+    {
+      name: 'Access From',
+      type: 'pie',
+    	// center: ['50%', '40%'],
+			radius: ['60%', '90%'],
+      avoidLabelOverlap: false,
         labelLine: {
-          show: false,
-        },
-        data: [
-          {
-            value: currentSum,
-            name: "当前累计产出",
-            selected: false,
-            itemStyle: {
-              borderJoin: "round",
-              borderCap: "round",
-              borderWidth: 12,
-              borderRadius: "50%",
-              // color: {
-              //   type: "linear",
-              //   x: 1,
-              //   y: 0,
-              //   x2: 0,
-              //   y2: 1,
-              //   colorStops: single
-              //     ? [
-              //         { offset: 0, color: `${color}11` },
-              //         { offset: 1, color: `${color}` },
-              //       ]
-              //     : [
-              //         { offset: 0, color: "#4CF0E811" },
-              //         { offset: 1, color: "#4CF0E8" },
-              //       ],
-              // },
-            },
-          },
-          {
-            value:
-              targetSum > currentSum
-                ? targetSum - currentSum
-                : targetSum == 0
-                ? currentSum == 0
-                  ? 1
-                  : 0
-                : 0,
-
-            name: "未达成累计",
-            itemStyle: { color: "transparent" },
-            label: { show: false },
-          },
-        ],
+        show: false
       },
-      // 数据 series2 - 2023累计
-      single
-        ? null
-        : {
-            type: "pie",
-            radius: ["55%", "70%"],
-            center: ["50%", "52%"],
-            avoidLabelOvervlap: false,
-            label: {
-              show: false,
-            },
-            labelLine: {
-              show: false,
-            },
-            data: [
-              {
-                value: previousSum,
-                name: "上期累计产出",
-                selected: false,
-                itemStyle: {
-                  borderJoin: "round",
-                  borderCap: "round",
-                  borderWidth: 12,
-                  borderRadius: "50%",
-                  // color: {
-                  //   type: "linear",
-                  //   x: 1,
-                  //   y: 0,
-                  //   x2: 0,
-                  //   y2: 1,
-                  //   colorStops: [
-                  //     { offset: 0, color: "#1065ff66" },
-                  //     { offset: 1, color: "#1065ff" },
-                  //   ],
-                  // },
-                },
-              },
-              {
-                value:
-                  targetSum > previousSum
-                    ? targetSum - previousSum
-                    : previousSum == 0
-                    ? 1
-                    : 0,
-                name: "-",
-                itemStyle: { color: "transparent" },
-                label: { show: false },
-              },
-            ],
-          },
-    ],
+      label: {
+        show: false
+      },
+      data: dataList && dataList.length > 0 && dataList.map((item, index) => ({
+						name:item.name,
+            value: item.value,
+
+						itemStyle:{
+							color:{
+								type: 'linear',
+								x: 0,
+								y: 0,
+								x2: 0,
+								y2: 1,
+								global: false,
+								colorStops:[
+									{offset: 0,color:colors[index%5]},
+									{offset: 1,color:colors[index%5]+'33'}
+								]
+							}
+						}
+            }))
+    }
+  ]
   };
 }

src/views/copilot/factoryData/components/Container.vue

@@ -0,0 +1,232 @@
+<!-- 
+    filename: Container.vue
+    author: liubin
+    date: 2024-04-09 10:44:09
+    description: 
+-->
+
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button
+      v-if="false"
+      style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        position: absolute;
+        top: 8px;
+        right: 8px;
+      "
+      @click="$emit('refresh')"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke-width="1.5"
+        stroke="currentColor"
+        style="width: 24px; height: 24px"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
+        />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></div>
+    <div v-if="side == 'left'" class="corner bl"></div>
+    <div v-if="side == 'right'" class="corner br"></div>
+    <!-- content  -->
+    <div
+      class="container-head"
+      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
+    >
+      <Icon :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div
+      class="container-body"
+      :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]"
+    >
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 100%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    left: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 30%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 60%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    left: 8%;
+    bottom: 0;
+    background: linear-gradient(to right, #024798, transparent);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1.18vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.95vw;
+    height: 0.95vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid #0175dc;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    border-left: 0.532vw solid transparent;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid #0175dc;
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/factoryData/components/ContainerIcon.vue

@@ -0,0 +1,56 @@
+<!-- 
+    filename: ContainerIcon.vue
+    author: liubin
+    date: 2024-04-09 16:41:36
+    description: 
+-->
+
+<template>
+  <div class="container-icon" :style="bgStyle"></div>
+</template>
+
+<script>
+import prod from "@/assets/images/companyData/prod-minor.png";
+import store from "@/assets/images/companyData/store.png";
+import energy from "@/assets/images/companyData/energy.png";
+import order from "@/assets/images/companyData/order.png";
+
+export default {
+  name: "ContainerIcon",
+  components: {},
+  props: {
+    icon: {
+      type: String,
+      default: "prod",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    bgStyle() {
+      return {
+        prod:
+          "background: url(" + prod + ") no-repeat center center / 100% 100%",
+        store:
+          "background: url(" + store + ") no-repeat center center / 100% 100%",
+        energy:
+          "background: url(" + energy + ") no-repeat center center / 100% 100%",
+        order:
+          "background: url(" + order + ") no-repeat center center / 100% 100%",
+      }[this.icon];
+    },
+  },
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.container-icon {
+  //   width: 32px;
+  //   height: 32px;
+  width: 1.701vw;
+  height: 1.701vw;
+  background: #ccc2;
+}
+</style>

src/views/copilot/factoryData/components/Energy.vue

@@ -0,0 +1,371 @@
+<template>
+  <div class="left-chart-base">
+    <div class="legend">
+      <span
+        v-for="item in legend"
+        :key="item.label"
+        class="legend-item"
+        :style="{ fontSize: isFullscreen ? '0.85vw' : '0.73vw' }"
+        >{{ item.label }}</span
+      >
+    </div>
+    <div id="factoryEnergyChart" style="width: 100%; height: 100%"></div>
+  </div>
+</template>
+<script>
+import { debounce } from "@/utils/debounce";
+import * as echarts from "echarts";
+export default {
+  name: "Energy",
+  props: {
+    vHeight: {
+      type: Number,
+      default: 34,
+    },
+    legend: {
+      type: Array,
+      required: true,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      isFullscreen: false,
+      actualOptions: null,
+      chart: "",
+      options: {
+        color: ["#FFD160", "#2760FF", "#12FFF5"],
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "0",
+          top: "15%",
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+        },
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "rgba(255, 255, 255, 0.7)",
+            fontSize: 12,
+          },
+          data: this.xAxis,
+        },
+        yAxis: [
+          {
+            type: "value",
+            name: "KW/h",
+            nameTextStyle: {
+              color: "rgba(255, 255, 255, 0.7)",
+              fontSize: 12,
+              align: "right",
+            },
+            axisTick: {
+              show: false,
+            },
+            axisLabel: {
+              color: "rgba(255, 255, 255, 0.7)",
+              fontSize: 12,
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#4561AE",
+              },
+            },
+            splitLine: {
+              lineStyle: {
+                color: "#4561AE",
+              },
+            },
+          },
+          {
+            type: "value",
+            name: "m³/h",
+            nameTextStyle: {
+              color: "rgba(255, 255, 255, 0.7)",
+              fontSize: 12,
+              align: "left",
+            },
+            axisTick: {
+              show: false,
+            },
+            axisLabel: {
+              color: "rgba(255, 255, 255, 0.7)",
+              fontSize: 12,
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: "#4561AE",
+              },
+            },
+            splitLine: {
+              lineStyle: {
+                color: "#4561AE",
+              },
+            },
+          },
+        ],
+        series: [
+          {
+            name: "",
+            data: [],
+            type: "line",
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: "#FFD160" + "80" },
+                { offset: 0.5, color: "#FFD160" + "20" },
+                { offset: 1, color: "#FFD160" + "00" },
+              ]),
+            },
+            lineStyle: {
+              width: 2,
+            },
+            symbol: "circle",
+            symbolSize: 8,
+            emphasis: {
+              focus: "series",
+            },
+          },
+          {
+            name: "",
+            data: [],
+            type: "line",
+            yAxisIndex: 1,
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: "#2760FF" + "80" },
+                { offset: 0.5, color: "#2760FF" + "20" },
+                { offset: 1, color: "#2760FF" + "00" },
+              ]),
+            },
+            lineStyle: {
+              width: 2,
+            },
+            symbol: "circle",
+            symbolSize: 8,
+            emphasis: {
+              focus: "series",
+            },
+          },
+          {
+            name: "",
+            data: [],
+            type: "line",
+            yAxisIndex: 1,
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: "#12FFF5" + "80" },
+                { offset: 0.5, color: "#12FFF5" + "20" },
+                { offset: 1, color: "#12FFF5" + "00" },
+              ]),
+            },
+            lineStyle: {
+              width: 2,
+            },
+            symbol: "circle",
+            symbolSize: 8,
+            emphasis: {
+              focus: "series",
+            },
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    /** 全屏状态切换时，对柱子粗细和字体大小进行相应调整 */
+    // isFullscreen(val) {
+    //   this.actualOptions.series.map((item) => {
+    //     item.barWidth = val ? 18 : 12;
+    //   });
+    //   this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+    //   this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+    //   this.initOptions(this.actualOptions);
+    // },
+    // series(val) {
+    //   if (!val) {
+    //     this.initOptions(this.options);
+    //     return;
+    //   }
+    //   const actualOptions = JSON.parse(JSON.stringify(this.options));
+    //   actualOptions.series[0].data = val[0].data;
+    //   actualOptions.series[0].name = val[0].name;
+    //   actualOptions.series[1].data = val[1].data;
+    //   actualOptions.series[1].name = val[1].name;
+    //   actualOptions.series[2].data = val[2].data;
+    //   actualOptions.series[2].name = val[2].name;
+    //   this.actualOptions = actualOptions;
+    //   this.initOptions(actualOptions);
+    // },
+  },
+  mounted() {
+    // if (screenfull.isEnabled) {
+    //   screenfull.on("change", () => {
+    //     this.isFullscreen = screenfull.isFullscreen;
+    //   });
+    // }
+    this.canvasReset();
+    window.addEventListener("resize", this.canvasReset);
+  },
+  beforeDestroy() {
+    if (this.chart) {
+      this.chart.dispose();
+    }
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.canvasReset);
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.initChart();
+      }, 500)();
+    },
+    initChart() {
+      if (this.chart) {
+        this.chart.dispose();
+      }
+      this.chart = echarts.init(document.getElementById("factoryEnergyChart"));
+      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      actualOptions.series[0].data = this.series[0].data;
+      actualOptions.series[0].name = this.series[0].name;
+      actualOptions.series[1].data = this.series[1].data;
+      actualOptions.series[1].name = this.series[1].name;
+      actualOptions.series[2].data = this.series[2].data;
+      actualOptions.series[2].name = this.series[2].name;
+      this.actualOptions = actualOptions;
+      this.chart.setOption(actualOptions);
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.left-chart-base {
+  // position: relative;
+  height: 100%;
+
+  .legend {
+    position: absolute;
+    top: 5.2vh;
+    right: 4vw;
+  }
+
+  .legend-item {
+    position: relative;
+    // font-size: 12px;
+    margin-right: 1.34vw;
+
+    &::before {
+      content: "";
+      display: inline-block;
+      // width: 10px;
+      // height: 10px;
+      width: 0.531vw;
+      height: 0.531vw;
+      background-color: #ccc;
+      border-radius: 2px;
+      margin-right: 0.22vw;
+    }
+  }
+  .legend-item:nth-child(1):before {
+    // width: 12px;
+    // height: 2px;
+    width: 0.638vw;
+    height: 0.1064vw;
+    background-color: #ffd160;
+    position: absolute;
+    top: 50%;
+    // left: -16px;
+    left: -0.851vw;
+    transform: translateY(-50%);
+  }
+  .legend-item:nth-child(1):after {
+    background-color: #ffd160;
+    content: "";
+    display: inline-block;
+    position: absolute;
+    // width: 6px;
+    // height: 6px;
+    width: 0.3191vw;
+    height: 0.3191vw;
+    border-radius: 100%;
+    top: 50%;
+    left: -0.851vw;
+    // left: -16px;
+    transform: translateY(-50%) translateX(50%);
+  }
+  .legend-item:nth-child(2):before {
+    // width: 12px;
+    // height: 2px;
+    width: 0.638vw;
+    height: 0.1064vw;
+    background-color: #2760ff;
+    position: absolute;
+    top: 50%;
+    // left: -16px;
+    left: -0.851vw;
+    transform: translateY(-50%);
+  }
+  .legend-item:nth-child(2):after {
+    background-color: #2760ff;
+    content: "";
+    display: inline-block;
+    position: absolute;
+    // width: 6px;
+    // height: 6px;
+    width: 0.3191vw;
+    height: 0.3191vw;
+    border-radius: 100%;
+    top: 50%;
+    left: -0.851vw;
+    // left: -16px;
+    transform: translateY(-50%) translateX(50%);
+  }
+  .legend-item:nth-child(3):before {
+    // width: 12px;
+    // height: 2px;
+    width: 0.638vw;
+    height: 0.1064vw;
+    background-color: #12fff5;
+    position: absolute;
+    top: 50%;
+    // left: -16px;
+    left: -0.851vw;
+    transform: translateY(-50%);
+  }
+  .legend-item:nth-child(3):after {
+    background-color: #12fff5;
+    content: "";
+    display: inline-block;
+    position: absolute;
+    // width: 6px;
+    // height: 6px;
+    width: 0.3191vw;
+    height: 0.3191vw;
+    border-radius: 100%;
+    top: 50%;
+    left: -0.851vw;
+    // left: -16px;
+    transform: translateY(-50%) translateX(50%);
+  }
+}
+</style>

src/views/copilot/factoryData/components/Order.vue

@@ -0,0 +1,77 @@
+<template>
+  <dv-scroll-board
+    v-if="aa"
+    :config="config"
+    style="width: 100%; height: 100%"
+  />
+</template>
+<script>
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "Order",
+  data() {
+    return {
+      aa: true,
+      config: {
+        header: ["序号", "客户名称", "产品名称", "计划加工数量", "加工进度"],
+        headerBGC: "rgba(0, 106, 205, 0.22)",
+        oddRowBGC: "rgba(0, 106, 205, 0.22)",
+        evenRowBGC: "rgba(rgba(2, 13, 45, 0.18)",
+        data: [],
+        rowNum: 12,
+        waitTime: 3000,
+        columnWidth: [50],
+        align: ["center"],
+        carousel: "page",
+      },
+    };
+  },
+  mounted() {
+    this.getTableList();
+    this.tableReset();
+    window.addEventListener("resize", this.tableReset);
+  },
+  methods: {
+    tableReset() {
+      this.aa = false;
+      debounce(() => {
+        this.initTable();
+      }, 500)();
+    },
+    initTable() {
+      this.aa = true;
+    },
+    getTableList() {
+      let _this = this;
+      setTimeout(
+        (function name() {
+          _this.config.data = [
+            ["1", "行1列1", "行1列2", "行1列3", "50%"],
+            ["2", "行2列1", "行2列2", "行2列3", "50%"],
+            ["3", "行3列1", "行3列2", "行3列3", "50%"],
+            ["4", "行4列1", "行4列2", "行4列3", "50%"],
+            ["5", "行5列1", "行5列2", "行5列3", "50%"],
+            ["6", "行6列1", "行6列2", "行6列3", "50%"],
+            ["7", "行7列1", "行7列2", "行7列3", "50%"],
+            ["8", "行8列1", "行8列2", "行8列3", "50%"],
+            ["9", "行9列1", "行9列2", "行9列3", "50%"],
+            ["10", "行10列1", "行10列2", "行10列3", "50%"],
+            ["11", "行11列1", "行11列2", "行11列3", "50%"],
+            ["12", "行12列1", "行12列2", "行12列3", "50%"],
+            ["13", "行13列1", "行13列2", "行13列3", "50%"],
+            ["14", "行14列1", "行14列2", "行14列3", "50%"],
+            ["15", "行15列1", "行15列2", "行15列3", "50%"],
+            ["16", "行16列1", "行16列2", "行16列3", "50%"],
+            ["17", "行17列1", "行17列2", "行17列3", "50%"],
+            ["18", "行18列1", "行18列2", "行18列3", "50%"],
+            ["19", "行19列1", "行19列2", "行19列3", "50%"],
+            ["20", "行20列1", "行20列2", "行20列3", "50%"],
+          ];
+        })(),
+        2000
+      );
+      this.initTable();
+    },
+  },
+};
+</script>

src/views/copilot/factoryData/components/ProdMonitor.vue

@@ -0,0 +1,272 @@
+<template>
+  <div class="prod-monitor">
+    <div class="fto-box">
+      <div class="icon">
+        <img
+          src="./../assets/images/fto.png"
+          alt=""
+          style="width: 2.1875vw; height: 2.2875vw"
+        />
+      </div>
+      <div class="middle-box">
+        <span class="type">玻璃类型</span>
+        <span class="type-name">FTO投入</span>
+      </div>
+      <div class="right-box">
+        <span class="type">投入数量</span>
+        <span class="num">8391222</span>
+      </div>
+    </div>
+    <div class="std-box">
+      <div class="icon">
+        <img
+          src="./../assets/images/std.png"
+          alt=""
+          style="width: 2.1875vw; height: 2.1875vw"
+        />
+      </div>
+      <div class="middle-box">
+        <div class="separate">
+          <div>
+            <span class="type">玻璃类型</span>
+            <span class="type-name">标准组检产量</span>
+          </div>
+          <div>
+            <span class="type">良品数量</span>
+            <span class="type-name">740</span>
+          </div>
+        </div>
+      </div>
+      <div class="right-box">
+        <div class="separate">
+          <div>
+            <span class="type">生产数量</span>
+            <span class="num">783</span>
+          </div>
+          <div>
+            <span class="type1">良品率</span>
+            <span class="num">96%</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="chip-box">
+      <div class="icon">
+        <img
+          src="./../assets/images/chip.png"
+          alt=""
+          style="width: 2.1875vw; height: 2.1875vw"
+        />
+      </div>
+      <div class="middle-box">
+        <div class="separate">
+          <div>
+            <span class="type">玻璃类型</span>
+            <span class="type-name">芯片产量</span>
+          </div>
+          <div>
+            <span class="type">良品数量</span>
+            <span class="type-name">740</span>
+          </div>
+        </div>
+      </div>
+      <div class="right-box">
+        <div class="separate">
+          <div>
+            <span class="type">生产数量</span>
+            <span class="num">783</span>
+          </div>
+          <div>
+            <span class="type1">良品率</span>
+            <span class="num">96%</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bipv-box">
+      <div class="icon">
+        <img
+          src="./../assets/images/bipv.png"
+          alt=""
+          style="width: 2.1875vw; height: 2.1875vw"
+        />
+      </div>
+      <div class="middle-box">
+        <div class="separate">
+          <div>
+            <span class="type">玻璃类型</span>
+            <span class="type-name">BIPV产量</span>
+          </div>
+          <div>
+            <span class="type">良品数量</span>
+            <span class="type-name">740</span>
+          </div>
+        </div>
+      </div>
+      <div class="right-box">
+        <div class="separate">
+          <div>
+            <span class="type">生产数量</span>
+            <span class="num">783</span>
+          </div>
+          <div>
+            <span class="type1">良品率</span>
+            <span class="num">96%</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "ProdMonitor",
+};
+</script>
+<style lang="scss" scoped>
+.prod-monitor {
+  height: 100%;
+  display: flex;
+  gap: 6px;
+  flex-direction: column;
+  .fto-box,
+  .std-box,
+  .chip-box,
+  .bipv-box {
+    box-shadow: inset 0 0 12px 2px #fff3;
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    .icon {
+      flex: 1;
+      text-align: center;
+    }
+    .middle-box {
+      flex: 2.086;
+      position: relative;
+    }
+    .right-box {
+      flex: 2.424;
+      position: relative;
+    }
+    .type {
+      display: inline-block;
+      font-size: 0.9375vw;
+      color: #6db6ff;
+      position: relative;
+      text-align: right;
+      padding-right: 0.417vw;
+      letter-spacing: 2px;
+      width: 6.25vw;
+    }
+    .type1 {
+      display: inline-block;
+      font-size: 0.9375vw;
+      color: #6db6ff;
+      position: relative;
+      text-align: right;
+      padding-right: 0.6vw;
+      width: 6.25vw;
+      padding-left: 1.6vw;
+      text-align: justify;
+      text-align-last: justify;
+    }
+    .type-name {
+      font-size: 1.042vw;
+      color: #fff;
+      position: relative;
+      text-align: left;
+      padding-left: 0.573vw;
+    }
+    .type-name::before {
+      content: "";
+      display: inline-block;
+      width: 1px;
+      height: 1.042vw;
+      border: 1px solid;
+      border-image: linear-gradient(
+          180deg,
+          rgba(0, 176, 243, 0),
+          rgba(31, 143, 255, 1)
+        )
+        2 2;
+      position: absolute;
+      left: 0;
+      top: 4px;
+    }
+    .num {
+      font-size: 1.042vw;
+      color: #fff;
+      position: relative;
+      text-align: left;
+      padding-left: 0.573vw;
+    }
+    .num::before {
+      content: "";
+      display: inline-block;
+      width: 1px;
+      height: 1.042vw;
+      border: 1px solid;
+      border-image: linear-gradient(
+          180deg,
+          rgba(0, 176, 243, 0),
+          rgba(31, 143, 255, 1)
+        )
+        2 2;
+      position: absolute;
+      left: 0;
+      top: 4px;
+    }
+  }
+  .fto-box {
+    flex: 1;
+    .type::before {
+      content: "";
+      display: inline-block;
+      width: 1px;
+      height: 1.6146vw;
+      border: 1px solid;
+      border-image: linear-gradient(
+          135deg,
+          rgba(0, 176, 243, 0),
+          rgba(31, 143, 255, 1),
+          rgba(31, 143, 255, 0)
+        )
+        2 2;
+      position: absolute;
+      left: 0;
+      top: -2px;
+    }
+  }
+  .std-box {
+    flex: 1.3;
+  }
+  .chip-box {
+    flex: 1.3;
+  }
+  .bipv-box {
+    flex: 1.3;
+  }
+  .std-box,
+  .chip-box,
+  .bipv-box {
+    .separate::before {
+      content: "";
+      display: inline-block;
+      width: 1px;
+      height: 3.125vw;
+      border: 1px solid;
+      border-image: linear-gradient(
+          135deg,
+          rgba(0, 176, 243, 0),
+          rgba(31, 143, 255, 1),
+          rgba(31, 143, 255, 0)
+        )
+        2 2;
+      position: absolute;
+      left: 0;
+      top: -2px;
+    }
+  }
+}
+</style>

src/views/copilot/factoryData/components/Store.vue

@@ -0,0 +1,170 @@
+<template>
+  <div id="factoryStoreChart" style="width: 100%; height: 100%"></div>
+</template>
+<script>
+import { debounce } from "@/utils/debounce";
+import * as echarts from "echarts";
+export default {
+  name: "Store",
+  props: {
+    vHeight: {
+      type: Number,
+      default: 34,
+    },
+    xAxis: {
+      type: Array,
+      required: true,
+    },
+    series: {
+      type: Array,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      isFullscreen: false,
+      actualOptions: null,
+      chart: "",
+      options: {
+        grid: {
+          left: "3%",
+          right: "1%",
+          bottom: "0",
+          top: "10%",
+          containLabel: true,
+        },
+        tooltip: {},
+        xAxis: {
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          axisLabel: {
+            color: "rgba(255, 255, 255, 0.7)",
+            fontSize: 12,
+          },
+          data: this.xAxis,
+        },
+        yAxis: {
+          name: "单位/片",
+          nameTextStyle: {
+            color: "rgba(255, 255, 255, 0.7)",
+            fontSize: 12,
+            align: "right",
+          },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            color: "rgba(255, 255, 255, 0.7)",
+            fontSize: 12,
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+          splitLine: {
+            lineStyle: {
+              color: "#4561AE",
+            },
+          },
+        },
+        series: [
+          {
+            name: "", // this.series[0].name,
+            type: "bar",
+            barWidth: 12,
+            itemStyle: {
+              borderRadius: [10, 10, 0, 0],
+              color: {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#12f7f1", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.35,
+                    color: "#12f7f177", // 100% 处的颜色
+                  },
+                  {
+                    offset: 0.75,
+                    color: "#12f7f133", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "transparent", // 100% 处的颜色
+                  },
+                ],
+                global: false, // 缺省为 false
+              },
+            },
+            data: [], // this.series[0].data,
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    series(val) {
+      if (!val) {
+        this.initOptions(this.options);
+        return;
+      }
+      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      actualOptions.series[0].data = val[0].data;
+      actualOptions.series[0].name = val[0].name;
+      actualOptions.series[1].data = val[1].data;
+      actualOptions.series[1].name = val[1].name;
+      this.actualOptions = actualOptions;
+      this.initOptions(actualOptions);
+    },
+  },
+  mounted() {
+    // if (screenfull.isEnabled) {
+    //   screenfull.on("change", () => {
+    //     this.isFullscreen = screenfull.isFullscreen;
+    //   });
+    // }
+    this.canvasReset();
+    window.addEventListener("resize", this.canvasReset);
+  },
+  beforeDestroy() {
+    if (this.chart) {
+      this.chart.dispose();
+    }
+  },
+  destroyed() {
+    window.removeEventListener("resize", this.canvasReset);
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.initChart();
+      }, 500)();
+    },
+    initChart() {
+      if (this.chart) {
+        this.chart.dispose();
+      }
+      this.chart = echarts.init(document.getElementById("factoryStoreChart"));
+      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      actualOptions.series[0].data = this.series[0].data;
+      actualOptions.series[0].name = this.series[0].name;
+      this.actualOptions = actualOptions;
+      this.chart.setOption(actualOptions);
+    },
+  },
+};
+</script>
+<style></style>

src/views/copilot/factoryData/index.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="factory-layout">
+    <FactoryDataHeader
+      :companyName="companyName"
+      :companyId="companyId"
+      :period="period"
+      @updateCompany="updateCompany"
+      @update:period="period = $event"
+    />
+    <div class="factory-section">
+      <section class="top flex">
+        <db-container title="生产监控" icon="prod">
+          <prod-monitor />
+        </db-container>
+        <db-container title="仓库监控.当前" icon="store">
+          <store :series="series" :xAxis="xAxis" />
+        </db-container>
+      </section>
+      <section class="bottom flex">
+        <db-container title="能源监控" icon="energy">
+          <energy
+            :legend="energyLegend"
+            :series="energySeries"
+            :xAxis="energyxAxis"
+          />
+        </db-container>
+        <db-container title="订单监控" icon="order">
+          <order />
+        </db-container>
+      </section>
+    </div>
+    <div class="factory-footer">© 中建材智能自动化研究院有限公司</div>
+  </div>
+</template>
+<script>
+import FactoryDataHeader from "./../components/FactoryDataHeader.vue";
+import Container from "./components/Container.vue";
+import ProdMonitor from "./components/ProdMonitor.vue";
+import Store from "./components/Store.vue";
+import Energy from "./components/Energy.vue";
+import Order from "./components/Order.vue";
+import { cockpitDataMonitor } from "@/api/produceData";
+export default {
+  name: "FactoryData",
+  components: {
+    FactoryDataHeader,
+    DbContainer: Container,
+    ProdMonitor,
+    Store,
+    Energy,
+    Order,
+  },
+  data() {
+    const year = new Date().getFullYear();
+    const cities = ["瑞昌", "邯郸", "株洲", "佳木斯", "成都", "凯盛", "蚌埠"];
+    return {
+      companyId: "1",
+      companyName: "瑞昌中建材光电材料有限公司",
+      period: "日",
+
+      energyLegend: [
+        { label: "电", color: "#FFD160" },
+        { label: "水", color: "#2760FF" },
+        { label: "气", color: "#12FFF5" },
+      ],
+      energyxAxis: [3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7],
+
+      legend: [
+        { label: `${year - 1}年`, color: "#12f7f1" },
+        // { label: `${year}年`, color: "#58adfa" },
+      ],
+      xAxis: cities,
+    };
+  },
+  computed: {
+    energySeries() {
+      return [
+        {
+          name: "电",
+          data: Array.from({ length: 7 }, () =>
+            Math.floor(Math.random() * 1000)
+          ),
+        },
+        {
+          name: "水",
+          data: Array.from({ length: 7 }, () =>
+            Math.floor(Math.random() * 1000)
+          ),
+        },
+        {
+          name: "气",
+          data: Array.from({ length: 7 }, () =>
+            Math.floor(Math.random() * 1000)
+          ),
+        },
+      ];
+    },
+    series() {
+      // const ftoInvest = this.$store.getters.home.ftoInvest;
+      // if (!ftoInvest || !ftoInvest.current || !ftoInvest.previous) {
+      return [
+        {
+          name: "2023年",
+          data: Array.from({ length: 7 }, () =>
+            Math.floor(Math.random() * 1000)
+          ),
+        },
+      ];
+      // }
+
+      // return [
+      //   {
+      //     name: `${new Date().getFullYear() - 1}年`,
+      //     data: ftoInvest.previous,
+      //   },
+      //   {
+      //     name: `${new Date().getFullYear()}年`,
+      //     data: ftoInvest.current,
+      //   },
+      // ];
+    },
+  },
+  mounted() {
+    this.getMes1();
+  },
+  methods: {
+    updateCompany(obj) {
+      this.companyId = obj.companyId;
+      this.companyName = obj.companyName;
+    },
+    getMes1() {
+      cockpitDataMonitor({
+        factorys: [1],
+        date: 4,
+      }).then((res) => {
+        console.log(res);
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.factory-layout {
+  padding: 16px;
+  background: url(../../../assets/images/copilot-bg.png) 0 0 / 100% 100%
+    no-repeat;
+  position: absolute;
+  height: calc(100% + 38px);
+  left: -16px;
+  top: -8px;
+  width: calc(100% + 30px);
+  z-index: 1001;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  .factory-section {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    .flex {
+      display: flex;
+      gap: 16px;
+      flex: 1;
+    }
+    .top > div,
+    .bottom > div {
+      height: 100%;
+    }
+  }
+  .factory-footer {
+    /** position: absolute;
+  bottom: 10px; **/
+    height: 10px;
+    width: 100%;
+    color: rgb(80, 80, 80);
+    user-select: none;
+    font-size: 14px;
+    letter-spacing: 1px;
+    display: grid;
+    place-content: center;
+  }
+}
+</style>

src/views/copilot/yield/components/ChipInvest.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: FtoInvest.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -73,7 +73,7 @@ export default {
           break;
         default:
           dataList = [];
-          dataList[0] = chipInvest?.pervious;
+          dataList[0] = chipInvest?.previous;
           dataList[1] = chipInvest?.current;
       }
       return getTemplate(this.period, dataList);

src/views/copilot/yield/components/FtoInvest.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: FtoInvest.vue
     author: liubin
     date: 2024-04-10 08:59:28
-    description: 
+    description:
 -->
 
 <template>
@@ -74,7 +74,7 @@ export default {
           break;
         default:
           dataList = [];
-          dataList[0] = ftoInvest?.pervious;
+          dataList[0] = ftoInvest?.previous;
           dataList[1] = ftoInvest?.current;
       }
 

src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue

@@ -1,13 +1,15 @@
-<!-- 
+<!--
     filename: DoubleRingChart.vue
     author: liubin
     date: 2024-04-17 11:01:55
-    description: 
+    description:
 -->
 
 <template>
   <div class="double-ring-chart">
-    <div ref="chart" class="double-ring-chart__container"></div>
+    <div class="double-ring-chart__container">
+      <div ref="chart" style="height: 90%;"></div>
+    </div>
     <!-- style="{ height: vHeight + 'vh' }" -->
     <div class="double-ring-chart__legend">
       <div v-for="item in legendItems" :key="item.label" class="legend-item">
@@ -70,6 +72,7 @@ export default {
       // [previousValue, currentValue, sumValue?]
       const getter = this.$store.getters.copilot.yield[this.dataSourceField];
       if (this.period === "日" || this.period === "周") {
+        console.log(this.period)
         return [
           getter.previous[this.factoryId],
           getter.current[this.factoryId],
@@ -168,7 +171,10 @@ function calculateItems(period, valueTuple) {
 }
 
 .double-ring-chart__container {
-  flex: 1;
+  flex:1;
+  padding: 0 10%;
+  /* margin: 10%; */
+  /* min-width: 300px; */
   height: 0;
 }
 

src/views/copilot/yield/index.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: index.vue
     author: liubin
     date: 2024-04-16 14:40:15

src/views/copilot/yield/options/double-ring-chart-options.js

@@ -15,8 +15,8 @@ export default ({
   tooltip: {},
   title: {
     text: titleValue,
-    left: "49%",
-    top: "39%",
+    left: "44%",
+    top: "37%",
     textAlign: "center",
     textStyle: {
       fontWeight: 600,
@@ -37,7 +37,7 @@ export default ({
       type: "pie",
       name: "当前目标",
       radius: ["70%", "85%"],
-      center: ["50%", "52%"],
+      center: ["45%", "52%"],
       emptyCircleStyle: {
         color: "#042c5f33",
       },
@@ -46,7 +46,7 @@ export default ({
     {
       type: "pie",
       radius: ["70%", "85%"],
-      center: ["50%", "52%"],
+      center: ["45%", "52%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -97,7 +97,7 @@ export default ({
     {
       type: "pie",
       radius: ["55%", "70%"],
-      center: ["50%", "52%"],
+      center: ["45%", "52%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,

src/views/cost/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:14:51
+ * @LastEditTime: 2024-05-06 14:55:56
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-// import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
+import { getOrderList, getCostPage } from '@/api/cost/index';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
@@ -47,11 +47,11 @@ export default {
 	data() {
     return {
       listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        factoryId: null,
-        total: 0,
-        type: null,
+        current: 1,
+        size: 10,
+        // factoryId: null,
+        // total: 0,
+        // type: null,
         // reportType: 2,
         reportTime: []
       },
@@ -230,7 +230,7 @@ export default {
 	mounted() {
     this.getDict()
     // this.getCurrentYearFirst()
-    // this.getDataList()
+    this.getDataList()
 	},
   methods: {
     buttonClick() {
@@ -264,10 +264,14 @@ export default {
       }
     },
     async getDict() {
-      this.$refs.lineChart.initChart()
+      // this.$refs.lineChart.initChart()
 			// 产线列表
-			// const res = await getCorePLList();
-			// this.proLineList = res.data;
+      const res = await getOrderList({
+        current:1,
+        size:999,
+      });
+      console.log(res)
+			this.mainFormConfig[0].selectOptions = res.data;
 		},
     // 获取数据列表
     multipliedByHundred(str) {
@@ -293,6 +297,10 @@ export default {
 
     },
     async getDataList() {
+        const res = await getCostPage({
+        current: 1,
+        size: 999,
+      });
     },
     add0(m) {
       return m < 10 ? '0' + m : m

src/views/energy/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:14:31
+ * @LastEditTime: 2024-05-06 09:24:02
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,7 +9,7 @@
   <div style="display: flex; flex-direction: column; min-height: calc(100vh - 96px - 31px)">
     <div class="app-container" style="padding: 16px 24px 0;height: auto; flex-grow: 1;">
       <div style="background: #fff; height: 70px; width:100%">
-        <ButtonNav :menus="['水', '电', '气']" :button-mode="true" @change="currentMenu = $event">
+        <ButtonNav :menus="['水', '电', '气']" :button-mode="true" @change="handleChange">
         </ButtonNav>
       </div>
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
@@ -93,8 +93,8 @@
 </template>
 
 <script>
-// import { parseTime } from '../../core/mixins/code-filter';
-// import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
+import { parseTime } from '@/mixins/code-filter';
+import { getEnergyPage } from '@/api/energy';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
@@ -116,27 +116,6 @@ export default {
       },
       date1: undefined,
       date2: undefined,
-      // weekNum: undefined,
-      dataList: [
-        {
-          id:'first',
-        },
-         {
-          id: 'second',
-        },
-         {
-          id: 'third',
-        },
-         {
-          id: 'fourth',
-        },
-         {
-          id: 'fifth',
-        },
-         {
-          id: 'sixth',
-        },
-      ],
 			urlOptions: {
 				// getDataListURL: getGlassPage,
 				// exportURL: exportGlasscExcel
@@ -216,13 +195,14 @@ export default {
           type:'button',
           btnName: '导出',
           name: 'export',
-          color: 'warning',
+          plain: true,
+          color: 'primary',
         },
       ],
       formConfig: [
         {
           type: 'title',
-          label: '成本管理',
+          label: '能源管理',
         },
       ],
       timeList: [
@@ -258,8 +238,9 @@ export default {
         // 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
         // },
         {
-          prop: 'userName',
+          prop: 'createTime',
           label: '日期',
+          filter: parseTime,
         },
         {
           prop: 'nickName',
@@ -303,9 +284,12 @@ export default {
 	mounted() {
     this.getDict()
     // this.getCurrentYearFirst()
-    // this.getDataList()
+    this.getDataList()
 	},
   methods: {
+    handleChange(e) {
+      console.log(e);
+    },
     buttonClick() {
 
     },
@@ -461,6 +445,9 @@ export default {
 
     },
     async getDataList() {
+      const res = await getEnergyPage(this.listQuery)
+      this.tableData = res.data.list
+      // this.dataProps = res.data.list.map()
     },
     add0(m) {
       return m < 10 ? '0' + m : m

src/views/greenest/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:14:01
+ * @LastEditTime: 2024-05-07 08:40:58
  * @LastEditors: zhp
  * @Description:
 -->
@@ -11,18 +11,18 @@
       <!-- <el-alert title="自定义 close-text" type="warning" close-text="知道了">
       </el-alert> -->
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
-        <el-form-item label="时间维度" prop="reportTime">
-          <el-select clearable v-model="timeSelect" placeholder="请选择">
+        <el-form-item label="时间维度" prop="mode">
+          <el-select clearable v-model="listQuery.mode" placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-show="timeSelect === 'month'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.mode === 2" label="时间范围" prop="reportTime">
           <el-date-picker clearable v-model="listQuery.reportTime" type="monthrange" range-separator="至"
             start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="timeSelect === 'year'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.mode === 3" label="时间范围" prop="reportTime">
           <el-date-picker clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
             placeholder="开始时间">
           </el-date-picker>
@@ -31,8 +31,8 @@
             @change="getYear">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="工厂名称" prop="factoryId">
-          <el-select clearable v-model="listQuery.factoryId" placeholder="请选择工厂名称">
+        <el-form-item label="工厂名称" prop="factorys">
+          <el-select clearable v-model="listQuery.factorys" placeholder="请选择工厂名称" multiple>
             <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
@@ -56,8 +56,7 @@
     </div>
     <div class="app-container" style="margin-top: 18px;flex-grow: 1; padding: 16px;">
       <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-        :table-data="tableData">
+      <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData">
       </base-table>
     </div>
     <!-- <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
@@ -71,8 +70,8 @@
 </template>
 
 <script>
-// import { parseTime } from '../../core/mixins/code-filter';
-// import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
+import { parseTime } from '@/mixins/code-filter';
+import { getEpPage } from '@/api/greenest/index';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
@@ -83,14 +82,18 @@ export default {
 	data() {
     return {
       listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        factoryId: null,
-        total: 0,
-        type: null,
+        current: 1,
+        size: 10,
+        factorys: [],
+        mode: 2,
+        beginTime: undefined,
+        endTime: undefined,
+        // total: 0,
+        // type: null,
         // reportType: 2,
         reportTime: []
       },
+      dynamicProps: [],
 			urlOptions: {
 				// getDataListURL: getGlassPage,
 				// exportURL: exportGlasscExcel
@@ -103,19 +106,43 @@ export default {
       ],
       timeList: [
         {
-          value: 'month',
+          value: 2,
           label:'月'
         },
         {
-          value: 'year',
+          value: 3,
           label: '年'
         }
       ],
       factoryList: [
         {
-          name: '测试',
-          id:1
-        }
+          id: 0,
+          name: '瑞昌中建材光电材料有限公司'
+        },
+        {
+          id: 1,
+          name: '邯郸中建材光电材料有限公司'
+        },
+        {
+          id: 2,
+          name: '中建材株洲光电材料有限公司'
+        },
+        {
+          id: 3,
+          name: '佳木斯中建材光电材料有限公司'
+        },
+        {
+          id: 4,
+          name: '成都中建材光电材料有限公司'
+        },
+        {
+          id: 5,
+          name: '凯盛光伏材料有限公司'
+        },
+        {
+          id: 6,
+          name: '蚌埠兴科玻璃有限公司'
+        },
       ],
       typeList: [
         {
@@ -131,68 +158,14 @@ export default {
           id: 2,
         },
       ],
-      tableProps: [
-        // {
-        // 	prop: 'createTime',
-        // 	label: '添加时间',
-        // 	fixed: true,
-        // 	width: 180,
-        // 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-        // },
-        {
-          prop: 'userName',
-          label: '日期',
-        },
-        {
-          prop: 'nickName',
-          label: '工厂名称',
-        },
-        {
-          prop: 'datas',
-          label: '废水(t)',
-          // subcomponent: row
-        },
-        {
-          prop: 'unit',
-          label: '废气(m³)',
-          // subcomponent: row
-        },
-        {
-          prop: 'remark',
-          label: 'VOC(g/L)',
-          // subcomponent: row
-        },
-        {
-          prop: 'kg',
-          label: '固体废弃物-可回收(kg)',
-          // subcomponent: row
-        }
-      ],
-      timeSelect:'month',
-      startTimeStamp:null, //开始时间
-      endTimeStamp:null, //结束时间
-      date:'凯盛玻璃控股成员企业2024生产数据',
+      tableProps: [],
+      // startTimeStamp:null, //开始时间
+      // endTimeStamp:null, //结束时间
+      // date:'凯盛玻璃控股成员企业2024生产数据',
 			// reportTime: '',
-			startTimeStamp: '',
-			endTimeStamp: '',
-      tableData: [
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas:'111111'
-        },
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas: '111111'
-        },
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas: '111111'
-          // subcomponent: row
-        }
-      ],
+			// startTimeStamp: '',
+			// endTimeStamp: '',
+      tableData: [],
 			// proLineList: [],
 			// all: {}
 		};
@@ -201,12 +174,26 @@ export default {
     this.getDict()
     // this.getCurrentYearFirst()
     // this.getDataList()
-	},
+  },
+  // computed: {
+  //   tableProps() {
+  //     return [
+  //       {
+  //         prop: 'createTime',
+  //         label: '日期',
+  //         filter: parseTime
+  //       },
+  //       ...this.dynamicProps,
+  //     ];
+  //   },
+  // },
   methods: {
     buttonClick() {
 
     },
     getYear(e) {
+      this.listQuery.beginTime = this.listQuery.reportTime ? new Date(new Date(new Date(this.listQuery.reportTime[0]).setMonth(0, 1)).setHours(0, 0, 0)).getTime() : undefined
+      this.listQuery.endTime = this.listQuery.reportTime ? new Date(new Date(new Date(this.listQuery.reportTime[1]).setMonth(11, 31)).setHours(23,59,59)).getTime() : undefined
       if (this.listQuery.reportTime[0] && e - this.listQuery.reportTime[0] > 10) {
         this.$message({
           message: '年份起止时间不能超过十年',
@@ -218,20 +205,22 @@ export default {
     },
     changeTime() {
       if (this.listQuery.reportTime) {
-        this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
-        this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
+        this.listQuery.beginTime = this.listQuery.reportTime ? new Date(this.listQuery.reportTime[0]).getTime() : undefined
+        this.listQuery.endTime = this.listQuery.reportTime ? new Date(this.listQuery.reportTime[1]).getTime() : undefined
+        // this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
+        // this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
         const numDays = (new Date(this.listQuery.reportTime[1]).getTime() - new Date(this.listQuery.reportTime[0]).getTime()) / (24 * 3600 * 1000); if (numDays > 730) {
           this.$message({
             message: '时间范围不能超过24个月',
             type: 'warning'
           });
           this.listQuery.reportTime = [];
-          this.createStartDate = '';
-          this.createEndDate = '';
+          // this.createStartDate = '';
+          // this.createEndDate = '';
         }
       } else {
-        this.createStartDate = '';
-        this.createEndDate = '';
+        // this.createStartDate = '';
+        // this.createEndDate = '';
       }
     },
     async getDict() {
@@ -264,61 +253,109 @@ export default {
 
     },
     async getDataList() {
+      // this.tableData = []
+      // this.tabl
+
+      const res = await getEpPage(this.listQuery)
+      let arr =[
+        {
+          prop: 'createTime',
+          label: '日期',
+          // filter: parseTime
+        },
+        {
+          prop: 'factory',
+          label: '工厂名称',
+          filter: (val) => ['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司'][val]
+        }
+      ]
+      // console.log(dataArr);
+      // for (let i = 0; i < res.data.list.length-1; i++) {
+      //   if (r[i].createTime != r[i + 1].createTime ) {
+      //     this.data.a.push(r[i])
+      //   }
+      // }
+      // console.log(res.data);
+      // this.dynamicProps = []
+      const dateList = []
+      const processList = []
+      const factoryList = []
+
+      res.data.records.forEach(ele => {
+        // 表头
+        dateList.push(ele.environmentalProtectionName)
+        // 列数
+        processList.push(ele.createTime)
+        factoryList.push(ele.factory)
+      })
+      this.dateProps = Array.from(new Set(dateList))
+      // this.processArray = Array.from(new Set(processList))
+      // this.factoryArray = Array.from(new Set(factoryList))
+      // this.factoryArray.forEach(item => {
+      //   const props =
+      //   arr.push(props)
+      // })
+      // res.data.records.forEach(ele => {
+      //   if (this.factoryArray.some(ele.factory) && this.factoryArray.some(ele.createTime)) {
+      //     arr.push({
+
+      //     })
+      //   }
+      //   // 表头
+      //   // dateList.push(ele.environmentalProtectionName)
+      //   // 列数
+      //   // processList.push(ele.createTime)
+      //   // factoryList.push(ele.factory)
+      // })
+      this.dateProps.forEach(item => {
+        const props = {
+          'prop': item,
+          'label': item
+        }
+        arr.push(props)
+      })
+      this.tableProps = arr
+      this.tableData = this.mergeGrade(res.data.records)
+      console.log(this.tableData)
+      // // 构造表格数据
+      // this.total = this.processArray.length
+      // this.processArray.forEach(process => {
+      //   const listData = {
+      //     'createTime': process,
+      //     'factory':null
+      //   }
+      //   res.data.records.forEach((r,index) => {
+      //     if (process === r.createTime) {
+      //       // const temp = Object.keys(r).filter(keys => keys !== 'reportDate' && keys !== 'factory' && keys !== 'environmentalProtectionName' && keys !== 'id' && keys !== 'createTime')
+      //       // const item = Object.keys(r).filter(keys => keys !== 'reportDate' && keys !== 'environmentalProtectionValue' && keys !== 'environmentalProtectionName' && keys !== 'id' && keys !== 'createTime')
+      //       // console.log(r[item[0]]);
+      //       listData[r.environmentalProtectionName] = r.environmentalProtectionValue
+      //       listData.factory = r.factory
+      //     }
+      //   })
+      //   console.log(listData);
+      //   this.tableData.push(listData)
+      // })
     },
-    add0(m) {
-      return m < 10 ? '0' + m : m
+
+   mergeGrade(grade) {
+        if (!Array.isArray(grade)) return []
+        const newGrade = []
+        grade.forEach(item => {
+          const index = newGrade.findIndex(subItem => subItem.factory === item.factory && subItem.createTime === item.createTime)
+            if (index > -1) {
+              newGrade[index][item.environmentalProtectionName] = item.environmentalProtectionValue
+            } else {
+                newGrade.push({
+                  factory: item.factory,
+                  createTime: item.groupTime,
+                  [item.environmentalProtectionName]: item.environmentalProtectionValue
+                    // grades: { [item.class]: item.grade }
+                })
+            }
+        })
+        return newGrade
     },
-    format(shijianchuo) {
-      //shijianchuo是整数，否则要parseInt转换
-      var time = moment(new Date(shijianchuo)).format('YYYY-MM-DD HH:mm:ss')
-      // console.log(time)
-      // var y = time.getFullYear();
-      // var m = time.getMonth() + 1;
-      // var d = time.getDate();
-      // var h = time.getHours();
-      // var mm = time.getMinutes();
-      // var s = time.getSeconds();
-      return time
-    },
-		// changeTime(val) {
-    //   if (val) {
-    //     // console.log(val)
-    //     // console.log(val.setHours(7, 0, 0))
-    //     // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
-    //     // let time = this.format(val.setHours(7, 0, 0))
-    //     this.endTimeStamp = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-    //     this.startTimeStamp  = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
-    //     // console.log(this.listQuery.reportTime);
-    //     this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-    //     this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
-    //     console.log(this.listQuery.reportTime);
-		// 	} else {
-		// 			this.listQuery.reportTime = []
-		// 	}
-		// },
-		//时间戳转为yy-mm-dd hh:mm:ss
-		timeFun(unixtimestamp) {
-				var unixtimestamp = new Date(unixtimestamp);
-				var year = 1900 + unixtimestamp.getYear();
-				var month = "0" + (unixtimestamp.getMonth() + 1);
-				var date = "0" + unixtimestamp.getDate();
-				return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
-		},
-		buttonClick(val) {
-			this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
 		/** 导出按钮操作 */
     handleExport() {
       // 处理查询参数

src/views/index.vue

@@ -210,14 +210,6 @@ export default {
   },
 };
 </script>
-
-<style>
-.hideSidebar.mobile .dashboard-factory-all {
-  left: 0 !important;
-  width: 100vw !important;
-}
-</style>
-
 <style lang="scss" scoped>
 .dashboard-factory-all {
   background: #151516;
@@ -271,9 +263,9 @@ export default {
   z-index: 9998;
   width: 1.702vw;
   height: 1.702vw;
-  /* 
+  /*
   width: 32px;
-  height: 32px; 
+  height: 32px;
   */
   background: url(../assets/pinicon.png) no-repeat 0 0 / 100% 100%;
   transition: transform 0.1s linear;

src/views/login.vue

@@ -9,7 +9,7 @@
           class="welcome"
           style="
             position: absolute;
-            top: 15%;
+            top: 12%;
             left: 20%;
             user-select: none;
             display: flex;
@@ -51,6 +51,11 @@
             向世界先进水平挑战，为人类社会文明做贡献
           </p>
         </div>
+        <img
+          src="../assets/images/login.png"
+          style="position: absolute; top: 30%; left: 15%; width: 40vw"
+          alt=""
+        />
       </div>
       <!-- 表单 -->
       <div class="field">
@@ -64,7 +69,7 @@
             style=""
             class="cnbm_logo"
           />
-          <h3 class="title" style="margin: 16px 0;">集团工业互联网平台</h3>
+          <h3 class="title" style="margin: 16px 0">发电玻璃智能管控平台</h3>
         </h2>
         <h2 class="pc-title" style="">
           <img
@@ -75,7 +80,9 @@
             style=""
             class="cnbm_logo"
           />
-          <span style="font-weight: bold; letter-spacing: 1px; font-size: 32px;">集团工业互联网平台</span>
+          <span style="font-weight: bold; letter-spacing: 1px; font-size: 32px"
+            >发电玻璃智能管控平台</span
+          >
         </h2>
 
         <!-- 表单 -->
@@ -164,7 +171,7 @@
         </div>
         <!-- footer -->
         <div class="footer">
-          Copyright © 2023 中建材智能自动化研究院有限公司 All Rights Reserved.
+          版权所有：中建材智能自动化研究院有限公司&nbsp;&nbsp;&nbsp;版本：1.0
         </div>
       </div>
     </div>

src/views/playground.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: playground.vue
     author: liubin
     date: 2024-04-02 09:42:43

src/views/produce/data/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-04-17 15:37:39
+ * @LastEditTime: 2024-05-07 09:31:54
  * @LastEditors: zhp
  * @Description:
 -->
@@ -156,10 +156,9 @@
 
 <script>
 // import basicAdd from './basic-add';
-// import {
-//   createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
-//   getTeamList, getDetList, getLineList
-// } from "@/api/base/qualityScrapLog";
+import {
+  getProduceDataDetail
+} from "@/api/produceData";
 // import { getList, } from "@/api/base/qualityScrapType";
 import SmallTitle from './SmallTitle';
 export default {
@@ -223,8 +222,11 @@ export default {
     // this.getCurrentTime()
   },
   methods: {
-    init() {
+    init(id) {
       this.visible = true
+      if (id) {
+        getProduceDataDetail()
+      }
     },
     // getCurrentTime() {
     //   // new Date().Format("yyyy-MM-dd HH:mm:ss")

src/views/produce/data/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:13:47
+ * @LastEditTime: 2024-05-07 09:18:01
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,17 +10,17 @@
     <div class="app-container" style="padding: 16px 24px 0;height: auto; flex-grow: 1;">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="时间维度" prop="reportTime">
-          <el-select clearable v-model="timeSelect" placeholder="请选择">
+          <el-select clearable v-model="listQuery.date" placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-show="timeSelect === 'day'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 0" label="时间范围" prop="reportTime">
           <el-date-picker clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
             start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="timeSelect === 'week'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
           <el-date-picker clearable v-model="listQuery.reportTime[0]" type="week" format="yyyy 第 WW 周" placeholder="选择周"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
@@ -32,12 +32,12 @@
             {{ date1 }} 至 {{ date2 }}，共 {{ weekNum }} 周
           </span>
         </el-form-item>
-        <el-form-item v-show="timeSelect === 'month'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 2" label="时间范围" prop="reportTime">
           <el-date-picker clearable v-model="listQuery.reportTime" type="monthrange" range-separator="至"
             start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-show="timeSelect === 'year'" label="时间范围" prop="reportTime">
+        <el-form-item v-show="listQuery.date === 3" label="时间范围" prop="reportTime">
           <el-date-picker clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
             placeholder="开始时间">
           </el-date-picker>
@@ -46,8 +46,8 @@
             @change="getYear">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="工厂名称" prop="factoryId">
-          <el-select clearable v-model="listQuery.factoryId" placeholder="请选择工厂名称">
+        <el-form-item label="工厂名称" prop="factorys">
+          <el-select clearable v-model="listQuery.factorys" placeholder="请选择工厂名称" multiple >
             <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
           </el-select>
@@ -76,7 +76,6 @@
       <!-- <el-col :span="12">
             <line-chart :id=" 'second' " class="yearChart" ref="lineChart" style="height: 40vh;width: 100%"></line-chart>
           </el-col> -->
-      </el-row>
     </div>
     <div class="app-container" style="margin-top: 18px;flex-grow: 1; height: auto; padding: 16px;">
       <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
@@ -99,7 +98,7 @@
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-// import { getGlassPage, exportGlasscExcel } from '@/api/report/glass';
+import { getProduceDataPage } from '@/api/produceData';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
 import moment from 'moment'
@@ -115,12 +114,15 @@ export default {
 	data() {
     return {
       listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        factoryId: null,
+        size: 10,
+        current: 1,
+        factorys: [],
         total: 0,
-        type: null,
+        date: 1,
+        type:undefined,
         // reportType: 2,
+        beginTime: undefined,
+        endTime:undefined,
         reportTime: []
       },
       detailOrUpdateVisible:false,
@@ -256,24 +258,24 @@ export default {
       formConfig: [
         {
           type: 'title',
-          label: '成本管理',
+          label: '生产数据管理',
         },
       ],
       timeList: [
         {
-          value: 'day',
+          value: 0,
           label: '日'
         },
         {
-          value: 'week',
+          value: 1,
           label: '周'
         },
         {
-          value: 'month',
+          value: 2,
           label:'月'
         },
         {
-          value: 'year',
+          value: 3,
           label: '年'
         }
       ],
@@ -284,67 +286,38 @@ export default {
         }
       ],
       tableProps: [
-        // {
-        // 	prop: 'createTime',
-        // 	label: '添加时间',
-        // 	fixed: true,
-        // 	width: 180,
-        // 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-        // },
         {
-          prop: 'userName',
+          prop: 'createTime',
           label: '日期',
         },
         {
-          prop: 'nickName',
+          prop: 'factory',
           label: '工厂名称',
+          filter: (val) => ['瑞昌中建材光电材料有限公司', '邯郸中建材光电材料有限公司', '中建材株洲光电材料有限公司', '佳木斯中建材光电材料有限公司', '成都中建材光电材料有限公司', '凯盛光伏材料有限公司', '蚌埠兴科玻璃有限公司'][val]
         },
         {
-          prop: 'type',
+          prop: 'glassType',
           label: '玻璃类型',
+          filter: (val) => ['玻璃芯片', '标准组件', 'BIPV'][val]
         },
         {
-          prop: 'inNum',
+          prop: 'inputNumber',
           label: '投入数量',
         },
         {
-          prop: 'putNum',
+          prop: 'outputNumber',
           label: '产出数量',
         },
         {
-          prop: 'goodNum',
+          prop: 'goodNumber',
           label: '良品数量',
         },
         {
-          prop: 'goodYelid',
+          prop: 'yieldRate',
           label: '良品率%',
         },
       ],
-      timeSelect:'day',
-      startTimeStamp:null, //开始时间
-      endTimeStamp:null, //结束时间
-      // date:'凯盛玻璃控股成员企业2024生产数据',
-			// reportTime: '',
-			startTimeStamp: '',
-			endTimeStamp: '',
-      tableData: [
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas:'111111'
-        },
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas: '111111'
-        },
-        {
-          userName: 'userName',
-          nickName: '用户名',
-          datas: '111111'
-          // subcomponent: row
-        }
-      ],
+      tableData: [],
 			// proLineList: [],
 			// all: {}
 		};
@@ -522,6 +495,9 @@ export default {
 
     },
     async getDataList() {
+      const res = await getProduceDataPage(this.listQuery)
+      console.log(res)
+      this.tableData = res.data.records
     },
     add0(m) {
       return m < 10 ? '0' + m : m

src/views/produce/target/add-or-updata.vue

@@ -1,154 +1,202 @@
 <!--
  * @Author: zhp
- * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-04-17 15:37:39
+ * @Date: 2024-04-17 16:31:51
+ * @LastEditTime: 2024-04-17 17:01:14
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <el-drawer class="drawer" :visible.sync="visible" size="50%">
     <small-title slot="title" :no-padding="true">
-      {{ '碲化镉工厂生产数据详情' }}
+      {{ '新增' }}
     </small-title>
     <div class="detailBox">
-      <el-row :gutter="24">
-        <el-col :span="8">
-          <p class="title">工厂名称</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="8">
-          <p class="title">时间维度</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="8">
-          <p class="title">时间</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
-        {{ '芯片' }}
-      </small-title>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">芯片产量</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片良率</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片良率</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片总功率</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">FTO投入量</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">CSS稼动率</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片段OEE</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片平均功率</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">芯片人均产量</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片产能利用率</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-      </el-row>
-      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
-        {{ '标准组件' }}
-      </small-title>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">封装BOM</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">封装线OEE</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">标准组件良率</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">标准组件产量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">标准组件总功率</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">封装产能利用率</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">标准组件人均产量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">标准组件人均产量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
-        {{ 'BIPV产品' }}
-      </small-title>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">产品产量</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">人均产量</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片使用量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">芯片使用量</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <p class="title">内部材料成本</p>
-          <p class="text">{{ }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">内部材料成本</p>
-          <p class="text">{{ dataForm.code }}</p>
-        </el-col>
-        <el-col :span="6">
-          <p class="title">内部材料成本</p>
-          <p class="text">{{ dataForm.productName }}</p>
-        </el-col>
-      </el-row>
+      <el-form ref="form" :model="dataForm" label-width="80px" label-position="top">
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="8">
+            <el-form-item label="工厂名称" prop="factoryId">
+              <el-select v-model="dataForm.factoryId" placeholder="请选择工厂名称" multiple="true" clearable>
+                <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工厂名称" prop="factoryId">
+              <el-select v-model="dataForm.factoryId" placeholder="请选择工厂名称" multiple="true" clearable>
+                <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工厂名称" prop="factoryId">
+              <el-select v-model="dataForm.factoryId" placeholder="请选择工厂名称" multiple="true" clearable>
+                <el-option v-for="item in factoryList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+          {{ '芯片' }}
+        </small-title>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="芯片产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片良率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片良率"></el-input>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片BOM" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片BOM"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片总功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片总功率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="FTO投入量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入FTO投入量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="CSS稼动率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入CSS稼动率"></el-input>
+
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片段OEE" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片段OEE"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片平均功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片平均功率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="芯片人均产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片人均产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片人均产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片人均产量"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+          {{ '标准组件' }}
+        </small-title>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="封装BOM" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入封装BOM"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="封装线OEE" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入封装线OEE"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件良率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件良率"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件良率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件良率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="标准组件总功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件总功率"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件总功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件总功率"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件人均产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件人均产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准组件平均功率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入标准组件平均功率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+          {{ 'BIPV产品' }}
+        </small-title>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="产品产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入产品产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="人均产量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入人均产量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片使用量" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片使用量"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="芯片利用率" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入芯片利用率"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" style="padding: 0 32px;">
+          <el-col :span="6">
+            <el-form-item label="内部材料成本" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入内部材料成本"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="OEM及委外材料成本" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入OEM及委外材料成本"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="综合材料成本" prop="factoryId">
+              <el-input v-model="dataForm.factoryId" placeholder="请输入综合材料成本"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="footer">
+      <el-button @click="cancelForm">取 消</el-button>
+      <el-button type="primary" @click="handleClose()">确 定</el-button>
     </div>
   </el-drawer>
 
@@ -191,6 +239,7 @@ export default {
           name: '自动',
         }
       ],
+      factoryList:[],
       sectionList: [],
       visible: false,
       dataForm: {
@@ -325,6 +374,22 @@ export default {
 };
 </script>
 <style scoped>
+.footer {
+  position: absolute;
+  bottom: 1%;
+  right: 2%;
+}
+.drawer-footer {
+  width: 100%;
+  margin-top: 50px;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 50px;
+  text-align: left;
+  background: #fff;
+}
+.el-divider--horizontal{
+  margin: 0;
+}
   .drawer >>> .el-drawer {
   border-radius: 8px 0 0 8px;
 }

src/views/produce/target/detail-or-updata.vue

@@ -0,0 +1,365 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-06 15:15:30
+ * @LastEditTime: 2024-04-17 16:40:01
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <el-drawer class="drawer" :visible.sync="visible" size="50%">
+    <small-title slot="title" :no-padding="true">
+      {{ '碲化镉工厂生产数据详情' }}
+    </small-title>
+    <div class="detailBox">
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <p class="title">工厂名称</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="8">
+          <p class="title">时间维度</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="8">
+          <p class="title">时间</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+        {{ '芯片' }}
+      </small-title>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">芯片产量</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片良率</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片良率</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片总功率</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">FTO投入量</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">CSS稼动率</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片段OEE</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片平均功率</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">芯片人均产量</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片产能利用率</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+      </el-row>
+      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+        {{ '标准组件' }}
+      </small-title>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">封装BOM</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">封装线OEE</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件良率</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件产量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">标准组件总功率</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">封装产能利用率</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件人均产量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">标准组件人均产量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <small-title style=" margin: 0;padding: 26px 32px 24px;margin-bottom: 22px;" :no-padding="false">
+        {{ 'BIPV产品' }}
+      </small-title>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">产品产量</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">人均产量</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片使用量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">芯片使用量</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="6">
+          <p class="title">内部材料成本</p>
+          <p class="text">{{ }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">内部材料成本</p>
+          <p class="text">{{ dataForm.code }}</p>
+        </el-col>
+        <el-col :span="6">
+          <p class="title">内部材料成本</p>
+          <p class="text">{{ dataForm.productName }}</p>
+        </el-col>
+      </el-row>
+    </div>
+  </el-drawer>
+
+</template>
+
+<script>
+// import basicAdd from './basic-add';
+// import {
+//   createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
+//   getTeamList, getDetList, getLineList
+// } from "@/api/base/qualityScrapLog";
+// import { getList, } from "@/api/base/qualityScrapType";
+import SmallTitle from './SmallTitle';
+export default {
+  components: {
+    SmallTitle,
+  },
+  // mixins: [basicAdd],
+  data() {
+    return {
+      urlOptions: {
+        isGetCode: false,
+        // codeURL: getCode,
+        // createURL: createQualityScrapLog,
+        // updateURL: updateQualityScrapLog,
+        // infoURL: getQualityScrapLog,
+      },
+      lineList: [],
+      typeList: [],
+      workOrderList: [],
+      detList: [],
+      teamList: [],
+      sourceList: [
+        {
+          id: 1,
+          name: '手动',
+        },
+        {
+          id: 2,
+          name: '自动',
+        }
+      ],
+      sectionList: [],
+      visible: false,
+      dataForm: {
+        id: undefined,
+        logTime: undefined,
+        source: 1,
+        detId: undefined,
+        workOrderId: null,
+        teamId: undefined,
+        num: undefined,
+        lineId: undefined,
+        description: undefined,
+        // description: undefined,
+        remark: undefined,
+      },
+      // materialList: [],
+      dataRule: {
+        // materialId: [{ required: true, message: "", trigger: "blur" }],
+        workOrderId: [{ required: true, message: "工单号不能为空", trigger: "change" }],
+        num: [{ required: true, message: "数量不能为空", trigger: "blur" }],
+        detId: [{ required: true, message: "报废原因不能为空", trigger: "change" }],
+
+        logTime: [{ required: true, message: "报废时间不能为空", trigger: "change" }],
+      }
+    };
+  },
+  mounted() {
+    this.getDict()
+    console.log('我看看', this.dataForm)
+    // this.getCurrentTime()
+  },
+  methods: {
+    init() {
+      this.visible = true
+    },
+    // getCurrentTime() {
+    //   // new Date().Format("yyyy-MM-dd HH:mm:ss")
+    //   this.dataForm.logTime = new Date()
+    //   // this.dataForm.logTime = year + "-" + month + "-" + day;
+    //   console.log(this.dataForm.logTime);
+    // },
+    async getDict() {
+    //   // 物料列表
+    //   const res = await getList()
+    //   this.typeList = res.data
+    //   getWorkOrderList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.workOrderList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getLineList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.lineList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getDetList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.detList = res.data.map((item) => {
+    //       return {
+    //         name: item.content,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    //   getTeamList().then((res) => {
+    //     console.log(res);
+    //     // console.log(response);
+    //     this.teamList = res.data.map((item) => {
+    //       return {
+    //         name: item.name,
+    //         id: item.id
+    //       }
+    //     })
+    //     // console.log(this.formConfig[0].selectOptions);
+    //     // this.listQuery.total = response.data.total;
+    //   })
+    // },
+    // async getWorksectionById(lineId) {
+    //   if (lineId) {
+    //     const { code, data } = await this.$axios({
+    //       url: '/base/core-workshop-section/listByParentId',
+    //       method: 'get',
+    //       params: {
+    //         id: lineId,
+    //       },
+    //     });
+    //     if (code == 0) {
+    //       console.log(data)
+    //       this.sectionList = data.map((item) => {
+    //         return {
+    //           name: item.name,
+    //           id: item.id,
+    //         };
+    //       });
+    //     }
+    //   } else {
+    //     this.$axios({
+    //       url: '/base/core-workshop-section/listAll',
+    //       method: 'get',
+    //       // params: {
+    //       //   id: lineId,
+    //       // },
+    //     }).then((res) => {
+    //       // console.log(data)
+    //       this.sectionList = res.data.map((item) => {
+    //         return {
+    //           name: item.name,
+    //           id: item.id,
+    //         };
+    //       });
+    //     })
+    //   }
+    },
+  },
+};
+</script>
+<style scoped>
+  .drawer >>> .el-drawer {
+  border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-form-item__label {
+  padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+  margin: 0;
+  padding: 32px 32px 24px;
+  border-bottom: 1px solid #dcdfe6;
+  margin-bottom: 30px;
+}
+.detailBox p {
+  margin: 0;
+  padding: 0 32px;
+}
+.detailBox .title {
+  /* width: 56px; */
+  /* height: 14px; */
+  font-family: Source Han Sans CN, Source Han Sans CN;
+  font-weight: 400;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.85);
+  line-height: 16px;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+}
+.detailBox .text {
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(102,102,102,0.75);
+  padding-bottom: 20px;
+}
+
+</style>

src/views/produce/target/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-04-17 16:12:20
+ * @LastEditTime: 2024-04-17 16:37:35
  * @LastEditors: zhp
  * @Description:
 -->
@@ -77,7 +77,8 @@
         <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
           :method-list="tableBtn" @clickBtn="handleClick" />
       </base-table>
-      <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" />
+      <detail-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" @refreshDataList="successSubmit" />
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="successSubmit" />
 
       <!-- <el-row :gutter="24"> -->
       <!-- <el-col :span="12" v-for="item in  dataList" :key="item.id"> -->
@@ -86,7 +87,7 @@
       <!-- <el-col :span="12">
             <line-chart :id=" 'second' " class="yearChart" ref="lineChart" style="height: 40vh;width: 100%"></line-chart>
           </el-col> -->
-      </el-row>
+
     </div>
 
     <!-- <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
@@ -107,12 +108,14 @@ import lineChart from './lineChart';
 import moment from 'moment'
 import ButtonNav from '@/components/ButtonNav'
 import basicPage from '@/mixins/basic-page'
-import AddOrUpdate from './add-or-updata';
+import detailOrUpdate from './detail-or-updata';
+import addOrUpdate from './add-or-updata';
+
 
 // import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
-  components: { lineChart, ButtonNav, AddOrUpdate },
+  components: { lineChart, ButtonNav, detailOrUpdate,addOrUpdate },
   mixins: [basicPage],
 	data() {
     return {
@@ -125,18 +128,23 @@ export default {
         // reportType: 2,
         reportTime: []
       },
-      detailOrUpdateVisible:false,
+      detailOrUpdateVisible: false,
+      addOrUpdateVisible:false,
       date1: undefined,
       date2: undefined,
       tableBtn: [
-          {
+        {
             type: 'detail',
             btnName: '详情',
         },
-        // {
-        //     type: 'delete',
-        //     btnName: '删除',
-        //   },
+        {
+          type: 'edit',
+          btnName: '修改',
+        },
+        {
+            type: 'delete',
+            btnName: '删除',
+          },
       ].filter((v) => v),
       typeList: [
         {
@@ -297,33 +305,58 @@ export default {
         // 	width: 180,
         // 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
         // },
-        {
-          prop: 'userName',
-          label: '日期',
-        },
+
         {
           prop: 'nickName',
           label: '工厂名称',
         },
+        {
+          prop: 'userName',
+          label: '目标时间',
+        },
         {
           prop: 'type',
-          label: '玻璃类型',
+          label: '提交时间',
         },
         {
           prop: 'inNum',
-          label: '投入数量',
+          label: '钼电极投入量(片)',
         },
         {
           prop: 'putNum',
-          label: '产出数量',
+          label: '芯片产量(片)',
         },
         {
           prop: 'goodNum',
-          label: '良品数量',
+          label: '芯片平均功率(W)',
         },
         {
           prop: 'goodYelid',
-          label: '良品率%',
+          label: '芯片良率(%)',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片总功率(KW)',
+        },
+        {
+          prop: 'goodYelid',
+          label: 'PID6稼动率(%)',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片段OEE(%)',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片产能利用率(%)',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片人均产量（片/人）',
+        },
+        {
+          prop: 'goodYelid',
+          label: '芯片BOM',
         },
       ],
       timeSelect:'month',
@@ -366,6 +399,19 @@ export default {
     // this.getDataList()
 	},
   methods: {
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        // this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+      } else {
+        this.otherMethods(val)
+      }
+    },
     otherMethods(val) {
       this.detailOrUpdateVisible = true;
       this.addOrEditTitle = "详情";

src/views/system/components/statusBtn.vue

@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <span class="dot" :class="injectData.status === 1 ? 'red' : 'green'"></span>
+    <span>{{ state }}</span>
+  </div>
+</template>
+<script>
+export default {
+  name: "StatusBtn",
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  computed: {
+    state() {
+      return this.injectData.status === 1 ? "停用" : "启用";
+    },
+  },
+};
+</script>
+<style scoped>
+.dot {
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  border-radius: 3px;
+  vertical-align: middle;
+  margin-right: 8px;
+}
+.green {
+  background: #10dc76;
+}
+.red {
+  background: #ff5656;
+}
+</style>

src/views/system/post/components/InPageLeftNav.vue

@@ -0,0 +1,445 @@
+<template>
+  <div class="in-page-left-nav" style="overflow: hidden">
+    <div
+      class="factory-list__selector"
+      style="margin: 20px 12px"
+      title="株洲中建材光电材料有限公司"
+      @mouseenter="factoryListOpen = true"
+      @mouseleave="factoryListOpen = false"
+    >
+      <img src="./../assets/images/arrow.png" class="arrow" alt="" />
+      <div class="factory-list__content">{{ currentFactory.label }}</div>
+      <div class="factory-list__wrapper" :class="{ open: factoryListOpen }">
+        <ul
+          class="factory-list"
+          v-if="sidebarContent.length"
+          @click.capture="factoryClickHandler"
+        >
+          <li
+            v-for="fc in sidebarContent"
+            :key="fc.id"
+            class="factory-list__item"
+            :class="{ 'is-current': fc.id == currentFactory?.id }"
+          >
+            <span :data-value="fc.id">
+              {{ fc.label }}
+            </span>
+            <svg-icon
+              v-if="fc.id == currentFactory?.id"
+              icon-class="Confirm"
+              style="height: 14px; width: 14px"
+            />
+          </li>
+        </ul>
+        <div v-else style="color: #0008; width: 128px; text-align: center">
+          - 无 -
+        </div>
+      </div>
+    </div>
+    <!-- side bar  -->
+    <div class="side-bar__left" style="width: 100%; height: 100%">
+      <!-- <el-tree
+        class="custom-tree-class"
+        :data="currentFactory?.children"
+        :props="treeProps"
+        :empty-text="''"
+        icon-class="custom-icon-class"
+        @node-click="handleSidebarItemClick"
+      >
+      </el-tree> -->
+      <el-menu
+        default-active="2"
+        class="el-menu-vertical-demo"
+        @open="handleOpen"
+        @close="handleClose"
+      >
+        <el-submenu index="1">
+          <template slot="title">
+            <svg-icon
+              style="
+                font-size: 18px;
+                margin-right: 10px;
+                vertical-align: middle;
+              "
+              icon-class="orgTreeIcon"
+            />
+            <span>导航一</span>
+          </template>
+          <el-menu-item index="1-1"
+            ><svg-icon
+              style="
+                font-size: 18px;
+                margin-right: 10px;
+                vertical-align: middle;
+              "
+              icon-class="orgTreeIcon2"
+            />选项1</el-menu-item
+          >
+          <el-menu-item index="1-2"
+            ><svg-icon
+              style="
+                font-size: 18px;
+                margin-right: 10px;
+                vertical-align: middle;
+              "
+              icon-class="orgTreeIcon2"
+            />选项2</el-menu-item
+          >
+          <el-menu-item index="1-3"
+            ><svg-icon
+              style="
+                font-size: 18px;
+                margin-right: 10px;
+                vertical-align: middle;
+              "
+              icon-class="orgTreeIcon2"
+            />选项3</el-menu-item
+          >
+          <el-submenu index="1-4">
+            <template slot="title">
+              <svg-icon
+                style="
+                  font-size: 18px;
+                  margin-right: 10px;
+                  vertical-align: middle;
+                "
+                icon-class="orgTreeIcon"
+              />选项4</template
+            >
+            <el-menu-item index="1-4-1">
+              <svg-icon
+                style="
+                  font-size: 18px;
+                  margin-right: 10px;
+                  vertical-align: middle;
+                "
+                icon-class="orgTreeIcon2"
+              />选项1</el-menu-item
+            >
+          </el-submenu>
+        </el-submenu>
+        <el-menu-item index="2">
+          <svg-icon
+            style="font-size: 18px; margin-right: 10px; vertical-align: middle"
+            icon-class="orgTreeIcon"
+          />
+          <span slot="title">导航二</span>
+        </el-menu-item>
+      </el-menu>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "InpageLeftNav",
+  components: {},
+  props: {},
+  data() {
+    return {
+      factoryListOpen: false,
+      currentFactory: {
+        label: "点我选择设备",
+        id: null,
+        children: [],
+      },
+      treeProps: {
+        children: "children",
+        label: "label",
+      },
+      sidebarContent: [
+        {
+          id: 1,
+          label: "招商局",
+          children: [
+            {
+              label: "招商局地产",
+              children: [
+                {
+                  label: 1,
+                },
+              ],
+            },
+            {
+              label: "招商局商业",
+            },
+            {
+              label: "招商局物流",
+            },
+          ],
+        },
+        {
+          id: 2,
+          label: "株洲中建材光电材料有限公司",
+          children: [
+            {
+              label: "保利地产",
+            },
+            {
+              label: "保利投资",
+            },
+          ],
+        },
+        {
+          id: 3,
+          label: "中国建材集团",
+          children: [
+            {
+              label: "凯盛集团",
+            },
+            {
+              label: "蚌埠研究院",
+            },
+          ],
+        },
+      ],
+      queryParams: {
+        equipmentId: null,
+        lineId: null,
+        sectionId: null,
+        productId: null,
+      },
+    };
+  },
+  computed: {},
+  methods: {
+    /** 暴露给外部，用于更新sidebarContent */
+    async updateSidebarContent(id, url) {
+      // TODO
+      const { code, data } = await this.$axios({
+        url: (url || "/api/quality/deviceParameters") + `/${id}`,
+        method: "get",
+      });
+      if (code === 0) {
+        this.getTree(data);
+      }
+    },
+    /** 点击工厂名称 */
+    factoryClickHandler(event) {
+      this.currentFactory = {
+        label: "加载中...",
+        id: null,
+        children: [],
+      };
+      this.factoryListOpen = false;
+      const fcId = event.target.dataset.value;
+      this.handleSidebarItemClick({ id: fcId, type: "工厂" });
+      this.currentFactory = this.sidebarContent.find((item) => item.id == fcId);
+    },
+    /** 点击某一具体工厂或产线，或工段或设备 */
+    handleSidebarItemClick({ label, id, type }) {
+      this.equipmentId = id;
+      console.log("label clicked!", label, id, type);
+      switch (type) {
+        case "设备":
+          this.queryParams.equipmentId = id;
+          break;
+        case "工段":
+          this.queryParams.equipmentId = null;
+          this.queryParams.sectionId = id;
+          break;
+        case "产线":
+          this.queryParams.equipmentId = null;
+          this.queryParams.sectionId = null;
+          this.queryParams.lineId = id;
+          break;
+        case "工厂":
+          this.queryParams.equipmentId = null;
+          this.queryParams.sectionId = null;
+          this.queryParams.lineId = null;
+          break;
+      }
+    },
+    buildTree(data) {
+      data.forEach((factory) => {
+        this.$set(factory, "label", factory.name);
+        this.$set(factory, "type", "工厂");
+        delete factory.name;
+        factory.children?.forEach((line) => {
+          this.$set(line, "label", line.name);
+          this.$set(line, "type", "产线");
+          delete line.name;
+          line.children?.forEach((ws) => {
+            this.$set(ws, "label", ws.name);
+            this.$set(ws, "type", "工段");
+            delete ws.name;
+            ws.children?.forEach((eq) => {
+              this.$set(eq, "label", eq.name);
+              this.$set(eq, "type", "设备");
+              delete eq.name;
+            });
+          });
+        });
+      });
+    },
+
+    async getTree(data) {
+      // '@/api/quality/deviceParameters'
+      // const res = await getTreeData({ id: id });
+      this.buildTree(data);
+      this.sidebarContent = data;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.in-page-left-nav {
+  display: inline-block;
+  background: #fff;
+  height: calc(100vh - 120px - 8px);
+  width: 256px;
+  border-radius: 8px;
+  padding: 0;
+  vertical-align: top;
+}
+
+.factory-list__selector {
+  position: relative;
+  height: 36px;
+  font-size: 16px;
+  line-height: 36px;
+  padding-left: 28px;
+  background: url(../assets/images/factory-icon.png) 0px 4px no-repeat;
+  background-size: 26px 26px;
+  padding-right: 16px;
+  .arrow {
+    position: absolute;
+    right: 0;
+    top: 13px;
+  }
+}
+
+.factory-list__selector:hover {
+  cursor: pointer;
+  color: #0008;
+}
+
+.factory-list__selector::after {
+  /* content: ''; */
+  position: absolute;
+  top: 16px;
+  right: 12px;
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  /* background: #5c5c5c; */
+  border-color: #000;
+  border-width: 4px;
+  border-style: solid;
+  border-top-color: transparent;
+  border-right-color: transparent;
+  border-bottom-color: transparent;
+}
+
+.factory-list__selector:hover::after {
+  /* cursor: pointer; */
+  border-left-color: #0008;
+}
+.factory-list__content {
+  height: 36px;
+  overflow: hidden; /* 确保超出容器的内容会被隐藏 */
+  white-space: nowrap; /* 防止文本自动换行 */
+  text-overflow: ellipsis; /* 使用省略号表示文本被截断 */
+}
+.factory-list__wrapper {
+  visibility: hidden;
+  position: absolute;
+  background: #fff;
+  box-shadow: 0 0 32px 10px #0002;
+  border-radius: 8px;
+  top: 36px;
+  // left: 90px;
+  /* max-width: 128px; */
+  height: auto;
+  width: 200px;
+  white-space: nowrap;
+  overflow: hidden;
+  /* transition: all 0.3s ease-out; */
+  z-index: 1000;
+}
+
+.factory-list__wrapper.open {
+  visibility: visible;
+}
+
+ul,
+li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+.factory-list {
+  color: #0008;
+  max-height: 240px;
+  overflow-y: auto;
+}
+
+.factory-list__item {
+  font-size: 16px;
+  line-height: 1;
+  padding: 8px 16px 8px 16px;
+  min-width: 128px;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.factory-list__item:hover,
+.factory-list__item.is-current {
+  background: #e3efff;
+  color: #0b58ff;
+}
+
+/* .factory-list__item.is-current::after {
+	content: '√';
+	position: absolute;
+	top: 8px;
+	right: 16px;
+	font-weight: bold;
+} */
+</style>
+
+<style>
+.custom-tree-class .el-tree-node__content {
+  width: 100%;
+  height: auto !important;
+  padding: 8px 12px !important;
+}
+
+.custom-tree-class .el-tree-node__content:hover {
+  background: #e3efff;
+}
+
+.custom-tree-class .el-tree-node__children .el-tree-node__content {
+  padding: 8px 18px !important;
+}
+
+.custom-tree-class
+  .el-tree-node__children
+  .el-tree-node__children
+  .el-tree-node__content {
+  padding: 8px 24px !important;
+}
+
+.custom-icon-class {
+  margin-right: 8px;
+  width: 20px;
+  height: 20px;
+  background: url("../assets/images/Qian.png") center center / contain no-repeat;
+}
+
+.custom-icon-class.el-tree-node__expand-icon.expanded {
+  transform: unset;
+}
+
+.el-tree-node__children .custom-icon-class {
+  background: url("../assets/images/tree-icon-2.png") 100% / contain no-repeat;
+}
+
+.el-tree-node__children .el-tree-node__children .custom-icon-class {
+  background: unset;
+}
+</style>

src/views/system/post/components/SearchBarTop.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="search-bar-top">
+    <el-form :inline="true">
+      <span class="blue-block"></span>
+      <span class="org-name">组织名称</span>
+      <el-form-item label="用户名">
+        <el-input placeholder="用户名" size="small"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="small" @click="onSearch"
+          >查询</el-button
+        >
+        <span class="separateStyle"></span>
+        <el-button type="success" size="small" plain @click="addNew"
+          >新增</el-button
+        >
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+export default {
+  name: "SearchBarTop",
+  data() {
+    return {
+      userName: "",
+    };
+  },
+  mounted() {},
+  methods: {
+    onSearch() {
+      console.log("查询");
+      this.$emit("emitFun", { btn: "onSearch", userName: this.userName });
+    },
+    addNew() {
+      console.log("新增");
+      this.$emit("emitFun", { btn: "addNew" });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.search-bar-top {
+  font-size: 14px;
+  .blue-block {
+    display: inline-block;
+    width: 4px;
+    height: 15px;
+    background-color: #0b58ff;
+    border-radius: 1px;
+    margin-right: 8px;
+    vertical-align: middle;
+  }
+  .org-name {
+    display: inline-block;
+    height: 36px;
+    line-height: 36px;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #606266;
+    font-weight: 700;
+  }
+  .el-form--inline .el-form-item {
+    display: inline-block;
+    margin-right: 10px;
+    vertical-align: top;
+    margin-bottom: 16px;
+  }
+  .separateStyle {
+    display: inline-block;
+    width: 1px;
+    height: 24px;
+    background: #e8e8e8;
+    vertical-align: middle;
+    margin: 0 8px;
+  }
+}
+</style>

src/views/system/post/index.vue

@@ -1,243 +1,162 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="岗位编码" prop="code">
-        <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="岗位名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
-          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['system:post:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:post:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="postList">
-      <el-table-column label="岗位编号" align="center" prop="id" />
-      <el-table-column label="岗位编码" align="center" prop="code" />
-      <el-table-column label="岗位名称" align="center" prop="name" />
-      <el-table-column label="岗位排序" align="center" prop="sort" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['system:post:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['system:post:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 添加或修改岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="岗位名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入岗位名称" />
-        </el-form-item>
-        <el-form-item label="岗位编码" prop="code">
-          <el-input v-model="form.code" placeholder="请输入编码名称" />
-        </el-form-item>
-        <el-form-item label="岗位顺序" prop="sort">
-          <el-input-number v-model="form.sort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="岗位状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
-              {{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+  <div class="user-manager">
+    <InPageLeftNav />
+    <div
+      class="table-area"
+      :class="{
+        'table-area-w': sidebar.opened,
+        'table-area-ws': !sidebar.opened,
+      }"
+    >
+      <SearchBarTop @emitFun="emitFun" />
+      <!-- 列表 -->
+      <base-table
+        :page="queryParams.pageNo"
+        :limit="queryParams.pageSize"
+        :table-props="tableProps"
+        :table-data="list"
+        :max-height="tableH"
+      >
+        <method-btn
+          v-if="tableBtn.length"
+          slot="handleBtn"
+          :width="120"
+          label="操作"
+          :method-list="tableBtn"
+          @clickBtn="handleClick"
+        />
+      </base-table>
+      <pagination
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        :total="total"
+        @pagination="getList"
+      />
+    </div>
   </div>
 </template>
 
 <script>
-import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
-
-import {CommonStatusEnum} from '@/utils/constants'
-import { getDictDatas, DICT_TYPE } from '@/utils/dict'
-
+import { mapGetters } from "vuex";
+import InPageLeftNav from "./components/InPageLeftNav";
+import SearchBarTop from "./components/SearchBarTop";
+import tableHeightMixin from "@/mixins/tableHeightMixin";
+import { listUser } from "@/api/system/user";
+const tableProps = [
+  {
+    prop: "username",
+    label: "用户名",
+    minWidth: 120,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "email",
+    label: "邮箱",
+    minWidth: 150,
+    showOverflowtooltip: true,
+  },
+  {
+    prop: "mobile",
+    label: "手机号",
+    minWidth: 120,
+  },
+  {
+    prop: "deptName",
+    label: "组织",
+    minWidth: 120,
+  },
+  {
+    prop: "role",
+    label: "角色名称",
+  },
+  {
+    prop: "workno",
+    label: "工号",
+  },
+  {
+    prop: "status",
+    label: "状态",
+  },
+  {
+    prop: "remark",
+    label: "备注",
+    showOverflowtooltip: true,
+  },
+];
 export default {
   name: "SystemPost",
+  components: { InPageLeftNav, SearchBarTop },
+  mixins: [tableHeightMixin],
+  computed: {
+    ...mapGetters(["sidebar"]),
+  },
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 岗位表格数据
-      postList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
-        pageSize: 10,
-        code: undefined,
-        name: undefined,
-        status: undefined
+        pageSize: 20,
+        name: null,
+        status: null,
+        planFinishTime: [],
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "岗位名称不能为空", trigger: "blur" }
-        ],
-        code: [
-          { required: true, message: "岗位编码不能为空", trigger: "blur" }
-        ],
-        sort: [
-          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
-        ]
-      },
-
-      // 枚举
-      CommonStatusEnum: CommonStatusEnum,
-      // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
+      total: 0,
+      tableProps,
+      list: [{ username: "111" }],
+      tableBtn: [
+        {
+          type: "authorization",
+          btnName: "授权",
+        },
+        {
+          type: "edit",
+          btnName: "编辑",
+        },
+        {
+          type: "delete",
+          btnName: "删除",
+        },
+      ],
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /** 查询岗位列表 */
+    /** 查询用户列表 */
     getList() {
-      this.loading = true;
-      listPost(this.queryParams).then(response => {
-        this.postList = response.data.list;
+      listUser(this.queryParams).then((response) => {
+        this.list = response.data.list;
         this.total = response.data.total;
-        this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
+    emitFun(val) {
+      if (val.btn === "onSearch") {
+        this.queryParams.pageNo = 1;
+        this.getList();
+      } else {
+      }
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        code: undefined,
-        name: undefined,
-        sort: 0,
-        status: CommonStatusEnum.ENABLE,
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加岗位";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id
-      getPost(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改岗位";
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            updatePost(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPost(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id;
-      this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function() {
-          return delPost(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
-          this.exportLoading = true;
-          return exportPost(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '岗位数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
-    }
-  }
+    handleClick() {},
+  },
 };
 </script>
+<style lang="scss" scoped>
+.user-manager {
+  display: flex;
+  .table-area {
+    display: inline-block;
+    height: calc(100vh - 120px - 8px);
+    background-color: #fff;
+    margin-left: 8px;
+    border-radius: 8px;
+    padding: 8px;
+  }
+  .table-area-w {
+    width: calc(100vw - 542px);
+  }
+  .table-area-ws {
+    width: calc(100vw - 348px);
+  }
+}
+</style>

src/views/system/post/index1.vue

@@ -0,0 +1,243 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="岗位编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="岗位名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入岗位名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
+          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['system:post:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['system:post:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="postList">
+      <el-table-column label="岗位编号" align="center" prop="id" />
+      <el-table-column label="岗位编码" align="center" prop="code" />
+      <el-table-column label="岗位名称" align="center" prop="name" />
+      <el-table-column label="岗位排序" align="center" prop="sort" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:post:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:post:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 添加或修改岗位对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="岗位名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入岗位名称" />
+        </el-form-item>
+        <el-form-item label="岗位编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入编码名称" />
+        </el-form-item>
+        <el-form-item label="岗位顺序" prop="sort">
+          <el-input-number v-model="form.sort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="岗位状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
+              {{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/system/post";
+
+import {CommonStatusEnum} from '@/utils/constants'
+import { getDictDatas, DICT_TYPE } from '@/utils/dict'
+
+export default {
+  name: "SystemPost",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 岗位表格数据
+      postList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        code: undefined,
+        name: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "岗位名称不能为空", trigger: "blur" }
+        ],
+        code: [
+          { required: true, message: "岗位编码不能为空", trigger: "blur" }
+        ],
+        sort: [
+          { required: true, message: "岗位顺序不能为空", trigger: "blur" }
+        ]
+      },
+
+      // 枚举
+      CommonStatusEnum: CommonStatusEnum,
+      // 数据字典
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询岗位列表 */
+    getList() {
+      this.loading = true;
+      listPost(this.queryParams).then(response => {
+        this.postList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        code: undefined,
+        name: undefined,
+        sort: 0,
+        status: CommonStatusEnum.ENABLE,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加岗位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id
+      getPost(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改岗位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updatePost(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPost(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id;
+      this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function() {
+          return delPost(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
+          this.exportLoading = true;
+          return exportPost(queryParams);
+        }).then(response => {
+          this.$download.excel(response, '岗位数据.xls');
+          this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/system/role/components/dataAuth.vue

@@ -0,0 +1,162 @@
+<template>
+  <el-form :model="form" label-width="80px">
+    <el-form-item label="角色名称">
+      <el-input v-model="form.name" :disabled="true" />
+    </el-form-item>
+    <el-form-item label="角色标识">
+      <el-input v-model="form.code" :disabled="true" />
+    </el-form-item>
+    <el-form-item label="权限范围">
+      <el-select v-model="form.dataScope" style="width: 100%">
+        <el-option
+          v-for="item in dataScopeDictDatas"
+          :key="parseInt(item.value)"
+          :label="item.label"
+          :value="parseInt(item.value)"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      label="数据权限"
+      v-show="form.dataScope === SysDataScopeEnum.DEPT_CUSTOM"
+    >
+      <el-checkbox
+        :checked="!form.deptCheckStrictly"
+        @change="handleCheckedTreeConnect($event, 'dept')"
+        >父子联动(选中父节点，自动选择子节点)</el-checkbox
+      >
+      <el-checkbox
+        v-model="deptExpand"
+        @change="handleCheckedTreeExpand($event, 'dept')"
+        >展开/折叠</el-checkbox
+      >
+      <el-checkbox
+        v-model="deptNodeAll"
+        @change="handleCheckedTreeNodeAll($event, 'dept')"
+        >全选/全不选</el-checkbox
+      >
+      <el-tree
+        class="tree-border"
+        :data="deptOptions"
+        show-checkbox
+        default-expand-all
+        ref="dept"
+        node-key="id"
+        :check-strictly="form.deptCheckStrictly"
+        empty-text="加载中，请稍后"
+        :props="defaultProps"
+      ></el-tree>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { SystemDataScopeEnum } from "@/utils/constants";
+import { getRole } from "@/api/system/role";
+import { listSimpleDepts } from "@/api/system/dept";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { assignRoleDataScope } from "@/api/system/permission";
+export default {
+  name: "DataAuth",
+  data() {
+    return {
+      form: {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        deptIds: [],
+        dataScope: undefined,
+        deptCheckStrictly: false,
+      },
+      deptExpand: true,
+      deptNodeAll: false,
+      // 部门列表
+      deptOptions: [], // 部门属性结构
+      depts: [], // 部门列表
+      defaultProps: {
+        label: "name",
+        children: "children",
+      },
+      // 枚举
+      SysDataScopeEnum: SystemDataScopeEnum,
+      // 数据字典
+      dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE),
+    };
+  },
+  methods: {
+    init(id) {
+      this.form.id = id;
+      getRole(id).then((res) => {
+        this.form.name = res.data.name;
+        this.form.code = res.data.code;
+        this.form.dataScope = res.data.dataScope;
+        // 获得部门列表
+        listSimpleDepts().then((response) => {
+          // 处理 deptOptions 参数
+          this.deptOptions = [];
+          this.deptOptions.push(...this.handleTree(response.data, "id"));
+          this.depts = response.data;
+          this.$refs.dept.setCheckedKeys(res.data.dataScopeDeptIds, false);
+        });
+      });
+    },
+    submitForm() {
+      if (this.form.id !== undefined) {
+        assignRoleDataScope({
+          roleId: this.form.id,
+          dataScope: this.form.dataScope,
+          dataScopeDeptIds:
+            this.form.dataScope !== SystemDataScopeEnum.DEPT_CUSTOM
+              ? []
+              : this.$refs.dept.getCheckedKeys(),
+        }).then((response) => {
+          this.$modal.msgSuccess("修改成功");
+          this.$emit("successSubmitd");
+        });
+      }
+    },
+    formClear() {
+      this.deptExpand = true;
+      this.deptNodeAll = false;
+      this.form = {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        deptIds: [],
+        dataScope: undefined,
+        deptCheckStrictly: false,
+      };
+    },
+    // 树权限（父子联动）
+    handleCheckedTreeConnect(value, type) {
+      if (type === "menu") {
+        this.form.menuCheckStrictly = value;
+      } else if (type === "dept") {
+        this.form.deptCheckStrictly = !value;
+      }
+    },
+    // 树权限（展开/折叠）
+    handleCheckedTreeExpand(value, type) {
+      if (type === "menu") {
+        let treeList = this.menuOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      } else if (type === "dept") {
+        let treeList = this.deptOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      }
+    },
+    // 树权限（全选/全不选）
+    handleCheckedTreeNodeAll(value, type) {
+      if (type === "menu") {
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
+      } else if (type === "dept") {
+        // this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
+        this.$refs.dept.setCheckedNodes(value ? this.depts : []);
+      }
+    },
+  },
+};
+</script>

src/views/system/role/components/menuAuth.vue

@@ -0,0 +1,146 @@
+<template>
+  <el-form :model="form" label-width="80px">
+    <el-form-item label="角色名称">
+      <el-input v-model="form.name" :disabled="true" />
+    </el-form-item>
+    <el-form-item label="角色标识">
+      <el-input v-model="form.code" :disabled="true" />
+    </el-form-item>
+    <el-form-item label="菜单权限">
+      <el-checkbox
+        v-model="menuExpand"
+        @change="handleCheckedTreeExpand($event, 'menu')"
+        >展开/折叠</el-checkbox
+      >
+      <el-checkbox
+        v-model="menuNodeAll"
+        @change="handleCheckedTreeNodeAll($event, 'menu')"
+        >全选/全不选</el-checkbox
+      >
+      <el-tree
+        class="tree-border"
+        :data="menuOptions"
+        show-checkbox
+        ref="menu"
+        node-key="id"
+        :check-strictly="form.menuCheckStrictly"
+        empty-text="加载中，请稍后"
+        :props="defaultProps"
+      ></el-tree>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { getRole } from "@/api/system/role";
+import { SystemDataScopeEnum } from "@/utils/constants";
+import { assignRoleMenu, listRoleMenus } from "@/api/system/permission";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+import { listSimpleMenus } from "@/api/system/menu";
+export default {
+  name: "MenuAuth",
+  data() {
+    return {
+      form: {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        menuIds: [],
+        menuCheckStrictly: true,
+      },
+      // 菜单列表
+      menuOptions: [],
+      menuExpand: false,
+      menuNodeAll: false,
+      SysDataScopeEnum: SystemDataScopeEnum,
+      // 数据字典
+      dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE),
+      defaultProps: {
+        label: "name",
+        children: "children",
+      },
+    };
+  },
+  methods: {
+    init(id) {
+      this.form.id = id;
+      getRole(id).then((res) => {
+        this.form.name = res.data.name;
+        this.form.code = res.data.code;
+        listSimpleMenus().then((response) => {
+          // 处理 menuOptions 参数
+          this.menuOptions = [];
+          this.menuOptions.push(...this.handleTree(response.data, "id"));
+          // 获取角色拥有的菜单权限
+          listRoleMenus(id).then((response) => {
+            // 设置为严格，避免设置父节点自动选中子节点，解决半选中问题
+            this.form.menuCheckStrictly = true;
+            // 设置选中
+            this.$refs.menu.setCheckedKeys(response.data);
+            // 设置为非严格，继续使用半选中
+            this.form.menuCheckStrictly = false;
+          });
+        });
+      });
+    },
+    submitForm() {
+      if (this.form.id !== undefined) {
+        assignRoleMenu({
+          roleId: this.form.id,
+          menuIds: [
+            ...this.$refs.menu.getCheckedKeys(),
+            ...this.$refs.menu.getHalfCheckedKeys(),
+          ],
+        }).then((response) => {
+          this.$modal.msgSuccess("修改成功");
+          this.$emit("successSubmitm");
+        });
+      }
+    },
+    formClear() {
+      if (this.$refs.menu !== undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false;
+      this.menuNodeAll = false;
+      this.form = {
+        id: undefined,
+        name: undefined,
+        code: undefined,
+        menuIds: [],
+        menuCheckStrictly: true,
+      };
+    },
+    // 树权限（父子联动）
+    handleCheckedTreeConnect(value, type) {
+      if (type === "menu") {
+        this.form.menuCheckStrictly = value;
+      } else if (type === "dept") {
+        this.form.deptCheckStrictly = !value;
+      }
+    },
+    // 树权限（展开/折叠）
+    handleCheckedTreeExpand(value, type) {
+      if (type === "menu") {
+        let treeList = this.menuOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      } else if (type === "dept") {
+        let treeList = this.deptOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      }
+    },
+    // 树权限（全选/全不选）
+    handleCheckedTreeNodeAll(value, type) {
+      if (type === "menu") {
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
+      } else if (type === "dept") {
+        // this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
+        this.$refs.dept.setCheckedNodes(value ? this.depts : []);
+      }
+    },
+  },
+};
+</script>

src/views/system/role/components/roleAdd.vue

@@ -0,0 +1,129 @@
+<template>
+  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="角色编码" prop="code">
+          <el-input v-model="form.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="角色名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="角色顺序" prop="sort">
+          <el-input-number
+            v-model="form.sort"
+            controls-position="right"
+            :min="1"
+            :max="999999999"
+            style="width: 100%"
+          ></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="状态" prop="status" v-if="isEdit">
+          <el-switch v-model="form.status"> </el-switch>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import { addRole, getRole, updateRole } from "@/api/system/role";
+export default {
+  name: "RoleAdd",
+  data() {
+    return {
+      form: {
+        id: "",
+        code: "",
+        name: "",
+        sort: 1,
+        status: 0,
+        remark: "",
+      },
+      isEdit: false, //是否是编辑
+      rules: {
+        code: [
+          { required: true, message: "角色编码不能为空", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "角色名称不能为空", trigger: "blur" },
+        ],
+        sort: [{ required: true }],
+      },
+    };
+  },
+  methods: {
+    init(id) {
+      if (id) {
+        this.isEdit = true;
+        this.form.id = id;
+        getRole(id).then((res) => {
+          if (res.code === 0) {
+            this.form.id = res.data.id;
+            this.form.code = res.data.code;
+            this.form.name = res.data.name;
+            this.form.sort = res.data.sort;
+            this.form.remark = res.data.remark;
+            this.form.status = res.data.status ? false : true;
+          }
+        });
+      } else {
+        this.isEdit = false;
+        this.form.id = "";
+      }
+    },
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.isEdit) {
+            //编辑
+            updateRole({
+              id: this.form.id,
+              code: this.form.code,
+              name: this.form.name,
+              sort: this.form.sort,
+              remark: this.form.remark,
+              status: this.form.status ? 0 : 1,
+            }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit("successSubmit");
+              }
+            });
+          } else {
+            addRole({
+              code: this.form.code,
+              name: this.form.name,
+              sort: this.form.sort,
+              remark: this.form.remark,
+              status: 0,
+            }).then((res) => {
+              if (res.code === 0) {
+                this.$modal.msgSuccess("操作成功");
+                this.$emit("successSubmit");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    formClear() {
+      this.$refs.form.resetFields();
+      this.isEdit = false;
+    },
+  },
+};
+</script>