指定设备功能隐藏&发布测试版

src/utils/request.js

@@ -15,9 +15,9 @@ var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}
 var browserUrl = window.location.hostname
 console.log("========url===",reg.test(browserUrl))
 // 打包的时候打开,日常关掉
-// if (reg.test(browserUrl)){
-//   URL = window.location.protocol +"//"+ browserUrl + ":80/"
-// }
+if (reg.test(browserUrl)){
+  URL = window.location.protocol +"//"+ browserUrl + ":80/"
+}
 
 Cookies.set('url',URL)
 console.log(process.env.VUE_APP_BASE_API,'===========URL1111')

src/views/basicData/equipmentTMR/index.vue

@@ -110,7 +110,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="指定设备" min-width="100px" align="center">
+        <!-- <el-table-column label="指定设备" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.appointName }}</span>
             <el-select v-if="scope.row.Edit" v-model="scope.row.appointName" filterable placeholder="指定设备" class="filter-item" style="width:95%;padding:10px 0;" @change="changeAppoint">
@@ -118,7 +118,7 @@
             </el-select>
 
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="备注" min-width="90px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
@@ -413,8 +413,8 @@ export default {
       }, 1000)
       this.requestParam.name = 'insertTMR'
       this.requestParam.parammaps = this.table.temp
-      this.requestParam.parammaps.appoint= this.appoinObj.appoint;
-      this.requestParam.parammaps.appointName= this.appoinObj.appointName;
+      this.requestParam.parammaps.appoint= this.appoinObj.appoint || 0;
+      this.requestParam.parammaps.appointName= this.appoinObj.appointName || '';
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
@@ -561,8 +561,8 @@ export default {
       }, 1000)
       this.requestParam.name = 'updateTMR'
       this.requestParam.parammaps = this.table.temp
-      this.requestParam.parammaps.appoint= this.appoinObj.appoint;
-      this.requestParam.parammaps.appointName= this.appoinObj.appointName;
+      this.requestParam.parammaps.appoint= this.appoinObj.appoint || 0;
+      this.requestParam.parammaps.appointName= this.appoinObj.appointName || '';
       console.log('点击了编辑保存---hss', this.requestParam)
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)