Merge branch 'product-kk' into product

pages/dncmnc/dnc/datalist.vue

+<template>
+    <div>
+        数据传输
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+
+        };
+    },
+}
+</script>
\ No newline at end of file

pages/dncmnc/dnc/index.vue

+<template>
+  <div class="dnc_box">
+    <!-- 数据传输 -->
+    <DataGrid :columns="columns" ref="grid" :action="action" :data="data" :high="false"></DataGrid>
+  </div>
+</template>
+<script>
+export default {
+  components: {},
+  data() {
+    return {
+      columns: [
+        {
+          key: "projectNo",
+          title: "物料编码"
+        },
+        {
+          key: "lingNo",
+          title: "零件图号"
+        },
+        {
+          key: "lingName",
+          title: "零件名称"
+        },
+        {
+          key: "produCode",
+          title: "工艺规程/工序号"
+        },
+        {
+          key: "produName",
+          title: "工序名称"
+        },
+        {
+          key: "projecName",
+          title: "程序名称"
+        },
+        {
+          key: "fileName",
+          title: "程序文件名称"
+        },
+        {
+          key: "tvb",
+          title: "版本"
+        },
+        {
+          key: "creatUser",
+          title: "创建人",
+          width: "100"
+        },
+        {
+          key: "statue",
+          title: "状态",
+          width: "100"
+        },
+        {
+          key: "id",
+          title: "操作",
+          width: 120,
+          render: (h,params)=>{
+              return h("div",{class:"action"},[
+                  h(
+                      "op",
+                      {
+                          on:{click:()=>{
+                              this.edit(params.row)
+                          }}
+                      },
+                      "编辑"
+                  ),
+              ])
+          }
+        },
+        {
+          key: "notse",
+          title: "备注"
+        }
+      ],
+      data: [
+        {
+          projectNo: "1102347890",
+          id:1,
+          lingNo: "dd4.rt5.991",
+          lingName: "轴承",
+          produCode: "JJGYI-001/1",
+          produName: "车",
+          projecName: "精车文件",
+          fileName: "dd4rt5991.1.A.txt",
+          tvb: "A",
+          creatUser: "刘建",
+          statue: "受控",
+          notse: "适用于MDF设备"
+        },
+        {
+          projectNo: "1102347890",
+          id:2,
+          lingNo: "dd4.rt5.991",
+          lingName: "轴承",
+          produCode: "JJGYI-001/1",
+          produName: "车",
+          projecName: "精车文件",
+          fileName: "dd4rt5991.1.A.txt",
+          tvb: "A",
+          creatUser: "刘建",
+          statue: "受控",
+          notse: "适用于MDF设备"
+        },
+        {
+          projectNo: "1102347890",
+          id:3,
+          lingNo: "dd4.rt5.991",
+          lingName: "轴承",
+          produCode: "JJGYI-001/1",
+          produName: "车",
+          projecName: "精车文件",
+          fileName: "dd4rt5991.1.A.txt",
+          tvb: "A",
+          creatUser: "刘建",
+          statue: "受控",
+          notse: "适用于MDF设备"
+        },
+        {
+          projectNo: "1102347890",
+          id:4,
+          lingNo: "dd4.rt5.991",
+          lingName: "轴承",
+          produCode: "JJGYI-001/1",
+          produName: "车",
+          projecName: "精车文件",
+          fileName: "dd4rt5991.1.A.txt",
+          tvb: "A",
+          creatUser: "刘建",
+          statue: "受控",
+          notse: "适用于MDF设备"
+        }
+      ]
+    };
+  },
+  created() {},
+  mounted() {
+    this.loadDuration();
+  },
+  methods: {
+      edit(rowData){
+          console.log(rowData)
+      },
+  },
+  computed: {},
+  watch: {}
+};
+</script>
\ No newline at end of file

pages/dncmnc/mnc/index.vue

+<template>
+  <div class="dnc_box">
+      设备监控
+    <DataGrid
+      :columns="columnsDuration"
+      ref="gridDuration"
+      :data="data"
+      :high="false"
+      :page="false"
+      :batch="false"
+      :easy="false"
+      :set="false"
+      :height="400"
+      :tool="false"
+    ></DataGrid>
+  </div>
+</template>
+<script>
+export default {
+  components: {},
+  data() {
+    return {
+      columnsDuration: []
+    };
+  },
+  created() {},
+  mounted() {
+    this.loadDuration();
+  },
+  methods: {},
+  computed: {},
+  watch: {}
+};
+</script>
\ No newline at end of file