likang'

src/config/componentsMap.js

@@ -2,87 +2,133 @@
  * export component map
  */
 export default {
-  layout: () => import('@/layout'),
-  // 权限管理
-  users: () => import('@/views/permission/users'),
-  roles: () => import('@/views/permission/roles'),
-  rules: () => import('@/views/permission/rules'),
-  departments: () => import('@/views/permission/departments'),
-  jobs: () => import('@/views/permission/jobs'),
-  // 系统设置
-  database: () => import('@/views/system/database'),
-  attachment: () => import('@/views/system/attachments'),
-  loginLog: () => import('@/views/system/log/login'),
-  operateLog: () => import('@/views/system/log/operate'),
-  sensitiveWord: () => import('@/views/system/sensitiveWord'),
-  develop: () => import('@/views/system/develop'),
-  generate: () => import('@/views/system/generate'),
-  // 配置管理
-  config: () => import('@/views/system/config'),
-  // 模块管理
-  module: () => import('@/views/system/module'),
-  // 表单构建
-  form: () => import('@/views/system/form'),
+    layout: () =>
+        import ('@/layout'),
+    // 权限管理
+    users: () =>
+        import ('@/views/permission/users'),
+    roles: () =>
+        import ('@/views/permission/roles'),
+    rules: () =>
+        import ('@/views/permission/rules'),
+    departments: () =>
+        import ('@/views/permission/departments'),
+    jobs: () =>
+        import ('@/views/permission/jobs'),
+    // 系统设置
+    database: () =>
+        import ('@/views/system/database'),
+    attachment: () =>
+        import ('@/views/system/attachments'),
+    loginLog: () =>
+        import ('@/views/system/log/login'),
+    operateLog: () =>
+        import ('@/views/system/log/operate'),
+    sensitiveWord: () =>
+        import ('@/views/system/sensitiveWord'),
+    develop: () =>
+        import ('@/views/system/develop'),
+    generate: () =>
+        import ('@/views/system/generate'),
+    // 配置管理
+    config: () =>
+        import ('@/views/system/config'),
+    // 模块管理
+    module: () =>
+        import ('@/views/system/module'),
+    // 表单构建
+    form: () =>
+        import ('@/views/system/form'),
 
-  // 微信管理
-  wechatMenus: () => import('@/views/wechat/menus'),
-  //
-  // 微信用户
-  wechatUsers: () => import('@/views/wechat/users'),
-  // 微信用户标签
-  wechatTags: () => import('@/views/wechat/tags'),
-  // wechatGraphic:() => import('@/views/catchAdmin/wechat/graphic'),
-  wechatReply: () => import('@/views/wechat/reply'),
-  //微信公众号轮播图管理
-  wechatBanner: () => import('@/views/wechat/banner'),
-  //微信公众号公告管理
-  wechatNotice: () => import('@/views/wechat/notice'),
-  //微信公众号补卡管理
-  wechatUpdateCard: () => import('@/views/wechat/updatecard'),
-  //设备管理
-  hydraulic: () => import('@/views/device/hydraulic'),
-  wrench: () => import('@/views/device/wrench'),
-  flange: () => import('@/views/device/flange'),
-  maintenance: () => import('@/views/device/maintenance'),
-  wind: () => import('@/views/wind/wind'),
-  fan: () => import('@/views/wind/fan'),
-  device_mold:() => import('@/views/device/mold'),
-  // stolenVehicles: () => import('@/views/yunying/vehicle/stolen'),
-  // 短信平台
-  sms: () => import('@/views/sms'),
+    // 微信管理
+    wechatMenus: () =>
+        import ('@/views/wechat/menus'),
+    //
+    // 微信用户
+    wechatUsers: () =>
+        import ('@/views/wechat/users'),
+    // 微信用户标签
+    wechatTags: () =>
+        import ('@/views/wechat/tags'),
+    // wechatGraphic:() => import('@/views/catchAdmin/wechat/graphic'),
+    wechatReply: () =>
+        import ('@/views/wechat/reply'),
+    //微信公众号轮播图管理
+    wechatBanner: () =>
+        import ('@/views/wechat/banner'),
+    //微信公众号公告管理
+    wechatNotice: () =>
+        import ('@/views/wechat/notice'),
+    //微信公众号补卡管理
+    wechatUpdateCard: () =>
+        import ('@/views/wechat/updatecard'),
+    //设备管理
+    hydraulic: () =>
+        import ('@/views/device/hydraulic'),
+    wrench: () =>
+        import ('@/views/device/wrench'),
+    flange: () =>
+        import ('@/views/device/flange'),
+    maintenance: () =>
+        import ('@/views/device/maintenance'),
+    wind: () =>
+        import ('@/views/wind/wind'),
+    fan: () =>
+        import ('@/views/wind/fan'),
+    //同步方案
+    synscheme: () =>
+        import ('@/views/device/synscheme'),
+    device_mold: () =>
+        import ('@/views/device/mold'),
+    // stolenVehicles: () => import('@/views/yunying/vehicle/stolen'),
+    // 短信平台
+    sms: () =>
+        import ('@/views/sms'),
 
-  //推送记录
-  smsSendLog: () => import('@/views/sms/smsSendLog'),
-  // 域名管理
-  domain: () => import('@/views/domain'),
-  // 域名记录
-  domainRecord: () => import('@/views/domain/record'),
+    //推送记录
+    smsSendLog: () =>
+        import ('@/views/sms/smsSendLog'),
+    // 域名管理
+    domain: () =>
+        import ('@/views/domain'),
+    // 域名记录
+    domainRecord: () =>
+        import ('@/views/domain/record'),
 
+    //基础配置
+    basicConfig: () =>
+        import ('@/views/permission/config'),
 
-  //基础配置
-  basicConfig: () => import('@/views/permission/config'),
+    //类型字典
+    sysDictType: () =>
+        import ('@/views/system/sysDictType'),
 
-  //类型字典
-  sysDictType: () => import('@/views/system/sysDictType'),
 
+    // 报表分析 => 设备汇总
 
-  // 报表分析 => 设备汇总
 
- 
-  //大屏
-  screen: () => import('@/views/screen'),
+    //大屏
+    screen: () =>
+        import ('@/views/screen'),
 
 
-  //告警记录
-  alarmRecords: () => import('@/views/alarm/alarmRecords/index'),
-  alarmReport: () => import('@/views/alarm/alarmReport/index'),
-  alarmDevice: () => import('@/views/alarm/device/index'),
-  pushResult: () => import('@/views/alarm/pushResult/index'),
-  //轨迹地图
-  routeMap: () => import('@/views/map/routeMap'),
-  alarmMap: () => import('@/views/map/alarmMap'),
+    //告警记录
+    alarmRecords: () =>
+        import ('@/views/alarm/alarmRecords/index'),
+    alarmReport: () =>
+        import ('@/views/alarm/alarmReport/index'),
+    alarmDevice: () =>
+        import ('@/views/alarm/device/index'),
+    pushResult: () =>
+        import ('@/views/alarm/pushResult/index'),
+    //轨迹地图
+    routeMap: () =>
+        import ('@/views/map/routeMap'),
+    alarmMap: () =>
+        import ('@/views/map/alarmMap'),
 
-  // 围栏列表
-  fence: () => import('@/views/fence/index'),
+    // 围栏列表
+    fence: () =>
+        import ('@/views/fence/index'),
 
-}
+}

src/views/device/synscheme/formModel.vue

@@ -18,123 +18,38 @@
 export default {
   props: ["formModelVisible", "title"],
   data() {
-    var validateMaxPressure = (rule, value, callback) => {
-        if ( (value !== '') && (this.formFieldsData.min_pressure !=='')) {
-            var min_pressure = this.formFieldsData.min_pressure - 0;
-            var max_pressure = value - 0;
-            if (min_pressure > max_pressure) {
-                callback(new Error('不能小于最小压力'))
-            } else {
-                callback()
-            }
-        } else {
-           callback()
-        }
-    };
-    var validateMinPressure = (rule, value, callback) => {
-        if ( (value !== '') && (this.formFieldsData.max_pressure !=='')) {
-            var max_pressure = this.formFieldsData.max_pressure - 0;
-            var min_pressure = value - 0;
-            if (min_pressure > max_pressure) {
-                callback(new Error('不能大于最大压力'))
-            } else {
-                callback()
-            }
-        } else {
-           callback()
-        }
-    };
     return {
       formData: {},
       deviceTypes:[],
       formFieldsData: {
-        department_id: "",
-        number: "",
         name: "",
-        model: "",
-        brand:"",
-        supplier:"",
-        max_pressure:"",
-        min_pressure:"",
-        out_date:"",
-        remark: ""
+        hole: "",
+        step:"",
+        data:""
       },
-      url: "hydraulic",
+      url: "synscheme",
       formConfig: {
         formDesc: {
-          department_id: {
-            type: "cascader",
-            label: "所属部门",
-            isOptions: true,
-            options: [],
-            required: true,
-            attrs: {
-              props: {
-                label: "department_name",
-                value: "id",
-                emitPath: false,
-                checkStrictly: true
-              }
-            }
-          },
-          number: {
-            type: "input",
-            label: "编号",
-            required:true,
-          },
            name: {
             type: "input",
             label: "名称",
             required:true
           },
-          model: {
-            type: "select",
-            label: "型号",
-            required:true,
-     
-             options: [],
-          },
-           brand: {
+           hole: {
             type: "input",
-            label: "品牌"
+            label: "孔"
           },
-          supplier: {
+          step: {
             type: "input",
-            label: "供应商"
-          },
-          max_pressure: {
-            type: "input",
-            label: "最大压力"
-          },
-          min_pressure: {
-            type: "input",
-            label: "最小压力"
-          },
-          out_date: {
-            type: "date",
-            label: "出厂日期"
-          },
-          remark: {
-            type: "textarea",
-            label: "显示信息"
+            label: "步骤"
           }
         },
-        rules: {
-          max_pressure:  { validator: validateMaxPressure, trigger: 'blur' } ,
-          min_pressure:  { validator: validateMinPressure, trigger: 'blur' } ,
-        },
-        order: ["department_id","number", "name", "model","brand","supplier","min_pressure","max_pressure","out_date","remark"]
+        order: ["name","hole", "step"]
       }
     };
   },
   created() {
-    this.$http.get("departments").then(response => {
-      this.formConfig.formDesc.department_id.options = response.data;
-    });
-     // 0-液压泵
-    this.$http.get("get_device_mold",{ params: {type:0} }).then(resp => {
-        this.formConfig.formDesc.model.options = resp.data
-     });
+    
   },
   methods: {
     handleFormSubmit(data) {

src/views/device/synscheme/index.vue

@@ -3,29 +3,6 @@
     <div class="filter-container" style="padding-bottom: 0px">
       <div class="search-box-area" id="searchBox">
         <div class="search-item">
-          <el-cascader
-            class="filter-item form-search-input fl"
-            v-model="queryParam.department_id"
-            :options="departments"
-            clearable
-            :props="{
-              checkStrictly: true,
-              label: 'department_name',
-              value: 'id',
-            }"
-            @change="handleChange"
-          ></el-cascader>
-        </div>
-        <div class="search-item">
-          <el-input
-            v-model="queryParam.number"
-            placeholder="编号"
-            clearable
-            class="filter-item form-search-input fl"
-            @keyup.enter.native="handleSearch"
-          />
-        </div>
-        <div class="search-item">
           <el-input
             v-model="queryParam.name"
             placeholder="名称"
@@ -34,33 +11,6 @@
             @keyup.enter.native="handleSearch"
           />
         </div>
-        <div class="search-item">
-
-          <el-select
-            v-model="queryParam.model"
-            placeholder="设备型号"
-            class="filter-item form-search-input fl"
-            clearable
-          >
-          <el-option
-                v-for="item in deviceTypes"
-                :key="item.value"
-                :label="item.text"
-                :value="item.value">
-              </el-option>
-          </el-select>
-        </div>
-        <div class="search-item">
-          <el-select
-            v-model="queryParam.is_used"
-            placeholder="启用状态"
-            class="filter-item form-search-input fl"
-            clearable
-          >
-            <el-option value="0" label="未使用">启用</el-option>
-            <el-option value="1" label="已使用">停用</el-option>
-          </el-select>
-        </div>
       </div>
       <div class="search-operate-area">
         <!-- <el-input v-model="queryParam.code" placeholder="唯一编码" clearable class="filter-item form-search-input fl" /> -->
@@ -116,54 +66,7 @@
         fixed="left"
         width="55"
       ></el-table-column>
-      <el-table-column
-        prop="depart_name"
-        label="所属部门"
-        align="center"
-        v-if="showColumn.depart_name"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
-      <!-- <el-table-column
-        prop="alarm_state_text"
-        label="告警状态"
-        align="center"
-        v-if="showColumn.alarm_state_text"
-        width="120"
-      >
-        <template slot-scope="record">
-            <el-tag
-              effect="dark"
-              slot="reference"
-              :type="current_type[record.row.alarm_state] || ''"
-              size="small"
-              >{{ record.row.alarm_state_text }}</el-tag
-            >
-        </template>
-      </el-table-column> -->
-
-      <el-table-column
-        prop="net_state"
-        label="在线状态"
-        align="center"
-        v-if="showColumn.net_state"
-        :show-overflow-tooltip="true"
-        width="120"
-      >
-        <template slot-scope="record">
-          <el-tag type="success" v-if="record.row.net_state == '0'" >在线</el-tag >
-          <el-tag type="gray" v-else-if="record.row.net_state == '1'" >离线</el-tag >
-          <el-tag type="danger" v-else>从未上线</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="number"
-        label="编号"
-        align="center"
-        v-if="showColumn.number"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
+   
       <el-table-column
         prop="name"
         label="名称"
@@ -172,101 +75,21 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        prop="brand"
-        label="品牌"
+        prop="hole"
+        label="孔"
         align="center"
         v-if="showColumn.brand"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        prop="supplier"
-        label="供应商"
+        prop="step"
+        label="步骤"
         align="center"
         v-if="showColumn.supplier"
         :show-overflow-tooltip="true"
-        width="120"
-      />
-      <el-table-column
-        prop="model_name"
-        label="型号"
-        align="center"
-        v-if="showColumn.model_name"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        prop="max_pressure"
-        label="最大压力"
-        align="center"
-        v-if="showColumn.max_pressure"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        prop="min_pressure"
-        label="最小压力"
-        align="center"
-        v-if="showColumn.min_pressure"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        prop="out_date"
-        label="出厂日期"
-        align="center"
-        v-if="showColumn.out_date"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
-      <el-table-column
-        prop="is_used"
-        label="启用状态"
-        align="center"
-        v-if="showColumn.is_used"
-        :show-overflow-tooltip="true"
-        width="120"
-      >
-        <template slot-scope="record">
-          <el-switch
-            v-model="record.row.is_used"
-            active-color="#13ce66"
-            @change="changeUsedEvent(record.row,$event)"
-            inactive-color="#ff4949">
-          </el-switch>
-          <!-- <el-tag type="danger" v-if="record.row.is_used == 0"
-            >未使用</el-tag
-          >
-          <el-tag type="success" v-else>已使用</el-tag> -->
-        </template>
-      </el-table-column>
-       <el-table-column
-        prop="online_time"
-        label="在线时间"
-        align="center"
-        v-if="showColumn.online_time"
         width="200"
-        sortable
-      />
-      <el-table-column
-        prop="creator_user"
-        label="导入用户"
-        align="center"
-        v-if="showColumn.creator_user"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        prop="created_at"
-        label="添加时间"
-        align="center"
-        v-if="showColumn.created_at"
-        :show-overflow-tooltip="true"
-        width="200"
-        sortable
-      />
-       <el-table-column
-        prop="remark"
-        label="显示信息"
-        align="center"
-        v-if="showColumn.remark"
-        width="100"
       />
+    
       <el-table-column
         label="操作"
         width="180"
@@ -306,22 +129,9 @@
         <div class="content">
           <div class="head">选择显示字段</div>
           <div class="body">
-            <el-checkbox v-model="checkList.depart_name" disabled>所属部门</el-checkbox>
-            <!-- <el-checkbox v-model="checkList.alarm_state_text" disabled>告警状态</el-checkbox> -->
-            <el-checkbox v-model="checkList.net_state">在线状态</el-checkbox>
-            <el-checkbox v-model="checkList.number">编号</el-checkbox>
             <el-checkbox v-model="checkList.name">名称</el-checkbox>
-            <el-checkbox v-model="checkList.brand">品牌</el-checkbox>
-            <el-checkbox v-model="checkList.supplier">供应商</el-checkbox>
-            <el-checkbox v-model="checkList.max_pressure">最大压力</el-checkbox>
-            <el-checkbox v-model="checkList.min_pressure">最小压力</el-checkbox>
-            <el-checkbox v-model="checkList.model_name">型号</el-checkbox>
-            <el-checkbox v-model="checkList.out_date">出厂日期</el-checkbox>
-            <el-checkbox v-model="checkList.is_used">启用状态</el-checkbox>
-            <el-checkbox v-model="checkList.online_time">在线时间</el-checkbox>
-            <el-checkbox v-model="checkList.creator_user">导入用户</el-checkbox>
-            <el-checkbox v-model="checkList.created_at">添加时间</el-checkbox>
-            <el-checkbox v-model="checkList.remark">显示信息</el-checkbox>
+            <el-checkbox v-model="checkList.hole">孔</el-checkbox>
+            <el-checkbox v-model="checkList.step">步骤</el-checkbox>
           </div>
           <div class="footer">
             <el-button size="small" type="primary" plain @click="saveColumn"
@@ -378,7 +188,7 @@ import { action } from "@/directive/permission/index.js";
 import detail from "./detail.vue"
 import formModel from './formModel.vue'
 export default {
-  name: "hydraulic",
+  name: "synscheme",
   directives: { action },
   mixins: [rlListOperate],
   components: {
@@ -387,20 +197,17 @@ export default {
   },
   data() {
     return {
-      url: "hydraulic",
+      url: "synscheme",
       queryParam: {
-        number: "",
-        department_id: [],
+       
         name: "",
-        model: "",
-        is_used: "",
       },
       deviceTypes:[],
       current_type: {
         0: "success",
         1: "danger",
       },
-      formName:'hydraulic',
+      formName:'synscheme',
       formVisible:false,
       //搜索
       searchDisplay: true,
@@ -414,28 +221,14 @@ export default {
       // 列的配置化对象，存储配置信息
       checkList: {},
       showColumn: {
-        depart_name: true,
-        alarm_state_text: true,
-        net_state:true,
-        number: true,
         name: true,
-        brand: true,
-        supplier: true,
-        model_name: true,
-        is_used:true,
-        online_time: true
+        hole: true,
+        step:true,
       }
     };
   },
   created() {
-    this.$http.get("departments").then((response) => {
-      this.departments = response.data;
-    });
-
-    // 0-液压泵
-    this.$http.get("get_device_mold",{ params: {type:0} }).then(resp => {
-        this.deviceTypes = resp.data
-     });
+   
   },
   methods: {
    
@@ -467,7 +260,7 @@ export default {
       this.isShowColumn = true;
     },
     saveColumn() {
-      localStorage.setItem("hydColumnSet", JSON.stringify(this.checkList));
+      localStorage.setItem("synschemeSet", JSON.stringify(this.checkList));
       this.isShowColumn = false;
     },
     handleDetail(row){
@@ -479,7 +272,7 @@ export default {
     },
     changeUsedEvent(row,value){
 
-      this.$http.put('hydraulic/' + row.id, { is_used: value }).then(resp => {
+      this.$http.put('synscheme/' + row.id, { is_used: value }).then(resp => {
           if (resp.code === 10000) {
               this.$message.success('操作成功')
               // row[field] = val
@@ -519,19 +312,14 @@ export default {
       this.searchDis();
     });
     // 发请求得到checkListInitData的列的名字
-    if (localStorage.getItem("hydColumnSet")) {
-      this.checkList = JSON.parse(localStorage.getItem("hydColumnSet"));
+    if (localStorage.getItem("synschemeSet")) {
+      this.checkList = JSON.parse(localStorage.getItem("synschemeSet"));
     } else {
       this.checkList = {
-        depart_name: true,
-        alarm_state_text: true,
-        net_state:true,
-        number: true,
         name: true,
-        brand: true,
-        supplier: true,
-        model: true,
-        online_time: true
+        hole: true,
+        step:true,
+     
       };
     }
   },