+ 桩点聚合到视野功能

src/views/cons/consUnit/index.vue

@@ -3,12 +3,12 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item :label="$t('cons.unitName')" prop="name">
         <el-input
-            v-model="queryParams.name"
-            :placeholder="$t('common.typeInfo',{
+          v-model="queryParams.name"
+          :placeholder="$t('common.typeInfo',{
             name: $t('cons.unitName')
           })"
-            clearable
-            @keyup.enter.native="handleQuery"
+          clearable
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -23,23 +23,23 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['cons:consUnitInfo:add']"
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['cons:consUnitInfo:add']"
         >
           {{ $t('common.add') }}
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            type="info"
-            plain
-            icon="el-icon-sort"
-            size="mini"
-            @click="toggleExpandAll"
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
         >
           {{ $t('common.expand_collapse') }}
         </el-button>
@@ -48,12 +48,12 @@
     </el-row>
 
     <el-table
-        v-if="refreshTable"
-        v-loading="loading"
-        :data="consUnitInfoList"
-        row-key="id"
-        :default-expand-all="isExpandAll"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="consUnitInfoList"
+      row-key="id"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column :label="$t('cons.unitName')" width="200" prop="name"/>
       <el-table-column :label="$t('cons.nodeType')" prop="type">
@@ -61,7 +61,11 @@
           <dict-tag :options="dict.type.cons_unit_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('cons.designFileType')" prop="classifyType"/>
+      <el-table-column :label="$t('cons.designFileType')" prop="classifyType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.classify_type" :value="scope.row.classifyType"/>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('common.updateTime')" align="center" prop="updateTime" width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>
@@ -76,34 +80,34 @@
       <el-table-column :label="$t('common.operation')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['cons:consUnitInfo:edit']"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['cons:consUnitInfo:edit']"
           >
             {{
               $t('common.edit')
             }}
           </el-button>
           <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-plus"
-              @click="handleAdd(scope.row)"
-              v-hasPermi="['cons:consUnitInfo:add']"
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['cons:consUnitInfo:add']"
           >
             {{
               $t('common.add')
             }}
           </el-button>
           <el-button
-              v-if="scope.row.parentId != 0"
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['cons:consUnitInfo:remove']"
+            v-if="scope.row.parentId != 0"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['cons:consUnitInfo:remove']"
           >
             {{
               $t('common.delete')
@@ -111,46 +115,46 @@
           </el-button>
           <br/>
           <el-button
-              v-if="scope.row.type==='2'"
-              size="mini"
-              type="text"
-              icon="el-icon-upload"
-              @click="handleImport(scope.row)"
-              v-hasPermi="['cons:consUnitInfo:edit']"
+            v-if="scope.row.type==='2'"
+            size="mini"
+            type="text"
+            icon="el-icon-upload"
+            @click="handleImport(scope.row)"
+            v-hasPermi="['cons:consUnitInfo:edit']"
           >
             {{
               $t('cons.uploadCAD')
             }}
           </el-button>
           <el-button
-              v-if="scope.row.type==='2'"
-              size="mini"
-              type="text"
-              icon="el-icon-set-up"
-              @click="handleAssign(scope.row)"
-              v-hasPermi="['cons:consUnitInfo:edit']"
+            v-if="scope.row.type==='2'"
+            size="mini"
+            type="text"
+            icon="el-icon-set-up"
+            @click="handleAssign(scope.row)"
+            v-hasPermi="['cons:consUnitInfo:edit']"
           >
             {{
               $t('cons.assignMachine')
             }}
           </el-button>
           <el-button
-              v-if="scope.row.type==='2'"
-              size="mini"
-              type="text"
-              icon="el-icon-download"
-              @click="handleExport(scope.row)"
+            v-if="scope.row.type==='2'"
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="handleExport(scope.row)"
           >
             {{
               $t('cons.downloadFinishDrawing')
             }}
           </el-button>
           <el-button
-              v-if="scope.row.type==='2'"
-              size="mini"
-              type="text"
-              icon="el-icon-download"
-              @click="handleExportCsv(scope.row)"
+            v-if="scope.row.type==='2'"
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="handleExportCsv(scope.row)"
           >
             {{
               $t('cons.downloadPileData')
@@ -177,8 +181,8 @@
           <el-col :span="12">
             <el-form-item :label="$t('cons.unitName')" prop="name">
               <el-input
-                  v-model="form.name"
-                  :placeholder="$t('common.typeInfo',{
+                v-model="form.name"
+                :placeholder="$t('common.typeInfo',{
                             name: $t('cons.unitName')
                           })"
               />
@@ -204,22 +208,26 @@
                             name: $t('cons.nodeType')
                           })">
                 <el-option
-                    v-for="dict in dict.type.cons_unit_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
+                  v-for="dict in dict.type.cons_unit_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('cons.designFileType')" prop="classifyType">
-              <el-input
-                  v-model="form.classifyType"
-                  :placeholder="$t('common.typeInfo',{
+              <el-select v-model="form.classifyType+''" :placeholder="$t('common.select',{
                             name: $t('cons.designFileType')
-                          })"
-              />
+                          })">
+                <el-option
+                  v-for="dict in dict.type.classify_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -239,10 +247,10 @@
               <el-select style="width: 100%" v-model="form.machineId" multiple
                          :placeholder="$t('common.select',{name:$t('cons.machine')})">
                 <el-option
-                    v-for="machine in machineList"
-                    :key="machine.id"
-                    :label="`${machine.machineNum}(${machine.name})`"
-                    :value="machine.id"
+                  v-for="machine in machineList"
+                  :key="machine.id"
+                  :label="`${machine.machineNum}(${machine.name})`"
+                  :value="machine.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -256,17 +264,17 @@
     </el-dialog>
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
-          ref="upload"
-          :limit="1"
-          name="files"
-          accept=".dwg,.xls,.xlsx"
-          :headers="upload.headers"
-          :action="upload.url + '?updateSupport=' + upload.updateSupport"
-          :disabled="upload.isUploading"
-          :on-progress="handleFileUploadProgress"
-          :on-success="handleFileSuccess"
-          :auto-upload="false"
-          drag
+        ref="upload"
+        :limit="1"
+        name="files"
+        accept=".dwg,.xls,.xlsx"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">{{ $t("common.importModeMsg") }}</div>
@@ -298,10 +306,10 @@
               <el-select style="width: 100%" v-model="form.machineId" multiple
                          :placeholder="$t('common.select',{name:$t('cons.machine')})">
                 <el-option
-                    v-for="machine in machineList"
-                    :key="machine.id"
-                    :label="`${machine.machineNum}(${machine.name})`"
-                    :value="machine.id"
+                  v-for="machine in machineList"
+                  :key="machine.id"
+                  :label="`${machine.machineNum}(${machine.name})`"
+                  :value="machine.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -334,7 +342,7 @@ import {getToken} from "@/utils/auth";
 
 export default {
   name: "cons-unit",
-  dicts: ['cons_unit_type'],
+  dicts: ['cons_unit_type', 'classify_type'],
   components: {Treeselect},
   data() {
     return {
@@ -481,7 +489,7 @@ export default {
         type: "0",
         parentId: null,
         createType: 1,
-        classifyType: "dwg",
+        classifyType: "1",
         name: null,
       };
       this.resetForm("form");