huk 3 år sedan
förälder
incheckning
2decf0104d
3 ändrade filer med 14 tillägg och 13 borttagningar
  1. 1 5
      build/utils.js
  2. 2 0
      package.json
  3. 11 8
      src/components/main.vue

+ 1 - 5
build/utils.js

@@ -19,11 +19,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 // let devModules = ['all'];
-// let devModules = ['index','inward','TMS','RMS']
-let devModules = ['index','SporadicManage','TMS']
-// let devModules = ['index','SporadicManage'];
-// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
-// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
+let devModules = ['index','inward','TMS','RMS']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

+ 2 - 0
package.json

@@ -54,7 +54,9 @@
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.2",
     "vuex": "^3.0.1",
+    "vxe-table": "^3.4.12",
     "x2js": "^3.3.0",
+    "xe-utils": "^3.5.1",
     "xlsx": "^0.11.19",
     "xterm": "3.12.0"
   },

+ 11 - 8
src/components/main.vue

@@ -259,9 +259,9 @@
       <header class="sl-header">
         <div v-if="showIframe" class="sl-header-ul">
           <!-- <div class="sl-header-li-name">工业互联网平台 ICP-iCore 2.0</div> -->
-          <div class="hnstLogo">
+          <!-- <div class="hnstLogo">
             <img src="../assets/img/logo_1.png" alt="" />
-          </div>
+          </div> -->
           <!-- 下拉选择公司 -->
           <div
             class="company-select"
@@ -269,19 +269,22 @@
           >
             <span
               class="ifCompany el-dropdown-link"
-              v-if="companys.length === 1"
-              >{{ companyName }}</span
+              v-if="companys.length === 1">
+              {{ companyName }}
+              </span
             >
             <el-dropdown trigger="click" @command="selectComPany" v-else>
               <span class="el-dropdown-link">
-                {{ companyName
-                }}<i class="el-icon-arrow-down el-icon--right"></i>
+                {{ companyName}}
+                <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
                 <div v-for="item in companys" :key="item.id">
-                  <el-dropdown-item :command="item">{{
+                  <el-dropdown-item :command="item">
+                    {{
                     item.companyName
-                  }}</el-dropdown-item>
+                  }}
+                  </el-dropdown-item>
                 </div>
               </el-dropdown-menu>
             </el-dropdown>