opt: 国际化,页面优化

acs2/nladmin-ui/src/views/acs/device/index.vue

@@ -50,6 +50,20 @@
               <el-option v-for="item in regions" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
+          <el-form-item label="是否配置">
+            <el-select
+              v-model="query.is_config"
+              clearable
+              filterable
+              size="small"
+              placeholder="是否配置"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in is_configs" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -259,6 +273,7 @@ export default {
       device_types: [],
       uploadShow: false,
       regions: [],
+      is_configs: [],
       rules: {
         device_code: [
           { required: true, message: '设备编码不能为空', trigger: 'blur' }
@@ -282,6 +297,10 @@ export default {
       get('region_type').then(data => {
         this.regions = data.content
       })
+      // 是否
+      get('TrueOrFalse').then(data => {
+        this.is_configs = data.content
+      })
     })
   },
   methods: {

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -209,6 +209,7 @@
                   v-model="form.start_point_code"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
                   @change="showStartStorage"
                 >
@@ -257,6 +258,7 @@
                   v-model="form.next_point_code"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
                   @change="showEndStorage"
                 >
@@ -312,6 +314,7 @@
                   v-model="form.start_point_code2"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
                 >
                   <el-option
@@ -359,6 +362,7 @@
                   v-model="form.next_point_code2"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
                 >
                   <el-option
@@ -502,7 +506,7 @@
         <el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
         <el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
         <el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
-        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true":show-overflow-tooltip="true" width="150px" />
+        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true" width="150px" />
         <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
         <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />