Merge branch 'dev-tuceng0616' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-tuceng0616

src/views/modules/cpts/base/cpts/edit.vue

@@ -265,10 +265,26 @@
         </div>
       </el-form>
 
-      <slot v-bind:id="formId" v-bind:info="fmData"  v-bind:formType="formType"></slot>
+      <div class="div_btn resi-btns" v-if="!formBtnFixed">
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <el-button
+          v-if="formType != 'watch'"
+          type="primary"
+          size="small"
+          :disabled="btnDisable"
+          @click="handleComfirm"
+          >确 定</el-button
+        >
+      </div>
+
+      <slot
+        v-bind:id="formId"
+        v-bind:info="fmData"
+        v-bind:formType="formType"
+      ></slot>
     </div>
 
-    <div class="div_btn resi-btns">
+    <div class="div_btn resi-btns" v-if="formBtnFixed">
       <el-button size="small" @click="handleCancle">取 消</el-button>
       <el-button
         v-if="formType != 'watch'"
@@ -303,6 +319,10 @@ export default {
       type: String,
       default: "info",
     },
+    formBtnFixed: {
+      type: Boolean,
+      default: true,
+    },
     idName: {
       type: String,
       default: "",
@@ -431,8 +451,13 @@ export default {
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap(item) {
+      let { latitude, longitude } = this.$store.state.user;
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
       // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519);
+      var center = new window.TMap.LatLng(latitude, longitude);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
       map = new window.TMap.Map(document.getElementById("app"), {
         center: center, // 设置地图中心点坐标
@@ -545,7 +570,7 @@ export default {
         console.log("------------------------------------info", this.fmData);
 
         await nextTick(800);
-        if (map) {
+        if (map && data.latitude) {
           map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
         }
       } else {

src/views/modules/cpts/base/index.vue

@@ -212,6 +212,7 @@
         :editParams="editParams"
         :editParamsDiv="editParamsDiv"
         :editFixedParams="editFixedParams"
+        :formBtnFixed="formBtnFixed"
         @close="handleClose"
         @afterEdit="handleEditSuccess"
       >
@@ -318,6 +319,11 @@ export default {
       type: String,
       default: "id",
     },
+
+    formBtnFixed: {
+      type: Boolean,
+      default: true,
+    },
   },
 
   data() {
@@ -535,11 +541,12 @@ export default {
 
     handleClose() {
       this.formShow = false;
+      this.getTableData();
     },
 
     handleEditSuccess() {
       this.handleClose();
-      this.getTableData();
+      // this.getTableData();
     },
 
     async handleDelete(rowData, rowIndex) {

src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue

@@ -12,6 +12,7 @@
       :importUrl="importUrl"
       :mubanUrl="mubanUrl"
       :editParams="editParams"
+      :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
       idName="icDangerousChemicalsId"
     ></base-page>
   </div>

src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue

@@ -125,7 +125,7 @@
         <template slot-scope="scope">
           <el-input
             v-if="scope.row.isEdit"
-            type="number"
+            type="text"
             v-model="scope.row.detailed"
             placeholder="请输入"
             class="input-width"
@@ -224,6 +224,7 @@
               v-if="formType == 'edit'"
               title="删除之后无法恢复，确认删除？"
               @onConfirm="del(scope.row)"
+              @confirm="del(scope.row)"
             >
               <el-button
                 slot="reference"

src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue

@@ -16,11 +16,17 @@
       :editParams="editParams"
       :editFixedParams="editFixedParams"
       :editParamsDiv="5"
-      :editBtnName="(item) => (item.sourceType == 'import' ? '待完善' : '修改')"
+      :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
+      :formBtnFixed="false"
       idName="enterpriseId"
     >
       <template v-slot:editElse="{ id, formType, info }">
-        <record v-if="formType != 'add' && id" :formType="formType" :enterpriseId="id" :enterpriseInfo="info"></record>
+        <record
+          v-if="formType != 'add' && id"
+          :formType="formType"
+          :enterpriseId="id"
+          :enterpriseInfo="info"
+        ></record>
       </template>
     </base-page>
   </div>
@@ -93,7 +99,7 @@ export default {
         { field: "场所名称", keyName: "placeOrgName", type: "text" },
         { field: "场所地址", keyName: "address", type: "text" },
         { field: "场所类型", keyName: "placeTypeName", type: "text" },
-        { field: "规模", keyName: "scale", type: "text" },
+        { field: "规模", keyName: "scaleName", type: "text" },
         { field: "负责人", keyName: "personInCharge", type: "text" },
         { field: "联系电话", keyName: "mobile", type: "text" },
         { field: "最新检查时间", keyName: "latestPatrolTime", type: "text" },

src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue

@@ -12,6 +12,7 @@
       :importUrl="importUrl"
       :mubanUrl="mubanUrl"
       :editParams="editParams"
+      :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
       idName="icSuperiorResourceId"
     ></base-page>
   </div>