Bladeren bron

Merge branch 'master' of http://101.42.248.108:3000/wangyu/post-check-web

李帅 6 maanden geleden
bovenliggende
commit
26d4fe8231

+ 3 - 2
src/views/statisticAnalysis/problemStatistics/leftZhu.vue

@@ -66,7 +66,8 @@ export default {
66 66
     initTopLeftChartEcharts() {
67 67
       const option = {
68 68
         title: {
69
-          text: '岗检问题级别占比',
69
+          // text: '岗检问题级别占比',
70
+          text: '岗检问题属性整改占比',
70 71
           left: 'center'
71 72
         },
72 73
         //格式化提示
@@ -113,4 +114,4 @@ export default {
113 114
     }
114 115
   }
115 116
 }
116
-</script>
117
+</script>

+ 1 - 1
src/views/statisticAnalysis/topRigthChart.vue

@@ -136,4 +136,4 @@ export default {
136 136
 </script>
137 137
 
138 138
 <style lang="scss" scoped>
139
-</style>
139
+</style>

+ 8 - 1
src/views/system/dept/index.vue

@@ -24,7 +24,7 @@
24 24
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
25 25
       </el-form-item>
26 26
     </el-form>
27
-
27
+    <!--
28 28
     <el-row :gutter="10" class="mb8">
29 29
       <el-col :span="1.5">
30 30
         <el-button
@@ -47,6 +47,7 @@
47 47
       </el-col>
48 48
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
49 49
     </el-row>
50
+    -->
50 51
 
51 52
     <el-table
52 53
       v-if="refreshTable"
@@ -86,6 +87,7 @@
86 87
             @click="handleUpdate(scope.row)"
87 88
             v-hasPermi="['system:dept:edit']"
88 89
           >修改</el-button>
90
+          <!--
89 91
           <el-button
90 92
             size="mini"
91 93
             type="text"
@@ -101,6 +103,7 @@
101 103
             @click="handleDelete(scope.row)"
102 104
             v-hasPermi="['system:dept:remove']"
103 105
           >删除</el-button>
106
+          -->
104 107
         </template>
105 108
       </el-table-column>
106 109
     </el-table>
@@ -166,12 +169,15 @@
166 169
               <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
167 170
             </el-form-item>
168 171
           </el-col>
172
+          <!--
169 173
           <el-col :span="12">
170 174
             <el-form-item label="负责人" prop="leader">
171 175
               <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
172 176
             </el-form-item>
173 177
           </el-col>
178
+          -->
174 179
         </el-row>
180
+        <!--
175 181
         <el-row>
176 182
           <el-col :span="12">
177 183
             <el-form-item label="联系电话" prop="phone">
@@ -185,6 +191,7 @@
185 191
           </el-col>
186 192
         </el-row>
187 193
         <el-row>
194
+        -->
188 195
           <!--<el-col :span="12">
189 196
             <el-form-item label="部门状态">
190 197
               <el-radio-group v-model="form.status">