Explorar el Código

fix:统一设置误触关闭弹窗,去除标题有2

chenxinlei hace 2 años
padre
commit
c0b6663824

+ 2 - 0
src/plugins/element.js

@@ -4,6 +4,8 @@ import 'element-ui/lib/theme-chalk/display.css'
 
 import '@/styles/element-variables.scss'
 
+ElementUI.Dialog.props.closeOnClickModal.default = false
+
 Vue.use(ElementUI, {
   size: 'small',
 })

+ 5 - 5
src/views/stationConfiguration/area/components/TableEdit.vue

@@ -36,19 +36,19 @@
           <el-form-item   label="光伏装机数量组串" prop="quantityzc"><el-input placeholder="请输入" class="inputs" v-model.trim="form.quantityzc" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item   label="接入风电装机容量2" prop="jrwindcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacity" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="接入风电装机容量" prop="jrwindcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacity" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item   label="接入风电容量单位2" prop="jrwindcapacityunit"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacityunit" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="接入风电容量单位" prop="jrwindcapacityunit"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindcapacityunit" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item   label="接入风电装机数量2" prop="jrwindquantity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindquantity" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="接入风电装机数量" prop="jrwindquantity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrwindquantity" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item   label="接入光伏装机容量2" prop="jrcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrcapacity" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="接入光伏装机容量" prop="jrcapacity"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrcapacity" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item   label="接入光伏容量单位2" prop="jrcapacityunit"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrcapacityunit" autocomplete="off"></el-input></el-form-item>
+          <el-form-item   label="接入光伏容量单位" prop="jrcapacityunit"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrcapacityunit" autocomplete="off"></el-input></el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item   label="接入光伏装机数量集中" prop="jrquantityjz"><el-input placeholder="请输入" class="inputs" v-model.trim="form.jrquantityjz" autocomplete="off"></el-input></el-form-item>

+ 5 - 5
src/views/stationConfiguration/area/index.vue

@@ -43,11 +43,11 @@
         <el-table-column width="170" show-overflow-tooltip label="光伏容量单位" prop="capacityunit" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="光伏装机数量集中" prop="quantityjz" align="center" sortable></el-table-column>
         <el-table-column width="170" show-overflow-tooltip label="光伏装机数量组串" prop="quantityzc" align="center" sortable></el-table-column>
-        <el-table-column width="170" show-overflow-tooltip label="接入风电装机容量2" prop="jrwindcapacity" align="center" sortable></el-table-column>
-        <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位2" prop="jrwindcapacityunit" align="center" sortable></el-table-column>
-        <el-table-column width="170" show-overflow-tooltip label="接入风电装机数量2" prop="jrwindquantity" align="center" sortable></el-table-column>
-        <el-table-column width="170" show-overflow-tooltip label="接入光伏装机容量2" prop="jrcapacity" align="center" sortable></el-table-column>
-        <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位2" prop="jrcapacityunit" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入风电装机容量" prop="jrwindcapacity" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入风电容量单位" prop="jrwindcapacityunit" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入风电装机数量" prop="jrwindquantity" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入光伏装机容量" prop="jrcapacity" align="center" sortable></el-table-column>
+        <el-table-column width="170" show-overflow-tooltip label="接入光伏容量单位" prop="jrcapacityunit" align="center" sortable></el-table-column>
         <el-table-column width="190" show-overflow-tooltip label="接入光伏装机数量集中" prop="jrquantityjz" align="center" sortable></el-table-column>
         <el-table-column width="190" show-overflow-tooltip label="接入光伏装机数量组串" prop="jrquantityzc" align="center" sortable></el-table-column>
         <el-table-column show-overflow-tooltip label="操作" width="180px" fixed="right">