Procházet zdrojové kódy

Merge branch 'dataType' of http://39.106.8.246:3003/web/adm into dataType

YaolongHan před 4 roky
rodič
revize
711048c860

+ 1 - 1
src/components/dialogs/changeRea.vue

@@ -40,7 +40,7 @@
             </el-table-column>
             <el-table-column label="安装位置">
               <template slot-scope="scope">
-                {{ scope.row.infos ? scope.row.infos.InstallLocation ? scope.row.infos.InstallLocation : "--" : "--" }}
+                {{ scope.row.infos ? scope.row.infos.installLocation ? scope.row.infos.installLocation : "--" : "--" }}
               </template>
             </el-table-column>
           </el-table>

+ 3 - 3
src/components/ledger/details/detail/exhibitionEnergy.vue

@@ -5,7 +5,7 @@
         <h4 class="base">{{key}}</h4>
         <div class="table-dynamic" v-for="(value,keys,index) in val.paths">
           <div class="table-title"> {{ value.InfoPointName }}:</div>
-          <p :style="{'color':value.value? '' :'#F56C6C'}">{{ value.value ? `表号功能号:${value.value} ` : '未维护' }}</p>
+          <p :style="{'color':value.value? '' :'#F56C6C'}">{{ value.value ? `${value.value}` : '未维护' }}</p>
           <p v-if="value.data == '0'">{{ value.data }}{{ value.Unit }}</p>
           <p v-else-if="value.data">{{ value.data }}{{ value.Unit }}</p>
           <!--          <p v-else-if="value.error">{{value.error}}</p>-->
@@ -15,9 +15,9 @@
             width="160"
             trigger="hover">
             <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">错误原因</p>
-            <p>{{ value.error }}</p>
+            <p>{{ '表号功能号不存在' }}</p>
             <div style="text-align: center; margin: 0">
-              <el-button type="text" size="mini" @click="handleCopy(value.error)">复制</el-button>
+              <el-button type="text" size="mini" @click="handleCopy(value.error)">复制错误信息</el-button>
             </div>
             <el-button slot="reference" type="text" style="color:#F56C6C">error</el-button>
           </el-popover>

+ 3 - 0
src/components/ledger/handsontables/device.vue

@@ -405,6 +405,9 @@ export default {
             this.initTable();
           }
         });
+      } else {
+        this.loading = false;
+        this.$message.info("请选择设备类别!");
       }
     },
     //获取所有主体数据---用于维护信息

+ 10 - 8
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -1,19 +1,21 @@
 <template>
   <div id="deviceList">
     <el-row class="left">
-      <span style="float:right;">当前选择的部件类型:{{ category.Name }}</span>
+      <span style="float:left;">当前选择的部件类型:{{ category.name }}</span>
       <!-- <div style="width:200px;display:inline-block;text-align:left;color:gray;">
         <span>隐藏自动填充的信息</span>
         <el-checkbox v-model="isWatch" @change="getTableHeader"></el-checkbox>
       </div> -->
-      <el-select v-model="showType" @change="initTable" style="width:100px;margin-right:10px;vertical-align:bottom;">
-        <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value">
+      <span style="float: right;">
+          <el-select v-model="showType" @change="initTable" style="width:100px;margin-right:10px;vertical-align:bottom;">
+            <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value">
         </el-option>
-      </el-select>
-      <span>增加</span>
-      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
-      <span>个{{ category.Name }}</span>
-      <el-button @click="handleAddTableRow">增加</el-button>
+        </el-select>
+        <span>增加</span>
+        <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
+        <span>个{{ category.name }}</span>
+        <el-button @click="handleAddTableRow">增加</el-button>
+      </span>
     </el-row>
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">

+ 5 - 4
src/views/ledger/report/index.vue

@@ -108,7 +108,7 @@
           竖井<i>{{ `(${shaftCount ? shaftCount : '0'})` }}</i></span>
         <div class="data-show" v-loading="isLoading" v-if="shaft.length">
           <div class="show-content" v-for="(item,index) in shaft" :key="index">
-            <datafan :id="'origin-datafan' + index" :renderData="item" v-if="!item.needCountT"></datafan>
+            <datafan :id="'origin-datafan' + index" :renderData="item" v-if="item.needCountT==undefined"></datafan>
             <data-origin :id="'origin-shaft' + index" :renderData="item" v-else></data-origin>
           </div>
         </div>
@@ -320,14 +320,14 @@ export default {
     },
     getShaftFunType() {// 获取数据功能类型
       getCenoteType(this.param, res => {
-        this.ShaftFunType = res.Content;
+        this.ShaftFunType = res.content;
         this.getShaftCount();
       })
     },
     shaftFunTypeTranstion(item) {// 竖井功能类型转换
       this.ShaftFunType.forEach((it, index) => {
-        if (item.Name === it.Id) {
-          item.Name = it.Name;
+        if (item.name === it.id) {
+          item.name = it.name;
         }
       })
     },
@@ -765,6 +765,7 @@ export default {
           needCountT: this.shaftCount - res1.count,
           text: text
         })
+        console.log(this.shaft,'88888888888');
       })
     }
   },

+ 4 - 1
src/views/ledger/spacelist/spaceadd/index.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click.prevent.once="handleCreateTableData" class="create_button">创建业务空间</el-button>
+      <el-button type="primary" size="medium" @click="handleCreateTableData" :disabled="createDisable" class="create_button">创建业务空间</el-button>
     </el-row>
 
     <!--二维码弹窗 -->
@@ -108,6 +108,7 @@ export default {
       imgsArr: [], //临时保存的图片key数组
       showType: this.$route.query.showType,
       buildFloorData: [],
+      createDisable: false
     };
   },
   computed: {
@@ -160,6 +161,7 @@ export default {
     },
     // 创建业务空间数据
     async handleCreateTableData() {
+      this.createDisable = true;
       let newData = this.tableData.filter(item => {
         let keys = Object.keys(item);
         keys.map(key => {
@@ -201,6 +203,7 @@ export default {
         content: newData
       }
       zoneCreate(param, res => {
+        this.createDisable = false;
         this.$message.success('创建成功')
         session.remove("spaceAddData")
         this.$router.push({

+ 13 - 11
src/views/ledger/system/addsystem.vue

@@ -191,9 +191,11 @@ export default {
       })
     },
     // 删除表格行
-    handleDeleteTableRow() {
-      this.$message.success("删除成功");
-      this.formaTableData();
+    handleDeleteTableRow(a,b,c,d) {
+      if (d && d === 'ContextMenu.removeRow') {
+				this.$message.success("删除成功");
+      	this.formaTableData();
+			}
     },
     // 添加行
     handleAddTableRow() {
@@ -339,14 +341,14 @@ export default {
           break;
         //设备二维码图片
         // case 'EquipQRCode':
-        case "defaultQRCode":
-          this.qrcodeUrl = this.tableData[row.row].EquipQRCode;
-          if (!!this.qrcodeUrl) {
-            this.myDialog.qrcode = true;
-          } else {
-            this.$message("此设备没有设备二维码");
-          }
-          break;
+        // case "defaultQRCode":
+        //   this.qrcodeUrl = this.tableData[row.row].EquipQRCode;
+        //   if (!!this.qrcodeUrl) {
+        //     this.myDialog.qrcode = true;
+        //   } else {
+        //     this.$message("此设备没有设备二维码");
+        //   }
+        //   break;
         //关联设备数量
         case 'count':
           if (!this.onlyRead) {

+ 1 - 1
src/views/model/report/index.vue

@@ -251,7 +251,7 @@ export default {
         this.tableList.forEach(item => {
           this.modelFloor.forEach(it => {
             if (item.Code === it.FolderId) {
-              if (!item.DataCheckResult) {
+              if (!it.DataCheckResult) {
                 item.flag = false;
               }
             }