指标权重字段修改

src/components/TopNav/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-dialog :modal="false" :before-close="closeMenuHandler" :visible.sync="isShowMenu" :fullscreen="true">
-    <el-menu :default-active="activeMenu" mode="horizontal" @select="handleSelect">
+  <el-dialog :modal="true" placement="left" class="abc" :before-close="closeMenuHandler" :visible.sync="isShowMenu">
+    <el-menu :default-active="activeMenu" class="test" mode="horizontal" @select="handleSelect">
       <template v-for="(item, index) in topMenus">
         <el-menu-item :style="{ '--theme': theme }" :index="item.path" :key="index" v-if="index < visibleNumber"><svg-icon
             :icon-class="item.meta.icon" />
@@ -111,7 +111,7 @@ export default {
   },
   methods: {
 
-    closeMenuHandler(){
+    closeMenuHandler() {
       this.$emit("closeMenuHandler");
     },
 
@@ -122,6 +122,7 @@ export default {
     },
     // 菜单选择事件
     handleSelect(key, keyPath) {
+      console.log(key);
       this.currentIndex = key;
       const route = this.routers.find(item => item.path === key);
       if (this.ishttp(key)) {
@@ -159,6 +160,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.el-dialog__wrapper>.el-dialog {
+  margin-top: 10vh;
+
+  background: red;
+}
+
 .topmenu-container.el-menu--horizontal>.el-menu-item {
   float: left;
   height: 50px !important;
@@ -184,7 +191,7 @@ export default {
   margin: 0 10px !important;
 }
 
-.el-dialog > .el-dialog__body{
+.el-dialog>.el-dialog__body {
   padding: 0 !important;
 }
 </style>

src/layout/components/Navbar.vue

@@ -6,17 +6,7 @@
       <!-- 伸缩按钮 -->
       <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
         @toggleClick="toggleSideBar" />
-      <div style="margin: 0 20px; position: relative;">
-        <!-- <ul v-show="isShowMenu" class="menu-list"> -->
-        <top-nav class="menu-list" @closeMenuHandler="handlerShowMenu" :isShowMenu="isShowMenu"></top-nav>
-        <!--           
-          <div class="manu-item-container cursor" @click="handlerRouteData(item,index)" v-for="(item, index) in routeData">
-            <img :src="routeImgs[index]" class="menu-item-img" alt="" srcset="">
-            <li :key="item.path + index" class="menu-item ">{{ item.meta.title }}
-            </li>
-          </div> -->
-        <!-- </ul> -->
-      </div>
+        <top-nav  @closeMenuHandler="handlerShowMenu" :isShowMenu="isShowMenu"></top-nav>
     </div>
 
 
@@ -167,51 +157,6 @@ export default {
     }
   }
 
-  .menu-list {
-    overflow: hidden;
-    padding: 10px;
-    position: absolute;
-    top: 30px;
-    background-color: rgba(255, 255, 255, 1);
-    box-sizing: border-box;
-    // border-width: 1px;
-    // border-style: solid;
-    // border-color: rgba(228, 228, 228, 1);
-    // border-radius: 10px;
-    left: -100px;
-    z-index: 1;
-    list-style: none;
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row;
-    width: 365px;
-    height: 50vh;
-    justify-content: start;
-
-    .manu-item-container {
-      width: 80px;
-      height: 80px;
-      font-size: 14px;
-      // background-color: rgb(0, 140, 140);
-      margin-left: 4px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-direction: column;
-      border-radius: 10px;
-
-      &:hover {
-        background-color: rgb(221, 235, 248);
-      }
-    }
-
-    .menu-item-img {
-      width: 22px;
-      height: 22px;
-      margin-bottom: 10px;
-    }
-  }
-
   .hamburger-container {
     line-height: 46px;
     height: 100%;

src/views/norm/dataSubmission.vue

@@ -53,7 +53,7 @@
           </el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="启用时间" width="150px" align="center" prop="startTime">
+      <!-- <el-table-column label="启用时间" width="150px" align="center" prop="startTime">
         <template slot-scope="scope">
           <div v-if="scope.row.status == '1' ? true : false">{{ scope.row.startTime }}</div>
         </template>
@@ -62,19 +62,13 @@
         <template slot-scope="scope">
           <div v-if="scope.row.status == '0' ? true : false">{{ scope.row.stopTime }}</div>
         </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
-
-      </el-table-column>
-      <el-table-column label="采集参考值" align="center" prop="collValue">
-
-      </el-table-column>
-      <el-table-column label="绩效参考值" align="center" prop="meritsValue">
-
-      </el-table-column>
-      <el-table-column label="上下公差占比" align="center" prop="dfRetio">
+      </el-table-column> -->
+      <el-table-column label="备注" align="center" prop="remark"></el-table-column>
+      <el-table-column label="绩效公差上下公差占比" align="center" prop="msRetio" />
+        <el-table-column label="采集公差上下公差占比" align="center" prop="dfRetio" />
+        <el-table-column label="采集参考值" align="center" prop="collValue" />
+        <el-table-column label="绩效参考值" align="center" prop="meritsValue" />
 
-      </el-table-column>
       <!-- <el-table-column label="明细类型(1=绩效,2=采集)" align="center" prop="type"></el-table-column> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

src/views/norm/feeindex.vue

@@ -40,7 +40,11 @@
         <el-table-column label="指标参数名称" align="center" prop="fname" />
         <el-table-column label="计量单位" align="center" prop="funit" />
         <el-table-column label="权数" align="center" prop="fnumber" />
-        <el-table-column label="指标参数" align="center" prop="fvalue" />
+        <el-table-column label="绩效公差上下公差占比" align="center" prop="msRetio" />
+        <el-table-column label="采集公差上下公差占比" align="center" prop="dfRetio" />
+        <el-table-column label="采集参考值" align="center" prop="collValue" />
+        <el-table-column label="绩效参考值" align="center" prop="meritsValue" />
+
         <el-table-column label="是否启用" align="center" prop="status">
           <template slot-scope="scope">
             <el-switch v-model="scope.row.status" @change="changeSwitchHandler(scope.row)" active-color="#13ce66"
@@ -48,8 +52,8 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="启用时间" align="center" prop="startTime" />
-        <el-table-column label="停用时间" align="center" prop="stopTime" />
+        <!-- <el-table-column label="启用时间" align="center" prop="startTime" />
+        <el-table-column label="停用时间" align="center" prop="stopTime" /> -->
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">