瀏覽代碼

bug 修复

lilei 4 年之前
父節點
當前提交
c22fce5c14
共有 2 個文件被更改,包括 5 次插入3 次删除
  1. 3 1
      src/views/equipmentManage/network/equipmentModal.vue
  2. 2 2
      vue.config.js

+ 3 - 1
src/views/equipmentManage/network/equipmentModal.vue

@@ -61,12 +61,14 @@
             placeholder="请选择箱体类型"
             style="width: 100%;"
             v-model="record.deviceTypeNo"
-            :disabled="record.state == 1&&record.deviceType!='STEELYARD'"
+            v-if="record.deviceType!='STEELYARD'"
+            :disabled="record.state == 1"
             @change="typeChange($event, record)">
             <a-select-option v-for="(item,index) in record.deviceTypeList" :key="index" :value="item.deviceTypeNo">
               {{ item.name }}
             </a-select-option>
           </a-select>
+          <span v-else>--</span>
         </template>
         <!-- 工作状态 -->
         <template slot="workStatus" slot-scope="record">

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.102:8301/gc-admin/',
-        // target: 'https://lese.test.sxzxyj.net/gc-admin/',
+        // target: 'http://192.168.16.102:8301/gc-admin/',
+        target: 'https://lese.test.sxzxyj.net/gc-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {