Squashed 'acs/' changes from e256468..6a70aba

6a70aba add：新增手动下发充电任务
8f9fa38 add:重新提交前端文件

git-subtree-dir: acs
git-subtree-split: 6a70aba6c93df402b0b3caa2271e517629b7fb1f

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

@@ -145,9 +145,21 @@
               <el-form-item :label="$t('device.device_table_title.sequence_number')" prop="seq_num">
                 <el-input-number v-model="form.seq_num" value="1" :min="1" label="描述文字" />
               </el-form-item>
-              <!--          <el-form-item label="生产厂家">-->
-              <!--            <el-input v-model="form.manufacturer" style="width: 370px;" />-->
-              <!--          </el-form-item>-->
+              <el-form-item label="所属车间" prop="manufacturer">
+                <el-select
+                  v-model="form.manufacturer"
+                  size="mini"
+                  placeholder="位置"
+                  class="filter-item"
+                  style="width: 370px;"
+                >
+                  <el-option
+                    v-for="item in dict.area"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
               <!--          <el-form-item label="厂家电话">-->
               <!--            <el-input v-model="form.manufacturer_phone" style="width: 370px;" />-->
               <!--          </el-form-item>-->
@@ -192,7 +204,7 @@
             <span v-else>否</span>
           </template>
         </el-table-column>
-        <!--        <el-table-column prop="manufacturer" label="生产厂家" />-->
+        <el-table-column prop="manufacturer" label="所属车间" />
         <!--        <el-table-column prop="manufacturer_phone" label="厂家电话" />-->
         <el-table-column prop="remark" :label="$t('device.device_table_title.descriptive_information')" :min-width="flexWidth('remark',crud.data,$t('device.device_table_title.descriptive_information'))" />
         <el-table-column v-permission="['admin','device:edit','device:del']" :label="$t('auto.common.Operate')" width="200px" align="center">
@@ -253,6 +265,7 @@ const defaultForm = {
 export default {
   name: 'Device',
   components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog },
+  dicts: ['area'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({