modify add device

src/components/ledger/handsontables/device.vue

@@ -14,23 +14,16 @@
       <div style="width:200px;color:gray;float:right;font-size:12px;">
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
-             <el-checkbox v-model="isWatch"  @change="changeWatch"></el-checkbox>
+          <el-checkbox v-model="isWatch"  @change="changeWatch"></el-checkbox>
         </el-tooltip>
         <span v-if="onlyRead">只看要采集的信息</span>
         <el-tooltip v-if="onlyRead" :content="'' + (allMess ? '部分' : '全集')" placement="top">
-            <el-checkbox v-model="allMess"  @change="changeWatch"></el-checkbox>
+          <el-checkbox v-model="allMess"  @change="changeWatch"></el-checkbox>
         </el-tooltip>
       </div>
-        <div
-        style="width:100px;cursor: pointer;float:right; font-size:14px;margin-right:10px"
-      >
+      <div style="width:100px;cursor: pointer;float:right; font-size:14px;margin-right:10px">
       <el-select v-model="onlyRead" @change="changeRead" size="small">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       </div>
     </div>
@@ -85,17 +78,22 @@
     <div v-show="mess.deviceId && main && main.length" class="right">
         <my-pagination @change="getMain" :page="page"></my-pagination>
     </div>
-    <dialog-assets
+    <!-- <dialog-assets
       @close="getClose"
       :graphyId="graphyId"
       :assetType="[this.mess.deviceId]"
       ref="assets"
       :dialog="dialog"
-    ></dialog-assets>
+    ></dialog-assets> -->
     <details-dialog :iframeSrc="iframeSrc" v-if="dialog.details" :dialog="dialog"></details-dialog>
     <change-rea @close="reset" :dialog="dialog" :category="category"></change-rea>
     <look-pic :dialog="dialog" :keysArr="picsArr"></look-pic>
-
+    <el-dialog title="确定新增设备的类型" :visible.sync="dialog.addDevice" width="30%">
+      <el-row><my-cascader ref="cascader" @change="changeAddType"></my-cascader></el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="addDevice">下 一 步</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -106,6 +104,7 @@ import tools from "@/utils/scan/tools";
 import handsonUtils from "@/utils/hasontableUtils"
 import showTools from "@/utils/handsontable/notShow"
 import text from "@/utils/handsontable/mainText"
+import myCascader from "@/components/ledger/lib/cascader";
 
 import qrcode from "@/components/ledger/lib/qrcode";
 import firm from "@/components/dialogs/list/firm";
@@ -150,7 +149,8 @@ export default {
     systemType,
     detailsDialog,
     changeRea,
-    lookPic
+    lookPic,
+    myCascader
   },
   data() {
     return {
@@ -485,17 +485,19 @@ export default {
 
     //添加设备
     addDevice() {
-      // this.$router.push({ path: '/ledger/addevice' })
-      this.$router.push({
-        path: "/ledger/addevice",
-        query: this.mess
-      });
-      // this.dialog.addDevice = true
-      // this.$nextTick(() => {
-      //   this.$refs.assets.step(0)
-      // })
+      if(this.mess.deviceId){
+        this.$router.push({
+          path: "/ledger/addevice",
+          query: this.mess
+        });
+      }else{
+        this.dialog.addDevice = true
+      }
+    },
+    changeAddType(val){
+      this.mess.deviceId = val.code;
+      this.mess.name = val.facility;
     },
-
     //下载
     download() {
       if (!this.onlyRead) {

src/views/ledger/facility/addfacility.vue

@@ -218,7 +218,7 @@ export default {
                 this.$router.push({
                   path: "/ledger/facility",
                   query: {
-                    deviceId: this.category.deviceId}
+                    deviceId: this.category.deviceId                  }
                 });
                 session.remove("deviceAddData")
               }
@@ -230,7 +230,7 @@ export default {
               this.$router.push({
                 path: "/ledger/partsmanage",
                 query: {
-                  deviceId: this.category.deviceId}
+                  deviceId: this.category.deviceId                }
               });
               session.remove("deviceAddData")
             }
@@ -288,7 +288,7 @@ export default {
         this.isWatch,
         false
       );
-      data.unshift("同时创建资产");
+      data.unshift("同时创建资产", "所属系统实例");
       return data;
     },
     formatHeaderType(list) {
@@ -309,7 +309,11 @@ export default {
         label: {
           position: "after"
         }
-      });
+      }, {
+          data: "linkSystem",
+          renderer: text.systemList,
+          readOnly: true
+        });
       return data;
     },
     initTable() {