safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/pc/DeviceChange.vue

@@ -97,8 +97,6 @@
                          class="input_search full-with"  placeholder="配置名称">
                 </div>
               </div>
-
-
               <button @click="confirm()"  class="btn button_search col-sm-1 col-sm-offset-5" style="width: 70px" :disabled="!$v.valid">
                 <span style="color: black" class="glyphicon glyphicon-floppy-disk"></span>保存
               </button>
@@ -112,6 +110,7 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
+
     <modal :show.sync="modelshow1"  v-ref:modal large backdrop="false">
       <header slot="modal-header" class="modal-header">
         <button type="button" class="close" @click="cancel1"><span style="color: black">&times;</span></button>
@@ -137,7 +136,7 @@
                 <span style="color: black" class="glyphicon glyphicon-floppy-disk"></span>保存
               </button>
               <button @click='cancel1()'  class="btn button_clear col-sm-1 col-sm-offset-1" style="width: 70px">
-                <span style="color: black" class=" glyphicon glyphicon-log-out"></span>返回
+                <span style="color: black" class="glyphicon glyphicon-floppy-disk"></span>返回
               </button>
             </div>
           </validator>
@@ -194,6 +193,7 @@
 <script>
 
 import { HttpResetClass } from 'vue-client'
+import Vue from "vue";
 
 export default {
   title: '配置修改',
@@ -224,42 +224,12 @@ export default {
     }
   },
   methods: {
-    getorg(val) {
-      this.f_filialeid = val[0]
-     if (val[0]){
-       new HttpResetClass().load('post','rs/sql/tel_singleTable_OrderBy',{data: {
-           items: 'f_dir',
-           tablename: 't_organization',
-           condition: `id  = '${val[0]}'`,
-           orderitem: 'id'
-         }}).then(res=>{
-         console.log("aaaaaaaaaaaaaaaa")
-         console.log(JSON.stringify(res.data[0].f_dir))
-         if (!res.data[0].f_dir){
-           this.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
-         }else{
-           this.f_dir=res.data[0].f_dir
-           try {
-             new HttpResetClass().load('GET',`/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {},{resolveMsg: '获取居民配置项成功！', rejectMsg: '获取居民配置项出错！'}).then(res=>{
-               console.log('居民===>', res.data)
-               this.safeConfig["民用配置项"]=Object.assign({},res.data)
-             })
-             new HttpResetClass().load('GET',`/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {},{resolveMsg: '获取非居民配置项成功！', rejectMsg: '获取非居民配置项出错！'}).then(res=>{
-               console.log('非居民===>', res.data)
-               this.safeConfig["非民用配置项"]=Object.assign({},res.data)
-             }).then(res=> {
-               this.safeArray = []
-               this.initArray()
-               this.model = {}
-               this.modeldata = {}
-             })
-
-           }catch (e) {
-              this.$showMessage("获取配置文件失败"+e)
-           }
-         }
-       })
-     }
+    async getorg(val) {
+      let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+      Vue.config = res.data
+      this.safeConfig["民用配置项"]=Object.assign({},res.data.safecheck.DevicesConfig)
+      this.safeConfig["非民用配置项"]=Object.assign({},res.data.safecheck.DevicesSetConfig)
+      this.initArray()
     },
     isdelete(item){
 
@@ -279,10 +249,13 @@ export default {
       return true
     },
     confirm() {
-      //console.log(item)
+      ////tag
       if (this.modeldata.safeindex==1){
-        console.log("99999999999999999991")
+        //tag
         for(let name in this.safeConfig[this.modeldata.safename]){
+          if(typeof name=='function'){
+            continue
+          }
           if (name==this.model.name){
             this.$showMessage('已有配置名'+name+',添加失败')
             return
@@ -291,12 +264,15 @@ export default {
       }
       if (this.modeldata.safeindex==2){
         for(let name in this.safeConfig[this.modeldata.safelast][this.modeldata.safename].items){
+          if(typeof name=='function'){
+            continue
+          }
           if (name==this.model.name){
             this.$showMessage('已有配置名'+name+',添加失败')
             return
           }
         }
-        console.log("99999999999999999992")
+        //tag
       }
       if (this.modeldata.safeindex==3){
         for (let i = 0; i < this.safeConfig[this.modeldata.safelastlast][this.modeldata.safelast].items[this.modeldata.safename].options.length; i++) {
@@ -305,48 +281,54 @@ export default {
             return
           }
         }
-        console.log("99999999999999999993")
+        //tag
       }
-      //console.log("ttttttttttttt")
-      //console.log(JSON.stringify(this.modeldata))
+      ////tag
+      ////tag)
       if (this.modeldata.safeindex=='1'){
         let index
-        //console.log(this.modeldata.safename)
-        //console.log(this.safeConfig[this.modeldata.safename])
+        ////tag
+        ////tag
         if (Object.keys(this.safeConfig[this.modeldata.safename]).length==0){
           index=0
         }else{
         for (let obj in this.safeConfig[this.modeldata.safename]) {
-          //console.log("77777777")
-          //console.log(obj)
-          //console.log(this.safeConfig[this.modeldata.safename][obj].index)
+          if(typeof obj=='function'){
+            continue
+          }
+          ////tag
+          ////tag
+          ////tag
           index = this.safeConfig[this.modeldata.safename][obj].index
         }
         }
-        //console.log(this.model.name)
+        ////tag
         this.safeConfig[this.modeldata.safename][this.model.name] = {
           checkmust: true,
           index: index + 1,
           items:{}
         }
-        //console.log(JSON.stringify(this.safeConfig))
+        ////tag)
       }
       if (this.modeldata.safeindex=='2'){
         let index
-        //console.log(this.modeldata.safename)
-        //console.log(this.safeConfig[this.modeldata.safelast][this.modeldata.safename].items)
+        ////tag
+        ////tag
         if (Object.keys(this.safeConfig[this.modeldata.safelast][this.modeldata.safename].items).length==0){
           index=0
         }else{
         for (let obj in this.safeConfig[this.modeldata.safelast][this.modeldata.safename].items) {
-          //console.log("77777777")
-          //console.log(obj)
-          //console.log(this.safeConfig[this.modeldata.safelast][this.modeldata.safename].items[obj].index)
+          if(typeof obj=='function'){
+            continue
+          }
+          ////tag
+          ////tag
+          ////tag
           index = this.safeConfig[this.modeldata.safelast][this.modeldata.safename].items[obj].index
         }
         }
 
-        //console.log(this.model.name)
+        ////tag
         this.safeConfig[this.modeldata.safelast][this.modeldata.safename].items[this.model.name] = {
           index: index + 1,
           multiple: false,
@@ -355,13 +337,13 @@ export default {
           checkmust:false,
           type: "selector"
         }
-        //console.log(JSON.stringify(this.safeConfig))
+        ////tag)
       }
       if (this.modeldata.safeindex=='3'){
         let index
-        //console.log(this.modeldata.safename)
-        //console.log(this.safeConfig[this.modeldata.safelastlast][this.modeldata.safelast].items[this.modeldata.safename].options)
-        //console.log(this.model.name)
+        ////tag
+        ////tag
+        ////tag
         this.safeConfig[this.modeldata.safelastlast][this.modeldata.safelast].items[this.modeldata.safename].options.push({
           data:this.model.name,
           isdefect:false,
@@ -369,7 +351,7 @@ export default {
           isdefault:false
         })
 
-        //console.log(JSON.stringify(this.safeConfig))
+        ////tag)
       }
       let path
       let value
@@ -381,7 +363,7 @@ export default {
         value=this.safeConfig["非民用配置项"]
       }
 
-      this.$resetpost('rs/vue/safeSaveConfig', {path: path, data: JSON.stringify(value)} ).then(res=> {
+      this.$resetpost('api/af-safecheck/logic/saveVueConfig', {data:{path: path, data: JSON.stringify(value)}} ).then(res=> {
 
         this.$showMessage("保存成功")
         this.safeArray = []
@@ -400,8 +382,11 @@ export default {
     },
     confirm1() {
       if (this.modeldata.safeindex==2){
-        console.log("99999999999999999991")
+        //tag
         for(let name in this.safeConfig[this.modeldata.safelast]){
+          if(typeof name=='function'){
+            continue
+          }
           if (name==this.model.name){
             this.$showMessage('已有配置名'+name+',修改失败')
             return
@@ -410,12 +395,15 @@ export default {
       }
       if (this.modeldata.safeindex==3){
         for(let name in this.safeConfig[this.modeldata.safelastlast][this.modeldata.safelast].items){
+          if(typeof name=='function'){
+            continue
+          }
           if (name==this.model.name){
             this.$showMessage('已有配置名'+name+',修改失败')
             return
           }
         }
-        console.log("99999999999999999992")
+        //tag
       }
       if (this.modeldata.safeindex==4){
         for (let i = 0; i < this.safeConfig[this.modeldata.safelastlastlast][this.modeldata.safelastlast].items[this.modeldata.safelast].options.length; i++) {
@@ -424,11 +412,11 @@ export default {
             return
           }
         }
-        console.log("99999999999999999993")
+        //tag
       }
       this.seaching=true
-      //console.log("77777777777777")
-      //console.log(JSON.stringify(this.modeldata))
+      ////tag
+      ////tag)
 
       if (this.modeldata.safeindex=='2'){
         this.safeConfig[this.modeldata.safelast][this.model.name]=Object.assign({},this.safeConfig[this.modeldata.safelast][this.modeldata.safename])
@@ -439,8 +427,8 @@ export default {
         delete this.safeConfig[this.modeldata.safelastlast][this.modeldata.safelast].items[this.modeldata.safename]
       }
       if (this.modeldata.safeindex=='4'){
-        //console.log("456456")
-        //console.log(JSON.stringify(this.safeConfig[this.modeldata.safelastlastlast][this.modeldata.safelastlast].items[this.modeldata.safelast].options))
+        ////tag
+        ////tag)
         for (let i = 0; i < this.safeConfig[this.modeldata.safelastlastlast][this.modeldata.safelastlast].items[this.modeldata.safelast].options.length; i++) {
           if(this.safeConfig[this.modeldata.safelastlastlast][this.modeldata.safelastlast].items[this.modeldata.safelast].options[i].data==this.modeldata.safename){
             this.safeConfig[this.modeldata.safelastlastlast][this.modeldata.safelastlast].items[this.modeldata.safelast].options[i].data=this.model.name
@@ -457,7 +445,7 @@ export default {
         value=this.safeConfig["非民用配置项"]
       }
 
-      this.$resetpost('rs/vue/safeSaveConfig', {path: path, data: JSON.stringify(value)} ).then(res=>{
+      this.$resetpost('api/af-safecheck/logic/saveVueConfig', {data:{path: path, data: JSON.stringify(value)}} ).then(res=>{
         this.$showMessage("修改成功")
         this.safeArray = []
         this.initArray()
@@ -476,7 +464,7 @@ export default {
       this.modelshow1 = false
     },
     addsafeConfig(item) {
-      //console.log("66666666")
+      ////tag
 
       this.modeldata = item
       this.modelshow = true
@@ -486,15 +474,18 @@ export default {
         if (res=='confirm'){
           this.seaching=true
           if (item.safeindex=='2'){
-            //console.log("99999999999")
+            ////tag
             if (item.safename=='燃气表'){
               this.$showMessage("燃气表不允许删除！！！")
               return
             }else{
-              //console.log("99999999998")
+              ////tag
               delete this.safeConfig[item.safelast][item.safename]
 
               for(let name in this.safeConfig[item.safelast]){
+                if(typeof name=='function'){
+                  continue
+                }
                 if (this.safeConfig[item.safelast][name].index>item.safesort){
                   this.safeConfig[item.safelast][name].index=this.safeConfig[item.safelast][name].index-1
                 }
@@ -503,6 +494,9 @@ export default {
           }else if (item.safeindex=='3'){
             delete this.safeConfig[item.safelastlast][item.safelast].items[item.safename]
             for(let name in this.safeConfig[item.safelastlast][item.safelast].items){
+              if(typeof name=='function'){
+                continue
+              }
               if (this.safeConfig[item.safelastlast][item.safelast].items[name].index>item.safesort){
                 this.safeConfig[item.safelastlast][item.safelast].items[name].index=this.safeConfig[item.safelastlast][item.safelast].items[name].index-1
               }
@@ -524,7 +518,7 @@ export default {
             value=this.safeConfig["非民用配置项"]
           }
 
-          this.$resetpost('rs/vue/safeSaveConfig', {path: path, data: JSON.stringify(value)} ).then(res=> {
+          this.$resetpost('api/af-safecheck/logic/saveVueConfig', {data:{path: path, data: JSON.stringify(value)}} ).then(res=> {
 
             this.$showMessage("删除成功")
             this.safeArray = []
@@ -542,10 +536,10 @@ export default {
     },
     updatesafeConfig(item){
       this.modeldata=item
-      console.log("88888888888888")
+      //tag
       let array=[]
       if (item.safeindex=='2') {
-        console.log(JSON.stringify(this.safeConfig[item.safelast][item.safename]))
+        //tag)
         let aa = {"checkmust": false, "index": 1}
         if (this.safeConfig[item.safelast][item.safename].checkmust) {
           array.push({
@@ -568,6 +562,9 @@ export default {
       if (item.safeindex=='3'){
         let aa={"index":1,"multiple":false,"isshow":true,"checkmust":false,"type":"selector"}
           for (let key in this.safeConfig[item.safelastlast][item.safelast].items[item.safename]){
+            if(typeof key=='function'){
+              continue
+            }
             if (key=='index'){
 
             }else if(key=='multiple'){
@@ -606,14 +603,17 @@ export default {
               })
             }
           }
-        console.log(JSON.stringify(this.safeConfig[item.safelastlast][item.safelast].items[item.safename]))
+        //tag)
       }
       if (item.safeindex=='4'){
         let aa={"data":"333333333","isdefect":"否","level":"A","isdefault":"否"}
         for (let i = 0; i < this.safeConfig[item.safelastlastlast][item.safelastlast].items[item.safelast].options.length; i++) {
           if (this.safeConfig[item.safelastlastlast][item.safelastlast].items[item.safelast].options[i].data==item.safename){
-            console.log(JSON.stringify(this.safeConfig[item.safelastlastlast][item.safelastlast].items[item.safelast].options[i]))
+            //tag)
             for(let key in this.safeConfig[item.safelastlastlast][item.safelastlast].items[item.safelast].options[i]){
+              if(typeof key=='function'){
+                continue
+              }
                if(key=='data'){
 
               }else if(key=='isdefect'){
@@ -646,8 +646,8 @@ export default {
           }
         }
       }
-      console.log("7777777777777777777")
-     console.log(array)
+      //tag
+     //tag
       this.updateArray=Object.assign([],array)
       this.modelshow2=true
     },
@@ -697,7 +697,7 @@ export default {
         value=this.safeConfig["非民用配置项"]
       }
 
-      this.$resetpost('rs/vue/safeSaveConfig', {path: path, data: JSON.stringify(value)} ).then(res=> {
+      this.$resetpost('api/af-safecheck/logic/saveVueConfig', {data:{path: path, data: JSON.stringify(value)}} ).then(res=> {
 
         this.$showMessage("修改成功")
         this.safeArray = []
@@ -720,8 +720,11 @@ export default {
     },
     initArray() {
       for (let bigsafe in this.safeConfig) {
-        //console.log(bigsafe)
-        //console.log(JSON.stringify(this.safeConfig[bigsafe]))
+        if(typeof bigsafe=='function'){
+          continue
+        }
+        ////tag
+        ////tag)
         this.safeArray.push({
           selectedshow: false,
           safetype: '',
@@ -744,17 +747,20 @@ export default {
       return '无'
     },
     pushArray(val, arrayindex) {
-      //console.log(arrayindex)
-      //console.log(JSON.stringify(val))
-      //console.log(JSON.stringify(this.safeArray[arrayindex]))
+      ////tag
+      ////tag)
+      ////tag)
       if (this.safeArray[arrayindex].safeshow == false) {
         let spliceindex = arrayindex + 1
         this.safeArray[arrayindex].safeshow = true
         if (val.safeindex == '1') {
           let linshiarray = []
           for (let two in this.safeConfig[val.safename]) {
-            //console.log(two)
-            //console.log(JSON.stringify(this.safeConfig[val.safename][two]))
+            if(typeof two=='function'){
+              continue
+            }
+            ////tag
+            ////tag)
 
             linshiarray.push({
               selectedshow: false,
@@ -770,8 +776,8 @@ export default {
           }
 
           linshiarray=this.jsonSort(linshiarray, "safesort",true)
-          //console.log("gggggggggggggggggg")
-          //console.log(JSON.stringify(linshiarray))
+          ////tag
+          ////tag)
           for (let i = 0; i < linshiarray.length; i++) {
             this.safeArray.splice(spliceindex, 0,linshiarray[i])
           }
@@ -780,13 +786,19 @@ export default {
           let linshiarray = []
           let aa = {"safename": "燃气表", "safevalue": 3, "safeindex": 2, "safelast": "民用配置项"}
           for (let isthree in this.safeConfig[val.safelast][val.safename]) {
+            if(typeof isthree=='function'){
+              continue
+            }
             if (isthree == 'items') {
               for (let three in this.safeConfig[val.safelast][val.safename].items) {
-                //console.log(three)
-                //console.log("8888888")
-                //console.log("插入位置==》" + spliceindex)
-                //console.log("此时数组" + JSON.stringify(this.safeArray))
-                //console.log(JSON.stringify(this.safeConfig[val.safelast][val.safename].items[three]))
+                if(typeof three=='function'){
+                  continue
+                }
+                ////tag
+                ////tag
+                ////tag
+                ////tag)
+                ////tag)
                 linshiarray.push({
                   safesort:this.safeConfig[val.safelast][val.safename].items[three].index,
                   selectedshow: false,
@@ -800,8 +812,8 @@ export default {
                 })
               }
               linshiarray=this.jsonSort(linshiarray, "safesort",true)
-              //console.log("gggggggggggggggggg")
-              //console.log(JSON.stringify(linshiarray))
+              ////tag
+              ////tag)
               for (let i = 0; i < linshiarray.length; i++) {
                 this.safeArray.splice(spliceindex, 0,linshiarray[i])
               }
@@ -819,14 +831,20 @@ export default {
             "safelastlast": "民用配置项"
           }
           for (let isfour in this.safeConfig[val.safelastlast][val.safelast].items[val.safename]) {
+            if(typeof isfour=='function'){
+              continue
+            }
             if (isfour == 'options') {
               for (let four in this.safeConfig[val.safelastlast][val.safelast].items[val.safename].options) {
-                //console.log(four)
-                //console.log("插入位置==》" + spliceindex)
-                //console.log("此时数组" + JSON.stringify(this.safeArray))
-                //console.log(JSON.stringify(this.safeConfig[val.safelastlast][val.safelast].items[val.safename].options[four]))
-                //console.log(JSON.stringify(this.safeConfig[val.safelastlast][val.safelast].items[val.safename].options[four]))
-                linshiarray.push( {
+                if(typeof four=='function'){
+                  continue
+                }
+                ////tag
+                ////tag
+                ////tag)
+                ////tag)
+                ////tag)
+                linshiarray.push({
                   safesort:four,
                   selectedshow: false,
                   safetype: 'no',
@@ -840,8 +858,8 @@ export default {
                 })
               }
               linshiarray=this.jsonSort(linshiarray, "safesort",true)
-              //console.log("gggggggggggggggggg")
-              //console.log(JSON.stringify(linshiarray))
+              ////tag
+              ////tag)
               for (let i = 0; i < linshiarray.length; i++) {
                 this.safeArray.splice(spliceindex, 0,linshiarray[i])
               }
@@ -863,15 +881,15 @@ export default {
             }
           }
         }
-        //console.log(JSON.stringify(deleteindex))
+        ////tag)
         this.safeArray.splice(deleteindex.begin, deleteindex.end + 1 - deleteindex.begin)
 
       }
-      //console.log(JSON.stringify(this.safeArray))
+      ////tag)
     },
     selectedshow(index) {
       this.rightdata={}
-      //console.log(index)
+      ////tag
       for (let i = 0; i < this.safeArray.length; i++) {
         this.safeArray[i].selectedshow = false
       }
@@ -879,16 +897,16 @@ export default {
       this.rightrow = Object.assign({}, this.safeArray[index])
       //传入参数到右侧
       //开始取对应参数
-      //console.log("99999999")
-      //console.log(this.rightrow)
+      ////tag
+      ////tag
       this.setRightRow(this.rightrow)
 
       this.rightshow = true
 
     },
     getrightdataname(name) {
-      //console.log("8888888888")
-      //console.log(name)
+      ////tag
+      ////tag
       if (name == 'checkmust') {
         return '是否必填'
       }
@@ -954,10 +972,10 @@ export default {
       return value
     },
     setRightRow(row) {
-      //console.log("999999999999")
+      ////tag
       if (row.safelastlastlast) {
-        //console.log(row)
-        //console.log(JSON.stringify(this.safeConfig[row.safelastlastlast][row.safelastlast].items[row.safelast].options))
+        ////tag
+        ////tag)
         for (let i = 0; i < this.safeConfig[row.safelastlastlast][row.safelastlast].items[row.safelast].options.length; i++) {
           if (this.safeConfig[row.safelastlastlast][row.safelastlast].items[row.safelast].options[i].data == row.safename) {
             this.rightdata = Object.assign({}, this.safeConfig[row.safelastlastlast][row.safelastlast].items[row.safelast].options[i])
@@ -965,10 +983,10 @@ export default {
         }
       } else if (row.safelastlast) {
 
-        //console.log(JSON.stringify(this.safeConfig[row.safelastlast][row.safelast].items[row.safename]))
+        ////tag)
         this.rightdata = Object.assign(this.safeConfig[row.safelastlast][row.safelast].items[row.safename])
       } else if (row.safelast) {
-        //console.log(JSON.stringify(this.safeConfig[row.safelast][row.safename]))
+        ////tag)
         this.rightdata = Object.assign(this.safeConfig[row.safelast][row.safename])
       }
     },
@@ -976,7 +994,7 @@ export default {
       return Object.keys(val).length
     },
     jsonSort(array, field, reverse) {
-      //console.log('传进来的数据==》', array)
+      ////tag
       //数组长度小于2 或 没有指定排序字段 或 不是json格式数据
       if (array.length < 2 || !field || typeof array[0] !== "object") return array;
       //数字类型排序
@@ -999,13 +1017,13 @@ export default {
     },
     sleep(n) {
     var start = new Date().getTime();
-  //  console.log('休眠前：' + start);
+  //  //tag;
     while (true) {
     if (new Date().getTime() - start > n) {
       break;
     }
   }
-  // console.log('休眠后：' + new Date().getTime());
+  // //tag.getTime());
 }