From c01dff9a24f98f10f247d2f2e449383f567ec338 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期三, 18 五月 2022 14:55:48 +0800
Subject: [PATCH] 提交代码

---
 src/views/construction/system/index.vue |   54 ++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/views/construction/system/index.vue b/src/views/construction/system/index.vue
index f0ee5d2..7d6f79e 100644
--- a/src/views/construction/system/index.vue
+++ b/src/views/construction/system/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="construction-view">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="杞欢鍚嶇О" prop="name">
         <el-input
@@ -71,15 +71,19 @@
         </template>
       </el-table-column>
       <el-table-column label="杞欢鍚嶇О" align="center" prop="name"/>
-      <el-table-column label="鐗堟湰" align="center" prop="edition"/>
-      <el-table-column label="鍔熻兘鎻忚堪" align="center" prop="functionDescription"/>
-      <el-table-column label="鎺堟潈鏂瑰紡" align="center" prop="authorizationMethod_dictText"/>
-      <el-table-column label="鎺堟潈鏁伴噺" align="center" prop="authorizedQuantity"/>
-      <el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" prop="serverId_dictText"/>
-      <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>
-      <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturerId_dictText"/>
-      <el-table-column label="澶囨敞" align="center" prop="remarks"/>
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="鐗堟湰" min-width="180" align="center" prop="edition"/>
+      <el-table-column label="鍔熻兘鎻忚堪" min-width="180" align="center" prop="functionDescription"/>
+      <el-table-column label="鎺堟潈鏂瑰紡" min-width="180" align="center" prop="authorizationMethod_dictText"/>
+      <el-table-column label="鎺堟潈鏁伴噺" min-width="180" align="center" prop="authorizedQuantity"/>
+      <el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" prop="serverId_dictText">
+        <template slot-scope="scope">
+          <el-link type="primary" @click="serverClick(scope.row)">{{scope.row.serverId_dictText}}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>
+      <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
+      <el-table-column label="澶囨敞" align="center" min-width="180" prop="remarks"/>
+      <el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
               size="mini"
@@ -140,7 +144,7 @@
           </el-col>
         </el-row>
         <el-form-item label="鍔熻兘鎻忚堪" prop="functionDescription">
-          <el-input v-model="form.functionDescription" :rows="8" maxlength="64" show-word-limit type="textarea"
+          <el-input v-model="form.functionDescription" :rows="8" maxlength="512" show-word-limit type="textarea"
                     placeholder="璇疯緭鍏ュ唴瀹�"/>
         </el-form-item>
         <el-row>
@@ -179,7 +183,7 @@
           </el-col>
         </el-row>
         <el-form-item label="澶囨敞" prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
+          <el-input v-model="form.remarks" :rows="8" maxlength="512" show-word-limit type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -200,6 +204,14 @@
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
     </Dialog>
+
+    <!-- 鏈嶅姟鍣� -->
+    <Dialog title="鏈嶅姟鍣�" :visible.sync="serverOpen" width="700px" :append-to-body="true" :destroy-on-close="true">
+      <server-form v-if="serverOpen" :serverId="serverId"></server-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="serverOpen = false">鍏� 闂�</el-button>
+      </div>
+    </Dialog>
   </div>
 </template>
 
@@ -211,6 +223,7 @@
 import manufacturer from "../../components/manufacturer";
 import nvr from "../../components/nvr";
 import server from '../../components/server'
+import serverForm from '../../components/server/form'
 
 export default {
   name: "System",
@@ -221,7 +234,8 @@
     constructionBatch,
     manufacturer,
     nvr,
-    server
+    server,
+    serverForm
   },
   props: {
     schoolId: {
@@ -294,7 +308,9 @@
         ],
       },
       disabled: false,
-      fileOpen: false
+      fileOpen: false,
+      serverOpen: false,
+      serverId: undefined
     };
   },
   created() {
@@ -427,7 +443,7 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎杞欢绯荤粺缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+      this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
         this.loading = true;
         return delSystem(ids);
       }).then(() => {
@@ -438,11 +454,9 @@
         this.loading = false;
       });
     },
-    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-    handleExport() {
-      this.download('oa/system/export', {
-        ...this.queryParams
-      }, `system_${new Date().getTime()}.xlsx`)
+    serverClick(row) {
+      this.serverId = row.serverId;
+      this.serverOpen = true;
     }
   }
 };

--
Gitblit v1.9.1