safecheck-client 3.0.30-96 → 3.0.30-98

package/src/filiale/dexin/pc.js

@@ -1,12 +1,12 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'paper-main': (resolve) => {require(['./pc/PaperList.vue'], resolve)},
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'paper-main': (resolve) => {require(['./pc/PaperList.vue'], resolve)},
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/fugou/pc/PaperDefectMain.vue

@@ -65,14 +65,14 @@
                 <!--<input type="text" class="input_search" v-model="model.f_device_type"-->
                 <!--style="width: 60%" placeholder="检&ensp;查&ensp;项" condition="f_device_type like '%{}%'">-->
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">隐患名称</label>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">隐患原因</label>
                 <v-select :value.sync="model.f_item_name"
                           v-model='model.f_item_name'
                           style="width: 60%"
                           class="select_list select"
                           :options='$parent.$parent.DefectConfigs'
-                          placeholder='隐患名称'
+                          placeholder='隐患原因'
                           :multiple="true"
                           condition="f_item_name in {}"></v-select>
               </div>
@@ -409,7 +409,7 @@
     try {
       let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
       Vue.config = res.data
-      self.getDefectInfoConfig(res.data)
+      self.getDeviceTypes(res.data)
     } catch (error) {
       // 忽略704,文件找不到异常R
       if (error.status !== 704) {
@@ -509,6 +509,33 @@
       }
     },
     methods: {
+      getDeviceTypes(val) {
+        try {
+          if (val.safecheck.DevicesSetConfig != undefined) {
+            this.DefectConfig = val.safecheck.DevicesConfig
+            for (var Key1 in this.DefectConfig) {
+              this.device_types.push({label: Key1, value: Key1})
+            }
+          }
+        } catch (e) {
+        }
+      },
+      async getDefectInfoConfig() {
+        var resData = await new HttpResetClass().load('POST', '/rs/sql/tel_singleTable_GroupBy', {data: {
+            items: 'f_item_name',
+            tablename: 't_devices_items',
+            condition: 'f_is_defect = true',
+            groupitem: 'f_item_name',
+          }}, {
+          warnMsg: null,
+          resolveMsg: null
+        })
+        if (resData.data) {
+          for (let i = 0; i < resData.data.length; i++) {
+            this.DefectConfigs.push({label: resData.data[i].f_item_name, value: resData.data[i].f_item_name})
+          }
+        }
+      },
       isChecked(row) {
         return this.checkes.findIndex(item => item.f_defect_id == row.f_defect_id) != -1
       },
@@ -686,23 +713,6 @@
         this.cancel1()
         this.$showMessage('本次转维修成功'+successCount+'单')
       },
-      getDefectInfoConfig(val){
-        try {
-          if (val.safecheck.DevicesSetConfig != undefined) {
-            this.DefectConfig = val.safecheck.DevicesConfig
-            // 获取到配置项，进行遍历，获取每个隐患项
-            for (var Key1 in this.DefectConfig){
-              this.device_types.push({label:Key1,value:Key1})
-              for(var Key2 in this.DefectConfig[Key1].items){
-                this.DefectConfigs.push({label:Key2,value:Key2})
-              }
-            }
-            // 非民用或其他配置项加入，在进行遍历
-          }
-        }catch (e) {
-          //tag
-        }
-      },
       showaudio(){
         //tag
         this.audioshow=!this.audioshow
@@ -885,6 +895,7 @@
       //this.pianqu()
       this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)
+      this.getDefectInfoConfig()
     }
   }
 </script>

package/src/filiale/wensu/pc/CheckSearchUser.vue

@@ -49,9 +49,9 @@
           </div>
           <div class="row" v-show="!$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">用户类型</label>
+              <label class="font_normal_body">用气类型</label>
               <v-select id="f_usertype"
-                        placeholder='用户类型'
+                        placeholder='用气类型'
                         class="select select_list"
                         :value.sync="model.f_usertype"
                         :value-single="true"

package/src/main.js

@@ -11,7 +11,7 @@ all()
 var Verificationfalg = false
 system(Verificationfalg)
 // system()
-safecheck(process.env.SAFE_CHECK);
+safecheck('fugou');
 // safecheck('rizhao')
 require('./bootstrap/less/bootstrap.less')
 require('./expandcss.less')