2022-4-11 吴卿华

gassafetyprogress-web/src/views/regulation/device/index.vue

@@ -89,11 +89,6 @@
     <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="设备id" align="center" prop="deviceId" />-->
-      <el-table-column label="照片" align="center"  >
-        <template scope="List">
-              <img :src="List.row.iconUrl" width="100px">
-        </template>
-      </el-table-column>
       <el-table-column label="设备名称" align="center" prop="deviceName">
         <span slot-scope="scope" v-if="scope.row.deviceName">{{scope.row.deviceName}}</span>
         <span v-else>-</span>
@@ -124,6 +119,11 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
+      <el-table-column label="照片" align="center"  >
+        <template slot-scope="List">
+          <img :src="List.row.iconUrl" width="100px">
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center"  >
       <template slot-scope="List">
           <span
@@ -837,7 +837,7 @@ export default {
     handleDelete(row) {
       const deviceIds = row.deviceId || this.ids;
       // const deviceIds = row.relationDeviceDetailId || this.ids;
-      this.$confirm('是否确认删除设备信息编号为"' + deviceIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除设备名称为"' + row.deviceName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

gassafetyprogress-web/src/views/regulation/info/index.vue

@@ -75,11 +75,6 @@
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="企业id" align="center" prop="enterpriseId" />-->
-      <el-table-column label="营业执照" align="center"  >
-        <template scope="List">
-          <img  :src="List.row.doDusiness" width="100px">
-        </template>
-      </el-table-column>
       <el-table-column label="企业名称" align="center" prop="enterpriseName" >
         <span slot-scope="scope" v-if="scope.row.enterpriseName">{{scope.row.enterpriseName}}</span>
         <span v-else>-</span>
@@ -112,6 +107,11 @@
         <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
         <span v-else>-</span>
       </el-table-column>
+      <el-table-column label="营业执照" align="center"  >
+        <template slot-scope="List">
+          <img  :src="List.row.doDusiness" width="100px">
+        </template>
+      </el-table-column>
       <el-table-column label="营业执照" align="center"  >
         <template slot-scope="List">
           <span
@@ -431,7 +431,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const enterpriseIds = row.enterpriseId || this.ids;
-      this.$confirm('是否确认删除企业信息编号为"' + enterpriseIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除企业名称为"' + row.enterpriseName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

gassafetyprogress-web/src/views/regulation/project/index.vue

@@ -451,7 +451,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const projectIds = row.projectId || this.ids;
-      this.$confirm('是否确认删除工程项目信息编号为"' + projectIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除企业名称为"' + row.enterpriseCode + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

gassafetyprogress-web/src/views/regulation/station/index.vue

@@ -74,11 +74,6 @@
 
     <el-table v-loading="loading" :data="stationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="照片" align="center"  >
-        <template slot-scope="List">
-          <img  :src="List.row.pictureAddress" width="100px">
-        </template>
-      </el-table-column>
       <el-table-column label="场站类型" align="center" prop="siteStationType" >
         <span slot-scope="scope" v-if="scope.row.siteStationType">{{scope.row.siteStationType}}</span>
         <span v-else>-</span>
@@ -116,6 +111,11 @@
         <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
         <span v-else>-</span>
       </el-table-column>
+      <el-table-column label="照片" align="center"  >
+        <template slot-scope="List">
+          <img  :src="List.row.pictureAddress" width="100px">
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center"  >
         <template slot-scope="List">
           <span
@@ -714,7 +714,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const siteStationIds = row.siteStationId || this.ids;
-      this.$confirm('是否确认删除场站信息编号为"' + siteStationIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除场站名称为"' + row.beyondEnterpriseName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

gassafetyprogress-web/src/views/regulation/supervise/index.vue

@@ -83,11 +83,6 @@
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="照片" align="center"  >
-        <template scope="List">
-          <img  :src="List.row.avatarAddress" width="100px">
-        </template>
-      </el-table-column>
       <el-table-column label="姓名" align="center" prop="employedPeopleName" >
         <span slot-scope="scope" v-if="scope.row.employedPeopleName">{{scope.row.employedPeopleName}}</span>
         <span v-else>-</span>
@@ -124,6 +119,11 @@
         <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
         <span v-else>-</span>
       </el-table-column>
+      <el-table-column label="照片" align="center"  >
+        <template slot-scope="List">
+          <img  :src="List.row.avatarAddress" width="100px">
+        </template>
+      </el-table-column>
       <el-table-column label="照片" align="center"  >
       <template slot-scope="List">
           <span
@@ -471,7 +471,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const employedPeopleIds = row.employedPeopleId || this.ids;
-      this.$confirm('是否确认删除从业人员信息编号为"' + employedPeopleIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除从业人员名称为"' + row.employedPeopleName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"