From cf4de0a3f218b79d49b05450ca0fc4527c2fa78e Mon Sep 17 00:00:00 2001
From: 王旭 <1377869194@qq.com>
Date: 星期三, 22 二月 2023 17:15:55 +0800
Subject: [PATCH] 修改数据管理弹框按钮样式

---
 src/views/datamanage/metadataManage.vue   |  491 ++++++++--------
 src/assets/css/global.css                 |    9 
 src/views/datamanage/dictionaryManage.vue |   69 +-
 src/views/datamanage/projectManage.vue    |  113 +--
 src/views/datamanage/versionManage.vue    |   26 
 src/views/userManage/templateManage.vue   |  214 +++---
 src/assets/css/content.css                |   18 
 src/views/Archive/dataApplication.vue     |  395 ++++++------
 src/views/datamanage/domainManage.vue     |  131 ++--
 src/views/datamanage/dataUpdata.vue       |  165 ++--
 src/views/datamanage/styleManage.vue      |   19 
 src/views/datamanage/SpatialData.vue      |   39 
 12 files changed, 871 insertions(+), 818 deletions(-)

diff --git a/src/assets/css/content.css b/src/assets/css/content.css
index 358e39a..9391c26 100644
--- a/src/assets/css/content.css
+++ b/src/assets/css/content.css
@@ -42,11 +42,13 @@
     /*z-index: 99999;*/
     font-size: 32px;
     color: white;
-    
+
 }
-.menuRoleAuthorization_resize{
+
+.menuRoleAuthorization_resize {
     /* left: 10px; */
 }
+
 /*鎷栨嫿鍖洪紶鏍囨偓鍋滄牱寮�*/
 .menuRoleAuthorization_resize,
 .userRoleAuthorization_resize1,
@@ -163,6 +165,16 @@
 
 }
 
+.infoBox_box {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    background: rgba(0, 0, 0, 0.4);
+    top: 0;
+    left: 0;
+    z-index: 10;
+}
+
 .infoBox {
     background: rgb(255, 255, 255);
     width: 500px;
@@ -171,7 +183,7 @@
     top: 15%;
     right: 15%;
     border: 1px solid white;
-   
+
     height: 600px;
     padding: 10px;
     /* overflow: auto; */
diff --git a/src/assets/css/global.css b/src/assets/css/global.css
index 1f770e0..1eebf89 100644
--- a/src/assets/css/global.css
+++ b/src/assets/css/global.css
@@ -72,4 +72,13 @@
 } 
 .pagination_box{
   margin-top: 25px
+}
+.BoxFlex {
+  display: flex;
+  justify-content: space-around;
+  width: 85%;
+  
+}
+.BoxFlexinput {
+  flex: 1;
 }
\ No newline at end of file
diff --git a/src/views/Archive/dataApplication.vue b/src/views/Archive/dataApplication.vue
index 3f9b927..c790741 100644
--- a/src/views/Archive/dataApplication.vue
+++ b/src/views/Archive/dataApplication.vue
@@ -1,99 +1,92 @@
 <template>
   <div class="logLog_box box_div">
-    <My-bread :list="[
+    <My-bread
+      :list="[
         `${$t('synthesis.synthesis')}`,
         `${$t('synthesis.dataApplication')}`,
-      ]"></My-bread>
+      ]"
+    ></My-bread>
     <el-divider />
-    <div class="inquire subpage_Div">
-      <el-form
-        :inline="true"
-        ref="sizeForm"
-        :model="sizeForm"
-      >
-        <el-form-item
-          prop="uname"
-          :label="$t('operatManage.operationLogObj.username')"
-        >
-          <el-input
-            v-model="sizeForm.uname"
-            :placeholder="$t('operatManage.operationLogObj.pleaseInput')"
-          />
-        </el-form-item>
-        <el-form-item
-          prop="status"
-          :label="$t('operatManage.operationLogObj.status')"
-        >
-          <el-select
-            v-model="sizeForm.status"
-            :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
-          >
-            <el-option
-              :label="$t('dataApply.type1')"
-              value="-10"
-            />
-            <el-option
-              :label="$t('dataApply.type2')"
-              value="-1"
-            />
-            <el-option
-              :label="$t('dataApply.type3')"
-              value="0"
-            />
-            <el-option
-              :label="$t('dataApply.type4')"
-              value="-9"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          prop="start"
-          :label="$t('operatManage.operationLogObj.startTime')"
-        >
-          <el-date-picker
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            v-model="sizeForm.start"
-            style="width: 100%"
-            type="datetime"
-            :placeholder="$t('operatManage.operationLogObj.optionDate')"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item
-          prop="end"
-          :label="$t('operatManage.operationLogObj.endTime')"
-        >
-          <el-date-picker
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            v-model="sizeForm.end"
-            style="width: 100%"
-            type="datetime"
-            :placeholder="$t('operatManage.operationLogObj.optionDate')"
-          >
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button
-            @click="onSubmit"
-            icon="el-icon-search"
-            style="background: #409eff; border: 1px solid #409eff; color: white"
-          >{{ $t("operatManage.operationLogObj.inquire") }}</el-button>
-          <el-button
-            @click="resAllTable"
-            icon="el-icon-delete"
-            type="info"
-          >{{ $t("operatManage.operationLogObj.empty") }}</el-button>
-        </el-form-item>
+    <div class="inquire subpage_Div" ref="container">
+      <el-form :inline="true" ref="sizeForm" :model="sizeForm">
+        <div class="flex_box">
+          <div style="margin-right: auto">
+            <el-form-item
+              prop="uname"
+              :label="$t('operatManage.operationLogObj.username')"
+            >
+              <el-input
+                v-model="sizeForm.uname"
+                :placeholder="$t('operatManage.operationLogObj.pleaseInput')"
+              />
+            </el-form-item>
+            <el-form-item
+              prop="status"
+              :label="$t('operatManage.operationLogObj.status')"
+            >
+              <el-select
+                v-model="sizeForm.status"
+                :placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
+              >
+                <el-option :label="$t('dataApply.type1')" value="-10" />
+                <el-option :label="$t('dataApply.type2')" value="-1" />
+                <el-option :label="$t('dataApply.type3')" value="0" />
+                <el-option :label="$t('dataApply.type4')" value="-9" />
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              prop="start"
+              :label="$t('operatManage.operationLogObj.startTime')"
+            >
+              <el-date-picker
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                v-model="sizeForm.start"
+                style="width: 100%"
+                type="datetime"
+                :placeholder="$t('operatManage.operationLogObj.optionDate')"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item
+              prop="end"
+              :label="$t('operatManage.operationLogObj.endTime')"
+            >
+              <el-date-picker
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                v-model="sizeForm.end"
+                style="width: 100%"
+                type="datetime"
+                :placeholder="$t('operatManage.operationLogObj.optionDate')"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </div>
+          <div>
+            <el-form-item>
+              <el-button
+                @click="onSubmit"
+                icon="el-icon-search"
+                style="
+                  background: #409eff;
+                  border: 1px solid #409eff;
+                  color: white;
+                "
+                >{{ $t("operatManage.operationLogObj.inquire") }}</el-button
+              >
+              <el-button
+                @click="resAllTable"
+                icon="el-icon-delete"
+                type="info"
+                >{{ $t("operatManage.operationLogObj.empty") }}</el-button
+              >
+            </el-form-item>
+          </div>
+        </div>
       </el-form>
     </div>
-    <div class="table_box subpage_Div">
-      <el-table
-        :data="tableData"
-        style="width: 100%"
-      >
-
+    <div class="table_box subpage_Div" :style="styleVar">
+      <el-table :data="tableData" style="width: 100%" height="calc(100% - 57px)">
         <el-table-column
           align="center"
           type="index"
@@ -125,40 +118,36 @@
           :formatter="formatStatus"
         />
 
-        <el-table-column
-          min-width="150"
-          :label="$t('common.operate')"
-        >
+        <el-table-column min-width="150" :label="$t('common.operate')">
           <template slot-scope="scope">
             <el-button
               type="danger"
               size="mini"
               @click="handleApplyCancel(scope.$index, scope.row)"
-              v-if="matchState(scope,/[]/)"
+              v-if="matchState(scope, /[]/)"
               plain
-            >{{$t('dataApply.ApplicationCancel')}}</el-button>
+              >{{ $t("dataApply.ApplicationCancel") }}</el-button
+            >
             <el-button
               type="warning"
               size="mini"
               @click="handleReApply(scope.$index, scope.row)"
-              v-if="matchState1(scope,/[]/)"
+              v-if="matchState1(scope, /[]/)"
               plain
-            >{{$t('dataApply.ReApply')}}</el-button>
+              >{{ $t("dataApply.ReApply") }}</el-button
+            >
             <el-button
               type="info"
               size="mini"
               plain
               @click="handlDetails(scope.$index, scope.row)"
-            >{{$t('dataApply.details')}}</el-button>
-
+              >{{ $t("dataApply.details") }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
 
-      <div
- 
-        class="pagination_box"
-      >
+      <div class="pagination_box">
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
@@ -178,50 +167,30 @@
       :before-close="handleClose"
     >
       <div>
-
-        <el-form
-          :inline="true"
-          :model="detailsFrom"
-          class="demo-form-inline"
-        >
+        <el-form :inline="true" :model="detailsFrom" class="demo-form-inline">
           <el-form-item label="琛ㄥ悕锛�">
-            <div class="statusLabel">{{detailsFrom.tabs}}</div>
-          </el-form-item><br />
+            <div class="statusLabel">{{ detailsFrom.tabs }}</div> </el-form-item
+          ><br />
           <el-form-item label="鐢宠浜猴細">
-            <div class="statusLabel">{{detailsFrom.uname}}</div>
+            <div class="statusLabel">{{ detailsFrom.uname }}</div>
           </el-form-item>
           <el-form-item label="鐢宠鏃堕棿锛�">
-            <div class="statusLabel">{{detailsFrom.time}}</div>
+            <div class="statusLabel">{{ detailsFrom.time }}</div>
           </el-form-item>
           <el-form-item label="鐘舵�侊細">
-            <div class="statusLabel">{{detailsFrom.status}}</div>
+            <div class="statusLabel">{{ detailsFrom.status }}</div>
           </el-form-item>
         </el-form>
-        <el-table
-          :data="detailsFrom.tableData"
-          style="width: 100%"
-        >
+        <el-table :data="detailsFrom.tableData" style="width: 100%">
           <el-table-column
             align="center"
             type="index"
             :label="$t('operatManage.ELM.index')"
             width="70px"
           />
-          <el-table-column
-            align="center"
-            prop="depName"
-            label="鍗曚綅"
-          />
-          <el-table-column
-            align="center"
-            prop="uname"
-            label="瀹℃牳浜�"
-          />
-          <el-table-column
-            align="center"
-            prop="uname"
-            label="鎻忚堪"
-          >
+          <el-table-column align="center" prop="depName" label="鍗曚綅" />
+          <el-table-column align="center" prop="uname" label="瀹℃牳浜�" />
+          <el-table-column align="center" prop="uname" label="鎻忚堪">
             <template slot-scope="scope">
               <el-input
                 type="textarea"
@@ -232,7 +201,6 @@
               >
               </el-input>
             </template>
-
           </el-table-column>
           <el-table-column
             align="center"
@@ -240,34 +208,30 @@
             label="鐘舵��"
             :formatter="formatStatus1"
           />
-          <el-table-column
-            min-width="150"
-            :label="$t('common.operate')"
-          >
+          <el-table-column min-width="150" :label="$t('common.operate')">
             <template slot-scope="scope">
-              <div v-if="matchState3(scope,/[]/)">
+              <div v-if="matchState3(scope, /[]/)">
                 <el-button
                   type="danger"
                   size="mini"
                   @click="handleApplyRepulse(scope.$index, scope.row)"
                   plain
-                >鎵撳洖</el-button>
+                  >鎵撳洖</el-button
+                >
 
                 <el-button
                   @click="handleApplyAdopt(scope.$index, scope.row)"
                   type="success"
                   size="mini"
                   plain
-                >閫氳繃</el-button>
+                  >閫氳繃</el-button
+                >
               </div>
-              <div v-if="!matchState3(scope,/[]/)">-  -</div>
-
+              <div v-if="!matchState3(scope, /[]/)">- -</div>
             </template>
-
           </el-table-column>
         </el-table>
       </div>
-
     </el-dialog>
   </div>
 </template>
@@ -280,7 +244,7 @@
   apply_updateForDiscard,
   apply_updateForSubmit,
   apply_updateForReject,
-  apply_updateForResubmit
+  apply_updateForResubmit,
 } from "../../api/api";
 export default {
   //import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -291,7 +255,7 @@
   data() {
     return {
       detailsFrom: {
-        tableData:[],
+        tableData: [],
       },
       dialogDetailsVisible: false,
       sizeForm: {
@@ -307,23 +271,48 @@
         start: null,
         end: null,
         uname: null,
-        status: null
+        status: null,
       },
       count: 0,
       detailsId: null,
+            tableHeight: 0,
+      timer: 0,
+      styleVar: {
+        height: "calc(100% - 109px)",
+      },
     };
   },
+    beforeDestroy() {
+    this.timer && clearTimeout(this.timer);
+    window.removeEventListener("resize", this.onResize);
+  },
+  mounted() {
+    window.addEventListener("resize", this.onResize);
+    this.calHeight();
+  },
   methods: {
+        onResize() {
+      this.timer && clearTimeout(this.timer);
+      this.timer = setTimeout(() => {
+        this.calHeight();
+      }, 500);
+    },
+    calHeight() {
+      this.$nextTick(() => {
+        const rect = this.$refs.container.getBoundingClientRect();
+        this.tableHeight = `${rect.height + 97}px`;
+        this.styleVar["height"] = `calc(100% - ${rect.height + 97}px)`;
+      });
+    },
     async handleApplyRepulse(index, row) {
       const data = await apply_updateForReject({ flowId: row.id });
       if (data.code != 200) {
         return this.$message.error("鍒楄〃璋冪敤澶辫触");
       }
-      
+
       this.showRestData();
     },
     async handleApplyAdopt(index, row) {
-
       const data = await apply_updateForSubmit({ flowId: row.id });
       if (data.code != 200) {
         return this.$message.error("鍒楄〃璋冪敤澶辫触");
@@ -332,9 +321,8 @@
     },
     async showRestData() {
       const data1 = await apply_selectFlows({
-        applyid:
-          this.detailsId
-      })
+        applyid: this.detailsId,
+      });
       if (data1.code != 200) {
         return this.$message.error("鍒楄〃璋冪敤澶辫触");
       }
@@ -359,9 +347,8 @@
       this.getAllData();
     },
     async handlDetails(index, row) {
-
       this.detailsId = row.id;
-      const data = await apply_selectFlows({ applyid: row.id })
+      const data = await apply_selectFlows({ applyid: row.id });
       if (data.code != 200) {
         return this.$message.error("鍒楄〃璋冪敤澶辫触");
       }
@@ -372,36 +359,43 @@
       this.detailsFrom.status = this.statusFormat(row.status);
       this.detailsFrom.statued = row.status;
       this.dialogDetailsVisible = true;
-
     },
-    matchState(state = '', reg) {
+    matchState(state = "", reg) {
       var row = state.row;
-      if (row.status >= -1 && row.status <= 9 && this.$store.state.unid == row.userid) {
-        return true
+      if (
+        row.status >= -1 &&
+        row.status <= 9 &&
+        this.$store.state.unid == row.userid
+      ) {
+        return true;
       }
-      return false
+      return false;
     },
-    matchState1(state = '', reg) {
-
+    matchState1(state = "", reg) {
       var row = state.row;
       if (row.status == -1 && this.$store.state.unid == row.userid) {
-        return true
+        return true;
       }
-      return false
+      return false;
     },
-    matchState2(state = '', reg) {
+    matchState2(state = "", reg) {
       var row = state.row;
       if (row.status != -10 && this.$store.state.unid == row.userid) {
-        return true
+        return true;
       }
-      return false
+      return false;
     },
-    matchState3(state = '', reg) {
+    matchState3(state = "", reg) {
       var row = state.row;
-      if (row.status == 0 && (this.detailsFrom.statued > -10 && this.detailsFrom.statued < 10) && this.$store.state.unid == row.userid) {
-        return true
+      if (
+        row.status == 0 &&
+        this.detailsFrom.statued > -10 &&
+        this.detailsFrom.statued < 10 &&
+        this.$store.state.unid == row.userid
+      ) {
+        return true;
       }
-      return false
+      return false;
     },
     add0(m) {
       return m < 10 ? "0" + m : m;
@@ -417,7 +411,11 @@
       var mm = time.getMinutes();
       var s = time.getSeconds();
       return (
-        y + "-" + this.add0(m) + "-" + this.add0(d) +
+        y +
+        "-" +
+        this.add0(m) +
+        "-" +
+        this.add0(d) +
         " " +
         this.add0(h) +
         ":" +
@@ -442,15 +440,14 @@
       return this.statusFormat(data);
     },
     statusFormat(res) {
-      
       if (res >= 0 && res <= 9) {
-        return "瀹℃牳涓�"
+        return "瀹℃牳涓�";
       } else if (res == -10) {
-        return "浣滃簾"
+        return "浣滃簾";
       } else if (res == -1) {
-        return "鎵撳洖"
-      }else if (res == 10) {
-        return "閫氳繃"
+        return "鎵撳洖";
+      } else if (res == 10) {
+        return "閫氳繃";
       }
     },
     formatStatus1(row, column) {
@@ -459,13 +456,14 @@
         return data;
       }
       return this.statusFormat1(data);
-    }, statusFormat1(res) {
+    },
+    statusFormat1(res) {
       if (res == 1) {
-        return "閫氳繃"
+        return "閫氳繃";
       } else if (res == 0) {
-        return "寰呭鏍�"
+        return "寰呭鏍�";
       } else if (res == -1) {
-        return "鎵撳洖"
+        return "鎵撳洖";
       }
     },
     resAllTable() {
@@ -475,21 +473,21 @@
         start: null,
         end: null,
         uname: null,
-        type: null
-      }
+        type: null,
+      };
       this.sizeForm = {
         start: null,
         end: null,
         uname: null,
         status: null,
-      }
+      };
       this.getAllData();
     },
     onSubmit() {
       this.listData.end = this.sizeForm.end;
       this.listData.start = this.sizeForm.start;
       this.listData.status = this.sizeForm.status;
-      this.listData.uname = this.sizeForm.uname
+      this.listData.uname = this.sizeForm.uname;
       this.getAllData();
     },
 
@@ -510,7 +508,7 @@
 
       this.tableData = data.result;
       this.count = data.count;
-    }
+    },
   },
   created() {
     this.getAllData();
@@ -520,24 +518,25 @@
 <style lang="less" scoped>
 //@import url(); 寮曞叆鍏叡css绫�
 .logLog_box {
-  width: 98%;
+  width: 100%;
 
-  height: 95%;
+  height: 100%;
   padding: 1%;
+  box-sizing: border-box;
 
   .el-input {
     width: 300px;
   }
   .inquire {
-    overflow: auto;
-    padding: 10px;
-    margin-top: 20px;
+    padding: 8px;
+
+     margin-top: 20px;
 
     border-radius: 5px;
 
     margin-bottom: 20px;
     .el-form-item {
-      margin: 7px;
+      margin: 5px;
     }
   }
   .statusLabel {
@@ -545,11 +544,11 @@
     font-size: 14px;
   }
   .table_box {
-    overflow: auto;
-    height: 70%;
-    padding: 10px;
-    height: auto;
-    border-radius: 5px;
+    // overflow: auto;
+    // height: 70%;
+    // padding: 10px;
+    // height: auto;
+    // border-radius: 5px;
   }
   .text-center {
     text-align: center;
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index ebf3c52..69fa27c 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -104,19 +104,23 @@
               align="center"
             ></el-table-column>
             <el-table-column
-            
+            min-width="180"
               :label="$t('common.operate')"
             >
               <template slot-scope="scope">
-                <el-link
-                  class="elLink"
+                <el-button
+                   type="primary"
+                  plain
+                  size="small"
                   @click="showDetail(scope.$index, scope.row)"
-                >{{$t('common.details')}}</el-link>
-                <el-link
-                  class="elLink"
+                >{{$t('common.details')}}</el-button>
+                <el-button
+                 type="primary"
+                  plain
+                  size="small"
                   @click="getAttachTable(scope.$index, scope.row)"
                   style="margin-left: 20px;  "
-                >{{$t('common.enclosure')}}</el-link>
+                >{{$t('common.enclosure')}}</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -138,9 +142,10 @@
       </div>
       
     </div>
-    <div
+     <div class="infoBox_box" v-show="showinfoBox">
+      <div
       class="infoBox box_div"
-      v-show="showinfoBox"
+   
     >
 
       <div
@@ -169,15 +174,18 @@
         </ul>
       </div>
 
-    </div>
+      </div>
+     </div>
     <el-dialog
       :title="$t('common.attachinform')"
-      width="30%"
+      top="2vh"
       :visible.sync="dialogFormVisible"
     >
+    <div style="height: 500px; overflow: auto">
       <el-form
         :model="formInline"
         class="demo-form-inline"
+        label-position="top"
       >
         <el-form-item>
           <el-input
@@ -271,19 +279,22 @@
           </el-row>
         </el-form-item> -->
       </el-form>
-
+    </div>
     </el-dialog>
     <el-dialog
-      width="37%"
+       top="2vh"
       :visible.sync="conditionVisible"
       title="鏌ヨ鏉′欢"
       :before-close="handleconditionClose"
     >
+    
       <el-form
         :inline="true"
         :model="formSql"
         class="demo-form-inline"
+        label-position="top"
       >
+      
         <el-form-item>
           <el-select
             @change="fieldChange($event)"
@@ -325,7 +336,9 @@
           >
           </el-date-picker>
         </el-form-item>
+       
       </el-form>
+    
       <span
         slot="footer"
         class="dialog-footer"
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 6f683da..bd01376 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -368,9 +368,9 @@
                   v-if="menuStatus.download"
                   v-show="scope.row.code != null"
                   @click="handerLogClick(scope.row)"
-                  type="text"
+                  type="primary"
                   size="mini"
-                  style="font-size: 14px;"
+                  plain
                 > 鏃ュ織
                 </el-button>
               </template>
@@ -559,7 +559,7 @@
       title="鏁版嵁璐ㄦ"
       :visible.sync="quayTestVisible"
       width="70%"
-      top="10vh"
+      top="2vh"
       :modal="false"
       :before-close="handleQuayTestCloseDown"
     >
@@ -834,40 +834,40 @@
     <el-dialog
       title="鏁版嵁璐ㄦ"
       :visible.sync="testQuayVisible"
-      width="50%"
-      top="15vh"
+      top="2vh"
       :modal="false"
       :before-close="handleTestQuayCloseDown"
-      label-width="80px"
+
     >
-      <el-form :model="formCheckAll">
+      <el-form :model="formCheckAll" label-position="top">
         <el-form-item label="椤圭洰鍚嶇О">
-          <el-col :span="20">
+         
             <el-input
               disabled
               v-model="formCheckAll.xmmc"
+              style="width:85%"
             ></el-input>
-          </el-col>
+     
         </el-form-item>
         <el-form-item label="鎵�灞炰笓涓�">
 
-          <el-col :span="20">
+       
             <el-input
               disabled
               v-model="formCheckAll.sjzy"
-              width="100px"
+              style="width:85%"
             ></el-input>
-          </el-col>
+    
         </el-form-item>
         <el-form-item
           v-show="formCheckAll.isDiZai"
           label="鎵�灞炰笓涓�"
         >
-          <el-col :span="20">
+         
             <el-select
               v-model="formCheckAll.diZaiType"
               placeholder="璇烽�夋嫨"
-              style="width:100%"
+              style="width:85%"
             >
               <el-option
                 v-for="item in disOptions"
@@ -877,7 +877,7 @@
               >
               </el-option>
             </el-select>
-          </el-col>
+      
 
         </el-form-item>
       </el-form>
@@ -908,6 +908,7 @@
       :title="$t('dataManage.datawarehousing')"
       :visible.sync="dialogWarehousing"
       width="70%"
+      top="2vh"
     >
       <div class="dialogBox">
         <div class="transFarBox subpage_Div">
@@ -984,9 +985,9 @@
       :title="$t('common.details')"
       :visible.sync="dialogVisible"
       width="70%"
-      top="10vh"
+       top="2vh"
     >
-      <div style="height:550px">
+      <div style="height: 500px; overflow: auto">
         <el-table
           ref="filterTable"
           :data="dbTableData"
@@ -1031,6 +1032,7 @@
       title="涓婁紶杩涘害"
       :visible.sync="jindudialogVisible"
       width="30%"
+       top="2vh"
     >
       <div>
         <div>
@@ -1049,6 +1051,7 @@
       :title="$t('common.details')"
       :visible.sync="enclosureVisible"
       :show-close="false"
+       top="2vh"
     >
       <span
         style="font-size:20px"
@@ -1069,9 +1072,9 @@
       :title="fromQueryMeta.title"
       :visible.sync="queryMetaFlag"
       width="70%" 
-      
+      top="2vh"
     >
-    <div style="height:65vh;width:100%; ">
+    <div style="height: 500px; overflow: auto;width:100%; ">
     <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
   <el-form-item  >
     <el-input size="small" v-model="fromQueryMeta.name" ></el-input>
@@ -1086,7 +1089,7 @@
                 ref="filterTable"
                 :data="metaDataTable"
                 style="width: 100%"
-                height="calc(100% - 100px)"
+                height="calc(100% - 130px)"
                 
               >
              
@@ -1098,7 +1101,7 @@
                 ></el-table-column>
                 <el-table-column
                   align="center"
-       prop="name"
+                  prop="name"
                   :label="$t('common.name')"
           
                   width="120"
@@ -1209,7 +1212,7 @@
   dataUpload_insertFiles,
   dataUpload_selectFields,
   dataUpload_selectDbData,
- dataUpload_selectPageAndCountByPid
+  dataUpload_selectPageAndCountByPid,
 } from "../../api/api";
 export default {
   name: "dataUpdata",
@@ -1398,20 +1401,20 @@
       styleVar1: {
         height: "calc(100% - 109px)",
       },
-      metaFileData:[],
-      listMetaData:{
-        metaid:0,
-        name:'',
-        pageIndex:1,
-        pageSize:10,
-        count:0,
+      metaFileData: [],
+      listMetaData: {
+        metaid: 0,
+        name: "",
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
       },
-      queryMetaFlag:false,
-      fromQueryMeta:{
-        title:'',
-        name:''
+      queryMetaFlag: true,
+      fromQueryMeta: {
+        title: "",
+        name: "",
       },
-      metaDataTable:[],
+      metaDataTable: [],
     };
   },
 
@@ -1435,53 +1438,53 @@
   },
   watch: {},
   methods: {
- setRestMetaData(){
- this.fromQueryMeta.name="";
-       this.listMetaData.name =this.fromQueryMeta.name; 
-          this.listMetaData.pageIndex = 1
-             this.listMetaData.pageSize = 10
-         
+    setRestMetaData() {
+      this.fromQueryMeta.name = "";
+      this.listMetaData.name = this.fromQueryMeta.name;
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = 10;
+
       this.startQueryMetaData();
     },
-    setSearchMetaData(){
-       this.listMetaData.name =this.fromQueryMeta.name; 
-          this.listMetaData.pageIndex = 1
-             this.listMetaData.pageSize = 10
-         
+    setSearchMetaData() {
+      this.listMetaData.name = this.fromQueryMeta.name;
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = 10;
+
       this.startQueryMetaData();
     },
     //鍏冩暟鎹〉闈㈠垏鎹�
-    handleMetaSizeChange(val){
+    handleMetaSizeChange(val) {
       this.listMetaData.pageIndex = 1;
-     this.listMetaData.pageSize = val;
-     this.startQueryMetaData();
+      this.listMetaData.pageSize = val;
+      this.startQueryMetaData();
     },
-     //鍏冩暟鎹〉闈㈠垏鎹�
-    handMetaCurrentChange(val){
+    //鍏冩暟鎹〉闈㈠垏鎹�
+    handMetaCurrentChange(val) {
       this.listMetaData.pageIndex = val;
       this.startQueryMetaData();
     },
-  //鍏冩暟鎹煡璇�
- setQueryMetaData(row){
-  this.fromQueryMeta.title = row.name
-  this.listMetaData = {
-        metaid:row.id,
-        name:'',
-        pageIndex:1,
-        pageSize:10,
-         count:0,
+    //鍏冩暟鎹煡璇�
+    setQueryMetaData(row) {
+      this.fromQueryMeta.title = row.name;
+      this.listMetaData = {
+        metaid: row.id,
+        name: "",
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
+      };
+      this.startQueryMetaData();
+      this.queryMetaFlag = true;
+    },
+    async startQueryMetaData() {
+      const data = await dataUpload_selectPageAndCountByPid(this.listMetaData);
+      if (data.code != 200) {
+        return;
       }
-this.startQueryMetaData();
-this.queryMetaFlag=true;
-},
-async startQueryMetaData(){
-const data = await dataUpload_selectPageAndCountByPid(this.listMetaData);
- if(data.code != 200){
-  return;
- }
- this.metaDataTable= data.result;
- this.listMetaData.count = data.count;
-},
+      this.metaDataTable = data.result;
+      this.listMetaData.count = data.count;
+    },
 
     onResize() {
       this.timer && clearTimeout(this.timer);
@@ -1493,7 +1496,7 @@
       this.$nextTick(() => {
         const rect = this.$refs.container.getBoundingClientRect();
         const rect1 = this.$refs.container1.getBoundingClientRect();
- 
+
         this.tableHeight = `${rect.height + 40}px`;
         this.styleVar["height"] = `calc(100% - ${rect.height + 40}px)`;
         this.styleVar1["height"] = `calc(100% - ${rect1.height + 40}px)`;
@@ -1725,14 +1728,14 @@
           }
         }
       }
-      for(var i in this.metaFileData){
-        this.insertWareList.filter((res)=>{
-          if(res.name == this.metaFileData[i]){
-              res.isMeta = true;
+      for (var i in this.metaFileData) {
+        this.insertWareList.filter((res) => {
+          if (res.name == this.metaFileData[i]) {
+            res.isMeta = true;
           }
-        })
+        });
       }
- 
+
       this.loading = true;
       const res = await dataUpload_insertFiles(
         JSON.stringify(this.insertWareList)
@@ -1884,7 +1887,7 @@
           }
         }
       }
- 
+
       var obj = {
         dirid: this.formInline.dirid,
         epsgCode: this.formInline.coordinateId,
@@ -2587,7 +2590,7 @@
         std.push(f.name);
       }
       this.formInline.metaData = std.toString();
-      this.metaFileData= std;
+      this.metaFileData = std;
     },
 
     //From琛ㄥ崟鍒濆鍖�
@@ -2758,8 +2761,8 @@
       overflow: auto;
     }
   }
-  /deeep/.el-loading-mask{
-    z-index:9999
+  /deeep/.el-loading-mask {
+    z-index: 9999;
   }
 }
 .inquire {
diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index 5762d6b..6d7f73a 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -141,20 +141,26 @@
             />
 
             <el-table-column
-              min-width="100"
+              min-width="180"
               :label="$t('dataManage.dictionaryManageObj.operation')"
             >
               <template slot-scope="scope">
-                <el-link
+                <el-button
+                 type="primary"
+                  plain
+                  size="small"
                   v-if="btnStatus.select"
                   @click="showDetail(scope.$index, scope.row)"
-                  >{{ $t("dataManage.dictionaryManageObj.lookOver") }}</el-link
+                  >{{ $t("dataManage.dictionaryManageObj.lookOver") }}</el-button
                 >
-                <el-link
+                <el-button
+                 type="warning"
+                  plain
+                  size="small"
                   v-if="btnStatus.update"
                   @click="handleEdit(scope.$index, scope.row)"
                   style="margin-left: 10px"
-                  >{{ $t("dataManage.dictionaryManageObj.revamp") }}</el-link
+                  >{{ $t("dataManage.dictionaryManageObj.revamp") }}</el-button
                 >
               </template>
             </el-table-column>
@@ -174,7 +180,8 @@
         </div>
       </div>
     </div>
-    <div class="infoBox box_div" v-show="showinfoBox">
+    <div class="infoBox_box" v-show="showinfoBox">
+    <div class="infoBox box_div">
       <div slot="header" class="clearfix">
         <span>{{ $t("dataManage.dictionaryManageObj.particulars") }}</span>
         <div style="float: right; cursor: pointer" @click="closeDetial">
@@ -258,70 +265,72 @@
         </p>
       </div>
     </div>
+    </div>
     <el-dialog
-      top="3vh"
-      style="overflow: hidden"
+      top="2vh"
       :title="$t('dataManage.dictionaryManageObj.revamp')"
       :visible.sync="dialogFormVisible"
     >
-      <el-form :model="upform">
+     <div style="height: 500px; overflow: auto">
+      <el-form :model="upform" label-position="top">
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.number')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.orderNum" autocomplete="off"></el-input>
+          <el-input v-model="upform.orderNum" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.tableName')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.tab" autocomplete="off"></el-input>
+          <el-input v-model="upform.tab" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.tableAliasName')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.tabDesc" autocomplete="off"></el-input>
+          <el-input v-model="upform.tabDesc" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
 
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.fieldName')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.field" autocomplete="off"></el-input>
+          <el-input v-model="upform.field" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.fieldAliasName')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.alias" autocomplete="off"></el-input>
+          <el-input v-model="upform.alias" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.fieldType')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.type" autocomplete="off"></el-input>
+          <el-input v-model="upform.type" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.fieldLength')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.len" autocomplete="off"></el-input>
+          <el-input v-model="upform.len" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.FieldPrecision')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.precision" autocomplete="off"></el-input>
+          <el-input v-model="upform.precision" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
 
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.remark')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="upform.bak" autocomplete="off"></el-input>
+          <el-input v-model="upform.bak" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
       </el-form>
+     </div>
       <div slot="footer" class="dialog-footer">
         <el-button
           type="info"
@@ -336,53 +345,53 @@
     </el-dialog>
     <el-dialog
       :title="$t('dataManage.dictionaryManageObj.add')"
-      top="3vh"
-      style="overflow: hidden"
+      top="2vh"
       :visible.sync="InsertFormdialog"
     >
-      <el-form :model="insertform">
+     <div style="height: 500px; overflow: auto">
+      <el-form :model="insertform" label-position="top">
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.number')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="insertform.orderNum" autocomplete="off"></el-input>
+          <el-input v-model="insertform.orderNum" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.tableName')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="insertform.tab" autocomplete="off"></el-input>
+          <el-input v-model="insertform.tab" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.tableAliasName')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="insertform.tabDesc" autocomplete="off"></el-input>
+          <el-input v-model="insertform.tabDesc" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
 
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.fieldName')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="insertform.field" autocomplete="off"></el-input>
+          <el-input v-model="insertform.field" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.fieldAliasName')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="insertform.alias" autocomplete="off"></el-input>
+          <el-input v-model="insertform.alias" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.fieldType')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="insertform.type" autocomplete="off"></el-input>
+          <el-input v-model="insertform.type" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.fieldLength')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="insertform.len" autocomplete="off"></el-input>
+          <el-input v-model="insertform.len" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.dictionaryManageObj.FieldPrecision')"
@@ -391,6 +400,7 @@
           <el-input
             v-model="insertform.precision"
             autocomplete="off"
+            style="width:85%"
           ></el-input>
         </el-form-item>
 
@@ -398,9 +408,10 @@
           :label="$t('dataManage.dictionaryManageObj.remark')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="insertform.bak" autocomplete="off"></el-input>
+          <el-input v-model="insertform.bak" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
       </el-form>
+     </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="info" size="small" @click="InsertFormdialog = false">{{
           $t("dataManage.dictionaryManageObj.cancel")
diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue
index 6421b94..39691fa 100644
--- a/src/views/datamanage/domainManage.vue
+++ b/src/views/datamanage/domainManage.vue
@@ -122,9 +122,10 @@
             <el-table-column min-width="150" :label="$t('common.operate')">
               <template slot-scope="scope">
                 <el-button
-                  class="primary"
                   @click="showDetail(scope.row)"
+                  type="primary"
                   size="small"
+                  plain
                   >{{ $t("common.details") }}</el-button
                 >
                 <el-button
@@ -132,68 +133,79 @@
                   type="warning"
                   @click="handleEdit(scope.$index, scope.row)"
                   size="small"
+                  plain
                   >{{ $t("common.update") }}</el-button
                 >
               </template>
             </el-table-column>
           </el-table>
           <div class="pagination_box" style="margin-top: 20px">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="listData.pageIndex"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="listData.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="count"
-          >
-          </el-pagination>
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="listData.pageIndex"
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="listData.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="count"
+            >
+            </el-pagination>
+          </div>
         </div>
-        </div>
-        
       </div>
     </div>
-    <div class="infoBox subpage_Div box_div" v-show="showinfoBox">
-      <div slot="header" class="clearfix">
-        <span>{{ $t("common.details") }}</span>
-        <div style="float: right; cursor: pointer" @click="closeDetial">
-          <i class="el-icon-close"></i>
+    <div class="infoBox_box" v-show="showinfoBox">
+      <div class="infoBox subpage_Div box_div">
+        <div slot="header" class="clearfix">
+          <span>{{ $t("common.details") }}</span>
+          <div style="float: right; cursor: pointer" @click="closeDetial">
+            <i class="el-icon-close"></i>
+          </div>
         </div>
-      </div>
-      <el-divider></el-divider>
-      <div class="contentBox">
-        <p>
-          {{ $t("dataManage.domainManage.domName") }}锛歿{ itemdetail.domName }}
-        </p>
         <el-divider></el-divider>
-        <p>
-          {{ $t("dataManage.domainManage.domDesc") }}锛歿{ itemdetail.domDesc }}
-        </p>
-        <el-divider></el-divider>
-        <p>
-          {{ $t("dataManage.domainManage.domCode") }}锛歿{ itemdetail.domCode }}
-        </p>
-        <el-divider></el-divider>
-        <p>
-          {{ $t("dataManage.domainManage.codeDesc") }}锛歿{
-            itemdetail.codeDesc
-          }}
-        </p>
-        <el-divider></el-divider>
-        <p>{{ $t("dataManage.domainManage.bsm") }}锛歿{ itemdetail.bsm }}</p>
-        <el-divider></el-divider>
-        <p>{{ $t("dataManage.domainManage.level") }}锛歿{ itemdetail.level }}</p>
-        <el-divider></el-divider>
-        <p>
-          {{ $t("dataManage.domainManage.orderid") }}锛歿{ itemdetail.orderid }}
-        </p>
-        <el-divider></el-divider>
-        <p>{{ $t("dataManage.domainManage.bak") }}锛歿{ itemdetail.bak }}</p>
+        <div class="contentBox">
+          <p>
+            {{ $t("dataManage.domainManage.domName") }}锛歿{
+              itemdetail.domName
+            }}
+          </p>
+          <el-divider></el-divider>
+          <p>
+            {{ $t("dataManage.domainManage.domDesc") }}锛歿{
+              itemdetail.domDesc
+            }}
+          </p>
+          <el-divider></el-divider>
+          <p>
+            {{ $t("dataManage.domainManage.domCode") }}锛歿{
+              itemdetail.domCode
+            }}
+          </p>
+          <el-divider></el-divider>
+          <p>
+            {{ $t("dataManage.domainManage.codeDesc") }}锛歿{
+              itemdetail.codeDesc
+            }}
+          </p>
+          <el-divider></el-divider>
+          <p>{{ $t("dataManage.domainManage.bsm") }}锛歿{ itemdetail.bsm }}</p>
+          <el-divider></el-divider>
+          <p>
+            {{ $t("dataManage.domainManage.level") }}锛歿{ itemdetail.level }}
+          </p>
+          <el-divider></el-divider>
+          <p>
+            {{ $t("dataManage.domainManage.orderid") }}锛歿{
+              itemdetail.orderid
+            }}
+          </p>
+          <el-divider></el-divider>
+          <p>{{ $t("dataManage.domainManage.bak") }}锛歿{ itemdetail.bak }}</p>
+        </div>
       </div>
     </div>
     <el-dialog
-      width="510px"
-      top="5vh"
+      top="2vh"
       :title="
         behavior == '鏂板鐢ㄦ埛'
           ? `${$t('common.append')}`
@@ -202,14 +214,15 @@
       :visible.sync="dialogFormVisible"
       :before-close="handleClose"
     >
-      <el-form :model="editForm" ref="editForm">
+    <div style="height: 500px; overflow: auto">
+      <el-form :model="editForm" ref="editForm" label-position="top">
         <el-form-item
           :label="$t('dataManage.domainManage.domName')"
           :label-width="formLabelWidth"
         >
           <el-select
             :popper-append-to-body="false"
-            style="width: 100%"
+            style="width:85%"
             v-model="editForm.domName"
             placeholder="璇烽�夋嫨"
           >
@@ -227,46 +240,47 @@
           :label="$t('dataManage.domainManage.domDesc')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="editForm.domDesc" autocomplete="off"></el-input>
+          <el-input v-model="editForm.domDesc" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
 
         <el-form-item
           :label="$t('dataManage.domainManage.domCode')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="editForm.domCode" autocomplete="off"></el-input>
+          <el-input v-model="editForm.domCode" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.domainManage.codeDesc')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="editForm.codeDesc" autocomplete="off"></el-input>
+          <el-input v-model="editForm.codeDesc" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.domainManage.bsm')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="editForm.bsm" autocomplete="off"></el-input>
+          <el-input v-model="editForm.bsm" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.domainManage.level')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="editForm.level" autocomplete="off"></el-input>
+          <el-input v-model="editForm.level" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.domainManage.orderid')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="editForm.orderid" autocomplete="off"></el-input>
+          <el-input v-model="editForm.orderid" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
         <el-form-item
           :label="$t('dataManage.domainManage.bak')"
           :label-width="formLabelWidth"
         >
-          <el-input v-model="editForm.bak" autocomplete="off"></el-input>
+          <el-input v-model="editForm.bak" autocomplete="off" style="width:85%"></el-input>
         </el-form-item>
       </el-form>
+    </div>
       <div v-if="behavior == '淇敼淇℃伅'" slot="footer" class="dialog-footer">
         <el-button size="small" @click="cancelEdit()">{{
           $t("common.reset")
@@ -710,7 +724,6 @@
           margin: 5px;
         }
       }
-
     }
   }
 }
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 46bda18..2e2b566 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -186,119 +186,119 @@
       </el-form>
     </div>
 
-      <div class="table_box subpage_Div" :style="styleVar">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          @selection-change="handleSelectionChange"
-          height="calc(100% - 57px)"
+    <div class="table_box subpage_Div" :style="styleVar">
+      <el-table
+        :data="tableData"
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+        height="calc(100% - 57px)"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column
+          :label="$t('dataManage.dictionaryManageObj.number')"
+          type="index"
+          width="50"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column
-            :label="$t('dataManage.dictionaryManageObj.number')"
-            type="index"
-            width="50"
-          >
-          </el-table-column>
-          <el-table-column  :label="$t('dataManage.vmobj.name')"  >      
-            <template slot-scope="scope">
-              <span v-if="scope.row.ismeta > 0 ">
-                  <el-link  title="婧愭暟鎹煡璇�" @click="setQueryMetaData(scope.row)"   target="_blank">{{ scope.row.name }}</el-link>
-              </span>
-              <span v-else>{{ scope.row.name }}</span>
-            </template>
-          </el-table-column>
+        </el-table-column>
+        <el-table-column :label="$t('dataManage.vmobj.name')">
+          <template slot-scope="scope">
+            <span v-if="scope.row.ismeta > 0">
+              <el-link
+                title="婧愭暟鎹煡璇�"
+                @click="setQueryMetaData(scope.row)"
+                target="_blank"
+                >{{ scope.row.name }}</el-link
+              >
+            </span>
+            <span v-else>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
 
-          <el-table-column prop="type" :label="$t('dataManage.vmobj.format')" />
-          <el-table-column
-            prop="sizes"
-            :label="$t('dataManage.vmobj.size')"
-            :formatter="stateFormatSizes"
-          />
-          <el-table-column
-            prop="depName"
-            :label="$t('dataManage.vmobj.depName')"
-          />
-          <el-table-column
-            prop="dirName"
-            :label="$t('dataManage.vmobj.dirName')"
-            width="200"
-          />
-          <el-table-column
-            prop="verName"
-            :label="$t('dataManage.vmobj.versionNumber')"
-          />
-          <el-table-column :label="$t('dataManage.dataUpObj.tableName')">
-            <template slot-scope="scope">
-              <a @click="detail(scope.row)">{{ scope.row.tab }}</a>
-            </template>
-          </el-table-column>
+        <el-table-column prop="type" :label="$t('dataManage.vmobj.format')" />
+        <el-table-column
+          prop="sizes"
+          :label="$t('dataManage.vmobj.size')"
+          :formatter="stateFormatSizes"
+        />
+        <el-table-column
+          prop="depName"
+          :label="$t('dataManage.vmobj.depName')"
+        />
+        <el-table-column
+          prop="dirName"
+          :label="$t('dataManage.vmobj.dirName')"
+          width="200"
+        />
+        <el-table-column
+          prop="verName"
+          :label="$t('dataManage.vmobj.versionNumber')"
+        />
+        <el-table-column :label="$t('dataManage.dataUpObj.tableName')">
+          <template slot-scope="scope">
+            <a @click="detail(scope.row)">{{ scope.row.tab }}</a>
+          </template>
+        </el-table-column>
 
-          <!-- <el-table-column
+        <!-- <el-table-column
               prop="tab"
               :label="$t('dataManage.vmobj.tab')"
               :formatter="formatData"
             /> -->
-          <el-table-column prop="rows" :label="$t('dataManage.vmobj.row')" />
-          <el-table-column
-            prop="uname"
-            :label="$t('dataManage.vmobj.createonuser')"
-          />
-          <el-table-column
-            prop="createTime"
-            :label="$t('dataManage.vmobj.createontime')"
-            :formatter="formatData"
-          />
-          <el-table-column min-width="100" :label="$t('common.operate')">
-            <template slot-scope="scope">
-              <el-link @click="showDetail(scope.row)">{{
-                $t("common.details")
-              }}</el-link>
-              <el-link
-                v-if="btnStatus.update"
-                @click="editInfo(scope.row)"
-                style="margin-left: 10px"
-                >{{ $t("common.edit") }}</el-link
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="pagination_box">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="listData.pageIndex"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="listData.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="count"
-          >
-          </el-pagination>
-        </div>
-      </div>
-  
-    <div
-      class="infoBox box_div"
-      v-show="showinfoBox"
-    >
-        <div
-          slot="header"
-          class="clearfix"
+        <el-table-column prop="rows" :label="$t('dataManage.vmobj.row')" />
+        <el-table-column
+          prop="uname"
+          :label="$t('dataManage.vmobj.createonuser')"
+        />
+        <el-table-column
+          prop="createTime"
+          :label="$t('dataManage.vmobj.createontime')"
+          :formatter="formatData"
+        />
+        <el-table-column min-width="100" :label="$t('common.operate')">
+          <template slot-scope="scope">
+            <el-button
+              @click="showDetail(scope.row)"
+              type="primary"
+              plain
+              size="small"
+              >{{ $t("common.details") }}</el-button
+            >
+            <el-button
+              type="warning"
+              plain
+              size="small"
+              v-if="btnStatus.update"
+              @click="editInfo(scope.row)"
+              style="margin-left: 10px"
+              >{{ $t("common.edit") }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination_box">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="listData.pageIndex"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="listData.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="count"
         >
-          <span>{{ $t('common.details') }}</span>
-          <div
-            style="float: right; cursor: pointer"
-            @click="closeDetial"
-          >
+        </el-pagination>
+      </div>
+    </div>
+    <div class="infoBox_box" v-show="showinfoBox">
+      <div class="infoBox box_div">
+        <div slot="header" class="clearfix">
+          <span>{{ $t("common.details") }}</span>
+          <div style="float: right; cursor: pointer" @click="closeDetial">
             <i class="el-icon-close"></i>
           </div>
         </div>
-          <el-divider></el-divider>
-        <div
-          class="contentBox"
-          style="padding:1%"
-        >
-          <p>{{ $t('dataManage.vmobj.name') }}锛歿{ itemdetail.name }}</p>
+        <el-divider></el-divider>
+        <div class="contentBox" style="padding: 1%">
+          <p>{{ $t("dataManage.vmobj.name") }}锛歿{ itemdetail.name }}</p>
           <el-divider></el-divider>
           <p>{{ $t("dataManage.vmobj.format") }}锛歿{ itemdetail.type }}</p>
           <el-divider></el-divider>
@@ -338,8 +338,9 @@
             }}
           </p>
         </div>
- 
+      </div>
     </div>
+
     <el-dialog
       width="80vh"
       top="5vh"
@@ -546,103 +547,95 @@
         </el-form-item>
       </el-form>
     </div>
-   <el-dialog
+    <el-dialog
       :title="fromQueryMeta.title"
       :visible.sync="queryMetaFlag"
-      width="70%" 
-      
+      width="70%"
     >
-    <div style="height:65vh;width:100%; ">
-    <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
-  <el-form-item  >
-    <el-input size="small" v-model="fromQueryMeta.name" ></el-input>
-  </el-form-item>
-  
-  <el-form-item>
-    <el-button type="primary" size="small"  @click="setSearchMetaData()">鏌ヨ</el-button>
-      <el-button type="info" size="small"  @click="setRestMetaData()" >閲嶇疆</el-button>
-  </el-form-item>
-</el-form>
-    <el-table
-                ref="filterTable"
-                :data="metaDataTable"
-                style="width: 100%"
-                height="calc(100% - 100px)"
-                
-              >
-             
-                <el-table-column
-                  align="center"
-                  type="index"
-                  :label="$t('common.index')"
-                  width="70px"
-                ></el-table-column>
-                <el-table-column
-                  align="center"
-       prop="name"
-                  :label="$t('common.name')"
-          
-                  width="120"
-                 >
-                   
-                   
-                 </el-table-column>
-                <el-table-column
-                  align="center"
-                  prop="dirName"
-                  :label="$t('dataManage.dataUpObj.catalogue')"
-                  width="300"
-                />
-                <el-table-column
-                  align="center"
-                  prop="depName"
-                  :label="$t('dataManage.dataUpObj.company')"
-                  width="200"
-                />
-                <el-table-column
-                  align="center"
-                  prop="verName"
-                  :label="$t('dataManage.dataUpObj.versionNo')"
-                />
-                <el-table-column
-                  align="center"
-                  prop="type"
-                  :label="$t('common.type')"
-                />
-                <el-table-column
-                  align="center"
-                  prop="sizes"
-                  :label="$t('common.size')"
-                  :formatter="changeSizeFile"
-                />
-                <el-table-column
-                  align="center"
-                  :label="$t('dataManage.dataUpObj.tableName')"
-                >
-                  <template slot-scope="scope">
-                    <a
-                      class="scopeRowColor"
-                      @click="detail(scope.row)"
-                    >{{ scope.row.tab }}</a>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  prop="rows"
-                  :label="$t('common.lineNuber')"
-                />
-                <el-table-column
-                  align="center"
-                  prop="desc"
-                  :label="$t('dataManage.dataUpObj.describe')"
-                />
-               
-               
-              </el-table>
- <div
-         
-          class="pagination_box"
+      <div style="height: 65vh; width: 100%">
+        <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
+          <el-form-item>
+            <el-input size="small" v-model="fromQueryMeta.name"></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" size="small" @click="setSearchMetaData()"
+              >鏌ヨ</el-button
+            >
+            <el-button type="info" size="small" @click="setRestMetaData()"
+              >閲嶇疆</el-button
+            >
+          </el-form-item>
+        </el-form>
+        <el-table
+          ref="filterTable"
+          :data="metaDataTable"
+          style="width: 100%"
+          height="calc(100% - 100px)"
         >
+          <el-table-column
+            align="center"
+            type="index"
+            :label="$t('common.index')"
+            width="70px"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="name"
+            :label="$t('common.name')"
+            width="120"
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="dirName"
+            :label="$t('dataManage.dataUpObj.catalogue')"
+            width="300"
+          />
+          <el-table-column
+            align="center"
+            prop="depName"
+            :label="$t('dataManage.dataUpObj.company')"
+            width="200"
+          />
+          <el-table-column
+            align="center"
+            prop="verName"
+            :label="$t('dataManage.dataUpObj.versionNo')"
+          />
+          <el-table-column
+            align="center"
+            prop="type"
+            :label="$t('common.type')"
+          />
+          <el-table-column
+            align="center"
+            prop="sizes"
+            :label="$t('common.size')"
+            :formatter="changeSizeFile"
+          />
+          <el-table-column
+            align="center"
+            :label="$t('dataManage.dataUpObj.tableName')"
+          >
+            <template slot-scope="scope">
+              <a class="scopeRowColor" @click="detail(scope.row)">{{
+                scope.row.tab
+              }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="rows"
+            :label="$t('common.lineNuber')"
+          />
+          <el-table-column
+            align="center"
+            prop="desc"
+            :label="$t('dataManage.dataUpObj.describe')"
+          />
+        </el-table>
+        <div class="pagination_box">
           <el-pagination
             @size-change="handleMetaSizeChange"
             @current-change="handMetaCurrentChange"
@@ -654,8 +647,7 @@
           >
           </el-pagination>
         </div>
-    </div>
-     
+      </div>
     </el-dialog>
     <iframe
       id="downFrame"
@@ -683,7 +675,7 @@
   meta_selectFields,
   meta_selectByPageForUpload,
   meta_selectVerByDirid,
-  meta_selectPageAndCountByPid
+  meta_selectPageAndCountByPid,
 } from "../../api/api";
 
 import MyBread from "../../components/MyBread.vue";
@@ -792,19 +784,19 @@
       styleVar: {
         height: "calc(100% - 109px)",
       },
-        listMetaData:{
-        metaid:0,
-        name:'',
-        pageIndex:1,
-        pageSize:10,
-        count:0,
+      listMetaData: {
+        metaid: 0,
+        name: "",
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
       },
-      queryMetaFlag:false,
-      fromQueryMeta:{
-        title:'',
-        name:''
+      queryMetaFlag: false,
+      fromQueryMeta: {
+        title: "",
+        name: "",
       },
-      metaDataTable:[],
+      metaDataTable: [],
     };
   },
   created() {
@@ -823,7 +815,7 @@
     this.calHeight();
   },
   methods: {
-     //澶у皬鍊兼敼鍙�
+    //澶у皬鍊兼敼鍙�
     changeSizeFile(row, column, cellValue, index) {
       if (cellValue >= 1024) {
         return parseFloat(cellValue / 1204).toFixed(3) + "GB";
@@ -831,58 +823,53 @@
         return cellValue + "MB";
       }
     },
-setRestMetaData(){
- this.fromQueryMeta.name="";
-       this.listMetaData.name =this.fromQueryMeta.name; 
-          this.listMetaData.pageIndex = 1
-             this.listMetaData.pageSize = 10
-         
+    setRestMetaData() {
+      this.fromQueryMeta.name = "";
+      this.listMetaData.name = this.fromQueryMeta.name;
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = 10;
+
       this.startQueryMetaData();
     },
-    setSearchMetaData(){
-       this.listMetaData.name =this.fromQueryMeta.name; 
-          this.listMetaData.pageIndex = 1
-             this.listMetaData.pageSize = 10
-         
+    setSearchMetaData() {
+      this.listMetaData.name = this.fromQueryMeta.name;
+      this.listMetaData.pageIndex = 1;
+      this.listMetaData.pageSize = 10;
+
       this.startQueryMetaData();
     },
     //婧愭暟鎹〉闈㈠垏鎹�
-    handleMetaSizeChange(val){
+    handleMetaSizeChange(val) {
       this.listMetaData.pageIndex = 1;
-     this.listMetaData.pageSize = val;
-     this.startQueryMetaData();
+      this.listMetaData.pageSize = val;
+      this.startQueryMetaData();
     },
-     //婧愭暟鎹〉闈㈠垏鎹�
-    handMetaCurrentChange(val){
+    //婧愭暟鎹〉闈㈠垏鎹�
+    handMetaCurrentChange(val) {
       this.listMetaData.pageIndex = val;
       this.startQueryMetaData();
     },
-  //婧愭暟鎹煡璇�
- setQueryMetaData(row){
-  this.fromQueryMeta.title = row.name
-  this.listMetaData = {
-        metaid:row.id,
-        name:'',
-        pageIndex:1,
-        pageSize:10,
-         count:0,
+    //婧愭暟鎹煡璇�
+    setQueryMetaData(row) {
+      this.fromQueryMeta.title = row.name;
+      this.listMetaData = {
+        metaid: row.id,
+        name: "",
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
+      };
+      this.startQueryMetaData();
+      this.queryMetaFlag = true;
+    },
+    async startQueryMetaData() {
+      const data = await meta_selectPageAndCountByPid(this.listMetaData);
+      if (data.code != 200) {
+        return;
       }
-this.startQueryMetaData();
-this.queryMetaFlag=true;
-},
-async startQueryMetaData(){
-const data = await meta_selectPageAndCountByPid(this.listMetaData);
- if(data.code != 200){
-  return;
- }
- this.metaDataTable= data.result;
- this.listMetaData.count = data.count;
-},
-
-
-
-
-
+      this.metaDataTable = data.result;
+      this.listMetaData.count = data.count;
+    },
 
     onResize() {
       this.timer && clearTimeout(this.timer);
diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue
index b5e56b6..345c4ac 100644
--- a/src/views/datamanage/projectManage.vue
+++ b/src/views/datamanage/projectManage.vue
@@ -22,11 +22,7 @@
         </el-tree>
       </div>
       <div class="verSion_rightContent subpage_Div">
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-        >
-        
+        <el-form :inline="true" class="demo-form-inline">
           <el-form-item>
             <el-button
               v-if="btnStatus.insert"
@@ -40,12 +36,11 @@
           </el-form-item>
         </el-form>
         <!-- <el-divider class="eldivider" /> -->
-        <div class="table_box" style="height:calc(100% - 89px)">
+        <div class="table_box" style="height: calc(100% - 89px)">
           <el-table
             ref="filterTable"
             :data="dbTableData"
-            height="calc(100% - 57px)"
-            
+            height="100%"
             style="width: 100%"
           >
             <el-table-column
@@ -107,27 +102,28 @@
                 <el-button
                   v-if="btnStatus.delete"
                   @click="deleteProject(scope.row)"
-                  icon="el-icon-delete"
                   size="small"
+                  plain
                   type="danger"
                   >{{ $t("common.delete") }}</el-button
                 >
                 <el-button
                   v-if="btnStatus.update"
                   @click="EditProject(scope.row)"
-                  icon="el-icon-edit"
-                  type="info"
+                  type="warning"
+                  plain
                   size="small"
                   >{{ $t("common.update") }}</el-button
                 >
               </template>
             </el-table-column>
           </el-table>
-          <div style="margin-top: 10px" class="pagination_box"></div>
+          <!-- <div class="pagination_box"></div> -->
         </div>
       </div>
     </div>
     <el-dialog
+      top="2vh"
       :title="
         behavior == '鏂板椤圭洰'
           ? `${$t('dataManage.projectObj.newProj')}`
@@ -147,55 +143,76 @@
           <project-ol v-if="showMap"></project-ol>
         </div>
       </el-dialog>
-      <div style="height: 540px; overflow: auto; padding: 1%">
+      <div style="height: 500px; overflow: auto">
         <el-form
           class="editFrom1"
           ref="form"
           :model="editFrom"
-          label-width="200px"
+          label-position="top"
         >
           <el-form-item :label="$t('dataManage.projectObj.projname')">
-            <el-input v-model="editFrom.projname"></el-input>
+            <el-input v-model="editFrom.projname" style="width: 85%"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.projtype')">
-            <el-input v-model="editFrom.projtype"></el-input>
+            <el-input v-model="editFrom.projtype" style="width: 85%"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.location')">
-            <el-input :disabled="true" v-model="editFrom.geom"></el-input>
-            <el-link
-              @click="ShowInner"
-              style="margin-left: 20px"
-              icon="el-icon-plus"
-            >
-            </el-link>
+            <div class="BoxFlex">
+              <div class="BoxFlexinput">
+                <el-input
+                  :disabled="true"
+                  v-model="editFrom.geom"
+                  style="width: 100%"
+                ></el-input>
+              </div>
+              <div>
+                <el-button
+                  @click="ShowInner"
+                  style="margin-left: 6px"
+                  icon="el-icon-plus"
+                  type="primary"
+                  size="small"
+                >
+                </el-button>
+              </div>
+            </div>
           </el-form-item>
 
           <el-form-item :label="$t('dataManage.projectObj.country')">
-            <el-input v-model="editFrom.country"></el-input>
+            <el-input v-model="editFrom.country" style="width: 85%"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.province')">
-            <el-input v-model="editFrom.province"></el-input>
+            <el-input v-model="editFrom.province" style="width: 85%"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.county')">
-            <el-input v-model="editFrom.location"></el-input>
+            <el-input v-model="editFrom.location" style="width: 85%"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.corpname')">
-            <el-input v-model="editFrom.corpname"></el-input>
+            <el-input v-model="editFrom.corpname" style="width: 85%"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.department')">
-            <el-input v-model="editFrom.department"></el-input>
+            <el-input
+              v-model="editFrom.department"
+              style="width: 85%"
+            ></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.conperiod')">
-            <el-input v-model="editFrom.conperiod"></el-input>
+            <el-input
+              v-model="editFrom.conperiod"
+              style="width: 85%"
+            ></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.contents')">
-            <el-input v-model="editFrom.contents"></el-input>
+            <el-input v-model="editFrom.contents" style="width: 85%"></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.projstate')">
-            <el-input v-model="editFrom.projstate"></el-input>
+            <el-input
+              v-model="editFrom.projstate"
+              style="width: 85%"
+            ></el-input>
           </el-form-item>
           <el-form-item :label="$t('dataManage.projectObj.remarks')">
-            <el-input v-model="editFrom.remarks"></el-input>
+            <el-input v-model="editFrom.remarks" style="width: 85%"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -392,7 +409,7 @@
     handleNodeClick(data) {
       //鑾峰彇鐩綍ID
       // this.dirId = data.id;
-      this.dirId = data.code
+      this.dirId = data.code;
       this.getSelectProject();
     },
 
@@ -445,12 +462,12 @@
   width: 98%;
   padding: 1%;
   .verSionContent {
-      width: 100%;
+    width: 100%;
     height: calc(100% - 75px);
     display: flex;
     justify-content: space-between;
     .verSion_leftTree {
-          width: calc(23% - 0px);
+      width: calc(23% - 0px);
       height: 100%;
       padding: 10px;
       border-radius: 5px;
@@ -462,34 +479,14 @@
       height: 100%;
       border-radius: 5px;
       padding: 10px;
+      // padding-bottom: 0;
       box-sizing: border-box;
       border: 1px solid #dcdfe6;
     }
-    .projectli {
-      height: 46px;
-      padding: 12px 12px;
-      font-size: 14px;
-
-      border-bottom: 1px solid white;
-      line-height: 46px;
-    }
-  }
-  .eldivider {
-    margin-top: 0px;
-  }
-  .projFrom {
-    .el-input {
-      width: 800px;
-    }
-  }
-  .editFrom1 {
-    .el-input {
-      width: 600px;
-    }
   }
 }
-.demo-form-inline{
-    padding: 8px;
+.demo-form-inline {
+  padding: 8px;
   // margin-top: 10px;
   border-radius: 5px;
   border: 1px solid #dcdfe6;
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 2d9714a..3ec4b7a 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -164,10 +164,9 @@
         </div>
         </div>
      
-    
+    <div class="infoBox_box" v-show="showinfoBox">
     <div
       class="infoBox subpage_Div box_div"
-      v-show="showinfoBox"
     >
 
       <div
@@ -267,14 +266,15 @@
       </div>
 
     </div>
+    </div>
     <el-dialog
       :title="$t('dataManage.styleObj.modifyStyleData')"
-      top="2vh"
-      style="overflow: hidden"
+     top="2vh"
       :before-close="removeUpdate"
       :visible.sync="dialogFormVisible"
     >
-      <el-form :model="upform">
+    <div style="height: 500px; overflow: auto">
+      <el-form :model="upform" label-position="top">
         <el-form-item
           :label="$t('dataManage.styleObj.name')"
           :label-width="formLabelWidth"
@@ -548,6 +548,7 @@
           ></el-input>
         </el-form-item>
       </el-form>
+      </div>
       <div
         slot="footer"
         class="dialog-footer"
@@ -566,12 +567,13 @@
     </el-dialog>
     <el-dialog
       :title="$t('dataManage.styleObj.addStyleData')"
-      top="2vh"
-      style="overflow: hidden"
+    
+    top="2vh"
       :visible.sync="InsertFormdialog"
       :before-close="handleClose"
     >
-      <el-form :model="insertform">
+     <div style="height: 500px; overflow: auto">
+      <el-form :model="insertform" label-position="top">
         <el-form-item
           :label="$t('dataManage.styleObj.name')"
           :label-width="formLabelWidth"
@@ -841,6 +843,7 @@
           ></el-input>
         </el-form-item>
       </el-form>
+       </div>
       <div
         slot="footer"
         class="dialog-footer"
diff --git a/src/views/datamanage/versionManage.vue b/src/views/datamanage/versionManage.vue
index e62c085..080ed9e 100644
--- a/src/views/datamanage/versionManage.vue
+++ b/src/views/datamanage/versionManage.vue
@@ -143,6 +143,7 @@
               "
               type="warning"
               size="small"
+              plain
               >{{ $t("common.update") }}</el-button
             >
             <el-button
@@ -150,6 +151,7 @@
               @click="handleDelete(scope.$index, scope.row)"
               type="danger"
               size="small"
+              plain
               >{{ $t("common.delete") }}</el-button
             >
           </template>
@@ -172,9 +174,10 @@
     <el-dialog
       :title="$t('dataManage.vmobj.editVersion')"
       :visible.sync="dialogFormVisible"
-      width="25%"
+      top="2vh"
     >
-      <el-form :model="upform">
+        <div style="height: 500px; overflow: auto">
+      <el-form :model="upform" label-position="top">
         <el-form-item
           :label="$t('dataManage.vmobj.name')"
           :label-width="formLabelWidth"
@@ -182,7 +185,7 @@
           <el-input
             v-model="upform.name"
             autocomplete="off"
-            style="width: 300px"
+             style="width:85%"
           ></el-input>
         </el-form-item>
         <el-form-item
@@ -193,7 +196,7 @@
             :popper-append-to-body="false"
             v-model="upform.dirid"
             placeholder="璇烽�夋嫨"
-            style="width: 300px"
+             style="width:85%"
           >
             <el-option
               :value="upform.dirid"
@@ -224,10 +227,11 @@
           <el-input
             v-model="upform.descr"
             autocomplete="off"
-            style="width: 300px"
+             style="width:85%"
           ></el-input>
         </el-form-item>
       </el-form>
+        </div>
       <div slot="footer" type="info" class="dialog-footer">
         <el-button size="small" @click="editFromDataClose">{{
           $t("common.close")
@@ -241,15 +245,16 @@
     <el-dialog
       :title="$t('dataManage.vmobj.addVersion')"
       :visible.sync="InsertFormdialog"
-      width="25%"
+       top="2vh"
     >
-      <el-form :model="insertform">
+    <div style="height: 500px; overflow: auto">
+      <el-form :model="insertform" label-position="top">
         <el-form-item
           :label="$t('dataManage.vmobj.name')"
           :label-width="formLabelWidth"
         >
           <el-input
-            style="width: 300px"
+             style="width:85%"
             v-model="insertform.name"
             autocomplete="off"
           ></el-input>
@@ -262,7 +267,7 @@
             :popper-append-to-body="false"
             v-model="insertform.path"
             placeholder="璇烽�夋嫨"
-            style="width: 300px"
+            style="width:85%"
           >
             <el-option
               :value="insertform.path"
@@ -292,12 +297,13 @@
           :label-width="formLabelWidth"
         >
           <el-input
-            style="width: 300px"
+             style="width:85%"
             v-model="insertform.descr"
             autocomplete="off"
           ></el-input>
         </el-form-item>
       </el-form>
+    </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="insertFromDataClose" type="info" size="small">{{
           $t("common.close")
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index f97e6be..d5e1a9e 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -379,53 +379,56 @@
 </template>
 
 <script>
-
 import MyBread from "../../components/MyBread.vue";
 import {
   report_selectByPageAndCount,
   report_upload,
   report_insert,
   report_deletes,
-  report_update
-} from '../../api/api.js'
-import { getToken } from '@/utils/auth';
+  report_update,
+} from "../../api/api.js";
+import { getToken } from "@/utils/auth";
 export default {
   name: "templateManage",
-  components: { MyBread, },
+  components: { MyBread },
   data() {
     return {
-      options: [{
-        value: 'countSizes',
-        label: '鏁版嵁閲忕粺璁�'
-      }, {
-        value: 'countServices',
-        label: '鏈嶅姟璋冪敤閲忕粺璁�'
-      }, {
-        value: 'countOperates ',
-        label: '鐢ㄦ埛娴侀噺缁熻'
-      }],
+      options: [
+        {
+          value: "countSizes",
+          label: "鏁版嵁閲忕粺璁�",
+        },
+        {
+          value: "countServices",
+          label: "鏈嶅姟璋冪敤閲忕粺璁�",
+        },
+        {
+          value: "countOperates ",
+          label: "鐢ㄦ埛娴侀噺缁熻",
+        },
+      ],
       itemdetail: {},
       showinfoBox: false,
-      behavior: '鏂板',
-      selectFileType: '*.*',
+      behavior: "鏂板",
+      selectFileType: "*.*",
       editForm: {
-        fname: '',
-        guid: '',
-        name: '',
-        code: '',
-        type: '',
-        bak: '',
+        fname: "",
+        guid: "",
+        name: "",
+        code: "",
+        type: "",
+        bak: "",
       },
       multipleSelection: [],
       dialogVisible: false,
       tableData: [],
       ruleForm: {
-        name: ''
+        name: "",
       },
       listData: {
         pageIndex: 1,
         pageSize: 10,
-        name: '',
+        name: "",
         count: 0,
       },
       btnStatus: {
@@ -436,28 +439,27 @@
         insert: false,
         update: false,
       },
-       tableHeight: 0,
+      tableHeight: 0,
       timer: 0,
       styleVar: {
-        "height": "calc(100% - 109px)",
+        height: "calc(100% - 109px)",
       },
-    }
+    };
   },
   created() {
     this.showPermsBtn();
     this.showTableData();
-
   },
-   beforeDestroy() {
+  beforeDestroy() {
     this.timer && clearTimeout(this.timer);
     window.removeEventListener("resize", this.onResize);
   },
-    mounted() {
+  mounted() {
     window.addEventListener("resize", this.onResize);
-    this.calHeight()
+    this.calHeight();
   },
   methods: {
-     onResize() {
+    onResize() {
       this.timer && clearTimeout(this.timer);
       this.timer = setTimeout(() => {
         this.calHeight();
@@ -478,16 +480,15 @@
       var blackTheme;
       if (this.$store.state.themeflag == true) {
         blackTheme = {
-          customClass: "Black_theme"
-        }
+          customClass: "Black_theme",
+        };
       }
 
-      this.$confirm('纭鍏抽棴锛�', blackTheme)
+      this.$confirm("纭鍏抽棴锛�", blackTheme)
         .then((_) => {
           this.closeInsertData();
-
         })
-        .catch((_) => { });
+        .catch((_) => {});
     },
     codeData(row, column) {
       let data = row[column.property];
@@ -495,44 +496,44 @@
         return data;
       }
       var val;
-      if (row.code.indexOf('countSizes') != -1) {
-        val = "鏁版嵁閲忕粺璁�"
-      } else if (row.code.indexOf('countServices') != -1) {
-        val = "鏈嶅姟璋冪敤閲忕粺璁�"
-      } else if (row.code.indexOf('countOperates') != -1) {
-        val = "鐢ㄦ埛娴侀噺缁熻"
+      if (row.code.indexOf("countSizes") != -1) {
+        val = "鏁版嵁閲忕粺璁�";
+      } else if (row.code.indexOf("countServices") != -1) {
+        val = "鏈嶅姟璋冪敤閲忕粺璁�";
+      } else if (row.code.indexOf("countOperates") != -1) {
+        val = "鐢ㄦ埛娴侀噺缁熻";
       }
       return val;
     },
     //鏌ョ湅
     showDetail(index, row) {
-
       this.itemdetail = row;
 
       if (parseInt(row.type) == 1) {
-        this.itemdetail.fileType = "World妯℃澘"
+        this.itemdetail.fileType = "World妯℃澘";
       } else if (parseInt(row.type) == 2) {
-        this.itemdetail.fileType = "Excel妯℃澘"
+        this.itemdetail.fileType = "Excel妯℃澘";
       }
-      if (row.code.indexOf('countSizes') != -1) {
-        this.itemdetail.code = "鏁版嵁閲忕粺璁�"
-      } else if (row.code.indexOf('countServices') != -1) {
-        this.itemdetail.code = "鏈嶅姟璋冪敤閲忕粺璁�"
-      } else if (row.code.indexOf('countOperates') != -1) {
-        this.itemdetail.code = "鐢ㄦ埛娴侀噺缁熻"
+      if (row.code.indexOf("countSizes") != -1) {
+        this.itemdetail.code = "鏁版嵁閲忕粺璁�";
+      } else if (row.code.indexOf("countServices") != -1) {
+        this.itemdetail.code = "鏈嶅姟璋冪敤閲忕粺璁�";
+      } else if (row.code.indexOf("countOperates") != -1) {
+        this.itemdetail.code = "鐢ㄦ埛娴侀噺缁熻";
       }
 
       this.itemdetail.uTime = this.format(row.updateTime);
-      this.showinfoBox = true
+      this.showinfoBox = true;
     },
     //鍏抽棴鏌ョ湅
     closeDetial() {
-      this.showinfoBox = false
+      this.showinfoBox = false;
     },
     //涓嬭浇
     handleDownload(index, row) {
       var token = getToken();
-      var url = BASE_URL + "/report/download?token=" + token + "&guid=" + row.guid;
+      var url =
+        BASE_URL + "/report/download?token=" + token + "&guid=" + row.guid;
       $("#downFrame").attr("src", url).click();
     },
     //淇敼鎻愪氦
@@ -542,64 +543,66 @@
         return this.$message.error("淇敼澶辫触");
       }
       this.$message({
-        message: '淇敼鎴愬姛',
-        type: 'success'
+        message: "淇敼鎴愬姛",
+        type: "success",
       });
       this.closeInsertData();
     },
     //鏂囦欢绫诲瀷鍒囨崲
     selFileTypeChange(val) {
       if (parseInt(val) == 1) {
-        this.selectFileType = ".docx"
+        this.selectFileType = ".docx";
       } else if (parseInt(val) == 2) {
-        this.selectFileType = ".xlsx"
+        this.selectFileType = ".xlsx";
       }
     },
     //淇敼
     handleEdit(index, row) {
-      this.behavior = "淇敼"
+      this.behavior = "淇敼";
       this.editForm = row;
       if (parseInt(row.type) == 1) {
-        this.selectFileType = ".docx"
+        this.selectFileType = ".docx";
       } else if (parseInt(row.type) == 2) {
-        this.selectFileType = ".xlsx"
+        this.selectFileType = ".xlsx";
       }
       this.dialogVisible = true;
     },
     //鍒犻櫎
     async delTableData() {
       if (this.multipleSelection.length == 0) {
-        return this.$message('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁');
+        return this.$message("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
       }
       var std = [];
       for (var i in this.multipleSelection) {
-        std.push(this.multipleSelection[i].id)
+        std.push(this.multipleSelection[i].id);
       }
-      this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユā鍧�, 鏄惁缁х画?', '鎻愮ず', {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }).then(async () => {
-        const data = await report_deletes({ ids: std.toString() })
-        if (data.code == 200) {
-          this.InsertFormdialog = false;
+      this.$confirm("姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユā鍧�, 鏄惁缁х画?", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(async () => {
+          const data = await report_deletes({ ids: std.toString() });
+          if (data.code == 200) {
+            this.InsertFormdialog = false;
+            this.$message({
+              message: "鍒犻櫎鎴愬姛锛�",
+              type: "success",
+            });
+            this.setRefreshTable();
+          } else {
+            this.$message({
+              message: "鍒犻櫎澶辫触锛�",
+              type: "warning",
+            });
+          }
+        })
+        .catch(() => {
           this.$message({
-            message: '鍒犻櫎鎴愬姛锛�',
-            type: 'success',
+            type: "info",
+            message: "宸插彇娑堝垹闄�",
           });
-          this.setRefreshTable();
-        } else {
-          this.$message({
-            message: '鍒犻櫎澶辫触锛�',
-            type: 'warning',
-          });
-        }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '宸插彇娑堝垹闄�'
         });
-      });
       // const data = await report_deletes({ ids: std.toString() })
       // if (data.code != 200) {
       //   return this.$message.error("鍒犻櫎澶辫触");
@@ -610,7 +613,6 @@
       // });
       // this.setRefreshTable();
     },
-
 
     //閲嶇疆鏌ヨ
     restRefreshTable() {
@@ -630,8 +632,8 @@
         return this.$message.error("鏂板澶辫触");
       }
       this.$message({
-        message: '鏂板鎴愬姛',
-        type: 'success'
+        message: "鏂板鎴愬姛",
+        type: "success",
       });
       this.closeInsertData();
     },
@@ -639,21 +641,21 @@
     closeInsertData() {
       this.dialogVisible = false;
       this.editForm = {
-        fname: '',
-        guid: '',
-        name: '',
-        code: '',
-        type: '',
-        bak: '',
-      }
+        fname: "",
+        guid: "",
+        name: "",
+        code: "",
+        type: "",
+        bak: "",
+      };
       this.setRefreshTable();
       document.getElementById("editFile").value = "";
     },
     //鏂囦欢涓婁紶
     async geteditFile(res) {
       if (res == 0) {
-        if (this.editForm.type == '') {
-          return this.$message('璇烽�夋嫨涓婁紶鏂囦欢绫诲瀷');
+        if (this.editForm.type == "") {
+          return this.$message("璇烽�夋嫨涓婁紶鏂囦欢绫诲瀷");
         }
 
         $("#editFile").click();
@@ -670,7 +672,6 @@
         formData.append("file", fs.files[0]);
         var val_data = await report_upload(formData);
         if (val_data.code == 200) {
-
           this.editForm.guid = val_data.result;
           this.$message({
             message: "涓婁紶鎴愬姛锛�",
@@ -683,7 +684,6 @@
           });
         }
       }
-
     },
     //鏍煎紡鍖栧垪琛�
     formatData(row, column) {
@@ -703,11 +703,11 @@
       var h = time.getHours();
       var mm = time.getMinutes();
       var s = time.getSeconds();
-      return y + '-' + this.add0(m) + '-' + this.add0(d);
+      return y + "-" + this.add0(m) + "-" + this.add0(d);
     },
     //鏍煎紡鍖栨椂闂�
     add0(m) {
-      return m < 10 ? '0' + m : m;
+      return m < 10 ? "0" + m : m;
     },
     //Table閫夋嫨浜嬩欢
     handleSelectionChange(val) {
@@ -715,8 +715,8 @@
     },
     //鏂板寮圭獥
     setTableInsert() {
-      this.behavior = "鏂板"
-      this.dialogVisible = true
+      this.behavior = "鏂板";
+      this.dialogVisible = true;
     },
     //鍒嗛〉鍒囨崲
     handleSizeChange(val) {
@@ -737,7 +737,7 @@
         return this.$message.error("鍒楄〃璋冪敤澶辫触");
       }
       this.tableData = data.result;
-      this.listData.count = data.count
+      this.listData.count = data.count;
     },
     //鏉冮檺閰嶇疆
     showPermsBtn() {
@@ -762,7 +762,7 @@
   }
 
   .searchComp {
-     padding: 8px;
+    padding: 8px;
     margin-top: 20px;
 
     border-radius: 5px;

--
Gitblit v1.9.3