change layout top

public/config.js

@@ -2,7 +2,7 @@ window.global = {
 	env: 'dev',
 	baseUrl: function() {
 		return {
-			dev: 'http://localhost/dev-api',
+			dev: 'http://47.108.150.237:11082/dev-api',
 			test: 'http://10.10.12.85:2004/graph',
 			local: 'http://localhost:2004',
 			prod: 'http://unigraph.xian.algmarket.com',

src/assets/knowledge/config/config.js

@@ -2,7 +2,7 @@ window.global = {
 	env: 'dev',
 	baseUrl: function() {
 		return {
-			dev: 'http://localhost/dev-api',
+			dev: 'http://47.108.150.237:11082/dev-api',
 			test: 'http://10.10.12.85:2004/graph',
 			local: 'http://localhost:2004',
 			prod: 'http://unigraph.xian.algmarket.com',

src/layout/components/Navbar.vue

@@ -9,13 +9,13 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!--<search id="header-search" class="right-menu-item" />-->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <!--<el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip>-->
 
       </template>
 
@@ -132,7 +132,7 @@ export default {
 
   .topmenu-container {
     position: absolute;
-    left: 50px;
+    left: 300px;
     background-color: transparent;
   }
 
@@ -144,7 +144,7 @@ export default {
   .right-menu {
     float: right;
     height: 100%;
-    line-height: 50px;
+    line-height: 40px;
 
     &:focus {
       outline: none;
@@ -172,21 +172,21 @@ export default {
       margin-right: 30px;
 
       .avatar-wrapper {
-        margin-top: 5px;
+        //margin-top: 5px;
         position: relative;
 
         .user-avatar {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
+          width: 25px;
+          height: 25px;
+          border-radius: 5px;
         }
 
         .el-icon-caret-bottom {
           cursor: pointer;
           position: absolute;
           right: -20px;
-          top: 25px;
+          top: 22px;
           font-size: 12px;
         }
       }

src/views/dataCenter/dataFile/index.vue

@@ -149,9 +149,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataFileList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="dataFileList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="序号" width="50px" align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="id" v-if="false"/>
       <el-table-column label="文件名" align="center" prop="fileName" />
       <el-table-column label="文件类型" align="center" prop="fileType" />
       <el-table-column label="文件后缀名" align="center" prop="typeName" />
@@ -185,7 +190,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/ledger/eqiupSys/index.vue

@@ -165,9 +165,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="eqiupSysList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="eqiupSysList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="序号" width="50px" align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="id" v-if="false"/>
       <el-table-column label="系统名" align="center" prop="sysName" />
       <el-table-column label="型号" align="center" prop="sysType" />
       <el-table-column label="上层系统id" align="center" prop="parentId" />
@@ -203,7 +208,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/ledger/equip/index.vue

@@ -117,9 +117,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="equipList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="equipList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="序号" width="50px" align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="id" v-if="false"/>
       <el-table-column label="装备名" align="center" prop="equipName" />
       <el-table-column label="编号" align="center" prop="equipNo" />
       <el-table-column label="型号" align="center" prop="equipType" />
@@ -149,7 +154,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/ledger/major/index.vue

@@ -85,9 +85,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="majorList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="majorList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="序号" width="50px" align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="id" v-if="false"/>
       <el-table-column label="专业名" align="center" prop="majorName" />
       <el-table-column label="系统名" align="center" prop="sysName" />
       <el-table-column label="系统id" align="center" prop="sysId" />
@@ -111,7 +116,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/ledger/parts/index.vue

@@ -205,9 +205,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="partsList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="partsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="序号" width="50px" align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="id" v-if="false"/>
       <el-table-column label="部件名" align="center" prop="partName" />
       <el-table-column label="所属系统id" align="center" prop="sysId" />
       <el-table-column label="系统名" align="center" prop="sysName" />
@@ -256,7 +261,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/ledger/platform/index.vue

@@ -77,9 +77,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="platformList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="platformList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="序号" width="50px" align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="id" v-if="false"/>
       <el-table-column label="平台名" align="center" prop="platName" />
       <el-table-column label="型号" align="center" prop="platType" />
       <el-table-column label="版本" align="center" prop="platVer" />
@@ -103,7 +108,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/maintenance/faultInfo/index.vue

@@ -109,9 +109,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="faultInfoList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="faultInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="序号" width="50px" align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="id" v-if="false"/>
       <el-table-column label="故障名" align="center" prop="faultName" />
       <el-table-column label="故障类型" align="center" prop="faultType" />
       <el-table-column label="平台" align="center" prop="platName" />
@@ -142,7 +147,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/maintenance/faultRecord/index.vue

@@ -221,9 +221,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="faultRecordList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="faultRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="序号" width="50px" align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="${comment}" align="center" prop="id" v-if="false"/>
       <el-table-column label="型号" align="center" prop="equipType" />
       <el-table-column label="装备编号" align="center" prop="equipNo" />
       <el-table-column label="战区" align="center" prop="equipDept" />
@@ -266,7 +271,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:11082`,
+        target: `http://47.108.150.237:11082`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''