GuoYuFu123 5 år sedan
förälder
incheckning
60742d115f
28 ändrade filer med 223 tillägg och 174 borttagningar
  1. 18 14
      src/components/business_space/dialogs/list/firm.vue
  2. 16 14
      src/components/business_space/dialogs/list/insurerDialog.vue
  3. 18 17
      src/components/business_space/dialogs/list/maintainerDialog.vue
  4. 16 15
      src/components/business_space/dialogs/list/supplierDialog.vue
  5. 1 1
      src/components/business_space/lib/uploadImg.vue
  6. 2 2
      src/components/business_space/lib/uploadImgs.vue
  7. 2 2
      src/components/business_space/lib/uploadImgsName.vue
  8. 8 6
      src/components/dialogs/addDialog/dialogDevice.vue
  9. 17 13
      src/components/dialogs/list/firm.vue
  10. 16 15
      src/components/dialogs/list/insurerDialog.vue
  11. 17 16
      src/components/dialogs/list/maintainerDialog.vue
  12. 18 15
      src/components/dialogs/list/supplierDialog.vue
  13. 19 11
      src/components/dialogs/list/systemType.vue
  14. 3 3
      src/components/ledger/addDialog/dialogAssets.vue
  15. 6 2
      src/components/ledger/addDialog/dialogDevice.vue
  16. 1 0
      src/components/ledger/handsontables/assets.vue
  17. 2 1
      src/components/ledger/handsontables/device.vue
  18. 1 1
      src/components/ledger/lib/lookImages.vue
  19. 2 2
      src/components/ledger/lib/uploadImgs.vue
  20. 2 2
      src/components/ledger/lib/uploadImgsName.vue
  21. 2 2
      src/framework/layout/Main.vue
  22. 2 2
      src/framework/layout/PageHeader.vue
  23. 7 7
      src/framework/layout/PageSidebar.vue
  24. 21 5
      src/router/system.js
  25. 1 1
      src/views/data_admin/buildGraphy/lib/lookImages.vue
  26. 1 1
      src/views/data_admin/buildGraphy/lib/uploadImg.vue
  27. 2 2
      src/views/data_admin/buildGraphy/lib/uploadImgs.vue
  28. 2 2
      src/views/data_admin/buildGraphy/lib/uploadImgsName.vue

+ 18 - 14
src/components/business_space/dialogs/list/firm.vue

@@ -2,50 +2,52 @@
     firm 厂商
 -->
 <template>
-  <el-dialog title="选择型号" :visible.sync="dialog.firm" width="600px">
+  <el-dialog title="选择型号" :visible.sync="dialog.firm" width="900px">
     <div>
       <div id="firm">
-        <div class="title-search" style="margin-bottom: 10px;">
+        <div class="title-search query-form" style="padding: 10px;margin-bottom: 10px;">
           <el-input
             placeholder="输入厂家名称、品牌名、型号进行查找"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button @click="searchKey" size="small">查找</el-button>
         </div>
         <el-radio-group v-model="radio" style="width:100%;">
-          <el-table :data="tableData" style="width: 100%" height="300px">
-            <el-table-column label="生产厂家">
+          <el-table class="data-table" border :data="tableData" style="width: 100%" height="300px">
+            <el-table-column header-align='center' label="生产厂家">
               <template slot-scope="scope">
                 <el-radio v-model="radio" :label="scope.row">{{scope.row.venderName || "--"}}</el-radio>
               </template>
             </el-table-column>
-            <el-table-column prop="brand" label="品牌"></el-table-column>
-            <el-table-column prop="name" label="型号"></el-table-column>
-            <el-table-column label="技术参数">
+            <el-table-column header-align='center' prop="brand" label="品牌"></el-table-column>
+            <el-table-column header-align='center' prop="name" label="型号"></el-table-column>
+            <el-table-column header-align='center' label="技术参数">
               <template slot-scope="scope">
                 <el-button type="text" @click="lookParam(scope.row)">技术参数</el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-radio-group>
-        <my-pagination :page="page" @change="changed" style="margin-top:10px;"></my-pagination>
+        <div class="right">
+            <my-pagination :page="page" @change="changed" style="margin-top:10px;"></my-pagination>
+        </div>
         <p style="height:40px;line-height:40px;text-align:center;color:#9E9E9E;">
           找不到想要的型号? 赶快去
           <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
         </p>
-        <div class="footer">
+        
+      </div>
+    </div>
+    <param-details :isLoad="isLoad" :data="data"></param-details>
+    <div slot="footer">
           <el-button
             type="primary"
             @click="getChange"
-            style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
         </div>
-      </div>
-    </div>
-    <param-details :isLoad="isLoad" :data="data"></param-details>
   </el-dialog>
 </template>
 <script>
@@ -151,6 +153,8 @@ export default {
 
 <style lang="less">
 #firm {
+    height: 455px;
+    overflow-y: auto;
   .el-table thead {
     tr {
       th {

+ 16 - 14
src/components/business_space/dialogs/list/insurerDialog.vue

@@ -6,46 +6,48 @@
   <el-dialog title="选择型号" :visible.sync="dialog.insurer" width="1000px">
     <div>
       <div id="firm">
-        <div class="title-search" style="margin-bottom: 10px;">
+        <div class="title-search query-form" style="padding:10px;margin-bottom: 10px;">
           <el-input
             placeholder="输入厂家名称进行查找"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button size="small" @click="filterSearch">查找</el-button>
         </div>
         <el-radio-group v-model="radio" style="width:100%;">
-          <el-table ref="maintenance" :data="tableData" style="width: 100%" height="300px">
-            <el-table-column label="供应商名称">
+          <el-table border class="data-table" ref="maintenance" :data="tableData" style="width: 100%" height="300px">
+            <el-table-column header-align='center' label="供应商名称">
               <template slot-scope="scope">
                 <el-tooltip :content="scope.row.name" placement="top">
                   <el-radio v-model="radio" :label="scope.row">{{scope.row.name}}</el-radio>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="website" label="网址"></el-table-column>
-            <el-table-column prop="man" label="联系人"></el-table-column>
-            <el-table-column prop="phone" label="联系电话"></el-table-column>
-            <el-table-column prop="faxes" label="传真"></el-table-column>
-            <el-table-column prop="email" label="电子邮件"></el-table-column>
+            <el-table-column header-align='center' prop="website" label="网址"></el-table-column>
+            <el-table-column header-align='center' prop="man" label="联系人"></el-table-column>
+            <el-table-column header-align='center' prop="phone" label="联系电话"></el-table-column>
+            <el-table-column header-align='center' prop="faxes" label="传真"></el-table-column>
+            <el-table-column header-align='center' prop="email" label="电子邮件"></el-table-column>
           </el-table>
         </el-radio-group>
-        <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        <div class="right">
+<my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        </div>
         <p style="height:40px;line-height:40px;text-align:center;color:#9E9E9E;">
           找不到想要的型号? 赶快去
           <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
         </p>
-        <div class="footer">
+        
+      </div>
+    </div>
+    <div slot="footer">
           <el-button
             type="primary"
             @click="getChange"
-            style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
         </div>
-      </div>
-    </div>
   </el-dialog>
 </template>
 <script>

+ 18 - 17
src/components/business_space/dialogs/list/maintainerDialog.vue

@@ -6,50 +6,51 @@
   <el-dialog title="选择维修商" :visible.sync="dialog.maintainer" width="1000px">
     <div>
       <div id="firm">
-        <div class="title-search" style="margin-bottom: 10px;">
+        <div class="title-search query-form" style="padding: 10px; margin-bottom: 10px;">
           <el-input
-            placeholder="输入厂家名称进行查找"
+            placeholder="输入厂家名称进行查找23"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button size="small" @click="filterSearch">查找</el-button>
         </div>
         <el-radio-group v-model="radio" style="width:100%;">
-          <el-table ref="maintenance" :data="tableData" style="width: 100%" height="300px">
-            <el-table-column label="维修商名称">
+          <el-table class="data-table" border ref="maintenance" :data="tableData" style="width: 100%" height="300px">
+            <el-table-column header-align='center' label="维修商名称">
               <template slot-scope="scope">
                 <el-tooltip :content="scope.row.name" placement="top">
                   <el-radio v-model="radio" :label="scope.row">{{scope.row.name}}</el-radio>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="website" label="网址"></el-table-column>
-            <el-table-column prop="man" label="联系人"></el-table-column>
-            <el-table-column prop="phone" label="联系电话"></el-table-column>
-            <el-table-column prop="faxes" label="传真"></el-table-column>
-            <el-table-column prop="email" label="电子邮件"></el-table-column>
+            <el-table-column header-align='center' prop="website" label="网址"></el-table-column>
+            <el-table-column header-align='center' prop="man" label="联系人"></el-table-column>
+            <el-table-column header-align='center' prop="phone" label="联系电话"></el-table-column>
+            <el-table-column header-align='center' prop="faxes" label="传真"></el-table-column>
+            <el-table-column header-align='center' prop="email" label="电子邮件"></el-table-column>
           </el-table>
         </el-radio-group>
-        <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        <div class="right">
+            <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        </div>
         <p style="height:40px;line-height:40px;text-align:center;color:#9E9E9E;">
           找不到想要的维修商? 赶快去
           <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
-        </p>
-        <div class="footer">
+        </p>        
+      </div>
+    </div>
+    <div slot="footer">
           <el-button
             type="primary"
             @click="getChange"
-            style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
         </div>
-      </div>
-    </div>
   </el-dialog>
 </template>
 <script>
-import myPagination from "@/components/common/myPagination";
+import myPagination from "@/components/ledger/lib/myPagination";
 import { getLib } from "@/api/scan/request"
 import tools from "@/utils/scan/tools"
 

+ 16 - 15
src/components/business_space/dialogs/list/supplierDialog.vue

@@ -6,46 +6,47 @@
   <el-dialog title="选择型号" :visible.sync="dialog.supplier" width="1000px">
     <div>
       <div id="firm">
-        <div class="title-search" style="margin-bottom: 10px;">
+        <div class="title-search query-form" style="padding:10px; margin-bottom: 10px;">
           <el-input
             placeholder="输入厂家名称进行查找"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button size="small" @click="filterSearch">查找</el-button>
         </div>
         <el-radio-group v-model="radio" style="width:100%;">
-          <el-table ref="supplier" :data="tableData" style="width: 100%" height="300px">
-            <el-table-column label="供应商名称">
+          <el-table border class='data-table' ref="supplier" :data="tableData" style="width: 100%" height="300px">
+            <el-table-column header-align='center' label="供应商名称">
               <template slot-scope="scope">
                 <el-tooltip :content="scope.row.name" placement="top">
                   <el-radio v-model="radio" :label="scope.row">{{scope.row.name}}</el-radio>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="website" label="网址"></el-table-column>
-            <el-table-column prop="man" label="联系人"></el-table-column>
-            <el-table-column prop="phone" label="联系电话"></el-table-column>
-            <el-table-column prop="faxes" label="传真"></el-table-column>
-            <el-table-column prop="email" label="电子邮件"></el-table-column>
+            <el-table-column header-align='center' prop="website" label="网址"></el-table-column>
+            <el-table-column header-align='center' prop="man" label="联系人"></el-table-column>
+            <el-table-column header-align='center' prop="phone" label="联系电话"></el-table-column>
+            <el-table-column header-align='center' prop="faxes" label="传真"></el-table-column>
+            <el-table-column header-align='center' prop="email" label="电子邮件"></el-table-column>
           </el-table>
         </el-radio-group>
-        <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        <div class="right">
+            <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        </div>
         <p style="height:40px;line-height:40px;text-align:center;color:#9E9E9E;">
           找不到想要的型号? 赶快去
           <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
-        </p>
-        <div class="footer">
+        </p>        
+      </div>
+    </div>
+    <div slot="footer">
           <el-button
             type="primary"
             @click="getChange"
-            style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
         </div>
-      </div>
-    </div>
   </el-dialog>
 </template>
 <script>

+ 1 - 1
src/components/business_space/lib/uploadImg.vue

@@ -58,7 +58,7 @@ export default {
           xhr.open(
             /* method */ "POST",
             /* target url */
-            "/img/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true&key=" +
+            "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true&key=" +
               file.uid + '.' + type
             /*, async, default to true */
           );

+ 2 - 2
src/components/business_space/lib/uploadImgs.vue

@@ -71,8 +71,8 @@ export default {
   data() {
     return {
       baseUrl: "",
-      imageGetUrl: "/img/image-service/common/image_get?systemId=dataPlatform",
-      imageUploadUrl: "/img/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
+      imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
+      imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
       imagesArr: []
     };
   },

+ 2 - 2
src/components/business_space/lib/uploadImgsName.vue

@@ -85,8 +85,8 @@ export default {
   data() {
     return {
       baseUrl: "",
-      imageGetUrl: "/img/image-service/common/image_get?systemId=dataPlatform",
-      imageUploadUrl: "/img/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
+      imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
+      imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
       imagesArr: [],
       iframeSrc: "",
       dialog: {

+ 8 - 6
src/components/dialogs/addDialog/dialogDevice.vue

@@ -26,7 +26,7 @@
               </span>
               <span>当前选择的设备族:{{deviceType.facility}}</span>
               <!-- 增加 -->
-              <div style="width:360px;float:right;overflow:hidden;">
+              <div style="float:right;overflow:hidden;">
                 <span>增加</span>
                 <el-input v-model="addNum" style="width:40px;" placeholder="增加个数" size="small"></el-input>
                 <span>个{{deviceType.facility}}</span>
@@ -34,7 +34,7 @@
               </div>
               <!-- switch -->
               <div
-                style="width:200px;color:gray;float:right;padding-top:7px;font-size:10px;"
+                style="width:200px;color:gray;float:right;font-size:10px;"
               >是否隐藏自动填充信息点:
                 <el-tooltip :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
                   <el-switch
@@ -51,7 +51,7 @@
         </div>
       </div>
       <div v-show="!isCenter" slot="footer" class="dialog-footer">
-        <el-button>取 消</el-button>
+        <!-- <el-button>取 消</el-button> -->
         <el-button type="primary" @click="step(1)">下 一 步</el-button>
       </div>
       <span v-show="isCenter" slot="footer" class="dialog-footer">
@@ -108,7 +108,9 @@ import uploadFilesDialog from "@/components/dialogs/list/filesDialog";
 import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog";
 import picDialog from "@/components/dialogs/list/picDialog"
 import systemType from "@/components/dialogs/list/systemType"
-
+import Handsontable from "handsontable-pro"
+import 'handsontable-pro/dist/handsontable.full.css'
+import zhCN from 'handsontable-pro/languages/zh-CN';
 
 //下拉插件
 import "@/assets/js/chosen.jquery.min";
@@ -358,7 +360,7 @@ export default {
       this.main = table(1)
       getTableHeader({
         code: this.deviceType.code,
-        ProjId: this.$route.query.projId
+        ProjId: this.projectId
       }).then(res => {
         this.headers = res.data.Content;
         if (!!this.hot) {
@@ -959,6 +961,6 @@ export default {
 </script>
 <style lang="less" scoped>
 #addDevice {
-  overflow: hidden;
+      overflow: hidden;
 }
 </style>

+ 17 - 13
src/components/dialogs/list/firm.vue

@@ -2,49 +2,51 @@
     firm 厂商
 -->
 <template>
-  <el-dialog title="选择型号" :visible.sync="dialog.firm" width="600px">
+  <el-dialog title="选择型号" :visible.sync="dialog.firm" width="900px">
     <div>
       <div id="firm">
-        <div class="title-search" style="margin-bottom: 10px;">
+        <div class="title-search query-form" style="padding: 10px;margin-bottom: 10px;">
           <el-input
             placeholder="输入厂家名称、品牌名、型号进行查找"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button @click="searchKey" size="small">查找</el-button>
         </div>
         <el-radio-group v-model="radio" style="width:100%;">
-          <el-table :data="tableData" style="width: 100%" height="300px">
-            <el-table-column label="生产厂家">
+          <el-table class='data-table' :data="tableData" style="width: 100%" height="300px" border>
+            <el-table-column label="生产厂家" header-align='center'>
               <template slot-scope="scope">
                 <el-radio v-model="radio" :label="scope.row">{{scope.row.venderName || "--"}}</el-radio>
               </template>
             </el-table-column>
-            <el-table-column prop="brand" label="品牌"></el-table-column>
-            <el-table-column prop="name" label="型号"></el-table-column>
-            <el-table-column label="技术参数">
+            <el-table-column prop="brand" label="品牌" header-align='center'></el-table-column>
+            <el-table-column prop="name" label="型号" header-align='center'></el-table-column>
+            <el-table-column label="技术参数" header-align='center'>
               <template slot-scope="scope">
                 <el-button type="text" @click="lookParam(scope.row)">技术参数</el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-radio-group>
-        <my-pagination :page="page" @change="changed" style="margin-top:10px;"></my-pagination>
+        <div class="right">
+            <my-pagination :page="page" @change="changed" style="margin-top:10px;"></my-pagination>
+        </div>        
         <p style="height:40px;line-height:40px;text-align:center;color:#9E9E9E;">
           找不到想要的型号? 赶快去
           <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
         </p>
-        <div class="footer">
+        
+      </div>
+    </div>
+    <div slot="footer" class="dialog-footer">
           <el-button
             type="primary"
             @click="getChange"
-            style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
         </div>
-      </div>
-    </div>
     <param-details :isLoad="isLoad" :data="data"></param-details>
   </el-dialog>
 </template>
@@ -151,6 +153,8 @@ export default {
 
 <style lang="less">
 #firm {
+    height: 455px;
+    overflow-y: auto;
   .el-table thead {
     tr {
       th {

+ 16 - 15
src/components/dialogs/list/insurerDialog.vue

@@ -6,46 +6,47 @@
   <el-dialog title="选择型号" :visible.sync="dialog.insurer" width="1000px">
     <div>
       <div id="firm">
-        <div class="title-search" style="margin-bottom: 10px;">
+        <div class="title-search query-form" style="padding: 10px;margin-bottom: 10px;">
           <el-input
             placeholder="输入厂家名称进行查找"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button size="small" @click="filterSearch">查找</el-button>
         </div>
         <el-radio-group v-model="radio" style="width:100%;">
-          <el-table ref="maintenance" :data="tableData" style="width: 100%" height="300px">
-            <el-table-column label="供应商名称">
+          <el-table class="data-table" border ref="maintenance" :data="tableData" style="width: 100%" height="300px">
+            <el-table-column header-align='center' label="供应商名称">
               <template slot-scope="scope">
                 <el-tooltip :content="scope.row.name" placement="top">
                   <el-radio v-model="radio" :label="scope.row">{{scope.row.name}}</el-radio>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="website" label="网址"></el-table-column>
-            <el-table-column prop="man" label="联系人"></el-table-column>
-            <el-table-column prop="phone" label="联系电话"></el-table-column>
-            <el-table-column prop="faxes" label="传真"></el-table-column>
-            <el-table-column prop="email" label="电子邮件"></el-table-column>
+            <el-table-column header-align='center' prop="website" label="网址"></el-table-column>
+            <el-table-column header-align='center' prop="man" label="联系人"></el-table-column>
+            <el-table-column header-align='center' prop="phone" label="联系电话"></el-table-column>
+            <el-table-column header-align='center' prop="faxes" label="传真"></el-table-column>
+            <el-table-column header-align='center' prop="email" label="电子邮件"></el-table-column>
           </el-table>
         </el-radio-group>
-        <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        <div class="right">
+            <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        </div>
         <p style="height:40px;line-height:40px;text-align:center;color:#9E9E9E;">
           找不到想要的型号? 赶快去
           <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
-        </p>
-        <div class="footer">
+        </p>        
+      </div>
+    </div>
+    <div slot="footer">
           <el-button
             type="primary"
             @click="getChange"
-            style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
         </div>
-      </div>
-    </div>
   </el-dialog>
 </template>
 <script>

+ 17 - 16
src/components/dialogs/list/maintainerDialog.vue

@@ -6,46 +6,47 @@
   <el-dialog title="选择维修商" :visible.sync="dialog.maintainer" width="1000px">
     <div>
       <div id="firm">
-        <div class="title-search" style="margin-bottom: 10px;">
+        <div class="title-search query-form" style="padding: 10px; margin-bottom: 10px;">
           <el-input
-            placeholder="输入厂家名称进行查找"
+            placeholder="输入厂家名称进行查找23"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button size="small" @click="filterSearch">查找</el-button>
         </div>
         <el-radio-group v-model="radio" style="width:100%;">
-          <el-table ref="maintenance" :data="tableData" style="width: 100%" height="300px">
-            <el-table-column label="维修商名称">
+          <el-table class="data-table" border ref="maintenance" :data="tableData" style="width: 100%" height="300px">
+            <el-table-column header-align='center' label="维修商名称">
               <template slot-scope="scope">
                 <el-tooltip :content="scope.row.name" placement="top">
                   <el-radio v-model="radio" :label="scope.row">{{scope.row.name}}</el-radio>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="website" label="网址"></el-table-column>
-            <el-table-column prop="man" label="联系人"></el-table-column>
-            <el-table-column prop="phone" label="联系电话"></el-table-column>
-            <el-table-column prop="faxes" label="传真"></el-table-column>
-            <el-table-column prop="email" label="电子邮件"></el-table-column>
+            <el-table-column header-align='center' prop="website" label="网址"></el-table-column>
+            <el-table-column header-align='center' prop="man" label="联系人"></el-table-column>
+            <el-table-column header-align='center' prop="phone" label="联系电话"></el-table-column>
+            <el-table-column header-align='center' prop="faxes" label="传真"></el-table-column>
+            <el-table-column header-align='center' prop="email" label="电子邮件"></el-table-column>
           </el-table>
         </el-radio-group>
-        <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        <div class="right">
+            <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        </div>
         <p style="height:40px;line-height:40px;text-align:center;color:#9E9E9E;">
           找不到想要的维修商? 赶快去
           <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
-        </p>
-        <div class="footer">
+        </p>        
+      </div>
+    </div>
+    <div slot="footer">
           <el-button
             type="primary"
             @click="getChange"
-            style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
         </div>
-      </div>
-    </div>
   </el-dialog>
 </template>
 <script>

+ 18 - 15
src/components/dialogs/list/supplierDialog.vue

@@ -6,46 +6,47 @@
   <el-dialog title="选择型号" :visible.sync="dialog.supplier" width="1000px">
     <div>
       <div id="firm">
-        <div class="title-search" style="margin-bottom: 10px;">
+        <div class="title-search query-form" style="padding: 10px;margin-bottom: 10px;">
           <el-input
             placeholder="输入厂家名称进行查找"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button size="small" @click="filterSearch">查找</el-button>
         </div>
         <el-radio-group v-model="radio" style="width:100%;">
-          <el-table ref="supplier" :data="tableData" style="width: 100%" height="300px">
-            <el-table-column label="供应商名称">
+          <el-table class="data-table" border ref="supplier" :data="tableData" style="width: 100%" height="300px">
+            <el-table-column header-align='center' label="供应商名称" >
               <template slot-scope="scope">
                 <el-tooltip :content="scope.row.name" placement="top">
                   <el-radio v-model="radio" :label="scope.row">{{scope.row.name}}</el-radio>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column prop="website" label="网址"></el-table-column>
-            <el-table-column prop="man" label="联系人"></el-table-column>
-            <el-table-column prop="phone" label="联系电话"></el-table-column>
-            <el-table-column prop="faxes" label="传真"></el-table-column>
-            <el-table-column prop="email" label="电子邮件"></el-table-column>
+            <el-table-column header-align='center' prop="website" label="网址"></el-table-column>
+            <el-table-column header-align='center' prop="man" label="联系人"></el-table-column>
+            <el-table-column header-align='center' prop="phone" label="联系电话"></el-table-column>
+            <el-table-column header-align='center' prop="faxes" label="传真"></el-table-column>
+            <el-table-column header-align='center' prop="email" label="电子邮件"></el-table-column>
           </el-table>
         </el-radio-group>
-        <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        <div class="right">
+            <my-pagination :page="page" @change="changePage" style="margin-top:10px;"></my-pagination>
+        </div>
         <p style="height:40px;line-height:40px;text-align:center;color:#9E9E9E;">
           找不到想要的型号? 赶快去
           <i style="color:#46B0FF;cursor: pointer;">厂家库</i>维护吧
-        </p>
-        <div class="footer">
+        </p>        
+      </div>
+    </div>
+    <div slot="footer" class="footer">
           <el-button
             type="primary"
             @click="getChange"
-            style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
         </div>
-      </div>
-    </div>
   </el-dialog>
 </template>
 <script>
@@ -172,6 +173,8 @@ export default {
 
 <style lang="less">
 #firm {
+    height: 455px;
+    overflow-y: auto;
   .el-table thead {
     tr {
       th {

+ 19 - 11
src/components/dialogs/list/systemType.vue

@@ -2,21 +2,22 @@
     systemType 设备所属类型
 -->
 <template>
-  <el-dialog title="所属系统实例" :visible.sync="dialog.systemType" width="500px">
+  <el-dialog title="所属系统实例" :visible.sync="dialog.systemType" width="900px">
     <div>
       <div id="systemType">
-        <div class="title-search" style="margin-bottom: 10px;" v-if="type != 'read' ">
+        <div class="title-search query-form" style="padding: 10px;margin-bottom: 10px;" v-if="type != 'read' ">
           <el-input
             placeholder="输入名称或编码进行查询"
             v-model="search"
             size="small"
-            style="width:400px;"
+            style="width:300px;"
             clearable
           ></el-input>
           <el-button size="small" @click="searchChecked">查找</el-button>
         </div>
         <el-table
         class='data-table'
+            border
           :data="tableData"
           @selection-change="handleSelectionChange"
           style="width: 100%"
@@ -28,31 +29,38 @@
             :reserve-selection="true"
             :disabled="true"
             width="55"
+             
           ></el-table-column>
-          <el-table-column label="系统名称">
+          <el-table-column label="系统名称" header-align='center'>
             <template slot-scope="scope">{{scope.row.infos.SysLocalName || scope.row.infos.SysName}}</template>
           </el-table-column>
-          <el-table-column label="本地编码">
+          <el-table-column label="本地编码" header-align='center'>
             <template slot-scope="scope">{{scope.row.infos.SysLocalID || '--'}}</template>
           </el-table-column>
-          <el-table-column label="专业">
+          <el-table-column label="专业" header-align='center'>
             <template slot-scope="scope">{{getName(scope.row.category)}}</template>
-          </el-table-column>
-          <el-table-column label="详情">
+          </el-table-column> 
+          <el-table-column label="详情" header-align='center'>
             <template slot-scope="scope">
               <el-button @click="lookDeatils(scope.row)" type="text">详情</el-button>
             </template>
           </el-table-column>
         </el-table>
-        <div class="footer" v-if="type != 'read' ">
+        <!-- <div class="footer" v-if="type != 'read' ">
           <el-button
             type="primary"
             @click="getChange"
             style="display:block;margin: 10px auto 0;"
           >确 定</el-button>
-        </div>
+        </div> -->        
       </div>
     </div>
+    <span slot="footer" class="dialog-footer">
+           <el-button
+            type="primary"
+            @click="getChange"            
+          >确 定</el-button>
+        </span>
     <el-dialog
       title="系统详情"
       :visible.sync="iframeShow"
@@ -307,7 +315,7 @@ export default {
 
 <style lang="less">
 #systemType {
-    height: 350px;
+    height: 455px;
     overflow-y:auto; 
   .el-table thead {
     tr {

+ 3 - 3
src/components/ledger/addDialog/dialogAssets.vue

@@ -19,14 +19,14 @@
           <div>
             <div class="hanson-bar">
               <span>当前选择的设备族:{{deviceType.facility}}</span>
-              <div style="width:350px;float:right;overflow:hidden;">
+              <div style="float:right;overflow:hidden;">
                 <span>增加</span>
                 <el-input v-model="addNum" style="width:40px;" placeholder="增加个数" size="small"></el-input>
                 <span>个{{deviceType.facility}}</span>
                 <el-button size="small" @click="addMain">增加</el-button>
               </div>
               <div
-                style="width:200px;color:gray;float:right;padding-top:7px;font-size:10px;"
+                style="width:200px;color:gray;float:right;font-size:10px;"
               >是否隐藏自动填充信息点:
                 <el-tooltip :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
                   <el-switch
@@ -43,7 +43,7 @@
         </div>
       </div>
       <div v-show="!isCenter" slot="footer" class="dialog-footer">
-        <el-button>取 消</el-button>
+        <!-- <el-button>取 消</el-button> -->
         <el-button type="primary" @click="step(1)">下 一 步</el-button>
       </div>
       <span v-show="isCenter" slot="footer" class="dialog-footer">

+ 6 - 2
src/components/ledger/addDialog/dialogDevice.vue

@@ -162,7 +162,7 @@ export default {
     return {
       width: "30%",
       isFull: false,//dialog是否为全屏
-      title: "确定新增设备的类型",
+      title: "",
       isCenter: false,
       deviceType: {},
       main: table(1),
@@ -952,6 +952,10 @@ export default {
 </script>
 <style lang="less" scoped>
 #addDevice {
-  overflow: hidden;
+    overflow: hidden;
+    // height: 300px;
+    // overflow-x: hidden;
+    // overflow-y:auto; 
+
 }
 </style>

+ 1 - 0
src/components/ledger/handsontables/assets.vue

@@ -1220,6 +1220,7 @@ export default {
   font-size: 14px;
   overflow: hidden;
   margin-top: 10px;
+  line-height: 40px;
   .iconfont {
     font-size: 12px;
   }

+ 2 - 1
src/components/ledger/handsontables/device.vue

@@ -14,7 +14,7 @@
         <el-button size="small" @click="reset" icon="iconfont icon-shuaxin">&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button>
         <el-button size="small" @click="undo" icon="iconfont icon-undo">&nbsp;&nbsp;&nbsp;撤销&nbsp;&nbsp;&nbsp;</el-button>
       </div>
-      <div style="width:200px;color:gray;float:right;padding-top:7px;font-size:10px;">
+      <div style="width:200px;color:gray;float:right;font-size:10px;">
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
           <el-switch
@@ -1282,6 +1282,7 @@ export default {
   font-size: 14px;
   overflow: hidden;
   margin-top: 10px;
+  line-height: 40px;
   .iconfont {
     font-size: 12px;
   }

+ 1 - 1
src/components/ledger/lib/lookImages.vue

@@ -4,7 +4,7 @@
 
 <template>
   <el-dialog title="上传图片" :visible.sync="dialog.lookPic" v-if="dialog.lookPic" width="600px">
-    <div style="max-height:700px;overflow-y:auto;">
+    <div style="max-height:500px;overflow-y:auto;">
       <el-tabs type="border-card">
         <el-tab-pane>
           <span slot="label">图片</span>

+ 2 - 2
src/components/ledger/lib/uploadImgs.vue

@@ -71,8 +71,8 @@ export default {
   data() {
     return {
       baseUrl: "",
-      imageGetUrl: "/img/image-service/common/image_get?systemId=dataPlatform",
-      imageUploadUrl: "/img/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
+      imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
+      imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
       imagesArr: []
     };
   },

+ 2 - 2
src/components/ledger/lib/uploadImgsName.vue

@@ -85,8 +85,8 @@ export default {
   data() {
     return {
       baseUrl: "",
-      imageGetUrl: "/img/image-service/common/image_get?systemId=dataPlatform",
-      imageUploadUrl: "/img/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
+      imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
+      imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
       imagesArr: [],
       iframeSrc: "",
       dialog: {

+ 2 - 2
src/framework/layout/Main.vue

@@ -58,8 +58,8 @@ export default {
         }
     },
     created() {
-        console.log('--------------------- Main created')
-        console.log(this.$store.getters.flag)
+        // console.log('--------------------- Main created')
+        // console.log(this.$store.getters.flag)
     },
     mounted() {
         this.windwoResize()

+ 2 - 2
src/framework/layout/PageHeader.vue

@@ -55,14 +55,14 @@ export default {
             this.setSidebarClosed(!this.sidebarClosed)
         },
         userMenuCommand(cmd) {
-            console.log('userMenuCommand ', cmd)
+            // console.log('userMenuCommand ', cmd)
             if (cmd == 'logout') {
                 frameworkApi.toLogout()
             }
         }
     },
     created() {
-        console.log('--------------------- PageHeader created')
+        // console.log('--------------------- PageHeader created')
         this.selectedProjectId = this.currentProjectId
     },
     mounted() {},

+ 7 - 7
src/framework/layout/PageSidebar.vue

@@ -46,28 +46,28 @@ export default {
     computed: {
         ...mapGetters('layout', ['sidebarClosed', 'sidebarSelected', 'permissions']),
         menus() {
-            console.log(this.permissions)
+            // console.log(this.permissions)
             let menus = frameworkApi.getMenus(this.permissions)
-            console.log('sidebar menus ', menus)
+            // console.log('sidebar menus ', menus)
             return menus
         }
     },
     methods: {
         ...mapMutations('layout', ['setSidebarSelected']),
         handleOpen(val) {
-            console.log('handleOpen------------- ', val)
+            // console.log('handleOpen------------- ', val)
         },
         handleClose(val) {
-            console.log('handleClose------------- ', val)
+            // console.log('handleClose------------- ', val)
         },
         menuSelect(index, indexPath) {
             this.setSidebarSelected(index)
-            console.log('menu select ', index, indexPath)
+            // console.log('menu select ', index, indexPath)
         }
     },
     created() {
-        console.log('--------------------- PageSidebar created')
-        console.log('menus ', this.menus)
+        // console.log('--------------------- PageSidebar created')
+        // console.log('menus ', this.menus)
     },
     mounted() {},
     components: {}

+ 21 - 5
src/router/system.js

@@ -43,8 +43,7 @@ import facilityLedger from '@/views/ledger/facility'
 import propertyLedger from '@/views/ledger/property'
 
 export default [
-    { path: '/', name: '', component: LayoutMain ,children: [
-        { path: '', name: 'blank', component: Dasboard }]},
+    { path: '/', name: '', component: LayoutMain, children: [{ path: '', name: 'blank', component: Dasboard }] },
     { path: '/login', name: 'Login', component: Login },
 
     // 报警设置
@@ -121,8 +120,18 @@ export default [
         component: LayoutMain,
         children: [
             { path: '', name: 'Dasboard', component: Dasboard },
-            { path: 'facility', name: 'facilityLedger', component: facilityLedger },
-            { path: 'property', name: 'propertyLedger', component: propertyLedger },
+            {
+                path: 'facility',
+                name: 'facilityLedger',
+                component: facilityLedger,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '设备清单' }] }
+            },
+            {
+                path: 'property',
+                name: 'propertyLedger',
+                component: propertyLedger,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '资产清单' }] }
+            },
             { path: 'cenotelist', name: 'Dasboard', component: Dasboard },
             { path: 'dimension', name: 'Dasboard', component: Dasboard },
             { path: 'rubbish', name: 'Dasboard', component: Dasboard },
@@ -198,6 +207,13 @@ export default [
         path: '/system',
         name: 'LayoutMain',
         component: LayoutMain,
-        children: [{ path: 'list', name: 'systemlist', component: systemLedger }]
+        children: [
+            {
+                path: 'list',
+                name: 'systemlist',
+                component: systemLedger,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统管理' }, { label: '系统清单' }] }
+            }
+        ]
     }
 ]

+ 1 - 1
src/views/data_admin/buildGraphy/lib/lookImages.vue

@@ -4,7 +4,7 @@
 
 <template>
   <el-dialog title="上传图片" :visible.sync="dialog.lookPic" v-if="dialog.lookPic" width="600px">
-    <div style="max-height:700px;overflow-y:auto;">
+    <div style="max-height:500px;overflow-y:auto;">
       <el-tabs type="border-card">
         <el-tab-pane>
           <span slot="label">图片</span>

+ 1 - 1
src/views/data_admin/buildGraphy/lib/uploadImg.vue

@@ -58,7 +58,7 @@ export default {
           xhr.open(
             /* method */ "POST",
             /* target url */
-            "/img/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true&key=" +
+            "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true&key=" +
               file.uid + '.' + type
             /*, async, default to true */
           );

+ 2 - 2
src/views/data_admin/buildGraphy/lib/uploadImgs.vue

@@ -71,8 +71,8 @@ export default {
   data() {
     return {
       baseUrl: "",
-      imageGetUrl: "/img/image-service/common/image_get?systemId=dataPlatform",
-      imageUploadUrl: "/img/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
+      imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
+      imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
       imagesArr: []
     };
   },

+ 2 - 2
src/views/data_admin/buildGraphy/lib/uploadImgsName.vue

@@ -85,8 +85,8 @@ export default {
   data() {
     return {
       baseUrl: "",
-      imageGetUrl: "/img/image-service/common/image_get?systemId=dataPlatform",
-      imageUploadUrl: "/img/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
+      imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
+      imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
       imagesArr: [],
       iframeSrc: "",
       dialog: {