Selaa lähdekoodia

Merge branch 'master' into hjl

haojianlong 5 vuotta sitten
vanhempi
commit
6e41181203

+ 28 - 7
src/api/scan/request.js

@@ -852,15 +852,15 @@ export function getProductList(param, success) {
 
 //完全匹配的厂商信息
 export function getBasicMatch(param) {
-    console.log(param, "param")
     let data = param
     return fetch({ method: 'POST', url: `${venders}/basic/autoFillId`, data })
 }
 
 //设备清单-查询设备内容
-export function getEquipTableCon(param) {
+export function getEquipTableCon(param, success) {
+    let url = `${baseUrl}/equip-component/equip-query/equip-components`;
     let data = param;
-    return fetch({ method: 'POST', url: `${baseUrl}/equip-component/equip-query/equip-components`, data })
+    http.postJson(url, data, success)
 }
 
 //设备清单-查询当前设备下的部件分类
@@ -893,8 +893,8 @@ export function getEquipPartsCon(param, success) {
 
 //设备清单 - 新增部件
 export function createPart(param, success) {
-    let url = `${baseUrl}/datacenter/component/create?projectId=${param.projectId}`;
-    let data = param.data;
+    let url = `${baseUrl}/datacenter/component/create`;
+    let data = param;
     http.postJson(url, data, success)
 }
 
@@ -912,6 +912,27 @@ export function updateParts(param, success) {
     http.postJson(url, data, success)
 }
 
+//设备清单 - 创建设备
+export function createEquip(param, success) {
+    let url = `${baseUrl}/datacenter/equip/create`;
+    let data = param;
+    http.postJson(url, data, success)
+}
+
+//设备清单 - 更新设备
+export function updateEquip(param, success) {
+    let url = `${baseUrl}/datacenter/equip/update`;
+    let data = param;
+    http.postJson(url, data, success)
+}
+
+//设备清单 - 删除设备
+export function deleteEquip(param, success) {
+    let url = `${baseUrl}/datacenter/equip/delete`;
+    let data = param;
+    http.postJson(url, data, success)
+}
+
 //创建资产所需(Family族id3位编码)-根据设备类型(4位编码)或部件类型(6位编码)查询
 export function getEquipBelongs(param, success) {
     let url = `${baseUrl}/datacenter/data-dictionary/family-query`;
@@ -921,8 +942,8 @@ export function getEquipBelongs(param, success) {
 
 //创建资产
 export function createPropertyData(param, success) {
-    let url = `${baseUrl}/datacenter/property/create?projectId=${param.projectId}`;
-    let data = param.data;
+    let url = `${baseUrl}/datacenter/property/create`;
+    let data = param;
     http.postJson(url, data, success)
 }
 

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 2 - 0
src/assets/image/uncultivated.svg


+ 16 - 58
src/components/dialogs/list/systemType.vue

@@ -6,31 +6,11 @@
     <div>
       <div id="systemType">
         <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:300px; margin-right:10px"
-            clearable
-          ></el-input>
+          <el-input placeholder="输入名称或编码进行查询" v-model="search" size="small" style="width:300px; margin-right:10px" 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%"
-          ref="multipleTable"
-        >
-          <el-table-column
-            v-if="type != 'read' "
-            type="selection"
-            :reserve-selection="true"
-            :disabled="true"
-            width="55"
-             
-          ></el-table-column>
+        <el-table class='data-table' border :data="tableData" @selection-change="handleSelectionChange" style="width: 100%" ref="multipleTable">
+          <el-table-column v-if="type != 'read' " type="selection" :reserve-selection="true" :disabled="true" width="55"></el-table-column>
           <el-table-column label="系统名称" header-align='center'>
             <template slot-scope="scope">{{scope.row.infos.SysLocalName || scope.row.infos.SysName}}</template>
           </el-table-column>
@@ -39,7 +19,7 @@
           </el-table-column>
           <el-table-column label="专业" header-align='center'>
             <template slot-scope="scope">{{getName(scope.row.category)}}</template>
-          </el-table-column> 
+          </el-table-column>
           <el-table-column label="详情" header-align='center' width="100" align="center">
             <template slot-scope="scope">
               <el-button @click="lookDeatils(scope.row)" type="text">详情</el-button>
@@ -52,36 +32,15 @@
             @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"
-      v-if="iframeShow"
-      width="500px"
-      append-to-body
-    >
-      <iframe
-        id="google_ads_frame2"
-        name="google_ads_frame2"
-        frameborder="0"
-        :src="iframeSrc"
-        marginwidth="0"
-        marginheight="0"
-        vspace="0"
-        hspace="0"
-        style="width:100%;height:500px;"
-        allowtransparency="true"
-        scrolling="no"
-        allowfullscreen="true"
-      ></iframe>
+      <el-button type="primary" @click="getChange">确 定</el-button>
+    </span>
+    <el-dialog title="系统详情" :visible.sync="iframeShow" v-if="iframeShow" width="500px" append-to-body>
+      <iframe id="google_ads_frame2" name="google_ads_frame2" frameborder="0" :src="iframeSrc" marginwidth="0" marginheight="0" vspace="0" hspace="0"
+        style="width:100%;height:500px;" allowtransparency="true" scrolling="no" allowfullscreen="true"></iframe>
     </el-dialog>
   </el-dialog>
 </template>
@@ -123,8 +82,7 @@ export default {
   data() {
     return {
       search: "", //搜索文案
-      tableData: [
-      ],
+      tableData: [],
       systemList: [],
       allData: [],
       multipleSelection: [],
@@ -135,9 +93,9 @@ export default {
   },
   computed: {
     ...mapGetters("layout", [
-        "projectId",
-        "secret",
-        "userId"
+      "projectId",
+      "secret",
+      "userId"
     ])
   },
   mounted() { },
@@ -315,8 +273,8 @@ export default {
 
 <style lang="less">
 #systemType {
-    height: 455px;
-    overflow-y:auto; 
+  height: 455px;
+  overflow-y: auto;
   .el-table thead {
     tr {
       th {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 348 - 763
src/components/ledger/handsontables/device.vue


+ 2 - 1
src/components/ledger/lib/cascader.vue

@@ -51,7 +51,8 @@ export default {
   },
   watch: {
       projectId() {
-          this.value = ['']
+          this.value = [''];
+          this.getData();
       }
   },
   methods: {

+ 5 - 2
src/router/system.js

@@ -17,6 +17,9 @@ import pointSteps from '@/views/point/config_point/steps'
 /**项目化配置 */
 import collectsetting from '@/views/project_setting/collection_setting/index'
 
+/**模型管理 */
+import  modelFile from '@/views/model/file/index'
+
 /** 业务空间 */
 import spacelist from '@/views/business_space/business_list'
 
@@ -121,8 +124,8 @@ export default [
             { path: '', name: 'Dasboard', component: Dasboard },
             {
                 path: 'file',
-                name: 'Dasboard',
-                component: Dasboard,
+                name: 'modelFile',
+                component: modelFile,
                 meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '模型文件管理' }] }
             },
             {

+ 39 - 3
src/views/dasboard/index.vue

@@ -1,8 +1,18 @@
 <template>
-    <div>
-        <h4>开发中...</h4>
-        <!-- <button v-if="hasPermission('system:role:query')">测试权限 </button> -->
+    <div class="main-box">
+        <div class="mian-icon">
+            <img src="@/assets/image/uncultivated.svg">
+        </div>
+        <div class="main-text">
+            <div class="main-content">
+                <h1>功能设计中。。。</h1>
+                <p><b>功能设计说明:</b><slot name="explain"></slot></p>
+                <p><b>计划可查看时间:</b><slot name="time"></slot></p>
+            </div>
+        </div>
     </div>
+    <!-- <h4>开发中...</h4> -->
+    <!-- <button v-if="hasPermission('system:role:query')">测试权限 </button> -->
 </template>
 <script>
 export default {
@@ -21,4 +31,30 @@ export default {
 }
 </script>
 <style lang='scss' scoped>
+.main-box{
+    width: 100%;
+    height: 100%;
+    display: flex;
+}
+.mian-icon{
+    flex: 2;
+    text-align: center;
+    position: relative;
+    img{
+        position: absolute;
+        top: 25%;
+    }
+}
+.main-text{
+    flex: 3;
+    position: relative;
+    .main-content{
+        position: absolute;
+        padding-right: 200px;
+        top: 20%;
+        p{
+            padding: 20px 0;
+        }
+    }
+}
 </style>

+ 106 - 159
src/views/ledger/facility/addfacility.vue

@@ -1,14 +1,14 @@
 <template>
   <div id="deviceList">
     <el-row class="right">
-      <span style="float:left;">当前选择的设备类型:{{category.Name}}</span>
+      <span style="float:left;">当前选择的设备类型:{{category.name}}</span>
       <div style="width:200px;display:inline-block;text-align:left;color:gray;">
         <span>隐藏自动填充的信息</span>
         <el-checkbox v-model="isWatch" @change="getTableHeader"></el-checkbox>
       </div>
       <span>增加</span>
       <el-input v-model="addNum" style="width:40px;" size="small"></el-input>
-      <span>个{{category.Name}}</span>
+      <span>个{{category.name}}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>
     <div class="tableBox">
@@ -23,12 +23,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button
-        type="primary"
-        size="medium"
-        @click="handleCreateTableData"
-        class="create_button"
-      >创建设备</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" class="create_button">创建设备</el-button>
     </el-row>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
@@ -39,28 +34,12 @@
     <!-- 供应商弹窗 -->
     <supplier-dialog ref="supplier" @changeSupplier="supplierChange" :dialog="myDialog"></supplier-dialog>
     <guarantee-dialog :id="id" ref="guarantee" @change="guaranteeChange" :dialog="myDialog"></guarantee-dialog>
-    <upload-files-dialog
-      :read="onlyRead ? true : false"
-      ref="upload"
-      @changeFile="fileChange"
-      :keysArr="filesArr"
-      :dialog="myDialog"
-    ></upload-files-dialog>
-    <upload-img-dialog
-      :read="onlyRead ? true : false"
-      @changeFile="imgChange"
-      :keysArr="imgsArr"
-      :dialog="myDialog"
-    ></upload-img-dialog>
+    <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr" :dialog="myDialog"></upload-files-dialog>
+    <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog"></upload-img-dialog>
     <maintainer-dialog @changeMaintainer="changeMaintainer" ref="maintainer" :dialog="myDialog"></maintainer-dialog>
     <insurer-dialog @changeInsurer="changeInsurer" ref="insurer" :dialog="myDialog"></insurer-dialog>
-    <pic-dialog
-      :read="onlyRead ? true : false"
-      :dialog="myDialog"
-      :keysArr="picsArr"
-      @change="changePics"
-    ></pic-dialog>
-    <system-type :infos="systemId" :graphyId="graphyId" :dialog="myDialog"></system-type>
+    <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
+    <system-type :infos="systemId" :graphyId="graphyId" :dialog="myDialog" :type="'edit'" @change="changeSystemType"></system-type>
     <details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
   </div>
 </template>
@@ -74,9 +53,9 @@ import session from "@/framework/utils/storage";
 import handsonTable from "@/components/common/handsontable";
 import {
   getDataDictionary,
-  createPart,
-  getEquipmentFamily,
-  createPropertyData
+  createEquip,
+  createPropertyData,
+  getEquipBelongs
 } from "@/api/scan/request";
 import { mapGetters, mapActions } from "vuex";
 
@@ -111,9 +90,9 @@ export default {
       addNum: 1,
       onlyRead: false,
       tableHeader: [],
-      tableData: session.get("partsAddData")
-        ? session.get("partsAddData").length
-          ? session.get("partsAddData")
+      tableData: session.get("deviceAddData")
+        ? session.get("deviceAddData").length
+          ? session.get("deviceAddData")
           : [{ Checked: 1 }]
         : [{ Checked: 1 }],
       isWatch: true,
@@ -142,47 +121,58 @@ export default {
       picsArr: [], //临时设备图片keys数组
       systemId: null,
       graphyId: null,
-      mess: {},
       id: 0,
-      readArr: ["A1","A2","B1","C5","D1","D2","E1","F1","F2","L","L1","L2","M"],
+      readArr: [
+        "A1",
+        "A2",
+        "B1",
+        "C5",
+        "D1",
+        "D2",
+        "E1",
+        "F1",
+        "F2",
+        "L",
+        "L1",
+        "L2",
+        "M"
+      ],
       EquipmentList: [],
-      firmId: "" //品牌型号所需字段
+      firmId: "" //品牌型号所需字段--族id三位编码(传设备类id或部件类id)
     };
   },
   computed: {
     ...mapGetters("layout", ["projectId", "secret", "userId"])
   },
   created() {
-    this.category = this.$route.params;
-    this.category.ParentId = this.category.Code.substr(0, 4);
-    this.mess = {
-      deviceId: this.category.ParentId
-    };
-    this.getEquipmentFamilyList();
+    this.category = this.$route.query;
+    this.getBelongs();
     this.getTableHeader();
   },
   methods: {
-    getEquipmentFamilyList() {
-      getEquipmentFamily(res => {
-        this.EquipmentList = res.Content;
-        this.changeCader();
-      });
+    //查询设备类对应的 族
+    getBelongs() {
+      let params = {
+        data: {
+          Filters: `EquipCode='${this.category.deviceId}'`,
+          PageNumber: 1,
+          PageSize: 50
+        }
+      }
+      getEquipBelongs(params, res => {
+        this.firmId = res.Content[0].Family;
+      })
     },
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let params = {
         PageNumber: 1,
         PageSize: 500,
-        Filters: `type='Equipment' or type='${this.category.Code}'`
+        Filters: `type='Equipment' or type='${this.category.deviceId}'`
       };
       await getDataDictionary(params, res => {
-        let response = res;
-        if (response.Result == "success") {
-          this.tableHeader = response.Content;
-          this.initTable();
-        } else {
-          this.$message.error("请求错误:" + response.Result);
-        }
+        this.tableHeader = res.Content;
+        this.initTable();
       });
     },
     // 创建设备数据
@@ -196,7 +186,7 @@ export default {
           }
         });
         let newK = Object.keys(item)
-        if ((item.Checked&&newK.length>1) || (!item.Checked&&newK.length)) {
+        if ((item.Checked && newK.length > 1) || (!item.Checked && newK.length)) {
           return item;
         }
       });
@@ -205,8 +195,8 @@ export default {
         return;
       }
       let flag = false;
-      newData.map(item=>{
-        if(item.Checked&&!item.EquipLocalName){
+      newData.map(item => {
+        if (item.Checked && !item.EquipLocalName) {
           flag = true;
         }
       })
@@ -214,61 +204,32 @@ export default {
         this.$message.info("存在设备的本地名称为空,请检查")
         return;
       }
-      let params = { projectId: this.projectId }
 
       for (let i = 0; i < newData.length; i++) {
-        let data = {
-          ParentId: this.category.deviceId, //当前设备id
-          Category: this.category.Code //当前设备分类
-        };
-        params.data = Object.assign(data, newData[i]);
-        // await createPart(params).then(res => {
-        //   let response = res;
-        //   if(response.Result=='success'){
-        //     if(newData[i].Checked){//同时创建资产
-        //       params.data.EquipmentId = response.Id
-        //       createPropertyData(params);
-        //     }
-        //     if(i==newData.length-1){
-        //       this.$router.push({
-        //         path: "/ledger/partsmanage",
-        //         query: {
-        //           deviceId: this.category.deviceId,
-        //           typeId: this.category.ParentId
-        //         }
-        //       });
-        //       session.remove("partsAddData")
-        //     }
-        //   }
-        // });
-        if(newData[i].Checked){//同时创建资产
-          await createPropertyData(params, res => {
-            let response = res;
-            params.data.PropertyId = response.Id;
-          })
-          await createPart(params, res=>{
-            if(i==newData.length-1){
-              this.$router.push({
-                path: "/ledger/partsmanage",
-                query: {
-                  deviceId: this.category.deviceId,
-                  typeId: this.category.ParentId
-                }
-              });
-              session.remove("partsAddData")
-            }
+        let params = newData[i]
+        params.Family = this.firmId;
+        params.Category = this.category.deviceId;
+        if (newData[i].Checked) {//同时创建资产
+          await createPropertyData(params, async res => {
+            params.PropertyId = res.Id
+            await createEquip(params, res => {
+              if (i == newData.length - 1) {
+                this.$router.push({
+                  path: "/ledger/facility",
+                  query: { deviceId: this.category.deviceId }
+                });
+                session.remove("deviceAddData")
+              }
+            })
           })
-        }else{
-          await createPart(params, res=>{
-            if(i==newData.length-1){
+        } else {
+          await createEquip(params, res => {
+            if (i == newData.length - 1) {
               this.$router.push({
                 path: "/ledger/partsmanage",
-                query: {
-                  deviceId: this.category.deviceId,
-                  typeId: this.category.ParentId
-                }
+                query: { deviceId: this.category.deviceId }
               });
-              session.remove("partsAddData")
+              session.remove("deviceAddData")
             }
           });
         }
@@ -306,7 +267,7 @@ export default {
           return item;
         }
       });
-      session.set("partsAddData", newData);
+      session.set("deviceAddData", newData);
     },
     //格式化表头显示的数据
     formatHeaderData(list) {
@@ -324,7 +285,7 @@ export default {
         this.isWatch,
         false
       );
-      data.unshift("同时创建资产");
+      data.unshift("同时创建资产", "所属系统实例");
       return data;
     },
     formatHeaderType(list) {
@@ -345,7 +306,11 @@ export default {
         label: {
           position: "after"
         }
-      });
+      }, {
+          data: "linkSystem",
+          renderer: text.systemList,
+          readOnly: true
+        });
       return data;
     },
     initTable() {
@@ -387,11 +352,10 @@ export default {
     },
     //选择型号修改
     firmChange(data) {
-      console.log(this.row)
-      tools.setDataForKey(this.tableData[this.row],"DPSpecificationID",data.specificationId)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.EquipManufactor.Brand",data.brand)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.EquipManufactor.Specification",data.name)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.EquipManufactor.Manufacturer",data.venderName)
+      tools.setDataForKey(this.tableData[this.row], "DPSpecificationID", data.specificationId)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Brand", data.brand)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Specification", data.name)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Manufacturer", data.venderName)
       for (let key in data) {
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name + "/" + data.brand;
@@ -405,12 +369,12 @@ export default {
     },
     //如果选择供应商之后
     supplierChange(data) {
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.SupplyPurchase.Supplier",data.name)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.SupplyPurchase.SupplierWeb",data.website)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.SupplyPurchase.SupplierContactor",data.man)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.SupplyPurchase.SupplierPhone",data.phone)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.SupplyPurchase.SupplierFax",data.fox)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.SupplyPurchase.SupplierEmail",data.email)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.Supplier", data.name)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierWeb", data.website)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierContactor", data.man)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierPhone", data.phone)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierFax", data.fox)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierEmail", data.email)
       for (let key in data) {
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name;
@@ -440,12 +404,12 @@ export default {
     },
     //维修商变更
     changeMaintainer(data) {
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.OperationMainte.Maintainer",data.name)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.OperationMainte.MaintainerWeb",data.website)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.OperationMainte.MaintainerContactor",data.man)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.OperationMainte.MaintainerPhone",data.phone)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.OperationMainte.MaintainerFax",data.fox)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.OperationMainte.MaintainerEmail",data.email)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.Maintainer", data.name)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerWeb", data.website)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerContactor", data.man)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerPhone", data.phone)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerFax", data.fox)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerEmail", data.email)
       for (let key in data) {
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name;
@@ -455,12 +419,12 @@ export default {
     },
     //保险商变更
     changeInsurer(data) {
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.InsuranceDoc.InsurerEmail",data.email)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.InsuranceDoc.InsurerFax",data.fox)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.InsuranceDoc.InsurerPhone",data.phone)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.InsuranceDoc.InsurerContactor",data.man)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.InsuranceDoc.InsurerWeb",data.website)
-      tools.setDataForKey(this.tableData[this.row],"LedgerParam.InsuranceDoc.Insurer",data.name)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerEmail", data.email)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerFax", data.fox)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerPhone", data.phone)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerContactor", data.man)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerWeb", data.website)
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.Insurer", data.name)
       for (let key in data) {
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name;
@@ -472,15 +436,10 @@ export default {
     changePics(keys) {
       this.setDataToMain(keys, this.messKey, this.row);
     },
-    setGraphyId(graphyId, assetGroupList) {
-      this.graphyId = graphyId;
-      this.assetGroupList = assetGroupList;
-    },
-    //触发父组件change
-    getClose(val) {
-      this.$emit("close", val);
+    //关联系统变更
+    changeSystemType(data) {
+      tools.setDataForKey(this.tableData[this.row], "linkSystem", data)
     },
-    reset() {},
     //表格点击事件
     handleTdClick(el, rowArr) {
       //点击的是表头
@@ -535,7 +494,7 @@ export default {
       }
       //关联系统
       if (val == "linkSystem") {
-        // this.systemList = this.tableData[row.row].linkSystem || [];
+        this.systemList = this.tableData[row.row].linkSystem || [];
         this.myDialog.systemType = true;
       }
       //品牌型号弹窗
@@ -586,11 +545,11 @@ export default {
       //保险文件--设备文档--安装质检报告
       if (
         val == "LedgerParam.InsuranceDoc.InsuranceFile" ||
-        val == "LedgerParam.PhotoDoc.Archive" || 
+        val == "LedgerParam.PhotoDoc.Archive" ||
         val == "LedgerParam.Siteinstall.CheckReport"
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val)
-        this.filesArr = data? data: []
+        this.filesArr = data ? data : []
         // this.filesArr = this.tableData[row.row].infos
         //   ? this.tableData[row.row].infos[val.split(".")[1]]
         //     ? [this.tableData[row.row].infos[val.split(".")[1]]]
@@ -606,7 +565,7 @@ export default {
         val == "LedgerParam.PhotoDoc.Drawing"
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val)
-        this.imgsArr = data? data: []
+        this.imgsArr = data ? data : []
         // if (val == "LedgerParam.PhotoDoc.Nameplate") {
         //   this.imgsArr = this.tableData[row.row].infos
         //     ? this.tableData[row.row].infos[val.split(".")[1]]
@@ -625,7 +584,7 @@ export default {
       //设备照片
       if (val == "LedgerParam.PhotoDoc.Pic") {
         let data = tools.dataForKey(this.tableData[row.row], val)
-        this.picsArr = data? data: []
+        this.picsArr = data ? data : []
         // this.picsArr = this.tableData[row.row].infos
         //   ? this.tableData[row.row].infos[val.split(".")[1]]
         //     ? this.tableData[row.row].infos[val.split(".")[1]]
@@ -636,18 +595,6 @@ export default {
       this.row = row.row;
       this.messKey = val;
     },
-    //修改设备类型
-    changeCader() {
-      this.EquipmentList.map(item => {
-        if (!!item.content && item.content.length) {
-          item.content.map(child => {
-            if (child.code == this.mess.deviceId) {
-              this.firmId = item.code;
-            }
-          });
-        }
-      });
-    },
     utilToKey(key, name, data, messName) {
       if (key == name) {
         this.setDataToMain(data[key], messName, this.row);

+ 6 - 14
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -39,7 +39,6 @@
     <maintainer-dialog @changeMaintainer="changeMaintainer" ref="maintainer" :dialog="myDialog"></maintainer-dialog>
     <insurer-dialog @changeInsurer="changeInsurer" ref="insurer" :dialog="myDialog"></insurer-dialog>
     <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
-    <system-type :infos="systemId" :graphyId="graphyId" :dialog="myDialog"></system-type>
     <details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
   </div>
 </template>
@@ -69,7 +68,6 @@ import guaranteeDialog from "@/components/dialogs/list/guaranteeDialog";
 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";
 export default {
   components: {
     qrcode, //二维码页面
@@ -82,7 +80,6 @@ export default {
     uploadFilesDialog,
     uploadImgDialog,
     picDialog,
-    systemType,
     handsonTable
   },
   data() {
@@ -157,7 +154,7 @@ export default {
         data: {
           Filters: `EquipCode='${this.category.Code}'`,
           PageNumber: 1,
-          PageSize: 50        
+          PageSize: 50
         }
       }
       getEquipBelongs(params, res => {
@@ -207,18 +204,13 @@ export default {
       }
 
       for (let i = 0; i < newData.length; i++) {
-        let params = {
-          projectId: this.projectId
-        }
-        let data = {
-          ParentId: this.category.deviceId, //当前设备id
-          Category: this.category.Code //当前部件分类
-        };
-        params.data = Object.assign(data, newData[i]);
-        params.data.Family = this.firmId;
+        let params = newData[i]
+        params.ParentId = this.category.deviceId, //当前设备id
+        params.Category = this.category.Code //当前部件分类
+        params.Family = this.firmId;
         if (newData[i].Checked) {//同时创建资产
           await createPropertyData(params, async res => {
-            params.data.PropertyId = res.Id
+            params.PropertyId = res.Id
             await createPart(params, res => {
               if (i == newData.length - 1) {
                 this.$router.push({

+ 33 - 117
src/views/ledger/facility/partsmanage/index.vue

@@ -26,7 +26,8 @@
       </div>
     </div>
     <el-pagination class="right" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-      :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total"></el-pagination>
+      :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
+      :total="page.total"></el-pagination>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
     <!-- 型号弹窗 -->
@@ -36,13 +37,15 @@
     <!-- 供应商弹窗 -->
     <supplier-dialog ref="supplier" @changeSupplier="supplierChange" :dialog="myDialog"></supplier-dialog>
     <guarantee-dialog :id="id" ref="guarantee" @change="guaranteeChange" :dialog="myDialog"></guarantee-dialog>
-    <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr" :dialog="myDialog"></upload-files-dialog>
+    <upload-files-dialog :read="onlyRead ? true : false" ref="upload" @changeFile="fileChange" :keysArr="filesArr" :dialog="myDialog">
+    </upload-files-dialog>
     <upload-img-dialog :read="onlyRead ? true : false" @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog"></upload-img-dialog>
     <maintainer-dialog @changeMaintainer="changeMaintainer" ref="maintainer" :dialog="myDialog"></maintainer-dialog>
     <insurer-dialog @changeInsurer="changeInsurer" ref="insurer" :dialog="myDialog"></insurer-dialog>
     <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
-    <system-type :infos="systemId" :graphyId="graphyId" :dialog="myDialog"></system-type>
     <details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
+    <!-- 修改关联的资产 -->
+    <!-- <change-rea :dialog="myDialog" :category="category"></change-rea> -->
   </div>
 </template>
 <script>
@@ -72,7 +75,7 @@ import guaranteeDialog from "@/components/dialogs/list/guaranteeDialog";
 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 changeRea from "@/components/dialogs/changeRea"
 export default {
   components: {
     qrcode, //二维码页面
@@ -85,8 +88,8 @@ export default {
     uploadFilesDialog,
     uploadImgDialog,
     picDialog,
-    systemType,
-    handsonTable
+    handsonTable,
+    changeRea
   },
   data() {
     return {
@@ -124,7 +127,8 @@ export default {
         systemType: false,
         details: false, //详情页
         changeRea: false,
-        lookPic: false //图片查看
+        lookPic: false, //图片查看
+        changeRea: false, //关联的资产
       },
       qrcodeUrl: "", //二维码图片地址
       filesArr: [], //保存临时的文件key
@@ -442,26 +446,10 @@ export default {
     },
     //选择型号修改
     firmChange(data) {
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "DPSpecificationID",
-        data.specificationId
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.EquipManufactor.Brand",
-        data.brand
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.EquipManufactor.Specification",
-        data.name
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.EquipManufactor.Manufacturer",
-        data.venderName
-      );
+      tools.setDataForKey(this.tableData[this.row], "DPSpecificationID", data.specificationId);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Brand", data.brand);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Specification", data.name);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Manufacturer", data.venderName);
       for (let key in data) {
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name + "/" + data.brand;
@@ -475,36 +463,12 @@ export default {
     },
     //如果选择供应商之后
     supplierChange(data) {
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.SupplyPurchase.Supplier",
-        data.name
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.SupplyPurchase.SupplierWeb",
-        data.website
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.SupplyPurchase.SupplierContactor",
-        data.man
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.SupplyPurchase.SupplierPhone",
-        data.phone
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.SupplyPurchase.SupplierFax",
-        data.fox
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.SupplyPurchase.SupplierEmail",
-        data.email
-      );
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.Supplier", data.name);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierWeb", data.website);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierContactor", data.man);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierPhone", data.phone);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierFax", data.fox);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.SupplyPurchase.SupplierEmail", data.email);
       for (let key in data) {
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name;
@@ -534,36 +498,12 @@ export default {
     },
     //维修商变更
     changeMaintainer(data) {
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.OperationMainte.Maintainer",
-        data.name
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.OperationMainte.MaintainerWeb",
-        data.website
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.OperationMainte.MaintainerContactor",
-        data.man
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.OperationMainte.MaintainerPhone",
-        data.phone
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.OperationMainte.MaintainerFax",
-        data.fox
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.OperationMainte.MaintainerEmail",
-        data.email
-      );
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.Maintainer", data.name);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerWeb", data.website);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerContactor", data.man);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerPhone", data.phone);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerFax", data.fox);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.OperationMainte.MaintainerEmail", data.email);
       for (let key in data) {
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name;
@@ -573,36 +513,12 @@ export default {
     },
     //保险商变更
     changeInsurer(data) {
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.InsuranceDoc.InsurerEmail",
-        data.email
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.InsuranceDoc.InsurerFax",
-        data.fox
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.InsuranceDoc.InsurerPhone",
-        data.phone
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.InsuranceDoc.InsurerContactor",
-        data.man
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.InsuranceDoc.InsurerWeb",
-        data.website
-      );
-      tools.setDataForKey(
-        this.tableData[this.row],
-        "LedgerParam.InsuranceDoc.Insurer",
-        data.name
-      );
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerEmail", data.email);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerFax", data.fox);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerPhone", data.phone);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerContactor", data.man);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.InsurerWeb", data.website);
+      tools.setDataForKey(this.tableData[this.row], "LedgerParam.InsuranceDoc.Insurer", data.name);
       for (let key in data) {
         if (key == "venderId") {
           data[key] = data[key] + "-" + data.name;

+ 28 - 0
src/views/model/file/index.vue

@@ -0,0 +1,28 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:explain>
+          <span>{{explain}}</span>
+        </template>
+        <template v-slot:time>
+          <span>{{time}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          explain:"模型文件管理",
+          time:"2019-06-25"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 1 - 1
src/views/point/config_point/steps/step1.vue

@@ -24,7 +24,7 @@
                 <el-button type="text" @click="download">下载模板</el-button>
             </div>
         </own-dialog>
-        <own-dialog :width="'500px'" :index="true" :footer="footer" title="导出excel模板" :dialogVisible="updateExcel" @confirm="sureOfUpload" @cancel="close">
+        <own-dialog :width="'500px'" :index="true" :footer="footer" title="导入excel" :dialogVisible="updateExcel" @confirm="sureOfUpload" @cancel="close">
             <div class="center" style="height:100px;">
                 <upload-file accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" @change="changeFile"></upload-file>
             </div>