Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

npm-shrinkwrap.json

@@ -10026,7 +10026,7 @@
     },
     "iview-loader": {
       "version": "1.3.0",
-      "resolved": "https://registry.npm.taobao.org/iview-loader/download/iview-loader-1.3.0.tgz",
+      "resolved": "http://r.cnpmjs.org/iview-loader/download/iview-loader-1.3.0.tgz",
       "integrity": "sha1-n0Yu6uI4K4tJ746JLNloFJfjVLc=",
       "dev": true,
       "requires": {
@@ -11762,7 +11762,7 @@
     },
     "less-loader": {
       "version": "5.0.0",
-      "resolved": "https://registry.npm.taobao.org/less-loader/download/less-loader-5.0.0.tgz?cache=0&sync_timestamp=1598354442231&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fless-loader%2Fdownload%2Fless-loader-5.0.0.tgz",
+      "resolved": "http://r.cnpmjs.org/less-loader/download/less-loader-5.0.0.tgz",
       "integrity": "sha1-SY3eOmxsT4h0WO6e0/CGoSrRtGY=",
       "dev": true,
       "requires": {

pages/resource/resource/index.vue

@@ -3,11 +3,15 @@
     <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
       <StoreTree @on-hide="onHide" @on-select="productSearch" />
     </Sider>
+      <Icon type="icon iconfont icondaochu" size="24" />
+    <!-- icon iconfont -->
+    
     <div v-if="!showMenu" class="show_menu">
       <a class="menu_play fr" @click="showMenuFn" title="展开">
         <Icon type="ios-arrow-forward" size="24" />
       </a>
     </div>
+
     <Content class="content" :class="!showMenu?'con_bord':''">
       <DataGrid
         :columns="columns"

plugins/iview.js

@@ -19,7 +19,8 @@ import '@/styles/index.less';
 import 'viewerjs/dist/viewer.css'
 import Viewer from 'v-viewer'
 
-
+//图标样式
+import '@/src/assets/icon/iconfont.css'
 
 import Tools from '@/components/page/tool.vue'
 import State from '@/components/page/state.vue'

src/assets/icon/iconfont.json

+{
+  "id": "2020771",
+  "name": "mes产品化",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "16691118",
+      "name": "导出",
+      "font_class": "daochu",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "16691119",
+      "name": "编辑",
+      "font_class": "bianji",
+      "unicode": "e616",
+      "unicode_decimal": 58902
+    },
+    {
+      "icon_id": "16691120",
+      "name": "导航-班组派工",
+      "font_class": "daohang-banzupaigong",
+      "unicode": "e617",
+      "unicode_decimal": 58903
+    },
+    {
+      "icon_id": "16691121",
+      "name": "导航-CRM",
+      "font_class": "daohang-CRM",
+      "unicode": "e618",
+      "unicode_decimal": 58904
+    },
+    {
+      "icon_id": "16691122",
+      "name": "导航-工艺设计",
+      "font_class": "daohang-gongyisheji",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "16691123",
+      "name": "导航-工艺管理",
+      "font_class": "daohang-gongyiguanli",
+      "unicode": "e61a",
+      "unicode_decimal": 58906
+    },
+    {
+      "icon_id": "16691124",
+      "name": "导航-工作流",
+      "font_class": "daohang-gongzuoliu",
+      "unicode": "e61b",
+      "unicode_decimal": 58907
+    },
+    {
+      "icon_id": "16691125",
+      "name": "导航-订单管理",
+      "font_class": "daohang-dingdanguanli",
+      "unicode": "e61c",
+      "unicode_decimal": 58908
+    },
+    {
+      "icon_id": "16691126",
+      "name": "导航-车间管理",
+      "font_class": "daohang-chejianguanli",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "16691127",
+      "name": "导航-数据传输",
+      "font_class": "daohang-shujuchuanshu",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
+    },
+    {
+      "icon_id": "16691128",
+      "name": "导航-生产执行",
+      "font_class": "daohang-shengchanzhihang",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
+    },
+    {
+      "icon_id": "16691129",
+      "name": "导航-计划管理",
+      "font_class": "daohang-jihuaguanli",
+      "unicode": "e620",
+      "unicode_decimal": 58912
+    },
+    {
+      "icon_id": "16691130",
+      "name": "导航-质量管理",
+      "font_class": "daohang-zhiliangguanli",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "16691131",
+      "name": "导航-资源管理",
+      "font_class": "daohang-ziyuanguanli",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "16691132",
+      "name": "工单-工时分配",
+      "font_class": "gongdan-gongshifenpei",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
+      "icon_id": "16691133",
+      "name": "导入",
+      "font_class": "daoru",
+      "unicode": "e624",
+      "unicode_decimal": 58916
+    },
+    {
+      "icon_id": "16691134",
+      "name": "工单-测试数据",
+      "font_class": "gongdan-ceshishuju",
+      "unicode": "e625",
+      "unicode_decimal": 58917
+    },
+    {
+      "icon_id": "16691135",
+      "name": "工单-工艺案例",
+      "font_class": "gongdan-gongyianli",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
+      "icon_id": "16691136",
+      "name": "工单-工艺查看",
+      "font_class": "gongdan-gongyichakan",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "16691137",
+      "name": "工单-进度汇报",
+      "font_class": "gongdan-jinduhuibao",
+      "unicode": "e628",
+      "unicode_decimal": 58920
+    },
+    {
+      "icon_id": "16691138",
+      "name": "工单-产品装配",
+      "font_class": "gongdan-chanpinzhuangpei",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "16691139",
+      "name": "工单-生产准备",
+      "font_class": "gongdan-shengchanzhunbei",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "16691140",
+      "name": "工单-物料领用",
+      "font_class": "gongdan-wuliaolingyong",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "16691141",
+      "name": "工单-数据填报",
+      "font_class": "gongdan-shujutianbao",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "16691142",
+      "name": "排产-插单",
+      "font_class": "paichan-chadan",
+      "unicode": "e62d",
+      "unicode_decimal": 58925
+    },
+    {
+      "icon_id": "16691143",
+      "name": "工单-质量判定",
+      "font_class": "gongdan-zhiliangpanding",
+      "unicode": "e62e",
+      "unicode_decimal": 58926
+    },
+    {
+      "icon_id": "16691144",
+      "name": "列设置",
+      "font_class": "lieshezhi",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "16691145",
+      "name": "排产-工序参数",
+      "font_class": "paichan-gongxucanshu",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "16691146",
+      "name": "排产-未插单",
+      "font_class": "paichan-weichadan",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
+      "icon_id": "16691147",
+      "name": "排产-自定义排序",
+      "font_class": "paichan-zidingyipaixu",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "16691148",
+      "name": "人员",
+      "font_class": "renyuan",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "16691149",
+      "name": "删除",
+      "font_class": "shanchu",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
+      "icon_id": "16691150",
+      "name": "设备",
+      "font_class": "shebei",
+      "unicode": "e635",
+      "unicode_decimal": 58933
+    },
+    {
+      "icon_id": "16691151",
+      "name": "设置",
+      "font_class": "shezhi",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
+      "icon_id": "16691152",
+      "name": "设置-不可见",
+      "font_class": "shezhi-bukejian",
+      "unicode": "e637",
+      "unicode_decimal": 58935
+    },
+    {
+      "icon_id": "16691153",
+      "name": "设置-长卡片展示",
+      "font_class": "shezhi-changkapianzhanshi",
+      "unicode": "e638",
+      "unicode_decimal": 58936
+    },
+    {
+      "icon_id": "16691154",
+      "name": "设置-可见",
+      "font_class": "shezhi-kejian",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "16691155",
+      "name": "设置-卡片展示",
+      "font_class": "shezhi-kapianzhanshi",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "16691156",
+      "name": "设置-列表展示",
+      "font_class": "shezhi-liebiaozhanshi",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "16691157",
+      "name": "首页-待审批",
+      "font_class": "shouye-daishenpi",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "16691158",
+      "name": "首页-电子对账单",
+      "font_class": "shouye-dianziduizhangdan",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "16691159",
+      "name": "首页-订单报价",
+      "font_class": "shouye-dingdanbaojia",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "16691160",
+      "name": "首页-统计表",
+      "font_class": "shouye-tongjibiao",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "16691161",
+      "name": "首页-流程设计",
+      "font_class": "shouye-liuchengsheji",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
+      "icon_id": "16691162",
+      "name": "首页-订单派发",
+      "font_class": "shouye-dingdanpaifa",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "16691163",
+      "name": "首页-任务排产",
+      "font_class": "shouye-renwupaichan",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "16691164",
+      "name": "首页-未读消息",
+      "font_class": "shouye-weiduxiaoxi",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "16691165",
+      "name": "首页-物料复验",
+      "font_class": "shouye-wuliaofuyan",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "16691166",
+      "name": "首页-站内邮件",
+      "font_class": "shouye-zhanneiyoujian",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "16691167",
+      "name": "新增",
+      "font_class": "xinzeng",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "16691168",
+      "name": "首页-质量检验",
+      "font_class": "shouye-zhiliangjianyan",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    }
+  ]
+}